Skip to content

Commit a2c231c

Browse files
GeeoonHusky Roboticsimisaacwu
authored
Panoramic Photos (#366)
* Basic camera setup * format * Vector of frames * Added servo * Added initial rotation * Hard coded parameters * Added cardinal directions * Added wait for camera * Relative spin direction * Stitching partially working * Code cleanup, need to fix direction drawing * Added ability to run locally * Added untested cardinal directions * Added scale to imaes * Using camera grab frames as delay * Added matcher * Tuned parameters --------- Co-authored-by: Husky Robotics <huskyrobotics@system76-pc.localdomain> Co-authored-by: Isaac <isaacw1925@gmail.com>
1 parent dfd2ab7 commit a2c231c

File tree

4 files changed

+417
-3
lines changed

4 files changed

+417
-3
lines changed

src/CAN/FakeCANBoard.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,9 @@ int main() {
287287
} else if (testMode == TestMode::ScienceServos) {
288288
int servo_no = prompt("Enter servo no");
289289
int degrees = prompt("Enter degrees");
290-
AssembleScienceServoPacket(&p, science_group, 0x0, (uint8_t)servo_no,
291-
(uint8_t)degrees);
290+
// AssembleScienceServoPacket(&p, science_group, 0x0, (uint8_t)servo_no,
291+
// (uint8_t)degrees);
292+
AssembleScienceStepperTurnAnglePacket(&p, science_group, 0x3, (uint8_t) servo_no, degrees, 0x3);
292293
can::sendCANPacket(p);
293294
}
294295
}

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ find_package(nlohmann_json 3.2.0 REQUIRED)
9494
FetchContent_Declare(
9595
HindsightCAN
9696
GIT_REPOSITORY https://github.com/huskyroboticsteam/HindsightCAN.git
97-
GIT_TAG e441ccf1026c0afadb0edd53cb50f048e3755216
97+
GIT_TAG 6ae5db46856cd1f745ad5e1745a6983f4fc372c1
9898
)
9999
FetchContent_MakeAvailable(HindsightCAN)
100100

src/camera/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
find_package(OpenCV REQUIRED)
22
find_package(Threads REQUIRED)
33

4+
# FetchContent_Declare(
5+
# HindsightCAN
6+
# GIT_REPOSITORY https://github.com/huskyroboticsteam/HindsightCAN.git
7+
# GIT_TAG cae6622cf6e37889a75dd3fd63676a91a1eef98e
8+
# )
9+
10+
# FetchContent_MakeAvailable(HindsightCAN)
11+
412
add_executable(calibration
513
calibration.cpp)
614

15+
add_executable(panoramic
16+
./CameraParams.cpp
17+
./Camera.cpp
18+
./CameraConfig.cpp
19+
PanoramicCamera.cpp)
20+
721
target_link_libraries(calibration ${OpenCV_LIBS})
22+
target_link_libraries(panoramic ${OpenCV_LIBS} can_interface real_world_interface)
23+

0 commit comments

Comments
 (0)