merge Service branch into main #5

Merged
SemvdH merged 193 commits from service into main 2023-05-08 13:42:59 +00:00

193 Commits

Author SHA1 Message Date
Sem van der Hoeven
44b3f135a9 add comments and improve code for object_detection package 2023-05-05 16:28:27 +02:00
Sem van der Hoeven
0a1ef8af3d add comments and code to lidar node 2023-05-05 16:19:24 +02:00
Sem van der Hoeven
6a29220bc9 add comments 2023-05-05 12:57:48 +02:00
Sem van der Hoeven
07f0202d51 remove unnecessary pipe operator from height 2023-05-05 12:49:18 +02:00
Sem van der Hoeven
615190ca06 add comments to heartbeat 2023-05-05 11:52:29 +02:00
Sem van der Hoeven
b93a616f58 add emergency stop 2023-05-04 14:55:39 +02:00
Sem van der Hoeven
4f4c148b69 add printing q only if new setpoint has been received 2023-05-04 14:53:05 +02:00
Sem van der Hoeven
5bd2885ad8 add print of q_d 2023-05-04 14:49:07 +02:00
Sem van der Hoeven
3baad7c7bd set proper getting average of base_q 2023-05-04 14:43:39 +02:00
Sem van der Hoeven
e9e6e033d1 add printing of base_q 2023-05-04 14:27:30 +02:00
Sem van der Hoeven
97a72d5a4a add calculation of base_q into message setpoint 2023-05-04 14:25:29 +02:00
Sem van der Hoeven
5ab0a39ee3 change up to 0.05 2023-05-04 11:53:40 +02:00
Sem van der Hoeven
2485647c72 add checking for up or down with sshkeyboard¨v 2023-05-04 11:51:59 +02:00
Sem van der Hoeven
7133a11e92 change char to key 2023-05-04 11:49:06 +02:00
Sem van der Hoeven
96edc69227 use sshkeyboard library 2023-05-04 11:23:03 +02:00
Sem van der Hoeven
be2ef48f0e add _1 placeholder to subscription bind 2023-05-03 16:49:39 +02:00
Sem van der Hoeven
78d5221633 add base_q amount 2023-05-03 16:40:59 +02:00
Sem van der Hoeven
2b287c561d add subscription to vehicle attitude 2023-05-03 16:33:09 +02:00
Sem van der Hoeven
5f90c53128 add extra print in service receive: 2023-05-03 15:45:18 +02:00
Sem van der Hoeven
741fa5b096 change sending to floats 2023-05-03 15:38:45 +02:00
Sem van der Hoeven
c88e82d42d bug 2023-05-03 15:36:10 +02:00
Sem van der Hoeven
adac3eb022 change setting thrust and angles 2023-05-03 15:34:57 +02:00
Sem van der Hoeven
db1322e2de add incrementing/decrementing values 2023-05-03 15:21:49 +02:00
Sem van der Hoeven
2c3123039e change pitch and yaw 2023-05-03 15:08:58 +02:00
Sem van der Hoeven
72b252a970 change pitch and yaw 2023-05-03 15:01:51 +02:00
Sem van der Hoeven
bb26e74f54 change position of parameters 2023-05-03 14:58:00 +02:00
Sem van der Hoeven
a23286f282 change service to be correct 2023-05-03 14:38:22 +02:00
Sem van der Hoeven
fbef263682 remove yaw pitch and roll body 2023-05-03 14:35:44 +02:00
Sem van der Hoeven
6db6c89bd3 add increasing/decreasing yaw pitch roll instead of setting 2023-05-03 14:23:42 +02:00
Sem van der Hoeven
779a5c9987 remove prints of keys 2023-05-03 14:20:21 +02:00
Sem van der Hoeven
85b56aef7b change vk to ints 2023-05-03 14:19:28 +02:00
Sem van der Hoeven
bb426cf1dc add printing directions 2023-05-03 14:18:02 +02:00
Sem van der Hoeven
80fa83a42f remove waiting on service for testing 2023-05-03 14:12:40 +02:00
Sem van der Hoeven
4fd44cec46 add controls info 2023-05-03 14:12:09 +02:00
Sem van der Hoeven
1b48c1d4b7 change every self.logger to self.get_logger 2023-05-03 14:09:54 +02:00
Sem van der Hoeven
cfa773231e add on_release 2023-05-03 14:06:05 +02:00
Sem van der Hoeven
d23a16358b test keys 2023-05-03 14:03:11 +02:00
Sem van der Hoeven
e5ae3dedfb add package description and licence 2023-05-03 14:02:01 +02:00
Sem van der Hoeven
8a017bd7b9 add entry point 2023-05-03 13:54:34 +02:00
Sem van der Hoeven
5b779a9ae3 add keyboard listener 2023-05-03 13:49:36 +02:00
Sem van der Hoeven
0a56a1fbb9 change passing q array by reference 2023-05-03 12:30:04 +02:00
Sem van der Hoeven
66880f710d add print of q 2023-05-03 12:23:48 +02:00
Sem van der Hoeven
1ea831d1c4 add extra checks for when armed or not armed 2023-05-03 12:06:10 +02:00
Sem van der Hoeven
ade2b38a58 add extra checks for when armed or not armed 2023-05-03 12:05:03 +02:00
Sem van der Hoeven
d084827f67 add empty service 2023-05-03 11:54:41 +02:00
Sem van der Hoeven
796c74f318 add disarm service 2023-05-03 11:48:25 +02:00
Sem van der Hoeven
09b6c6110e change to use _body msg params 2023-05-02 16:39:13 +02:00
Sem van der Hoeven
0a18a68f5c change to attitude heartbeat 2023-05-02 16:24:24 +02:00
Sem van der Hoeven
b0f261848c change to attitude setpoint 2023-05-02 16:10:01 +02:00
Sem van der Hoeven
38079342ff change to attitude 2023-05-02 15:40:54 +02:00
Sem van der Hoeven
5b04a69e78 change to trajectorysetpoint 2023-05-02 14:26:27 +02:00
Sem van der Hoeven
7d2624e717 add import for velocity service 2023-05-02 14:08:24 +02:00
Sem van der Hoeven
dab4077cef change to acceleration setpoints 2023-05-02 13:55:19 +02:00
Sem van der Hoeven
a62a640c73 Merge branch 'service' of github.com:SemvdH/5g_drone_ROS2 into service 2023-05-02 13:55:13 +02:00
Sem van der Hoeven
b971c7989e change to acceleration setpoints 2023-05-02 13:55:06 +02:00
Sem van der Hoeven
9852edb8b6 add python package for testing controls 2023-05-02 13:48:52 +02:00
Sem van der Hoeven
a65c6b5894 Merge branch 'service' of github.com:SemvdH/5g_drone_ROS2 into service 2023-05-02 13:48:48 +02:00
Sem van der Hoeven
e134bb2b72 add python package for testing controls 2023-05-02 13:48:41 +02:00
Sem van der Hoeven
dd474bf8ea add more log 2023-05-02 12:11:46 +02:00
Sem van der Hoeven
2a69321147 Merge branch 'service' of github.com:SemvdH/5g_drone_ROS2 into service 2023-05-02 12:01:41 +02:00
Sem van der Hoeven
b058713903 fix bug v2 2023-05-02 12:01:36 +02:00
Sem van der Hoeven
e25abc3973 fix bug 2023-05-02 12:00:57 +02:00
Sem van der Hoeven
1e521ea890 add service control 2023-05-02 11:54:57 +02:00
Sem van der Hoeven
517240a463 change to gradually increase thrust 2023-05-02 11:43:35 +02:00
Sem van der Hoeven
ce89e730fa change to attitude setpoints 2023-05-02 11:40:15 +02:00
Sem van der Hoeven
716c80d905 add back offboard control mode publisher 2023-05-02 11:27:05 +02:00
Sem van der Hoeven
f23415f60d test 2023-05-02 11:24:06 +02:00
Sem van der Hoeven
0b5d4c2c4f change px4 controller to setvelocity service 2023-05-02 11:08:53 +02:00
Sem van der Hoeven
4249f2b589 add setAttitude service 2023-05-02 11:05:51 +02:00
Sem van der Hoeven
d149b72c24 change printout 2023-05-01 16:17:39 +02:00
Sem van der Hoeven
767c658900 add service back 2023-05-01 16:15:49 +02:00
Sem van der Hoeven
2513e56631 add include srv 2023-05-01 16:13:55 +02:00
Sem van der Hoeven
a9b91d7a49 add drone services to package.xml 2023-05-01 16:11:24 +02:00
Sem van der Hoeven
64464d06a5 remove srv from px4controller 2023-05-01 16:07:49 +02:00
Sem van der Hoeven
0f0c84cf0c add separate package for service 2023-05-01 16:06:43 +02:00
ubuntu
bb3942c301 add services package 2023-05-01 16:02:19 +02:00
Sem van der Hoeven
c219359487 test 2023-05-01 15:58:15 +02:00
Sem van der Hoeven
ea4cfb17ec test 2023-05-01 15:55:15 +02:00
Sem van der Hoeven
8efa23948d no placeholders? 2023-05-01 15:53:39 +02:00
Sem van der Hoeven
a919c5b7f7 add test 2023-05-01 15:52:38 +02:00
Sem van der Hoeven
8be8a6d1f3 bull 2023-05-01 15:51:01 +02:00
Sem van der Hoeven
a24c145968 remove attitude message codes 2023-05-01 15:48:06 +02:00
Sem van der Hoeven
baad3abae2 use pointers 2023-05-01 15:42:29 +02:00
Sem van der Hoeven
0b98dfbf02 add processing of service request 2023-05-01 15:41:51 +02:00
Sem van der Hoeven
4846ee5052 add placeholders back 2023-05-01 15:31:02 +02:00
Sem van der Hoeven
22126929a7 remove placeholders 2023-05-01 15:30:30 +02:00
Sem van der Hoeven
d74b7db6b3 add request header? 2023-05-01 15:29:57 +02:00
Sem van der Hoeven
8f7e496107 add placeholders 2023-05-01 15:28:58 +02:00
Sem van der Hoeven
de2af0cf7c try according to tutorial 2023-05-01 15:27:15 +02:00
Sem van der Hoeven
9abee2b965 add shared ptr 2023-05-01 15:18:06 +02:00
Sem van der Hoeven
f4819381a5 stupid 2023-05-01 15:16:45 +02:00
Sem van der Hoeven
1ff1218359 try something else 2023-05-01 14:50:41 +02:00
Sem van der Hoeven
1c995253bd oops 2023-05-01 14:48:08 +02:00
Sem van der Hoeven
8f807bdfa3 try setting callback with bind 2023-05-01 14:47:22 +02:00
Sem van der Hoeven
b9b8c99f20 add server function 2023-05-01 14:46:06 +02:00
Sem van der Hoeven
6129216d80 add message code hpp file 2023-05-01 14:41:28 +02:00
Sem van der Hoeven
5996ac225a add include own package 2023-05-01 14:34:07 +02:00
Sem van der Hoeven
e7582c5760 add srv include 2023-05-01 14:32:39 +02:00
Sem van der Hoeven
db2b25e60d change int to int8 2023-05-01 14:29:11 +02:00
Sem van der Hoeven
fb34e50b38 add service definition 2023-05-01 14:28:00 +02:00
ubuntu
d82b1925a4 add srv file 2023-05-01 14:17:59 +02:00
Sem van der Hoeven
3e740de48e add circling 2023-05-01 14:07:09 +02:00
Sem van der Hoeven
c7dd7a25a0 try changing yawspeed 2023-05-01 14:02:23 +02:00
Sem van der Hoeven
65cd11ca11 add changing yawspeed 2023-05-01 13:59:48 +02:00
ubuntu
eeb67733d3 create drone_controls package 2023-05-01 13:49:31 +02:00
Sem van der Hoeven
568197a95a change to use d_speed 2023-05-01 12:47:31 +02:00
Sem van der Hoeven
500356f4e9 fix bug 2023-05-01 12:45:34 +02:00
Sem van der Hoeven
7b0520c920 use pointer method get 2023-05-01 12:43:41 +02:00
Sem van der Hoeven
3f2ffd6dc7 add hover after 20 s 2023-05-01 12:43:02 +02:00
Sem van der Hoeven
04cad041b6 change value 2023-05-01 12:39:12 +02:00
Sem van der Hoeven
ac759ace13 change to not check for 30 2023-05-01 12:38:25 +02:00
Sem van der Hoeven
a739fb51c3 change value 2023-05-01 12:36:38 +02:00
Sem van der Hoeven
a9c63cc235 change value 2023-05-01 12:35:08 +02:00
Sem van der Hoeven
e0c9c2601d add launch file to cmakelists 2023-05-01 11:38:16 +02:00
Sem van der Hoeven
6348e5371f add launch file 2023-05-01 11:30:06 +02:00
ubuntu
4eb876df0c add run script 2023-05-01 11:27:38 +02:00
Sem van der Hoeven
9c3dcb463d make dat boi schmoov 2023-05-01 11:23:25 +02:00
Sem van der Hoeven
048a1b4929 change values 2023-05-01 11:18:35 +02:00
Sem van der Hoeven
346e41f475 change values 2023-05-01 11:08:39 +02:00
Sem van der Hoeven
33d173d1e0 try to hover 2023-05-01 11:07:27 +02:00
Sem van der Hoeven
088af872f9 try negative down speed 2023-05-01 11:02:50 +02:00
Sem van der Hoeven
60033323d4 change speeds 2023-05-01 11:01:24 +02:00
Sem van der Hoeven
6b33ded940 add compensation for earth gravity pull 2023-05-01 10:56:43 +02:00
Sem van der Hoeven
ae18d7834a try up velocity of 1 2023-05-01 10:55:01 +02:00
Sem van der Hoeven
4449c6cc1f change checking of ready to fly 2023-05-01 10:51:03 +02:00
Sem van der Hoeven
23a59a449c typo 2023-05-01 10:21:03 +02:00
Sem van der Hoeven
3fe7b60374 add try sending trajectory setpoints 2023-05-01 10:19:45 +02:00
Sem van der Hoeven
19d1987484 try adding hover? 2023-04-28 21:01:12 +02:00
Sem van der Hoeven
c0d327165c change formatting numbers to f in strings 2023-04-28 20:59:38 +02:00
Sem van der Hoeven
799ef4237e try adding hover? 2023-04-28 20:57:35 +02:00
Sem van der Hoeven
0c543614a9 oops 2023-04-28 20:52:38 +02:00
Sem van der Hoeven
c4e9e3bb10 remove heartbeat from px4 controller 2023-04-28 20:52:02 +02:00
Sem van der Hoeven
37b5f14f72 change throttle 2023-04-28 20:48:07 +02:00
Sem van der Hoeven
1515206e2e set throttle to negative 2023-04-28 20:46:41 +02:00
Sem van der Hoeven
52f237fcb5 add extra parameters 2023-04-28 20:45:08 +02:00
Sem van der Hoeven
a037b7f00e try diff values 2023-04-28 20:40:28 +02:00
Sem van der Hoeven
b775f8015c try diff values 2023-04-28 20:36:01 +02:00
Sem van der Hoeven
10c0b5ae5f increase thrust 2023-04-28 20:33:20 +02:00
Sem van der Hoeven
4b063ce9b2 try with increasing thrust 2023-04-28 18:36:23 +02:00
Sem van der Hoeven
f767ee2583 try different values 2023-04-28 18:29:20 +02:00
Sem van der Hoeven
1224735954 waited longer before arming 2023-04-28 18:25:22 +02:00
Sem van der Hoeven
a3b0b761e7 made px4controller also send heartbeat 2023-04-28 18:22:41 +02:00
Sem van der Hoeven
806317a04c oops v2 2023-04-28 18:07:42 +02:00
Sem van der Hoeven
b03951faab oops 2023-04-28 18:07:04 +02:00
Sem van der Hoeven
5b935af894 change attitude value 2023-04-28 18:03:43 +02:00
Sem van der Hoeven
7545a8a2a8 add disarm 2023-04-28 18:03:14 +02:00
Sem van der Hoeven
9464dbf5ac try different values 2023-04-28 17:57:32 +02:00
Sem van der Hoeven
c9f546cb0c try different values 2023-04-28 17:53:46 +02:00
Sem van der Hoeven
f883d826ec change to 100% thrust 2023-04-28 17:50:15 +02:00
Sem van der Hoeven
5a7a54fc53 change 0.5 thrust to 0.8 2023-04-28 17:44:22 +02:00
Sem van der Hoeven
7a2f19d311 add comment 2023-04-28 17:37:07 +02:00
Sem van der Hoeven
b8f572d86f fix 2023-04-28 17:31:16 +02:00
Sem van der Hoeven
c8a61cac40 change name of quaternion array 2023-04-28 17:29:35 +02:00
Sem van der Hoeven
52132684d2 test move up 2023-04-28 17:25:26 +02:00
Sem van der Hoeven
8acd7f2c73 add print of quaternion 2023-04-28 16:50:28 +02:00
Sem van der Hoeven
b4494a726d change heartbeat to attitude 2023-04-28 16:47:54 +02:00
Sem van der Hoeven
c44dcb7f89 change ptr to std::array 2023-04-28 16:40:12 +02:00
Sem van der Hoeven
29931565e2 change ptr to std::array 2023-04-28 16:40:00 +02:00
Sem van der Hoeven
abd5931461 add calculating quaternion 2023-04-28 15:53:44 +02:00
Sem van der Hoeven
7fa1cd5816 100% thrust 2023-04-28 15:19:04 +02:00
Sem van der Hoeven
1775cae443 remove timesync includes 2023-04-28 15:16:13 +02:00
Sem van der Hoeven
d24f91512f change quaternion values 2023-04-28 15:12:08 +02:00
Sem van der Hoeven
bd8cec8516 typo 2023-04-28 14:51:14 +02:00
Sem van der Hoeven
388963511a test with 0 values 2023-04-28 14:47:36 +02:00
Sem van der Hoeven
e3466a1077 change float f to .0 2023-04-28 13:39:18 +02:00
Sem van der Hoeven
0107bb3c0b change vehicle attitude setpoint to trajectory setpoint for velocity 2023-04-28 12:46:05 +02:00
Sem van der Hoeven
6bdb10dd5c change vehicle attitude setpoint to trajectory setpoint for velocity 2023-04-28 12:45:27 +02:00
Sem van der Hoeven
5496e400cf it finally works 2023-04-25 15:45:14 +00:00
Sem van der Hoeven
4ed6dde80e typo v3 2023-04-25 16:58:10 +02:00
Sem van der Hoeven
78ac1963df typo v2 2023-04-25 16:55:55 +02:00
Sem van der Hoeven
fd2ace29ce typo 2023-04-25 16:54:57 +02:00
Sem van der Hoeven
455c495685 add setting to offboard mode and arming 2023-04-25 16:53:40 +02:00
Sem van der Hoeven
4540a24d85 fix name 2023-04-25 16:46:28 +02:00
Sem van der Hoeven
a12d1836fe add filling message with test values 2023-04-25 16:45:01 +02:00
Sem van der Hoeven
43f3838979 add vehicle attitude setpoint publisher 2023-04-25 16:39:15 +02:00
Sem van der Hoeven
5b6c097bd9 update CMakeLists.txt to be similar to object detection 2023-04-25 16:34:05 +02:00
Sem van der Hoeven
b5daa4a77a add px4 controller cmakelists 2023-04-25 14:32:19 +00:00
Sem van der Hoeven
15e530067e remove send setpoints 2023-04-25 14:24:28 +00:00
Sem van der Hoeven
8b1790f763 change CMakeLists.txt of heartbeat to include packages for ros 2023-04-25 16:15:03 +02:00
Sem van der Hoeven
010559ea9b put px4_connection package in src folder 2023-04-25 13:56:48 +00:00
Sem van der Hoeven
9ace6a70b3 add heartbeat package 2023-04-25 13:52:47 +00:00
Sem van der Hoeven
5ea8d5674f finish sending offboard control and check if 5 seconds elapsed 2023-04-25 14:24:56 +02:00
Sem van der Hoeven
f53385ae0a add sending offboardcontrolmode message 2023-04-25 14:08:42 +02:00
Sem van der Hoeven
c748bc5da8 add timer and publisher 2023-04-25 11:58:21 +00:00
Sem van der Hoeven
5c4d47b590 add message includes for sending offboard control mode messages 2023-04-25 11:53:49 +00:00
Sem van der Hoeven
0d52a66d2a Merge branch 'main' into send_setpoints 2023-04-25 11:27:04 +00:00
Sem van der Hoeven
91354beb0b stuff 2023-04-24 09:18:37 +00:00
Sem van der Hoeven
a1b778b74b fix typo 2023-04-20 16:00:09 +02:00
Sem van der Hoeven
be267f2aff fix typo 2023-04-20 15:59:16 +02:00
Sem van der Hoeven
615d026eb6 fix typo 2023-04-20 15:58:01 +02:00
Sem van der Hoeven
263f1c154e comment 2023-04-20 15:56:18 +02:00
Sem van der Hoeven
68cb8effa9 add px4 includes 2023-04-20 15:54:47 +02:00
Sem van der Hoeven
a444ce3193 add setpoints package 2023-04-20 13:49:43 +00:00