Commit Graph

695 Commits

Author SHA1 Message Date
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
vivek-shankar e36101f0de Fix for solos set mode issue 2018-10-24 14:40:01 -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 637ebb36a2 Merge commit '5cea95ce557dadd0783badce89084fd516ef2eeb' into ros_drones_ws
Conflicts: move bidding into taskallocate
	src/rosbuzz/buzz_scripts/include/bidding/bidding.bzz

	deleted:    src/rosbuzz/buzz_scripts/include/bidding/bidding.bzz
	modified:   src/rosbuzz/buzz_scripts/include/taskallocate/bidding.bzz
	renamed:    src/rosbuzz/buzz_scripts/include/bidding/waypoints_12.csv -> src/rosbuzz/buzz_scripts/include/taskallocate/waypoints_12.csv
	modified:   src/rosbuzz/buzz_scripts/main.bzz
2018-10-22 14:50:52 -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 4b293afac5 Merge commit 'fd8e8022744c30cb9d59b1dd4cb6cf90f1c728f8' into ros_drones_ws 2018-10-19 02:40:18 -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
david 3a0239b2ae io.fwrite function in buzz was crashing the node, commented out for now. Crash reason undertermined. 2018-10-18 18:16:35 -04:00
Fang Wu 389b8fca7c Change the csv file name
modified:   src/rosbuzz/buzz_scripts/include/bidding/bidding.bzz
2018-10-18 16:57:47 -04:00
Fang Wu 8af7578bc6 Add csv file, absolute path used, might need to fix in the future
modified:   src/rosbuzz/buzz_scripts/include/bidding/bidding.bzz
	new file:   src/rosbuzz/buzz_scripts/include/bidding/waypoints_12.csv
2018-10-18 12:33:15 -04:00
Fang Wu 55c8b0346d Merge commit '0d2304116092196feca6320e38527089a987be88' into sim 2018-10-18 11:15:01 -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
vivek-shankar 0d23041160 Local setpoint fix for the solos. 2018-10-04 16:06:45 -04:00
dave 557e554c1d added LCA support for drones -- 2betuned! 2018-10-03 22:50:39 -04:00
dave 9731085505 revert default setmode false 2018-10-03 21:50:30 -04:00
dave 7c438c2323 removed the need for setmode with m100 adapter 2018-10-03 21:43:11 -04:00
dave a20f70950b Merge commit 'e5e7500b20770df29d594a7d07d1cd8e9f6ee6f9' into sim 2018-10-03 21:25:36 -04:00
dave 78fb436fa4 setmode default to true 2018-10-03 21:23:58 -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
dave 67e8d9b04b added offline maps tiles for cepsum 2018-09-26 23:52:26 -04:00
dave 13719ec22f add lat/long to takeoff/land cmds 2018-09-26 23:01:40 -04:00
dave c60c1e53ec moved log commands to dedicated functions 2018-09-26 22:55:11 -04:00
dave 2150efe5b7 re-instated auto_launch to agf 2018-09-26 22:31:44 -04:00
dave e22f35a26e merge latest rosbuzz dev 2018-09-26 22:20:06 -04:00
dave a50d88d44e integrated all topics & services in yaml 2018-09-26 22:15:40 -04:00
vivek-shankar f4f637b9b4 Merge commit '2372149b8371027c9e9241c5dc2849e4082cca10' into sim 2018-09-26 12:15:39 -04:00
bramtoula 2372149b83 Add spiri case to cmdlinectr.sh 2018-09-26 15:11:29 -04:00
Fang Wu 65d7d3f5a8 Check for negative values of altitude
modified:   src/rosbuzz/src/roscontroller.cpp
2018-09-26 12:50:27 -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