1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Commit Graph

3866 Commits

Author SHA1 Message Date
Oleg Semyonov
406339eb49 Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3
Conflicts:
	flight/Libraries/inc/op_dfu.h
	flight/Libraries/op_dfu.c
	flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
	flight/targets/Bootloaders/OSD/op_dfu.c
	flight/targets/boards/coptercontrol/bootloader/inc/op_dfu.h
	flight/targets/boards/coptercontrol/bootloader/op_dfu.c
	flight/targets/boards/oplinkmini/bootloader/inc/op_dfu.h
	flight/targets/boards/oplinkmini/bootloader/op_dfu.c
	flight/targets/boards/osd/bootloader/inc/op_dfu.h
	flight/targets/boards/osd/bootloader/op_dfu.c
	flight/targets/boards/revolution/bootloader/inc/op_dfu.h
	flight/targets/boards/revolution/bootloader/op_dfu.c
	flight/targets/boards/sensortest/bootloader/inc/op_dfu.h
	flight/targets/boards/sensortest/bootloader/op_dfu.c
	make/boot-defs.mk
2013-04-24 00:37:39 +03:00
Alessio Morale
57ca1639cc Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next
Conflicts:
	flight/Libraries/op_dfu.c
	flight/PiOS/STM32F10x/pios_iap.c
	flight/PiOS/inc/pios_iap.h
	flight/targets/BootloaderUpdater/main.c
	flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
	flight/targets/Bootloaders/CopterControl/op_dfu.c
	flight/targets/Bootloaders/OSD/inc/op_dfu.h
	flight/targets/Bootloaders/PipXtreme/op_dfu.c
	flight/targets/Bootloaders/RevoMini/inc/op_dfu.h
	flight/targets/Bootloaders/RevoMini/op_dfu.c
	flight/targets/Bootloaders/Revolution/inc/op_dfu.h
	flight/targets/Bootloaders/Revolution/op_dfu.c
	ground/openpilotgcs/src/plugins/uploader/uploader.ui
	make/apps-defs.mk
	make/boot-defs.mk
2013-04-23 23:14:11 +02:00
Oleg Semyonov
27195b7327 OP-899: move UAVObjects and UAVTalk one level up from targets 2013-04-24 00:07:07 +03:00
Oleg Semyonov
399cafe7d7 OP-896: rename RevoMini to Revolution 2013-04-24 00:07:05 +03:00
Oleg Semyonov
6afbef01eb OP-896: rename Revo to SensorTest 2013-04-24 00:07:04 +03:00
Oleg Semyonov
1ded536056 OP-896: rename OPLink to OPLinkMini 2013-04-24 00:07:04 +03:00
Fredrik Arvidsson
538bedeb93 Merge remote-tracking branch 'origin/kevinv033/OP-791' into next
Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
2013-04-22 20:14:05 +02:00
Fredrik Arvidsson
78d47e4185 Merge remote-tracking branch 'origin/filnet/OP-769_remove_hardcoded_en_locale' into next 2013-04-22 19:27:18 +02:00
Oleg Semyonov
927e952a9d Merge remote-tracking branch 'origin/os/OP-897_hide-unsupported-modes' into next 2013-04-20 21:23:00 +02:00
Philippe Renon
cfbd9b2728 OP-769 main.cpp various cleanups 2013-04-20 14:04:28 +02:00
Philippe Renon
6074828807 OP-769 main.cpp fixed review comments (OPReview-440) 2013-04-20 00:04:06 +02:00
Oleg Semyonov
5e942bbd6d gcs: fix weird Windows build error if python is called w/o quotes
This fixes two problems:
- if OPENPILOT_TOOLS_DIR is set using backslashes, they should be
  converted to forward ones. Otherwise on Windows it can't run the
  program.
- for some weird reason the python called without quotes (regardless
  of full path used or not) tries to open whole command line as a file
  instead of the 1st parameter only. This works as it should from bash
  prompt. But executed by make it fails on Windows.
2013-04-19 22:54:55 +03:00
Philippe Renon
208e97f476 OP-769 cleaned up handling of options in main + other cleanups 2013-04-18 01:28:11 +02:00
Oleg Semyonov
61bb82ca15 gcs: find python in tools building with Qt-Creator
This fix uses the same approach as OpenPilot toolchain system,
but for build started from Qt-Creator.
2013-04-17 19:08:02 +02:00
Oleg Semyonov
ecad4ec0f3 gcs: bump minimum Qt version to 4.8 (4.7 is not supported anymore) 2013-04-16 10:08:53 +02:00
Oleg Semyonov
3b3377e6f4 Merge remote-tracking branch 'origin/os/friendly-toolchain-install' into next 2013-04-15 01:24:42 +02:00
Fredrik Arvidsson
361f8397c9 OP-885 Fixed some code formatting issues. 2013-04-14 13:24:07 +02:00
Oleg Semyonov
cb4cfac0f3 OP-719: fix +x for openpilotgcs on linux 2013-04-14 14:09:46 +03:00
Fredrik Arvidsson
471afde5f8 Merge remote-tracking branch 'origin/next' into thread/OP-885_Update_Boards_Artwork
Conflicts:
	ground/openpilotgcs/share/share.pro
