Commit Graph

202 Commits

Author SHA1 Message Date
Fang Wu a0bc189fdb Changes to be committed: bzz files are modified to integrate bidding, comm_hub is changed to have different package size limits, startswarmsim launch file is changed to work with bigger robot id
modified:   src/comm_hub/include/hub.h
	modified:   src/comm_hub/src/hub.cpp
	new file:   src/dji_sdk_mistlab/launch_sim/bidding.launch
	modified:   src/dji_sdk_mistlab/launch_sim/startswarmsim.launch
	modified:   src/rosbuzz/buzz_scripts/include/act/states.bzz
	new file:   src/rosbuzz/buzz_scripts/include/bidding/bidding.bzz
	modified:   src/rosbuzz/buzz_scripts/main.bzz
2018-10-17 19:05:13 -04:00
dave 557e554c1d added LCA support for drones -- 2betuned! 2018-10-03 22:50:39 -04:00
David St-Onge e5e7500b20 Revert debug stuff from field in main.bzz 2018-09-27 23:59:54 -04:00
mistSpiri_Vachkiri 92f7a8d1e6 changes made on the field 27/09 2018-09-27 19:51:09 -04:00
Rafael Braga 1da2084419 Revert "changes made on the field"
This reverts commit 5654274acf8db38896cfafe41b10a592bc602284
2018-09-27 19:44:18 -04:00
mistSpiri_Valmiki 0f54378b26 changes made on the field 2016-02-11 11:32:52 -05:00
mistSpiri_Valmiki b7d3a0c3ac minor fixes for the spiri 2016-02-11 11:40:13 -05:00
David St-Onge b38b9df043 more detailed log far WP 2018-09-27 12:30:46 -04:00
mistSpiri_Valmiki b2ab2ea9ec fixes from spiri HITL 2018-09-27 12:18:43 -04:00
dave 67e8d9b04b added offline maps tiles for cepsum 2018-09-26 23:52:26 -04:00
dave 2150efe5b7 re-instated auto_launch to agf 2018-09-26 22:31:44 -04:00
vivek-shankar f4f637b9b4 Merge commit '2372149b8371027c9e9241c5dc2849e4082cca10' into sim 2018-09-26 12:15:39 -04:00
vivek-shankar c5f1135e6e cleaned up syc. algo. and log. 2018-09-26 11:49:58 -04:00
david 06c7bf4d7c Merge branch 'ros_drones_ws' of http://git.mistlab.ca/dasto/drones into ros_drones_ws 2018-09-26 11:37:18 -04:00
david 0c69ad6d78 Change the auto launch state
modified:   src/rosbuzz/buzz_scripts/main.bzz
2018-09-26 11:21:30 -04:00
Benjamin Ramtoula 15280f4034 Add spiris takeoff heights 2018-09-25 20:11:58 -04:00
dave 835a25c3c5 fix setmode in launch and min alt. 2018-09-23 23:00:52 -04:00
dave 4eb044a4a9 fix modes usage for spiris mavros compatibility 2018-09-23 22:02:05 -04:00
dave 4c5d2e5ef2 add height table and fix large ID bug in ACF 2018-09-11 00:02:20 -04:00
David 353f169be1 added webcontrol to drones and increase script max_vel 2018-09-10 17:48:11 -04:00
dave 602d744140 removed state transitions 2018-09-08 19:15:46 -04:00
dave 5fc3276ac2 minor fix from sitl 2018-09-07 00:56:17 -04:00
dave d79b0f8530 cleaned rosbuzz in sim 2018-09-07 00:30:01 -04:00
dave 8cdd5eb105 force push from ros_drones_ws 2018-09-07 00:17:30 -04:00
vivek-shankar 0647601086 Custom function to test waypoints. 2018-08-31 19:59:14 -04:00
vivek-shankar c41bb81763 Fixed the limited buffer size bug in inmsgs and changed to y formation 2018-08-30 11:22:37 -04:00
vivek-shankar fff1c3398d disabled onboard time sync, hoping NTP would sync. 2018-08-28 16:18:29 -04:00
Gwaihir f58373e2b5 diabled barrier for stop state 2018-08-08 01:54:48 +00:00
Gwaihir ddbc1339cd velocity change 2018-08-08 01:09:13 +00:00
vivek-shankar bf4f23bc48 data logging fixes. 2018-08-06 14:26:17 -04:00
Gwaihir 79857a3f55 lowered the velocity and target threshold. increased altitude 2018-07-31 18:32:58 +00:00
Gwaihir 25968cfe6d Changes on speed limit, navigation and local pos control. 2018-07-31 09:25:02 +00:00
David St-Onge 861305bfcd nav parameter 2018-07-30 01:40:13 -04:00
David St-Onge a2a19d5583 nav param tunning to avoid ossilations 2018-07-30 01:32:05 -04:00
David St-Onge 7048c28142 nav param removed scaling 2018-07-30 01:23:05 -04:00
David St-Onge fbc5bd8e72 disabled movement at lock state 2018-07-30 01:07:50 -04:00
David St-Onge 79fea108a2 nav parameter adaptation 2018-07-30 00:54:56 -04:00
Gwaihir 5d06389f5e changes to pos tolarence value in navigation 2018-07-30 03:10:54 +00:00
David St-Onge 5665ac6ef2 fixed hook naming issue for storegoal 2018-07-29 19:58:19 -04:00
Gwaihir 0dd435e80e state change to task allocation 2018-07-29 23:44:43 +00:00
vivek-shankar 92cf7c4412 Adapted graph script for tests. 2018-07-29 19:05:08 -04:00
vivek-shankar f86da0d2e1 fixed the issues with serialization and time sync algo. 2018-07-29 18:28:08 -04:00
vivek-shankar 266f15ac84 Moved time sync algo to ROS side and computes in ns, as an attempt to measure msg delays. 2018-07-27 00:59:39 -04:00
vivek-shankar 2378a3881a changed to old barrier and modified log for easy parsing 2018-07-24 15:55:13 -04:00
vivek-shankar 81f4aba155 changed autolaunch function to formation 2018-07-22 15:42:10 -04:00
vivek-shankar f6f79e1d1b added msg size + nei id + nei pos to log in sim 2018-07-22 14:51:33 -04:00
vivek-shankar 0587a2ab6b fixed a bug within timesync algo. 2018-07-14 20:30:24 -04:00
vivek-shankar 81b263fa0a adapted barrier rebroadcast time on robots 2018-07-12 01:01:34 -04:00
vivek-shankar 7ab97b4fce adapted sync algo to robots 2018-07-11 23:19:51 -04:00
vivek-shankar d3f0299b7e adapted syc algo to robots 2018-07-11 23:18:35 -04:00
vivek-shankar 9f75bd989e Time sync algo and rc cmd implemeantation on sim 2018-07-11 18:43:20 -04:00
vivek-shankar 7261aabc40 Time Sync algorithm and rc cmd implementation to sync time on request 2018-07-11 18:41:50 -04:00
vivek-shankar 0836571c8e barrier enhance fix on branch dev 2018-07-10 14:03:26 -04:00
vivek-shankar 87083c5658 enhanced barrier with foreach 2018-07-10 14:00:01 -04:00
vivek-shankar ecb2aa67fe states.bzz syntax fix 2018-07-05 02:46:51 -04:00
vivek-shankar 1bfeada346 adapted bzz files from sim. 2018-07-04 21:17:42 -04:00
vivek-shankar 1cb390f595 Hub: made changes to allow arbitrary robot id's and Rosbuzz: changed bzzfiles barrier, states and main to fit arbitrary id's. 2018-07-04 21:10:57 -04:00
Marius Klimavicius 392531e131 solo sim parameters updated 2018-06-27 16:52:58 -04:00
dave 44212c8fcd rosbuzz dev enabled in sim, fixed testaloneWP in dev 2018-06-13 23:00:53 -04:00
dave e553d6a146 fixes for Zooids demo view angle 2018-06-13 23:00:53 -04:00
dave 2f25df02f0 minor fixes and fixed pursuit (vector field guidance) 2018-06-13 23:00:53 -04:00
dave a1d13d312a fixed formation and enhanced aggregation 2018-06-13 23:00:53 -04:00
dave c9364666e6 enhanced states switch and zooids rate 2018-06-13 23:00:53 -04:00
dave b798abf283 added yaw control and states pursuit, agreggation and formation (still to tweak) 2018-06-13 23:00:53 -04:00
dave ed59c6de7c ported AGF to new rosbuzz file structure 2018-06-13 23:00:53 -04:00
dave da86b4be81 added minimal ROSBuzz example script 2018-06-13 23:00:53 -04:00
dave 6cd162bff4 restructured bzz for path planning 2018-06-13 23:00:53 -04:00
dave a626c556d9 add collision boxes for gazebo buildings and debugged collision detection for rrt 2018-06-13 23:00:53 -04:00
dave 4e4bacb25d changed absolute_position to fit argos implementation 2018-06-13 23:00:53 -04:00
dave 292c4fda8a fix subscriber format, added NED yaw, changed position to absolute_position and fixed proximity obstacles detection 2018-06-13 23:00:53 -04:00
dave b30bd62018 fix proxmity topic 2018-06-13 23:00:53 -04:00
dave df11060f84 add comments and TODOs 2018-06-13 23:00:53 -04:00
dave 63f9111d2f made rrtstar a state 2018-06-13 23:00:53 -04:00
dave 50368d84d3 fix rviz res 2018-06-13 23:00:53 -04:00
dave d532dd2251 generalized some parts of RRT and complete export occ_grid 2018-06-13 23:00:53 -04:00
dave 6371581b66 debug new matrix form for RRT and add blob check for intersection 2018-06-13 23:00:53 -04:00
vivek-shankar 3154976e8a Added debug variable for prints within update files, corrected
prints, beautified update files and incorporate a part of safe
deployment state machine with standby.bzz.
2018-06-07 01:29:42 -04:00
vivek-shankar 8fa58e5e5b Made updates optional: including update.bzz will turnon update and
not including it will disable updates.
2018-06-06 23:58:38 -04:00
vivek-shankar 58c09093a7 Fixed the update crash caused by BVM state publisher. 2018-06-06 22:40:26 -04:00
dave 3ad277bd5e added script list menu and fix rostopic list to webcontrol 2018-06-06 12:40:24 -04:00
dave 6aa43f20bc added buzz script editor to webcontrol 2018-06-05 17:22:25 -04:00
dave 845742767b reinstate gohome in sim and webcontrol 2018-06-01 21:20:57 -04:00
dave 42d990676c bringup debug mode to launch file, fine tuned LJ params and rename hooks (generic hardware) 2018-06-01 20:12:06 -04:00
dave db452bd063 added states to webcontrol and enhance barrier for state machine 2018-06-01 13:10:59 -04:00
David 309f33fff1 fixed rosbag name and auto-takeoff for optimization 2018-05-16 15:32:48 -04:00
dave ed8a0a1cee files for LJ optim test and first working WebGUI for ROSBuzz 2018-05-07 19:01:41 -04:00
dave a99d2a6496 rosbuzz dev enabled in sim, fixed testaloneWP in dev 2018-04-27 11:42:59 -04:00
dave 98b1f3a9b0 fixes for Zooids demo view angle 2018-04-27 10:31:24 -04:00
dave b145574d6d minor fixes and fixed pursuit (vector field guidance) 2018-03-05 00:10:18 -05:00
dave 21ee166028 fixed formation and enhanced aggregation 2018-03-04 21:44:39 -05:00
dave cc767a5ac7 enhanced states switch and zooids rate 2018-03-03 22:43:12 -05:00
dave 8e6319e3a5 added yaw control and states pursuit, agreggation and formation (still to tweak) 2018-03-03 19:41:54 -05:00
dave fd7414f382 ported AGF to new rosbuzz file structure 2018-03-02 15:35:06 -05:00
dave 48a2dc53b3 added minimal ROSBuzz example script 2018-02-26 13:26:33 -05:00
dave 80799aeaa6 restructured bzz for path planning 2017-12-22 16:48:39 -05:00
dave 390a02df8d add collision boxes for gazebo buildings and debugged collision detection for rrt 2017-12-21 21:41:57 -05:00
dave 11053c82dc changed absolute_position to fit argos implementation 2017-12-21 13:28:06 -05:00
dave ceeee9f76e fix subscriber format, added NED yaw, changed position to absolute_position and fixed proximity obstacles detection 2017-12-21 12:20:26 -05:00
dave 1f2fae047a fix proxmity topic 2017-12-20 16:10:30 -05:00
dave 081269cdab add comments and TODOs 2017-12-20 14:51:00 -05:00