rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
Code Issues Releases Activity
7,979 Commits 5 Branches 8 Tags 266 MiB
8af1af6afa
Commit Graph

93 Commits

Author SHA1 Message Date
Alessio Morale
f293298118 Merge remote-tracking branch 'origin/revo-fixes' into amorale/revo-merge 
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	make/scripts/version-info.py
	package/Makefile.linux
 2013-01-19 20:23:48 +01:00
Oleg Semyonov
e9b7db82b4 [OP-759] Latest dpkg-buildpackage does not accept non-numeric version 2012-12-21 04:48:48 +02:00
Oleg Semyonov
30d874e859 [OP-703] Add default string as a source origin when using build servers 
Bamboo does not preserve git repository origin when making builds, and
it is shown later in About dialog as "Built from None". This patch fixes
that providing more accurate source description.
 2012-12-14 03:25:35 +02:00
Oleg Semyonov
e8f9a5b505 [OP-759] More installer renames 
OpenPilot-20121211-15ef4d9f-win32.exe
OpenPilot-20121211-15ef4d9f-amd64.deb
OpenPilot-20121211-15ef4d9f-i386.deb
OpenPilot-20121211-15ef4d9f-osx.dmg
 2012-12-13 15:34:13 +02:00
Oleg Semyonov
52b720a2e1 [OP-759] More installer renames 
OpenPilot-20121211-15ef4d9f-win32.exe
OpenPilot-20121211-15ef4d9f-amd64.deb
OpenPilot-20121211-15ef4d9f-i386.deb
OpenPilot-20121211-15ef4d9f-osx.dmg
 2012-12-12 20:26:11 +02:00
Oleg Semyonov
fc5381dc84 Windows installer: add Revo firmware 2012-12-11 19:55:15 +02:00
Oleg Semyonov
a407f0af31 [OP-759] Rename Linux package file as a workaround 
We should reconsider the Linux packaging later. It creates files
above the source tree directory, and that is not OK. But for now
it should work as a temporary solution.
 2012-12-11 19:55:14 +02:00
Oleg Semyonov
b7d5138c5a [OP-759] Rename all installers in the same style 
Conflicts:

	package/Makefile.winx86
	package/winx86/openpilotgcs.tpl
 2012-12-11 19:55:13 +02:00
Oleg Semyonov
a2d94ec4fd [OP-703] Add new variables to version-info.py and use them in Makefiles 
${REVISION} - revision info string (tag or branch:hash date time)
${LABEL} - package label string (tag or date-hash)
${DAY} - day of last commit
${MONTH} - month of last commit
${YEAR} - year of last commit

Conflicts:

	package/Makefile
 2012-12-11 19:55:12 +02:00
Oleg Semyonov
15ef4d9fef [OP-759] Rename Linux package file as a workaround 
We should reconsider the Linux packaging later. It creates files
above the source tree directory, and that is not OK. But for now
it should work as a temporary solution.
 2012-12-11 16:35:16 +02:00
Oleg Semyonov
757e72336c [OP-759] Rename all installers in the same style 2012-12-11 03:07:51 +02:00
Oleg Semyonov
5a66f64551 [OP-758] Move Windows installer package into the build directory 2012-12-10 19:29:57 +02:00
Oleg Semyonov
78c002e911 [OP-674] Attempt to fix Linux packaging dependencies 2012-12-10 19:29:08 +02:00
Oleg Semyonov
0f24034433 Merge remote-tracking branch 'origin/rel-12.10.2' into os/OP-758-windows-installer 2012-12-10 17:57:50 +02:00
Oleg Semyonov
8050283118 [OP-758] Move Windows installer package into the build directory 2012-12-10 16:00:03 +02:00
Oleg Semyonov
a0fb1b9061 [OP-674] Attempt to fix Linux packaging dependencies 2012-12-05 17:40:14 +02:00
Oleg Semyonov
3668ecede3 [OP-703] Add new variables to version-info.py and use them in Makefiles 
${REVISION} - revision info string (tag or branch:hash date time)
${LABEL} - package label string (tag or date-hash)
${DAY} - day of last commit
${MONTH} - month of last commit
${YEAR} - year of last commit
 2012-12-04 00:46:49 +02:00
a*morale
bf78a8b3be Fix for wrong DMG image size that prevent package build on OSX 2012-11-29 01:49:43 +01:00
Nuno Guedes
62c626aec3 Set DMG window to origin 
As there's no way to set the DMG window to open centered, it's best to set it to the screen origin (top left corner).
 2012-11-18 20:42:04 +02:00
Nuno Guedes
3b3e8aea3f Background image added 
Now the background image should be present.
 2012-11-18 20:42:02 +02:00
Nuno Guedes
565f5d458d "Polite" DMG 
"Polite" DMG with new style
Design by javl
 2012-11-18 20:42:01 +02:00
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
Oleg Semyonov
73df01bce1 packaging: use release tag without date for tagged releases 2012-10-22 20:36:09 +03:00
Oleg Semyonov
46b6dad9f7 packaging: on Windows use package label passed by Makefile 2012-10-22 20:18:57 +03: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