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
249e6db241
Windows Uninstaller: remove GCS config files (including obsolete) on demand
2012-10-16 01:14:11 +03:00
James Cotton
0559c90689
OSX packaging: Finally link SDL in properly.
2012-10-13 18:03:18 +01:00
Oleg Semyonov
4aa3c38d40
packaging: fix opfw_resource build dependencies
2012-10-11 16:40:35 +03:00
PT_Dreamer
8863601715
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate
2012-10-10 18:22:53 +01:00
James Cotton
0e111a62ff
OSX Packaging: Make sure to link libgamepad to the distributed SDL
2012-10-10 08:30:55 -05: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
Stacey Sheldon
754f58c33a
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
flight/Modules/ManualControl/inc/manualcontrol.h
flight/Revolution/Makefile.osx
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-16 09:56:35 -04:00
James Cotton
51683ffb65
Merge branch 'next' into revo
...
Conflicts:
ground/openpilotgcs/src/plugins/config/input.ui
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
ground/openpilotgcs/src/plugins/plugins.pro
2012-09-15 16:31:30 -05:00
Oleg Semyonov
7a5b445f4e
Windows Installer: regression fix (really uninstall GCS configuration)
...
Thanks Terrier for pointing this out.
2012-09-01 14:32:09 +03:00
Stacey Sheldon
1f1b240b2a
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-08-20 21:22:02 -04:00
Oleg Semyonov
f9f3d6d98c
Windows Installer: install also stylesheets
2012-08-20 12:19:21 +03:00
Oleg Semyonov
89e06d7a6b
Windows Installer: add default_configurations folder
2012-08-19 22:14:11 +03:00
James Cotton
75db0fcb35
Merge branch 'next' into revo
...
Conflicts:
flight/Modules/GPS/GPS.c
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/systemalarms.xml
2012-08-12 14:38:38 -05:00
James Cotton
6948f1dc41
Merge remote-tracking branch 'origin/master' into next
...
Conflicts:
package/winx86/translations/strings_de.nsh
2012-08-03 09:35:18 -05:00
PT_Dreamer
7884b7002e
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
HISTORY.txt
2012-07-30 15:24:36 +01:00
Sambas
60c4d7f922
bu targets fix
2012-07-30 11:41:10 +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
Oleg Semyonov
8d8a3d0155
AeroSimRC: add plugin option to Windows installer
...
Translations are welcome.
2012-07-20 22:37:36 +03:00
James Cotton
dc1a8205ca
Allow building an unsigned linux package until we have official OP signing keys
2012-07-18 17:01:39 -05:00
James Cotton
6b101d71af
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
2012-07-15 12:32:35 -05:00
James Cotton
d150fd5331
Merge branch 'next' into revo
...
Conflicts:
flight/Modules/ManualControl/manualcontrol.c
ground/openpilotgcs/src/plugins/config/input.ui
ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
shared/uavobjectdefinition/manualcontrolsettings.xml
2012-07-13 10:40:14 -05:00
Oleg Semyonov
43bd9a8819
nsis: add some translations for DE (thanks, D-Lite)
2012-07-13 01:55:25 +03:00
Oleg Semyonov
d78e4f2ca5
nsis: add some translations for DE (thanks, D-Lite)
2012-07-13 00:14:50 +03:00
Oleg Semyonov
0c8cc5768c
nsis: CDC driver, per-machine installation, release notes
...
Now CDC driver will be pre-installed during the install process.
Since driver installation requires elevated (admin) privileges
on Windows Vista/7, the software will also be installed into the
Program Files folder instead of user local profile. Former did not
require admin rights, but now it does not matter, so Program Files
folder is preferred.
HISTORY.txt file will be shown after installation.
2012-07-10 18:14:54 +03:00
Oleg Semyonov
4d169dbd54
nsis: add PipXtreme fw, matlab log parser and CDC driver file to the Windows package
...
Note that this does not install the CDC driver yet. It just puts the
inf file into the drivers subdirectory under OpenPilot installation
directory.
Installer string translations are welcome. But they are not used yet
because utilities and drivers sections are currently hidden and always
will be installed/removed.
2012-07-09 11:51:45 +03:00
Stacey Sheldon
54a161a3d4
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
2012-07-08 18:14:09 -04:00
James Cotton
cd311642dd
Merge branch 'next' into revo
2012-06-28 10:35:47 +02:00
Oleg Semyonov
6ed1348f13
Add "OpenPilotGCS (clean configuration)" Windows shortcut to reset GCS configuration
...
Similar options for Mac/Linux are welcome, so users don't have to search
for GCS configuration file in case they need to reset it to defaults.
2012-06-25 12:07:26 +03:00
James Cotton
b074b1f712
Work on the OSX packaging to get it working for revo and to package OSG.
2012-06-13 12:30:07 -05: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
09b6c03fd2
Make packaging on OSX include all pipxtremem compiled opfw in the packaging directory
2012-06-07 12:39:00 -05:00
James Cotton
3546e7fd6c
Include PipX firmware in packaging
2012-06-07 11:29:27 -05:00
James Cotton
0f2c41ac5d
Merge branch 'revolution' into navigation
...
Conflicts:
flight/Modules/ManualControl/manualcontrol.c
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
2012-05-07 21:53:10 -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
James Cotton
e9966da666
Add the OPLogConvert.m script to the OSX packages
2012-05-04 12:25:01 -05:00
James Cotton
353fe8b349
Need to link a few new libraries for the QML stuff
2012-02-14 22:05:20 -06:00
James Cotton
7990d209a8
Fix package deployment script for OSX to make sure the SVG pixmap shows up
2012-01-31 14:48:24 -06:00
naiiawah
6c38114cfc
Fixed borkage in the rules file where the if test was malformed. Added
...
a change to force an error if the passed in ENV var is not defined. If
that had been there, the borkage wouldn't have been undetected.
Changed to only put the main FW in the firmware dir, instead of BL and
FW.
2012-01-04 21:39:23 -07:00
naiiawah
f136f3d956
Updated Vid/Pids for Revo, CC3D and some minor comment cleanup in the UDev rules file.
2011-12-30 17:47:22 -07:00
naiiawah
5da31269a6
Changed the top level menu to OpenPilot.
2011-12-24 20:38:04 -07:00
naiiawah
e7a5c14fe2
Improved the handling of the UDev rules installation. Uses
...
dh_installudev now instead of just manually copying files. Should
survive any changes to where UDev puts rules better if there is a
channge in their scheme of locations.
Suggested change by Stac after finding the dh_installudev tool. Good
find!
2011-12-24 14:30:02 -07:00
naiiawah
15061dccab
Updates based on review feedback. Fixed (unlikely) case of empty
...
PACKAGE_DIR var to prevent splatered copying.
2011-12-21 22:38:40 -07:00
