Commit Graph

190 Commits

Author SHA1 Message Date
david f6685d6e4c Merge commit 'fa0e8729288e5a4bc1f9ea5071ea8e6a5ca5c07a' into ros_drones_ws 2018-11-12 18:18:01 -05:00
dave fa0e872928 minor fix on gohome 2018-11-12 18:17:09 -05:00
david 0f23cdd162 Merge commit '7d74c9291a79425747986d59184ade39e56b99dd' into ros_drones_ws 2018-11-12 18:11:44 -05:00
dave 7d74c9291a minor fix to gohome 2018-11-12 18:10:33 -05:00
dave 0cb87834e5 Merge commit '277842c3effb03f19e2eb02f1e322c9b87500cd4' into ros_drones_ws 2018-11-12 18:06:20 -05:00
dave 277842c3ef fix gohome manual 2018-11-12 18:04:56 -05:00
dave 9050de5954 Merge commit '33e19e16aedb33f792088967064e5c5da8de13ac' into ros_drones_ws 2018-11-12 17:45:33 -05:00
dave 33e19e16ae increase delay on neigh garbage collector and switch gohome to manual 2018-11-12 17:44:03 -05:00
dave 777c1b43d2 Merge commit 'b3f9b7cf4e39329abcb820ae0892725b25b2f61a' into ros_drones_ws 2018-11-12 16:00:21 -05:00
dave b3f9b7cf4e added Hull polygon from user inputs and minor enhancement to GIS and state machine 2018-11-11 15:11:41 -05:00
dave 4ad8ecf443 added voronoi anim pyscript and integrated Jacopo comments on readme 2018-11-10 13:13:01 -05:00
dave 8f7b8fa4e6 first working implementation of Voronoi deployment with geofence 2018-11-10 03:46:27 -05:00
dave 78638ce8b8 enhanced geofencing 2018-11-09 14:25:58 -05:00
Fang Wu 601b1d91e6 Removed some debugging log to reduce the message size:
modified:   src/rosbuzz/buzz_scripts/include/taskallocate/bidding.bzz
2018-11-07 18:53:52 -05:00
dave 5800cb8b8c Merge commit '12ff37965b577d13a3d3288686ddcbef1fb6cb43' into ros_drones_ws 2018-11-07 12:09:52 -05:00
dave 12ff37965b added individual waypoint selection to webcontrol 2018-11-07 12:01:40 -05:00
dave fa94467652 implemented Voronoi Centroid tessellation - still need works 2018-11-07 10:24:06 -05:00
dave bc4a50e2fe Merge commit '02f76b8f67eab43d655ac008df19f681410a6238' into ros_drones_ws 2018-11-06 04:03:20 -05:00
dave 02f76b8f67 added potential control in webcontrol 2018-11-06 04:01:16 -05:00
dave b119ec7df0 Merge commit '18360d3bfda8ac9088a182981de5c5754dd8ed26' into ros_drones_ws 2018-11-05 14:52:16 -05:00
dave 18360d3bfd finished groundstation support in rosbuzz+webcontrol 2018-11-05 14:50:24 -05:00
dave 7e5a3b1624 merge sim rosbuzz 2018-11-05 04:15:31 -05:00
dave ec869b3bb7 enhanced serialization, done with 1st exp. with added complexity (batt/state info) 2018-11-05 04:11:02 -05:00
dave b62789a583 added batt/state of all neighbor in webcontrol, enhance serialization for vstig 2018-11-04 16:27:11 -05:00
dave ec47973fef added low ids height for sim 2018-10-30 04:36:54 -04:00
dave 70cabdb4fa Merge commit '77886ac037f585465533271a8a5cc1642b456b80' into ros_drones_ws 2018-10-29 13:55:23 -04:00
dave 77886ac037 Merge branch 'sim' of http://git.mistlab.ca/dasto/drones into sim 2018-10-29 01:48:15 -04:00
dave 85f2ed41c6 enhanced individual waypoint control stability 2018-10-29 01:47:39 -04:00
rafaelrgb a6a4130949 moved the lca code to the right file 2018-10-26 19:32:11 -03:00
rafaelrgb b039fcfacc added new lca version 2018-10-26 19:26:07 -03:00
David St-Onge aed31e22b8 Update takeoff_heights.bzz with new xbee sx heights 2018-10-25 14:07:18 -04:00
Wayne aeb622649f Changed Centurion's takeoff height:
modified:   src/rosbuzz/buzz_scripts/include/utils/takeoff_heights.bzz
2018-10-24 18:02:54 -04:00
David St-Onge a80fb08310 Change the takeoff height for gizmo
modified:   src/rosbuzz/buzz_scripts/include/utils/takeoff_heights.bzz
2018-10-24 16:45:42 -04:00
Fang Wu 9cac1eef65 Changes to be committed: change the absolute path to drone workspace
modified:   src/rosbuzz/buzz_scripts/include/taskallocate/bidding.bzz
2018-10-22 14:56:39 -04:00
Fang Wu 5cea95ce55 Fixed the crashing at init_bidding, add the waypoint csv file
deleted:    src/rosbuzz/buzz_scripts/include/bidding/bidding.bzz
	modified:   src/rosbuzz/buzz_scripts/include/taskallocate/bidding.bzz
	new file:   src/rosbuzz/buzz_scripts/include/taskallocate/waypoints_12.csv
	modified:   src/rosbuzz/buzz_scripts/main.bzz
2018-10-22 14:35:09 -04:00
dave fd8e802274 merge from drone_ws 2018-10-19 02:38:31 -04:00
dave 4dec1ca100 individual waypoint ctl, map-based waypoint in webctl in formation 2018-10-19 02:34:18 -04:00
dave 6d53409aab split state file, commented out bidding: was crashing 2018-10-18 22:18:12 -04:00
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