1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Commit Graph

5597 Commits

Author SHA1 Message Date
Corvus Corax
ab28686976 Merge branch 'corvuscorax/new_navigation' into revo-next 2012-06-02 22:30:44 +02:00
Corvus Corax
ba50e191af Revert "no simposix for all_flight"
This reverts commit d8753b3815.
2012-06-02 22:23:51 +02:00
Sambas
e7155e279f bugfix 2012-06-02 21:19:55 +03:00
Sambas
06a814c8a9 Fixing most warnings from osd fw 2012-06-02 15:52:38 +03:00
Sambas
d6216cf02b Graphic features and cleanup
osdinput module back to irq based usart
2012-06-02 12:46:09 +03:00
Corvus Corax
2fcbb4ee8e Disabled OpenSceneGraph plugin per default. It doesn't compile without loads of extra work. 2012-05-31 16:49:24 +02:00
Corvus Corax
5b5b41a4c5 Merge remote branch 'origin/stac/use-gnu-arm-toolchain' into revo-next 2012-05-31 16:48:37 +02:00
Corvus Corax
a2d6cb8314 PathAction editor: make easy selection of actions per waypoint 2012-05-31 04:11:13 +02:00
Corvus Corax
df67a3e631 PathActionEditor: added more buttons, always highlight active waypoint and pathaction 2012-05-30 18:23:10 +02:00
Sambas
cac9000c16 filter-out osd 2012-05-30 16:41:12 +03:00
Sambas
ed1a4dada6 Merge remote-tracking branch 'remotes/origin/sambas/osd_test_v1' into revo-next
Conflicts:
	flight/PiOS/STM32F4xx/pios_adc.c
2012-05-30 16:30:09 +03:00
Corvus Corax
298b6233ed Merge branch 'revo-next' into corvuscorax/new_navigation
Conflicts:
	flight/Libraries/paths.c
	flight/Modules/ManualControl/manualcontrol.c
	flight/Revolution/Makefile
	shared/uavobjectdefinition/taskinfo.xml
2012-05-30 00:51:52 +02:00
Corvus Corax
7586a55fd6 Added an editor gadget for pathactions and waypoints - based on James
waypointeditor - no storing or loading yet
2012-05-29 22:48:17 +02:00
Sambas
e72e913e02 F4 cpuid fix, RM says flash size comes from same base address. who knows? 2012-05-29 22:17:31 +03:00
Sambas
7f1e392e83 some graphic fixes and ntsc defines 2012-05-29 17:55:30 +03:00
James Cotton
58e9c3b3fb Merge branch 'revo-next' of ssh://git.openpilot.org/revo into revo-next 2012-05-28 22:14:18 -05:00
James Cotton
1a9e0806c1 Merge branch 'next' into revo-next 2012-05-28 22:07:29 -05:00
Stacey Sheldon
8ca60ec183 makefile: remove simposix from all_flight on non-Linux platforms
The simposix build doesn't work on Windows or Mac so it shouldn't
be in the all_flight build target that is used as a pre-submit
check on all platforms.
2012-05-28 22:21:46 -04:00
James Cotton
a89b880609 Fix compilation error on CopterControl because it doesn't support some of the
path functionality.  These configurations that could result in
updatePathDesired or altitudeHoldDesired being called should result in an error
on startup to block arming.
2012-05-28 20:33:49 -05:00
James Cotton
564c442ac8 Remove some code from Zippe that used a timer to trigger the ADC. We might do
this again in the future but we need to generalize the configuration.  For now
the ADC is fairly simple requirements on revo for battery monitoring.
2012-05-28 20:28:48 -05:00
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
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
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
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