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 |
|
Stacey Sheldon
|
127ca1e7e1
|
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
ground/openpilotgcs/src/plugins/hitl/plugin.pro
ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.h
ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
|
2012-10-20 13:56:18 -04:00 |
|
Oleg Semyonov
|
4aa3c38d40
|
packaging: fix opfw_resource build dependencies
|
2012-10-11 16:40:35 +03:00 |
|
PT_Dreamer
|
4e4ed172c1
|
GCS-Added fw bundle resource to the uploader plugin
|
2012-10-06 19:46:33 +01:00 |
|
PT_Dreamer
|
ce338fdf4f
|
GCS-Make the resources target dependent of the flight package target
|
2012-10-06 03:20:15 +01:00 |
|
PT_Dreamer
|
f74b149152
|
GCS-Generate resources file
|
2012-10-06 03:02:21 +01:00 |
|
Stacey Sheldon
|
4eb485bdde
|
package: auto-generate Qt resource file for OPFW images
|
2012-10-05 16:23:42 -04:00 |
|
James Cotton
|
8a2f6f7398
|
Package revomini
|
2012-10-05 11:43:22 -05:00 |
|
Sambas
|
60c4d7f922
|
bu targets fix
|
2012-07-30 11:41:10 +03:00 |
|
James Cotton
|
d45fae1380
|
For now disable the bootloader updaters from being built with packaging. They
aren't packaged into the distributable and the bu_revolution breaks.
|
2012-06-13 02:58:44 -05:00 |
|
Stacey Sheldon
|
c73cffce59
|
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
Makefile
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/System/inc/pios_config.h
package/Makefile
Fixed CRLF line end clobbering in:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Common/pios_usb_util.c
flight/PiOS/STM32F4xx/pios_iap.c
flight/PiOS/inc/pios_rfm22b_priv.h
flight/PiOS/inc/pios_usb_util.h
|
2012-06-10 19:01:11 -04:00 |
|
James Cotton
|
f5b2575c88
|
Merge branch 'next' into revo
Conflicts:
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/System/inc/pios_config.h
package/Makefile
|
2012-06-07 12:45:06 -05:00 |
|
James Cotton
|
3546e7fd6c
|
Include PipX firmware in packaging
|
2012-06-07 11:29:27 -05:00 |
|
James Cotton
|
a40a0b0e31
|
Small fix to be able to build CC for Revo branch and to include revo in
package.
|
2012-05-07 01:55:52 -05:00 |
|
Oleg Semyonov
|
a4dfe9ac4e
|
packaging: do not build not yet supported targets for package (save time)
|
2011-09-06 15:46:21 +03:00 |
|
Oleg Semyonov
|
ca44469b92
|
packaging: build unified firmware for Rx interfaces and remove flash-erase tool
|
2011-07-13 00:09:30 +03:00 |
|
Oleg Semyonov
|
d372c615ed
|
sbus: added packaging target for CopterControl S.Bus firmware
Serial telemetry relocated to other port (USART3) for this firmware.
PPM OP MB firmware seems to be broken (the same as PWM one). Fix needed.
|
2011-06-19 16:26:14 +03:00 |
|
Oleg Semyonov
|
0305dc1094
|
package: replace 'spektrum' by 'dsm2sat' in the binary name
|
2011-05-30 02:52:01 +03:00 |
|
Oleg Semyonov
|
3dec910954
|
package: now it is called 'make package' instead of 'make release'
|
2011-05-28 03:14:51 +03:00 |
|