Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Event camera #65

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
9667187
Cleanup
gestom Jun 18, 2018
60afa4e
Cleanup
gestom Jun 18, 2018
0c9b20b
Navigator fix
gestom Jan 3, 2019
5cf2050
navigatof quickpathc
gestom Jan 3, 2019
2ab35c3
Core system isolated
gestom Jan 4, 2019
c5505e8
Test bluff
gestom Jan 4, 2019
e75d9f9
Core system partially tested
gestom Jan 4, 2019
d0a1c22
Update README.md
gestom Jan 27, 2019
523f015
Robotika SK
gestom Jan 27, 2019
1847604
Update README.md
gestom Jan 29, 2019
a43902d
Update README.md
gestom Jan 29, 2019
5bc29be
Update README.md
gestom Jan 29, 2019
7cf2b4a
Update README.md
gestom Jan 29, 2019
4dfe151
Update README.md
gestom Jan 29, 2019
77f730c
Update README.md
gestom Jan 29, 2019
5a515d3
Update README.md
gestom Jan 29, 2019
348cad3
Update README.md
gestom Jan 29, 2019
c59117d
Update README.md
gestom Jan 29, 2019
6907de1
Update README.md
gestom Jan 29, 2019
2371261
Update README.md
gestom Jul 3, 2019
084d43b
makde small modifications for jaguar robot at sheffield
kevinlisun Apr 13, 2020
4d7e836
add binarySearch to the map loader
kevinlisun Jul 9, 2020
fc1c6f4
add learning based navigation to sheffield branch
kevinlisun Aug 3, 2020
e9190d4
simple update
kevinlisun Aug 4, 2020
af46a0a
add accerlTurn mode and stational turnig mode for teach, add image_on…
kevinlisun Aug 7, 2020
7832d00
Merge branch 'sheffield' of github.com:kevinlisun/stroll_bearnav into…
kevinlisun Aug 7, 2020
7e54242
remove junk files
kevinlisun Aug 7, 2020
0c20995
modify the path event to support continous actions over time, havent …
kevinlisun Aug 16, 2020
bcce6de
parameter is tuned
kevinlisun Sep 10, 2020
b85165f
add PID control
kevinlisun Oct 8, 2020
966de62
add PID, but parameters not tuned
kevinlisun Oct 11, 2020
e482808
resocore spinning implementation
kevinlisun Oct 15, 2020
f503288
PID tuning
Marwan99 Oct 16, 2020
f7e783b
lio_sam topics added
Marwan99 Oct 16, 2020
6ca1135
add lauch files for baseline, fisheye, zed, add log saver
kevinlisun Oct 16, 2020
0e9d5f2
update the log saver as messages
kevinlisun Oct 17, 2020
e3441c5
added rviz config
Marwan99 Oct 17, 2020
27722c9
Update README.md
kevinlisun Nov 5, 2020
5ad2df9
Update README.md
kevinlisun Nov 5, 2020
749b72f
Update README.md
kevinlisun Nov 12, 2020
eb3b669
Update README.md
kevinlisun Nov 27, 2020
8652c0c
config used in experiments
Marwan99 Mar 13, 2021
252f8fa
Merge branch 'sheffield' of github.com:FAIRSpace-AdMaLL/stroll_bearna…
Marwan99 Mar 13, 2021
67f8210
Update README.md
kevinlisun Mar 16, 2021
36ddc01
updated jaguar launch files
Marwan99 Mar 25, 2021
e12a7bb
Update README.md
kevinlisun Jun 26, 2021
849dc32
Merge branch 'sheffield' of github.com:FAIRSpace-AdMaLL/stroll_bearna…
Marwan99 Jun 28, 2021
66f9823
zed topics updates
Marwan99 Jun 28, 2021
8b20657
Rename featureExtraction.cpp to featureExtraction_zed.cpp
flingok Jun 17, 2023
8a38166
Add files via upload
flingok Jun 17, 2023
4487f72
Update mapper.cpp
flingok Jun 17, 2023
0ee4e6a
Update mapPreprocessor.cpp
flingok Jun 17, 2023
d69e7a9
Update navigator_e2e.cpp
flingok Jun 17, 2023
9b8669a
Update stroll-core-zed.launch
flingok Jun 17, 2023
a8779d9
Add files via upload
flingok Jun 17, 2023
e364e41
Update CMakeLists.txt
flingok Jun 17, 2023
419f74d
Add files via upload
flingok Jun 17, 2023
794868e
Add files via upload
flingok Jun 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore 100644 → 100755
Expand Up @@ -2,3 +2,8 @@
*.swp
*.swo
*.bag

