James Cotton
|
88cf100430
|
Merge remote-tracking branch 'revo/amorale/revo' into revo
|
2012-05-28 20:27:51 -05:00 |
|
James Cotton
|
19d8f8a98a
|
Bump the history file a bit with recent commits
|
2012-05-28 20:17:35 -05:00 |
|
a*morale
|
d071491265
|
removed include for positiondesired.h
|
2012-05-29 00:56:39 +02:00 |
|
a*morale
|
468e8732f5
|
Fix for FlightBattertData ConsumedEnergy calculation
|
2012-05-29 00:55:03 +02:00 |
|
James Cotton
|
1e8db9f7e7
|
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-wheel' into next
|
2012-05-28 17:51:55 -05:00 |
|
James Cotton
|
1934752d50
|
Merge branch 'revo-next' into revo
|
2012-05-28 15:23:14 -05:00 |
|
James Cotton
|
f64adcfa58
|
Merge branch 'next' into revo-next
|
2012-05-28 15:17:13 -05:00 |
|
James Cotton
|
a6e9235888
|
Make the connections in the config gadget unique and add a flag to make sure
the refreshWidgetValues is never caleld after disabling updates
|
2012-05-28 14:11:29 -05:00 |
|
James Cotton
|
52a3d0079e
|
Clean up the output widget a bit with whole it interfaces to the
configTaskWidget. Uses more of the parent functionality.
|
2012-05-28 14:11:25 -05:00 |
|
Corvus Corax
|
1ad2b19d28
|
PathPlanner: fixed a few failsafes, changed waypointID to int16 - negative jump ids have special meaning
|
2012-05-28 20:50:09 +02:00 |
|
Oleg Semyonov
|
5739dfbfc8
|
Merge remote-tracking branch 'origin/next' into os/aerosimrc
Conflicts:
shared/uavobjectdefinition/gcsreceiver.xml
|
2012-05-28 21:46:43 +03:00 |
|
Oleg Semyonov
|
2ef1943c0c
|
AeroSimRC: change default ports to the same as in the AeroSimRC config
|
2012-05-28 19:44:36 +03:00 |
|
Oleg Semyonov
|
d463cd322a
|
AeroSimRC: fix metadata access functions
|
2012-05-28 19:44:36 +03:00 |
|
Oleg Semyonov
|
9f0edd803e
|
AeroSimRC: change HITLv2 code to reflect changed sensor data objects
|
2012-05-28 19:44:35 +03:00 |
|
Oleg Semyonov
|
910b465ac6
|
AeroSimRC: do not update sensor and/or attitude data if read-only flag is set
|
2012-05-28 19:44:34 +03:00 |
|
Sambas
|
d8753b3815
|
no simposix for all_flight
|
2012-05-28 19:33:42 +03:00 |
|
James Cotton
|
4360d8adfd
|
Merge branch 'next' into revo-next
|
2012-05-28 11:25:40 -05:00 |
|
James Cotton
|
a01197d2da
|
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
|
2012-05-28 11:24:55 -05:00 |
|
James Cotton
|
ea03f8f220
|
Remove the specific function for the setSpinningArmed flag. This is now done
differently with the configTaskWidget style.
|
2012-05-28 11:23:43 -05:00 |
|
James Cotton
|
1689424620
|
Merge branch 'ui_unbreak' into next
|
2012-05-28 11:23:35 -05:00 |
|
Sambas
|
147100bc2f
|
Merge remote-tracking branch 'remotes/origin/revo-next' into osd_test_v1
Conflicts:
Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
|
2012-05-28 19:06:25 +03:00 |
|
James Cotton
|
3fa7b30f22
|
Merge branch 'ui_unbreak' into revo
|
2012-05-28 09:42:10 -05:00 |
|
James Cotton
|
33e39713d1
|
Make GCS aware of revo board number again
|
2012-05-28 09:34:23 -05:00 |
|
James Cotton
|
8a6073fbaf
|
Merge remote-tracking branch 'revo/revo-next' into testing
Conflicts:
Makefile
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/task.c
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port_posix.c
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/Revolution/Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
shared/uavobjectdefinition/taskinfo.xml
|
2012-05-28 09:13:26 -05:00 |
|
PT_Dreamer
|
9024a21af7
|
GCS-MapLib - Reenabled waypoint features on the plugin.
Added go_to_place feature to the plugin.
|
2012-05-28 14:12:06 +01:00 |
|
Corvus Corax
|
51a4e82642
|
bugfix to path library
|
2012-05-28 14:48:08 +02:00 |
|
Corvus Corax
|
089aa54a59
|
FixedWingpathFollower: Added debug output of error indicators
|
2012-05-28 14:46:03 +02:00 |
|
Corvus Corax
|
32fdfe5aa5
|
fixed UAVObj include list for revolution to allow new style pathfollowers
|
2012-05-28 13:40:12 +02:00 |
|
Corvus Corax
|
d50108ff53
|
Merge branch 'revo-next' into corvuscorax/new_navigation
|
2012-05-28 13:27:51 +02:00 |
|
Corvus Corax
|
90e4047e2c
|
bugfix to etasv3 - made uavobject def compatible with new update modes
|
2012-05-28 13:09:38 +02:00 |
|
Corvus Corax
|
978ab5b96c
|
Merge remote branch 'origin/stac/etasv3' into revo-next
|
2012-05-28 12:56:27 +02:00 |
|
Oleg Semyonov
|
f95d29a3b8
|
TxPID: add GyroTau to the list of parameters (OP-637)
|
2012-05-28 12:48:55 +03:00 |
|
Brian Webb
|
e1e556b140
|
Merge branch 'Brian-PipXtreme-V2' of r:/git into Brian-PipXtreme-V2
|
2012-05-27 19:52:58 -07:00 |
|
Brian Webb
|
d153ba6f2f
|
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-wheel' into Brian-PipXtreme-V2
|
2012-05-27 19:42:44 -07:00 |
|
Brian Webb
|
687670a1a2
|
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
|
2012-05-27 19:42:29 -07:00 |
|
Stacey Sheldon
|
bc09c440d6
|
makefile: fix broken all_ef target due to typo
|
2012-05-27 21:51:55 -04:00 |
|
Stacey Sheldon
|
dca2d0ee66
|
makefile: filter out unbuildable targets for SimPosix
|
2012-05-27 21:51:29 -04:00 |
|
Stacey Sheldon
|
35ed945aff
|
revo bu: BU image doesn't currentyl work on F4 so disable it for revo
|
2012-05-27 21:39:55 -04:00 |
|
Stacey Sheldon
|
1e33ba62d8
|
makefile: fix dependency for EF images so they work with all_* targets
|
2012-05-27 21:39:15 -04:00 |
|
Stacey Sheldon
|
5c114aedd5
|
pipx: apply fixes that allow pipx to build with new gcc
|
2012-05-27 21:38:33 -04:00 |
|
Stacey Sheldon
|
decd92f21d
|
pipx bu: apply recent LED changes so BU image builds again
|
2012-05-27 21:37:59 -04:00 |
|
Stacey Sheldon
|
c719d5b6cf
|
f4 adc: allow PIOS ADC to be properly excluded from the build
This was preventing the BL image from building
|
2012-05-27 21:36:56 -04:00 |
|
Stacey Sheldon
|
261e65a6f2
|
revo bu: apply recent LED changes to revo so BU builds again
|
2012-05-27 21:35:52 -04:00 |
|
Stacey Sheldon
|
8d47dc1fe4
|
revo usb: apply recent hid+vcp decscriptor changes to revo
|
2012-05-27 21:35:13 -04:00 |
|
Stacey Sheldon
|
33e7e775c7
|
Merge remote-tracking branch 'op-public/next' into revo-next
|
2012-05-27 20:39:58 -04:00 |
|
Corvus Corax
|
e6f4a40d3e
|
path library: updated API and usage from pathfollowers, added new conditions and additional user feedback in pathstatus
|
2012-05-28 01:51:17 +02:00 |
|
PT_Dreamer
|
28b754183f
|
GCS - MapLib change relative waypoint to distance and
bearing definition
|
2012-05-27 21:55:47 +01:00 |
|
Corvus Corax
|
634a190d4f
|
FixedWingPathFollower: Redesigned and tested FixedWingpathFollower
|
2012-05-27 20:49:07 +02:00 |
|
Mike LaBranche
|
e2d1f67d9e
|
Add virtual updateObjectsFromWidgets to configccattitude;
reset calibration progress bar to 0% upon successful apply/save.
|
2012-05-27 10:20:31 -07:00 |
|
Brian Webb
|
eaa0290d74
|
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
|
2012-05-27 09:18:23 -07:00 |
|