2013-04-14 11:30:40 +02:00
Philippe Renon
3c3080a441 OP-769 OP-723 GCS main cleanups as per OPReview-440
+ documented new -no-splash switch
2013-04-13 14:49:11 +02:00
Oleg Semyonov
5040a13efb gcs: set default UDP port to 9000 as used by simposix firmware 2013-04-12 10:56:05 +02:00
Philippe Renon
42022df009 OP-69 allow to set language (translation) in use for first launch through
factory defaults
OP-723 do not hard code locale to en_US in order to allow locale specific
display and entry of numbers and dates
+ revisited the GCS startup sequence
2013-04-11 19:47:05 +02:00
Brian Webb
28bfc2725c Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-11 14:42:49 +01:00
Brian Webb
8f51610776 Fixed some formatting issues. 2013-04-11 14:41:24 +01:00
Alessio Morale
3f88a64cf3 OP-874 UI does not relies on enabled state but set button state at widget initialization, fixes for styles
+review OPReview-421
2013-04-08 23:55:11 +02:00
Alessio Morale
cc446260a7 OP-874 Enable the Erase Setting button only with BL ver >=4. Describe this this on the tooltip.
+review OPReview-421
2013-04-08 01:31:29 +02:00
Alessio Morale
09d2ba1d25 OP-874 merge of amorale/OP-874_gcs_rescue_erase_settings in next.
+review OPReview-421
2013-04-08 01:10:37 +02:00
Oleg Semyonov
1b8c3ee7bb OP-897: fix spacing +review OPReview-438 2013-04-08 01:58:48 +03:00
Philippe Renon
50e66d6ee3 OP-769 initial cleanups related to language setting 2013-04-07 23:04:40 +02:00
Philippe Renon
f6c94687fc OP-879 removed now unused importsettings dialog 2013-04-07 22:28:13 +02:00
Philippe Renon
030cab376e OP-879 move loading of factory default settings earlier
(i.e. before any access to settings).
In other words, factory default are now loaded from
main.cpp instead of from mainwindow.cpp
+ minor formatting cleanups
2013-04-07 22:25:10 +02:00
Brian Webb
081c016dfa Added braces around if body. 2013-04-07 16:04:24 +01:00
Oleg Semyonov
1eb6e3fd96 Merge remote-tracking branch 'origin/next-fixed-eol' into next 2013-04-07 15:41:26 +02:00
Fredrik Arvidsson
5dc467bda4 Fixed a copy&paste bug in configoutputwidget.cpp resulting in output rate for bank 5 & 6 not showing correctly in gui. 2013-04-07 11:15:24 +02:00
Brian Webb
2ade9abcff Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-07 03:29:39 +01:00
Alessio Morale
b5426aa761 Merge remote-tracking branch 'origin/amorale/OP-871_gcs_revo_reset_fix' into next 2013-04-06 19:59:03 +02:00
Oleg Semyonov
f260b2f568 OP-897: remove non-user-selectable modes from GCS dropdown lists
Now all unsupported options are disabled. They will be reenabled when
ready for end users. Still developers can set them using UAVObjBrowser.

As a side effect, a bit changed UAVO XML definitions. The "limits"
option now uses comma to separate rules, semicolon to separate elements.
Was vice versa.

OP-897 #resolve #comment Pushed for review
+review OPReview
2013-04-06 19:01:12 +03:00
Brian Webb
ee96890b96 Initialize the Radio configuration widgets in the Revo HW configuration page correctly. 2013-04-06 16:59:03 +01:00
Brian Webb
4564718708 Added setting of max RF power and initial frequency on Revo. 2013-04-06 04:28:25 +01:00
Brian Webb
948038f655 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-06 01:32:36 +01:00
Brian Webb
c330db3a28 Added setting of min/max frequencies on OPLink coordinator. 2013-04-06 01:32:15 +01:00
Oleg Semyonov
5bb6b56b4a OP-772: Normalize line endings 2013-04-05 23:46:56 +03:00
Oleg Semyonov
3bebec22f7 OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work)
This is a part of OP-726, OP-727 tasks to normalize source code.
Use the following to normalise your local repository to be able to merge:

git rm --cached -r .
git diff --cached --name-only -z | xargs -0 git add
git commit -m "Normalise line endings"
git ls-files -z | xargs -0 rm
git checkout .
2013-04-05 23:43:58 +03:00
Kevin Vertucio
9c00fdcd31 removed dependency for QtWebKit in AboutDialog.qml 2013-04-04 07:04:14 -04:00
Fredrik Arvidsson
a338257b2d OP-885 Added configuration for Zagi 3D model. Changed some rendering attributes and changed the name of Revomini to Revolution. 2013-04-03 19:56:41 +02:00
Fredrik Arvidsson
8dc2f23eb2 Merge remote-tracking branch 'origin/muralha/artwork' into thread/OP-885_Update_Boards_Artwork 2013-04-02 19:43:29 +02:00
Fredrik Arvidsson
a697f293b6 OP-885 Added and replaced some artwork for Revolution board and other. 2013-04-02 19:43:19 +02:00
Oleg Semyonov
e24b66897b build: fix qmake ground/share copy commands for all platforms
Read share.pro comments for more details.

+review OPReview-429
2013-04-02 19:43:48 +03:00
Nuno Guedes
a2ddcf7f3b Added the Zagi plane to the openpilotgcs
Added the Zagi plane to the openpilotgcs folder, because this model wasn't added to the ModelView before.
2013-04-02 15:08:28 +01:00
Nuno Guedes
460873884f New OP 3D boards
- Revolution
- OP GPS
- OPLink
2013-04-02 14:39:42 +01:00