cmake-build-debug/
src/cmake-build-debug/
.idea/
src/.idea/
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/stroll_bearnav.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 21 additions & 41 deletions CMakeLists.txt 100644 → 100755
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 2.8.3)
project(stroll_bearnav)
set ( CMAKE_CXX_FLAGS "-ggdb")
set(FMT_LIBRARIES fmt::fmt)
## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
Expand All @@ -19,6 +20,8 @@ find_package(catkin REQUIRED COMPONENTS
rosbag
)
find_package(OpenCV REQUIRED)
find_package(Sophus REQUIRED)
find_package(fmt REQUIRED)
## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system)
## Uncomment this if the package has a setup.py. This macro ensures
Expand Down Expand Up @@ -69,8 +72,8 @@ add_service_files(
add_action_files(
FILES
mapper.action
navigator.action
loadMap.action
navigator.action
loadMap.action
)

## Generate added messages and services with any dependencies listed here
Expand Down Expand Up @@ -99,7 +102,6 @@ add_service_files(
cfg/distance.cfg
cfg/featureExtraction.cfg
cfg/navigator.cfg
cfg/supervisor.cfg
)

###################################
Expand Down Expand Up @@ -128,6 +130,10 @@ catkin_package(
include_directories(
${catkin_INCLUDE_DIRS}
)
include_directories(${OpenCV_INCLUDE_DIRS}
${Sophus_INCLUDE_DIRS}
"/usr/local/include/eigen3/Eigen"
)
include_directories(${OpenCV_INCLUDE_DIRS})
## Declare a C++ library
#add_library(cameleon_driver src/CRobot.cpp)
Expand All @@ -141,64 +147,38 @@ include_directories(${OpenCV_INCLUDE_DIRS})
# add_dependencies(cameleon_ros_driver ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

## Declare a C++ executable
#add_executable(cameleon_ros_driver src/cameleon_ros_driver.cpp)
#add_executable(cameleon_video src/cameleon_video.cpp)
#add_executable(pid src/pid.cpp)
#add_executable(ImageConverter src/ImageConverter.cpp)
#add_executable(joyImage src/joyImage.cpp)
add_executable(mapper_node src/mapper.cpp)
add_executable(feature_extraction_node src/featureExtraction.cpp)
add_executable(feature_testing_node src/featureTesting.cpp)
add_executable(feature_extraction_zed_node src/featureExtraction_zed.cpp)
add_executable(odometry_monitor_node src/odometryMonitor.cpp)
add_executable(map_preprocessor_node src/mapPreprocessor.cpp)
add_executable(tester_image_extractor src/testerImageExtractor.cpp)
add_executable(map_preprocessor_zed_node src/mapPreprocessor_zed.cpp)
add_executable(navigator_node src/navigator.cpp)
add_executable(visualisation_node src/visualisation.cpp)
add_executable(supervisor_node src/supervisor.cpp)
add_executable(rosbag_node src/rosbag.cpp)
add_executable(feature_holder_node src/featureHolder.cpp)
add_executable(map_match_info_listener src/mapMatchInfoListener.cpp)
add_executable(tester src/tester.cpp)
add_executable(auto_remapper src/autoRemapper.cpp)
add_executable(end2end_navigator_node src/navigator_e2e.cpp)
add_executable(end2end_navigator_zed_node src/navigator_e2e_zed.cpp)

## Add cmake target dependencies of the executable
## same as for the library above
#add_dependencies(cameleon_ros_driver cameleon_message_client cameleon_message ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
#add_dependencies(cameleon_video imgFeatures ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
add_dependencies(feature_extraction_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(feature_testing_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(feature_extraction_zed_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(mapper_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(map_preprocessor_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(tester_image_extractor ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(map_preprocessor_zed_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(odometry_monitor_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(navigator_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(visualisation_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(supervisor_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(feature_holder_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(map_match_info_listener ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(tester ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(auto_remapper ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(end2end_navigator_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})
add_dependencies(end2end_navigator_zed_node ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg ${catkin_EXPORTED_TARGETS})

## Specify libraries to link a library or executable target against
#target_link_libraries(cameleon_ros_driver cameleon_message_client cameleon_message cameleon_timer${catkin_LIBRARIES})
#target_link_libraries(cameleon_video ${catkin_LIBRARIES})
#target_link_libraries(pid ${catkin_LIBRARIES})
#target_link_libraries(ImageConverter cameleon_timer ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
#target_link_libraries(joyImage cameleon_timer ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(mapper_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(feature_extraction_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(feature_testing_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(feature_extraction_zed_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(odometry_monitor_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(map_preprocessor_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(tester_image_extractor ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(map_preprocessor_zed_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(navigator_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(visualisation_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(supervisor_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(rosbag_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(feature_holder_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(map_match_info_listener ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(tester ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(auto_remapper ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(end2end_navigator_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
target_link_libraries(end2end_navigator_zed_node ${catkin_LIBRARIES} ${OpenCV_LIBRARIES} ${Sophus_LIBRARIES} ${FMT_LIBRARIES})

#############
## Install ##
Expand Down