1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
LibrePilot/flight/PiOS/STM32F10x
Stacey Sheldon 2119067722 Merge remote-tracking branch 'op-revo/james/revo' into revo-next
Conflicts:
	Makefile
	flight/Modules/Attitude/revolution/attitude.c
	flight/Modules/Battery/battery.c
	flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
	flight/Modules/GPS/GPS.c
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Modules/ManualControl/manualcontrol.c
	flight/Modules/OveroSync/overosync.c
	flight/Modules/PathPlanner/inc/pathplanner.h
	flight/Modules/PathPlanner/pathplanner.c
	flight/Modules/Sensors/sensors.c
	flight/Modules/VtolPathFollower/vtolpathfollower.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/Boards/pios_board.h
	flight/PiOS/STM32F4xx/library.mk
	flight/PiOS/inc/pios_hmc5883.h
	flight/PiOS/inc/pios_l3gd20.h
	flight/PiOS/inc/pios_rfm22b_priv.h
	flight/Revolution/Makefile
	flight/Revolution/Makefile.osx
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	package/Makefile
	shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
	shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/pathdesired.xml
	shared/uavobjectdefinition/vtolpathfollowersettings.xml
	shared/uavobjectdefinition/waypoint.xml
2012-10-30 00:08:43 -04:00
..
Libraries FreeRTOS: Make F1 targets use the FreeRTOS common code from PiOS/Common 2012-10-09 10:08:06 -05:00
link_stm32f10x_HD.ld Directory re-structuring. Doesn't compile yet, need to commit first. 2009-12-01 14:04:30 +00:00
link_stm32f10x_MD.ld build: convert all app loads to require bootloaders 2011-05-08 12:40:29 -04:00
link_STM3210E_OP_BL_sections.ld Merged latest origin/next. 2012-05-05 09:40:44 -07:00
link_STM3210E_OP_memory.ld build: add pios_board_info_blob struct to bootloader flash image 2011-05-16 08:30:30 -04:00
link_STM3210E_OP_sections.ld bu: drop CC and PipX from BU targets since they don't build 2012-03-10 20:41:15 -05:00
link_STM32103CB_AHRS_BL_sections.ld build: remove all remaining use of -DUSE_BOOTLOADER 2011-05-23 18:21:42 -04:00
link_STM32103CB_AHRS_memory.ld build: add pios_board_info_blob struct to bootloader flash image 2011-05-16 08:30:30 -04:00
link_STM32103CB_AHRS_sections.ld link: Use alternate declaration of pios_board_info_blob 2011-05-23 18:21:42 -04:00
link_STM32103CB_CC_Rev1_BL_sections.ld Merged latest origin/next. 2012-05-05 09:40:44 -07:00
link_STM32103CB_CC_Rev1_memory.ld build: add pios_board_info_blob struct to bootloader flash image 2011-05-16 08:30:30 -04:00
link_STM32103CB_CC_Rev1_sections.ld Merged latest origin/next. 2012-05-05 09:40:44 -07:00
link_STM32103CB_PIPXTREME_BL_sections.ld pipx: ensure pipx BL image is padded to fill its bank 2012-09-05 22:17:04 -04:00
link_STM32103CB_PIPXTREME_memory.ld Reverted change to link_STM32103CB_PIPXTREME_memory.ld 2012-05-18 19:08:44 -07:00
link_STM32103CB_PIPXTREME_sections.ld ld: make sure current pointer never goes backwards 2012-07-14 19:47:03 -05:00
pios_adc.c Merged latest origin/next. 2012-05-05 09:40:44 -07:00
pios_bl_helper.c Move the bl_helper out of the common directory as it isn't 2011-12-24 13:10:23 -06:00
pios_debug.c Make PWM/PPM and Servo drivers play nicely together 2011-08-27 21:39:56 -04:00
pios_delay.c Merged latest origin/next. 2012-05-05 09:40:44 -07:00
pios_dsm.c DSMx bindmode delay was too long, satellite binding works again. 2012-10-07 12:09:42 +11:00
pios_eeprom.c Mostly complete PipX configuration GUI. 2012-05-11 17:51:18 -07:00
pios_exti.c PIOS_EXTI: Make the line task macro now take in the xHigherTaskPriority variable name 2012-09-28 00:40:36 -05:00
pios_gpio.c Flight/PiOS: Whitespace changes 2010-09-27 07:28:45 +00:00
pios_i2c.c Merged latest origin/next. 2012-05-05 09:40:44 -07:00
pios_iap.c Get the right pios_iap.c from next 2012-01-24 09:23:07 -06:00
pios_irq.c Flight/PiOS: Whitespace changes 2010-09-27 07:28:45 +00:00
pios_led.c pios_led: added support for active_high connected leds 2012-09-16 18:19:27 +02:00
pios_ppm.c ppm: adjust min frame pulse width for 8ch x 18ms frames 2012-04-16 14:33:28 -04:00
pios_pwm.c Merge branch 'safer_failsafe' into next 2011-09-06 16:23:11 -05:00
pios_rtc.c rtc: allow registration of callbacks on RTC tick 2011-07-05 22:03:25 -04:00
pios_sbus.c sbus: better frame syncronization, some cosmetic changes 2011-10-22 00:44:09 +03:00
pios_servo.c actuator: factor out settings updates from main loop 2012-08-11 19:46:00 -04:00
pios_spi.c Merged latest origin/next. 2012-05-05 09:40:44 -07:00
pios_sys.c serial: use defines for serial number lengths 2012-05-19 16:06:48 -04:00
pios_tim.c Mainboard: Get PWM working again. Had to add extra timer IRQ handlers for 2011-09-10 14:20:40 -05:00
pios_usart.c copyright: remove incorrect attribution in boilerplate text 2012-01-02 23:33:07 -05:00
pios_usb_cdc.c usbcdc: fix handling of CDC SET_LINE_CODING request 2012-09-24 00:56:25 -04:00
pios_usb_hid_istr.c usb cdc: USB composite device with HID + VCP 2011-12-30 23:05:33 -05:00
pios_usb_hid_pwr.c Flight/PiOS: Whitespace changes 2010-09-27 07:28:45 +00:00
pios_usb_hid.c Merged latest origin/next. 2012-05-05 09:40:44 -07:00
pios_usb_rctx.c hid joystick: use linearly scaled channels 2012-08-10 23:36:06 -04:00
pios_usb.c usb: decouple "available" from "cable connected" 2012-05-22 00:21:24 -04:00
pios_usbhook.c usbcdc: fix handling of CDC SET_LINE_CODING request 2012-09-24 00:56:25 -04:00
pios_wdg.c Zero out watchdog register on init. 2012-05-24 18:04:42 -07:00
startup_stm32f10x_HD_OP.S OP-423: Cleanup and remove recently added *_BL.S startup file. 2011-07-03 18:45:02 -07:00
startup_stm32f10x_HD.S Merged latest origin/next. 2012-05-05 09:40:44 -07:00
startup_stm32f10x_MD_CC.S OP-423: Cleanup and remove recently added *_BL.S startup file. 2011-07-03 18:45:02 -07:00
startup_stm32f10x_MD_PX.S Added missing startup file for PipXtreme. 2012-02-23 20:06:34 -07:00
startup_stm32f10x_MD.S Changes to PiOS to be compatible with the AHRS. 2010-05-11 13:36:13 +00:00