Sambas
|
79be7613b5
|
CC mag&baro for OSD, bmp needed some black magic hacking
|
2012-07-30 11:40:16 +03:00 |
|
Stacey Sheldon
|
f5db83bd20
|
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
flight/Libraries/inc/NMEA.h
flight/Modules/GPS/GPS.c
flight/Modules/GPS/NMEA.c
flight/Modules/GPS/UBX.c
flight/Modules/GPS/inc/NMEA.h
flight/Modules/GPS/inc/UBX.h
flight/Modules/PathPlanner/inc/pathplanner.h
flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
flight/SimPosix/UAVObjects.inc
ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/qdebughandler.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/gpsvelocity.xml
|
2012-07-22 23:39:37 -04: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 |
|
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
|
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 |
|
Sambas
|
bb40eca695
|
Big font fix
IRQs back to normal
|
2012-05-26 12:14:10 +03: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 |
|
Sambas
|
d399469b88
|
Last push before summit
|
2012-04-07 14:30:04 +03:00 |
|
Sambas
|
13094abc1c
|
new splash screens and better handler for them
|
2012-03-16 18:00:16 +02:00 |
|
Sambas
|
ef7758505a
|
Mapping correct ports
|
2012-03-13 20:42:37 +02:00 |
|
Sambas
|
be6a4f2a1b
|
Merge remote-tracking branch 'remotes/origin/sambas/osd_test' into osd_test_v1
Conflicts:
flight/OSD/System/pios_board.c
flight/board_hw_defs/osd/board_hw_defs.c
|
2012-03-12 18:50:32 +02:00 |
|
Sambas
|
2ca27b0a27
|
USB and bootloader stuff, WORKS!!
|
2012-03-11 12:04:44 +02:00 |
|
Sambas
|
7c06c0ed93
|
Merge remote-tracking branch 'remotes/origin/sambas/osd_test' into osd_test_v1
Conflicts:
flight/Modules/Osd/osdgen/osdgen.c
flight/OSD/Makefile
flight/OSD/System/pios_board.c
flight/board_hw_defs/osd/board_hw_defs.c
make/boards/osd/board-info.mk
|
2012-03-11 11:58:06 +02:00 |
|
Sambas
|
cb442f0481
|
Merge remote-tracking branch 'remotes/origin/sambas/osd_test' into osd_test_v1
Conflicts:
flight/Modules/Osd/osdgen/osdgen.c
flight/OSD/Makefile
flight/PiOS/Common/pios_video.c
shared/uavobjectdefinition/osdsettings.xml
|
2012-03-11 11:39:29 +02:00 |
|
Sambas
|
addda5f29d
|
USB and bootloader stuff, WORKS!!
|
2012-03-11 11:31:02 +02:00 |
|
Sambas
|
ccf5c310c9
|
Updates
|
2012-03-11 09:27:38 +02:00 |
|
Sambas
|
ee2b12b917
|
Updates
|
2012-03-10 09:40:37 +02:00 |
|
Sambas
|
91a9e45888
|
Updates, first UAVtalk client test
|
2012-03-05 19:53:52 +02:00 |
|
Sambas
|
8e31f84058
|
V1 beta
|
2012-02-28 20:32:44 +02:00 |
|
Sambas
|
ebd2ae7e59
|
Bootloader, copy from revo, not functional
|
2012-02-18 22:35:13 +02:00 |
|
Sambas
|
4dd91d08c2
|
Settings, home arrow tests & other updates
|
2012-02-18 12:38:50 +02:00 |
|
Sambas
|
8f45114b1f
|
Fixes & cleanup
|
2012-02-15 21:14:02 +02:00 |
|
Sambas
|
0bc08a48d8
|
cleanup 'n' updates
|
2012-02-14 21:42:09 +02:00 |
|
Sambas
|
8cc876d02a
|
OSD branch
|
2012-02-12 22:29:42 +02:00 |
|