Corvus Corax
f75134c6d5
Merge branch 'corvuscorax/fix-baroaltitude-offset' into revo-next
2012-06-03 12:31:30 +02:00
Corvus Corax
88f69daf64
Merge remote branch 'origin/corvuscorax/portugal_backports' into revo-next
2012-06-02 22:44:13 +02:00
Corvus Corax
ab28686976
Merge branch 'corvuscorax/new_navigation' into revo-next
2012-06-02 22:30:44 +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
2d3645cb0a
ManualControl: Do not process input channels at all if theres invalid values to prevent flightmode changes due to glitch
2012-06-02 08:41:35 +02:00
Corvus Corax
fed9d98824
Merge commit '84c3705390a072d92bf69b58ae4d72a09989290e' into portugal_backports
2012-06-01 13:06:44 +02:00
Corvus Corax
c9d41e2a23
fixes to INS backported from portugal flight branch
2012-06-01 13:02:26 +02:00
Corvus Corax
a786c6e6b9
Attitude: Fixed calculation for baro offset adjustment time
2012-05-31 18:21:20 +02:00
Corvus Corax
f7a2b95167
Revolution/Attitude: Added offset calculation for barometric altitude
2012-05-31 16:41:03 +02: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
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
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
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
1934752d50
Merge branch 'revo-next' into revo
2012-05-28 15:23:14 -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
James Cotton
4360d8adfd
Merge branch 'next' into revo-next
2012-05-28 11:25:40 -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
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
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
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
Corvus Corax
634a190d4f
FixedWingPathFollower: Redesigned and tested FixedWingpathFollower
2012-05-27 20:49:07 +02:00
Corvus Corax
ef8d7275a8
PathFollower and PathPlanner: fixes for fixed wing
2012-05-27 02:38:56 +02:00
Corvus Corax
922b3b7f1e
Merge branch 'basenext' into corvuscorax/new_navigation
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-05-27 01:41:51 +02:00
James Cotton
1b53a9c4e6
Merge branch 'revo_battery' into testing
2012-05-26 17:06:27 -05:00
James Cotton
bd8125e41e
Catch from Corvus that the path error was being squared. However need to make
...
sure to take care of sign by removing one of those multiplcations.
2012-05-26 15:24:50 -05:00
Sambas
599e1b633f
graphic bugfixes
2012-05-26 21:56:54 +03:00
Sambas
36ea394d84
More graphic fixes
...
setting to change screens
2012-05-26 18:39:42 +03:00
Sambas
dfcba097f2
Cleanup and graphical bugfixes
2012-05-26 18:00:36 +03:00
Corvus Corax
9dfd34dd19
PathPlanner: added functions to allow circular paths and implement that feature in FixedWingPathFollower
2012-05-26 15:55:52 +02:00
Sambas
7eefe83335
Cleanup and fix
2012-05-26 13:38:01 +03:00
Sambas
bb40eca695
Big font fix
...
IRQs back to normal
2012-05-26 12:14:10 +03:00
James Cotton
5a6e02a688
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next
2012-05-25 20:37:23 -05:00
