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
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
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
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
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
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
Sambas
a9cfc4a0af
*float sprintf
...
*h/v deadbands
2012-05-25 21:12:03 +03:00
Sambas
a3b9451bcd
Merged some stuff to make original hardware work better
2012-05-24 20:14:15 +03:00
James Cotton
faf3532ad3
Closer on the fonts. Looks great!
2012-05-24 18:25:51 +03:00
James Cotton
b3150500d5
Change the buffers to byte buffers and update most of the drawing code to use
...
it accordingly. Large fonts broken.
2012-05-24 18:25:09 +03:00
James Cotton
fef6567cff
Clock the SPI device with bytes. Image is now totally stable.
2012-05-24 18:23:05 +03:00
James Cotton
9d6dfee6cc
Use memset to clear screen.
2012-05-24 18:20:24 +03:00
James Cotton
8411b9cc98
Remove the disable IRQ commands in PIOS_COM since they aren't needed.
2012-05-24 18:04:49 +03:00
Stacey Sheldon
ac75dd7be1
Revert "bu: remove LED support from bootloader updaters"
...
This reverts commit 7f03a77492
2012-05-23 00:46:19 -04:00
Stacey Sheldon
400e529703
bu: add back LED feedback
...
LED support was dropped from the BU images due to a lack
of proper abstraction for LED definitions between CC and
CC3D HW variants in the CopterControl board family.
Use the new LED abstraction to hide board revision details
from the BU image so it can once again flash some LEDs.
2012-05-23 00:31:08 -04:00
Stacey Sheldon
56dddee56c
cc: use defines for board revisions instead of hard-coded numbers
2012-05-23 00:29:12 -04:00
Stacey Sheldon
d2615cac96
hw_defs: hide board-rev differences in LED definitions
...
Every board has at least one LED (HEARTBEAT). Not all
users of LEDs need to be directly aware of which LED
configuration to choose when there may be more than one
possible configuration.
Hide the details of the differences between LEDs used in the
different HW revs for CC. This will allow generic code to
run on CC and CC3D without being exposed to the details of
the different pins used for the LEDs.
2012-05-23 00:22:11 -04:00
Stacey Sheldon
b97aba834a
cc3d leds: move pin remapping into led definition
...
The LED driver supports GPIO remapping. No need to
do the remapping outside of the LED definition.
2012-05-23 00:12:51 -04:00
Stacey Sheldon
dff43d5156
board_info: add guard for multiple includes of .h file
2012-05-22 21:50:53 -04:00
Corvus Corax
64c1ac3bd6
Stabilization: Bugfix: moved queue initialisation to TaskStart where it belongs
2012-05-22 22:19:31 +02:00
Corvus Corax
7f334a9773
SimPosix: make use of compile time uavobjecto initialization function generation
2012-05-22 22:06:26 +02:00
Corvus Corax
31da29a24b
Reenabled full UAVObject initialization for SimPosix
2012-05-22 21:22:59 +02:00
Corvus Corax
3e5741abea
SimPosix: Remove unneeded modules from Makefile to allow test run
2012-05-22 18:45:23 +02:00
Corvus Corax
9aca773714
SimPosix: Reenabled File IO for UAVObject saving
2012-05-22 18:32:52 +02:00
Corvus Corax
0d23e78762
PiOS.posix: added missing header definition to use FreeRTOS tasks in udp driver if applicable
2012-05-22 18:32:47 +02:00
Corvus Corax
e16a42b672
SimPosix: Fixed Module Initialisation, added missing UAVObject Initialisations (cause segfaults if not initialised)
2012-05-22 18:32:41 +02:00
Corvus Corax
5727d5714e
Created new "SimPosix" board and ported PiOS.posix to revolution API and more "standard like" configuration akin to other "boards"
2012-05-22 18:32:27 +02:00
Corvus Corax
414310fcba
test add of SimPosix architecture - doesnt work yet
2012-05-22 18:28:42 +02:00
