merge Position changer into main for report #11

Merged
SemvdH merged 83 commits from position_changer into main 2023-05-26 21:15:20 +00:00

83 Commits

Author SHA1 Message Date
Sem van der Hoeven
90f3b55dc9 add failsafe landing 2023-05-26 22:05:50 +02:00
Sem van der Hoeven
aaa7bce6b7 make px4controller land after enabling failsafe 2023-05-26 21:48:12 +02:00
Sem van der Hoeven
b779dba01a add failsafe node 2023-05-26 21:38:58 +02:00
Sem van der Hoeven
e65c2ff081 merge with api 2023-05-26 21:27:20 +02:00
Sem van der Hoeven
5b4e3f737f comments 2023-05-26 21:25:42 +02:00
Sem van der Hoeven
b9077562ca Merge branch 'position_changer' of github.com:SemvdH/5g_drone_ROS2 into position_changer 2023-05-26 21:25:39 +02:00
Sem van der Hoeven
7a5782ae29 comments 2023-05-26 21:25:32 +02:00
Sem van der Hoeven
d5b4f3b401 add failsafe node 2023-05-26 21:24:57 +02:00
Sem van der Hoeven
d5816214d0 scripts 2023-05-26 21:21:22 +02:00
Sem van der Hoeven
752e1560c8 remove some logs 2023-05-25 21:08:43 +02:00
Sem van der Hoeven
741e710940 fix if statement 2023-05-25 17:18:36 +02:00
Sem van der Hoeven
b8513f6dc5 change log 2023-05-25 17:15:51 +02:00
Sem van der Hoeven
75cf679168 change log 2023-05-25 17:15:13 +02:00
Sem van der Hoeven
6db5b797b0 typo 2023-05-25 17:11:03 +02:00
Sem van der Hoeven
93c78b1db3 test? 2023-05-25 17:10:25 +02:00
Sem van der Hoeven
3e02699c9d test? 2023-05-25 17:08:30 +02:00
Sem van der Hoeven
2359b38c70 more logs 2023-05-25 17:06:43 +02:00
Sem van der Hoeven
346b337f59 handle disconnection 2023-05-25 17:04:43 +02:00
Sem van der Hoeven
ac79ba7d76 more clear sending of available commands 2023-05-25 16:59:10 +02:00
Sem van der Hoeven
3046572d4c add checking for value 2023-05-25 16:56:30 +02:00
Sem van der Hoeven
a05dd8a4b9 only send data if we received status info 2023-05-25 16:53:11 +02:00
Sem van der Hoeven
f63bbad247 error 2023-05-25 16:46:24 +02:00
Sem van der Hoeven
3532720d15 service name 2023-05-25 16:44:52 +02:00
Sem van der Hoeven
88e726dd1b remove sending all messages for testing 2023-05-25 16:42:49 +02:00
Sem van der Hoeven
fe5132d05d bigger try except and more logging 2023-05-25 16:40:25 +02:00
Sem van der Hoeven
650c9bbf6b more logging 2023-05-25 16:37:34 +02:00
Sem van der Hoeven
4fa546511d serialize name instead of enum message 2023-05-25 16:35:09 +02:00
Sem van der Hoeven
2ead06f900 add exception handling for when no json message 2023-05-25 16:31:17 +02:00
Sem van der Hoeven
0d6a1b7c19 Merge branch 'api' of github.com:SemvdH/5g_drone_ROS2 into api 2023-05-25 16:31:15 +02:00
Sem van der Hoeven
61cd779f5e add exception handling for when no json message 2023-05-25 16:31:07 +02:00
Sem van der Hoeven
32c58b74b7 add websocket client test 2023-05-25 16:25:48 +02:00
Sem van der Hoeven
3831b8a371 Merge branch 'api' of github.com:SemvdH/5g_drone_ROS2 into api 2023-05-25 16:25:46 +02:00
Sem van der Hoeven
fe8e6b7126 add websocket client test 2023-05-25 16:25:38 +02:00
Sem van der Hoeven
d15d5511da use require 2023-05-25 16:22:20 +02:00
Sem van der Hoeven
c2c2a606cf use npm websocket library 2023-05-25 16:18:55 +02:00
Sem van der Hoeven
cccd06541e use npm websocket library 2023-05-25 16:18:17 +02:00
Sem van der Hoeven
bd1bdbd0e8 connect to websocket 2023-05-25 16:13:26 +02:00
Sem van der Hoeven
ce807ef422 Merge branch 'api' of github.com:SemvdH/5g_drone_ROS2 into api 2023-05-25 16:02:52 +02:00
Sem
b426a85ebe add bootstrap 2023-05-25 13:33:15 +00:00
Sem
db3fde448a add API setup 2023-05-25 09:27:21 +00:00
Sem van der Hoeven
9ea338f37f Merge branch 'api' of github.com:SemvdH/5g_drone_ROS2 into api 2023-05-24 15:40:31 +02:00
Sem van der Hoeven
62a5b276fb usbcam config file 2023-05-24 15:40:21 +02:00
Sem van der Hoeven
d180392666 add processing of messages via queue 2023-05-22 20:49:21 +02:00
Sem van der Hoeven
dc67324184 proper formatting 2023-05-22 17:20:54 +02:00
Sem van der Hoeven
1df4ccc3c5 change status_data to dict 2023-05-22 17:11:01 +02:00
Sem van der Hoeven
eead97f8fa json dumps 2023-05-22 17:03:33 +02:00
Sem van der Hoeven
37dc3f093e add json 2023-05-22 16:59:26 +02:00
Sem van der Hoeven
44a6dde339 add publishing every second 2023-05-22 16:52:42 +02:00
Sem van der Hoeven
55f89d9516 send drone data 2023-05-22 16:49:41 +02:00
Sem van der Hoeven
b08e801f3c add await for websocket 2023-05-22 16:48:35 +02:00
Sem van der Hoeven
adaf933664 try different approach 2023-05-22 16:47:37 +02:00
Sem van der Hoeven
81ddc95b01 try different approach 2023-05-22 16:39:54 +02:00
Sem van der Hoeven
5740e14fac try with consumer 2023-05-22 16:36:15 +02:00
Sem van der Hoeven
9f2f47aac4 add logging and sending back message 2023-05-22 16:21:45 +02:00
Sem van der Hoeven
2f5f117db8 add callback for receiving message 2023-05-22 16:18:39 +02:00
Sem van der Hoeven
1b5a2f9c3a add thread that runs asyncio daemon 2023-05-22 15:54:03 +02:00
Sem van der Hoeven
0165538cbc add daemon thread for api 2023-05-22 15:50:21 +02:00
Sem van der Hoeven
890ba3d121 add manual spin 2023-05-22 15:09:54 +02:00
Sem van der Hoeven
8d26aefe79 use asyncio event loop 2023-05-22 15:07:47 +02:00
Sem van der Hoeven
1ab95054f2 add task wrapper for api 2023-05-22 15:06:10 +02:00
Sem van der Hoeven
72d9249c69 add sending values back 2023-05-22 14:47:58 +02:00
Sem van der Hoeven
3bfb61f29d change qos 2023-05-22 14:43:53 +02:00
Sem van der Hoeven
45fed345d4 add proper qos preset 2023-05-22 14:38:59 +02:00
Sem van der Hoeven
3cea683760 add qos profile sensor data 2023-05-22 14:34:47 +02:00
Sem van der Hoeven
ff5b900fd1 change print: 2023-05-22 14:27:46 +02:00
Sem van der Hoeven
05936b733b change name of drone status node as to not clash with drone status message 2023-05-22 14:26:38 +02:00
Sem van der Hoeven
426b8c3d6f add main: 2023-05-22 14:23:47 +02:00
Sem van der Hoeven
e573c4a658 add message definitions 2023-05-22 14:17:25 +02:00
Sem van der Hoeven
0ceb7ac098 typo 2023-05-22 14:13:38 +02:00
Sem van der Hoeven
c742816827 add drone status entry point 2023-05-22 14:12:33 +02:00
Sem van der Hoeven
851c098be7 add subscribe to drone status 2023-05-22 14:09:43 +02:00
Sem van der Hoeven
d2caabc110 change interface 2023-05-22 12:46:36 +02:00
Sem van der Hoeven
703b0a20f0 change port 2023-05-22 12:40:47 +02:00
Sem van der Hoeven
f5e6e6a1b7 add self.messages 2023-05-22 12:34:55 +02:00
Sem van der Hoeven
fee116a0fe test async 2023-05-22 12:32:37 +02:00
Sem van der Hoeven
c3ea77a068 async spin with rclpy.spin_once 2023-05-22 12:26:21 +02:00
Sem van der Hoeven
4864cf339c try asyncio.async 2023-05-22 12:13:55 +02:00
Sem van der Hoeven
2ee2536007 switch to threading 2023-05-22 12:10:29 +02:00
Sem van der Hoeven
18546545a4 create asyncio task for api 2023-05-22 11:59:37 +02:00
Sem van der Hoeven
8d32db3bbd try to thread 2023-05-22 11:57:54 +02:00
Sem van der Hoeven
7f5ab30962 add api basics 2023-05-22 11:51:19 +02:00
Sem van der Hoeven
39e32fb796 create api package 2023-05-22 11:39:45 +02:00
SemvdH
d50bdef82a Merge pull request #9 from SemvdH/stable_flight
Merge pull request #8 from SemvdH/main
2023-05-22 11:38:02 +02:00