1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
LibrePilot/flight/PiOS.win32/win32
James Cotton 6bfb2a5e45 Merge branch 'next' into revo
Conflicts:
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/libs/utils/coordinateconversions.h
	ground/openpilotgcs/src/plugins/opmap/opmap.pro
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
	shared/uavobjectdefinition/waypoint.xml
2012-09-01 16:18:03 -05:00
..
Libraries/FreeRTOS/Source Fix win32 SiTL by adding PiOS CRC and another missing function. 2011-06-20 15:48:05 -04:00
pios_com.c PiOS for win32 2010-08-03 19:29:14 +00:00
pios_crc.c Fix win32 SiTL by adding PiOS CRC and another missing function. 2011-06-20 15:48:05 -04:00
pios_delay.c Remove commented code that refers to the now-obsolete PIOS_DELAY_TIMER 2011-07-23 13:49:36 -07:00
pios_led.c PiOS for win32 2010-08-03 19:29:14 +00:00
pios_sdcard.c PiOS.win32: updates to get it compiling again. 2011-01-17 00:00:41 +00:00
pios_servo.c actuator: factor out settings updates from main loop 2012-08-11 19:46:00 -04:00
pios_sys.c PiOS for win32 2010-08-03 19:29:14 +00:00
pios_udp.c PiOS for win32 2010-08-03 19:29:14 +00:00
pios_wdg.c SiTL: Updates for UAVObjects, and for the recent Actuator and Watchdog changes to compile with SiTL. Posix needs to be tested. 2011-01-12 00:39:18 +00:00