Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
9a2f7fc
Tuning with SLAM mission node added
AhmedHumais Dec 9, 2020
e228590
minor bug fixes
AhmedHumais Dec 9, 2020
144f875
added mrft rpz mission scenario
AhmedHumais Dec 21, 2020
06f6532
updated
AhmedHumais Dec 21, 2020
7e258f1
bug fixed MRFT PITCH
AhmedHumais Dec 21, 2020
b464ec3
fixed ROSUnit_OrientationSubscriber
AhmedHumais Feb 11, 2021
0354b1a
Added wait instead of user command
AhmedHumais Feb 11, 2021
a959dab
Merge branch 'main' of https://github.com/AhmedHumais/HEAR_Navio2_MC …
AhmedHumais Feb 11, 2021
8ab8015
changed mrft x relay amplitude and relative take off point
AhmedHumais Feb 15, 2021
412eaf3
Merge branch 'main' of https://github.com/AhmedHumais/HEAR_Navio2_MC …
AhmedHumais Feb 15, 2021
6e30bd8
updated
AhmedHumais Feb 15, 2021
8d2aaae
for y axis
AhmedHumais Feb 15, 2021
9f657dd
mrft for pitch
AhmedHumais Feb 17, 2021
6a4ca1a
added auto test for test node
AhmedHumais Feb 21, 2021
5750a4f
changed PD for pitch and roll
AhmedHumais Mar 9, 2021
35d54e1
updated slam tuning node for pid slam switching
AhmedHumais Mar 16, 2021
3095343
fixed bug slam tuning node
AhmedHumais Mar 16, 2021
6fddc4e
undef auto test
AhmedHumais Mar 17, 2021
46f91a6
changed takeoff and integral gain for opti pid z
AhmedHumais Mar 17, 2021
cf92176
step test x
AhmedHumais Mar 17, 2021
07385e4
increased waypoint x
AhmedHumais Mar 17, 2021
b422636
trying
AhmedHumais Mar 17, 2021
c1a7cdf
bug fixed in step relative waypoint
AhmedHumais Mar 17, 2021
d1c18b3
changed some waypoint settings
AhmedHumais Mar 18, 2021
af1615f
reverted rest norm settings
AhmedHumais Mar 18, 2021
ccd4631
changed x gain slam
AhmedHumais Mar 18, 2021
02221d3
testing 0.8 x gains
AhmedHumais Mar 18, 2021
99ccd8a
doing step with new gains
AhmedHumais Mar 18, 2021
9d7bfa1
doing mrft x again
AhmedHumais Mar 18, 2021
b581def
changed amplitude of mrft
AhmedHumais Mar 18, 2021
1880177
mrft on y with lower amplitude
AhmedHumais Mar 18, 2021
49f3f46
changed mrft params
AhmedHumais Mar 18, 2021
0fd5f32
mrft y changed mrft params
AhmedHumais Mar 18, 2021
1afce9e
changed beta doing mrft x
AhmedHumais Mar 25, 2021
c5974ed
changed mrft settings
AhmedHumais Mar 25, 2021
c5bbd84
doing on y
AhmedHumais Mar 25, 2021
6c7a7f0
doing on z
AhmedHumais Mar 25, 2021
2a1251d
added small hexa for mrft rpz
AhmedHumais Apr 21, 2021
5738611
changed test_node for small hexa
AhmedHumais Apr 21, 2021
c60856e
Merge branch 'main' of https://github.com/AhmedHumais/HEAR_Navio2_MC …
AhmedHumais Apr 21, 2021
3d4646f
fixed test_node
AhmedHumais Apr 21, 2021
a70bd75
testing for small hexa
AhmedHumais Jun 24, 2021
3e542c6
Merge branch 'main' of https://github.com/AhmedHumais/HEAR_Navio2_MC …
AhmedHumais Jun 24, 2021
4bd44b8
working fine for video
AhmedHumais Jun 24, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"configurations": [
{
"name": "Linux",
"includePath": [
"../HEAR_Architecture/**",
"../HEAR_ROS_BRIDGE/**",
"../../devel/include/**",
"/opt/ros/melodic/include/**"
],
"compilerPath": "/usr/bin/clang",
"cStandard": "c11",
"intelliSenseMode": "clang-x64"
}
],
"version": 4
}
"configurations": [
{
"name": "Linux",
"includePath": [
"../HEAR_Architecture/**",
"../HEAR_ROS_BRIDGE/**",
"../../devel/include/**",
"/opt/ros/melodic/include/**"
],
"compilerPath": "/usr/bin/clang",
"cStandard": "c11",
"intelliSenseMode": "clang-x64"
}
],
"version": 4
}
16 changes: 12 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
{
"python.autoComplete.extraPaths": [
"/home/pedrohrpbs/catkin_ws_HEAR/devel/lib/python2.7/dist-packages",
"/home/pedrohrpbs/catkin_ws_tensorflow/devel/lib/python2.7/dist-packages",
"/home/pedrohrpbs/catkin_ws_NAVIO/devel/lib/python2.7/dist-packages",
"/home/ahmed/HEAR_ws/devel/lib/python2.7/dist-packages",
"/home/ahmed/catkin_ws_other/devel/lib/python2.7/dist-packages",
"/home/ahmed/catkin_ws/devel/lib/python2.7/dist-packages",
"/home/ahmed/event_ws/devel/lib/python2.7/dist-packages",
"/opt/ros/melodic/lib/python2.7/dist-packages"
]
],
"python.analysis.extraPaths": [
"/home/ahmed/HEAR_ws/devel/lib/python2.7/dist-packages",
"/home/ahmed/catkin_ws_other/devel/lib/python2.7/dist-packages",
"/home/ahmed/catkin_ws/devel/lib/python2.7/dist-packages",
"/home/ahmed/event_ws/devel/lib/python2.7/dist-packages",
"/opt/ros/melodic/lib/python2.7/dist-packages"
],
}
18 changes: 13 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,35 @@ add_compile_options(-std=c++11)

find_package(catkin REQUIRED COMPONENTS
roscpp
hear_hardware_interface
hear_architecture
hear_ros_bridge
)

catkin_package(
INCLUDE_DIRS
LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS
hear_ros_bridge
hear_architecture
roscpp
DEPENDS
system_lib
)

include_directories(
${catkin_INCLUDE_DIRS}
)

add_executable(mc_example_node example_node/example_node.cpp)
add_executable(mc_slam_mrft_node example_node/SLAM_tuning_node.cpp)
add_executable(mc_translation_node example_node/traslation_node.cpp)
add_executable(mc_test_node example_node/test_node.cpp)
add_executable(mrft_scenario example_node/mrft_scenario.cpp)

add_dependencies(mc_example_node ${catkin_EXPORTED_TARGETS})
add_dependencies(mc_slam_mrft_node ${catkin_EXPORTED_TARGETS})
add_dependencies(mc_translation_node ${catkin_EXPORTED_TARGETS})
add_dependencies(mc_test_node ${catkin_EXPORTED_TARGETS})
add_dependencies(mrft_scenario ${catkin_EXPORTED_TARGETS})

target_link_libraries(mc_example_node ${catkin_LIBRARIES})
target_link_libraries(mc_test_node ${catkin_LIBRARIES})
target_link_libraries(mc_slam_mrft_node ${catkin_LIBRARIES})
target_link_libraries(mc_translation_node ${catkin_LIBRARIES})
target_link_libraries(mrft_scenario ${catkin_LIBRARIES})
299 changes: 0 additions & 299 deletions build/CMakeCache.txt

This file was deleted.

Loading