Oleg Semyonov
e2fd821e97
Merge remote-tracking branch 'origin/next' into sambas/diffnext
...
Conflicts:
make/common-defs.mk
2013-04-26 16:31:19 +03:00
Oleg Semyonov
4718e666ee
Merge remote-tracking branch 'origin/thread/OP-816_Setup_Wizard_Revo_Support' into next
2013-04-26 15:18:01 +03:00
sambas
abe3742217
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
flight/Libraries/CoordinateConversions.c
flight/Libraries/paths.c
flight/Modules/System/systemmod.c
flight/PiOS/STM32F4xx/pios_sys.c
flight/targets/boards/coptercontrol/pios_board.h
flight/targets/boards/revolution/pios_board.h
flight/targets/boards/revoproto/pios_board.h
2013-04-25 17:26:49 +03:00
Philippe Renon
6ff2b1873d
OP-907 fixed regression in vehicle config : "dirty" state management
...
was broken (continued).
2013-04-25 00:07:06 +02:00
Philippe Renon
99c052651c
OP-907 fixed regression in vehicle config : "dirty" state management
...
was broken.
+ added comments
2013-04-24 23:24:23 +02:00
Philippe Renon
d7596a64ff
OP-907 reverted airframe.ui border from 9 to 12 to make it more consistent
...
with other config tabs
2013-04-24 22:05:31 +02:00
Oleg Semyonov
f9f721a76a
Reset executable bits from non-executable files (Windows legacy)
2013-04-24 01:18:46 +03:00
Oleg Semyonov
fb207bdaf7
OP-896: rename SensorTest to RevoProto
2013-04-24 00:57:33 +03:00
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
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
Philippe Renon
4690949575
Merge remote-tracking branch 'origin/next' into filnet/OP-907_gcs_vehicle_config_overhaul
...
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
2013-04-22 22:56:06 +02:00
Philippe Renon
5f39206ebd
OP-907 vehicle config - removed uncessary setupUI calls.
...
+ fixed regression in multirotor config widget : svg display was not updated when switching frame type
+ formatting
2013-04-22 21:23:47 +02:00
sambas
731ee3e19d
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
2013-04-22 21:29: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
Nuno Guedes
7bfc0f7962
Code style fixes
...
Had forgotten about the code style standards.
I hope it's more correct now.
2013-04-20 18:31:35 +01:00
Nuno Guedes
8fef89d55c
OP-596 - GCSController output Fix
...
The GCSController widget now outputs the correct throttle range (0..1) on the ManualControlCommand.Throttle.
(Also, some empty lines cleaning.)
2013-04-20 16:48:23 +01:00
Philippe Renon
b03ebbaf3a
OP-907 step 4: added lazy creation of vehicle config widget
2013-04-18 03:51:47 +02:00
Philippe Renon
6fa3d88c23
Merge remote-tracking branch 'origin/next' into filnet/OP-907_gcs_vehicle_config_overhaul
2013-04-16 22:22:32 +02:00
Fredrik Arvidsson
9a9578a2a3
OP-816 Added page for Revolution calibration referring to the configuration plug-in until we get 'our ducks in a row' regarding the Revolution calibration procedure.
2013-04-16 20:40:25 +02:00
Fredrik Arvidsson
66b66ee8f4
OP-816 Re-factoring and removal of warnings.
2013-04-16 19:41:13 +02:00
Philippe Renon
0deb4d4a8f
OP-907 vehicle config widgets now have consistent labels for mixer sliders
2013-04-16 00:13:08 +02:00
Philippe Renon
3bb80977d5
OP-907 changed vehicle config widget margin
2013-04-15 21:59:11 +02:00
Philippe Renon
dc060de5da
OP-907 fixed minor spacing issue with multirotor mixer status line
2013-04-15 21:58:01 +02:00
Philippe Renon
70177a82d7
OP-907 changed grid lines of curve-bg.svg from dashed to solid to fix
...
rendering artefacts cause by dashed lines
2013-04-15 21:47:28 +02:00
Philippe Renon
c331a143ae
OP-907 moved mixer curve background svg file (curve-bg.svg) to
...
src/plugins/uavobjectwidgetutils as it is used from mixercurvewidget.cpp
located in that directory
2013-04-15 21:43:04 +02:00
Fredrik Arvidsson
b237b85c42
Merge remote-tracking branch 'origin/next' into thread/OP-816_Setup_Wizard_Revo_Support
2013-04-15 20:20:00 +02:00
sambas
ab8ab4bcc6
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
2013-04-15 17:41:06 +03:00
Philippe Renon
81da5303f2
OP-907 step 3: more vehicle config code cleanups
2013-04-14 22:12:15 +02:00
Fredrik Arvidsson
361f8397c9
OP-885 Fixed some code formatting issues.
2013-04-14 13:24:07 +02: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
sambas
589290dbd7
POI orbit + some code run thru code formatter
2013-04-14 12:23:47 +03:00
sambas
6989468d17
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
.gitignore
2013-04-14 10:13:51 +03:00
Philippe Renon
782913590b
OP-907 step 4: vehicle config UI cleanups
2013-04-13 17:58:12 +02:00
Philippe Renon
357f36a06d
OP-907 step 4: vehicle config UI cleanups
2013-04-13 17:58:11 +02:00
Philippe Renon
80b658cebf
OP-907 step 3: vehicle config code formatting cleanups
2013-04-13 17:58:11 +02:00
Philippe Renon
3520a7c055
OP-907 step 3: more vehicle config code cleanups
2013-04-13 17:58:10 +02:00
Philippe Renon
14a0da076d
OP-907 step 3: cleaned up configvehicletypewidget.cpp + related cleanups
2013-04-13 17:58:09 +02:00
Philippe Renon
e141e75e9f
OP-907 step 3: cleaned up configvehicletypewidget.cpp + related cleanups
2013-04-13 17:58:09 +02:00
Philippe Renon
2d1af680a0
OP-907 step 3: cleaned up configvehicletypewidget.cpp + related cleanups
2013-04-13 17:58:08 +02:00
Philippe Renon
90b0c5ca21
OP-907 step 3: cleaned up vehicleconfig.h + related cleanups
2013-04-13 17:58:07 +02:00
Philippe Renon
3ab96ed3cc
OP-907 step 2: moved vehicle specific code to respective vehicle widget
2013-04-13 17:58:03 +02:00
Philippe Renon
b190b898f1
OP-907 step 1: merged ccpm.ui into airframe_ccpm.ui
2013-04-13 17:57:57 +02:00
Philippe Renon
ccb285dd38
OP-907 step 1: renamed MultirotorRevMixercheckBox to MultirotorRevMixerCheckBox
2013-04-13 17:57:48 +02:00
Philippe Renon
b27bc03ef5
OP-907 step 1: extract vehicle specific UIs from airframe.ui (merged next)
2013-04-13 17:42:13 +02:00
Philippe Renon
0d3e00134a
OP-907 step 1: extract vehicle specific UIs from airframe.ui
2013-04-13 17:41:18 +02:00
Kevin Vertucio
1e2e93b8c0
OP-791 FIXED issue where Flickable web view would need to be dragged to scroll content
...
Replaced Flickable component with ListView for the Authors list.
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-04-13 16:35:22 +02:00
Fredrik Arvidsson
cc9c02ab4f
Merge remote-tracking branch 'origin/next' into thread/OP-816_Setup_Wizard_Revo_Support
2013-04-12 11:23:42 +02:00
Fredrik Arvidsson
860077c428
OP-816 Added Revolution specific configuration code to Setup Wizard.
2013-04-11 21:25:38 +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
sambas
24f1362cfe
Merge remote-tracking branch 'origin/next' into sambas/diffnext
2013-04-07 18:21:59 +03:00
Fredrik Arvidsson
580b3f771e
Merge remote-tracking branch 'origin/next' into thread/OP-816_Setup_Wizard_Revo_Support
2013-04-07 17:21:14 +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
ee130b6892
Merge branch 'next' into thread/OP-816_Setup_Wizard_Revo_Support
...
Conflicts:
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
2013-04-07 12:02:35 +02:00
Fredrik Arvidsson
9d53b68ab8
OP-816 Added settings enums for GPS and Revolution Radio modem.
...
Added basic hardware settings implementation for Revolution board.
2013-04-07 11:52:33 +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
sambas
33bb918924
Merge remote-tracking branch 'origin/next' into sambas/diffnext
2013-04-07 09:51:18 +03:00
sambas
fb8273459f
Normalize line endings
2013-04-07 09:49:13 +03: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
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
a697f293b6
OP-885 Added and replaced some artwork for Revolution board and other.
2013-04-02 19:43:19 +02:00
sambas
47a7659147
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
2013-04-02 20:40:41 +03:00
sambas
4240cc9670
Flight battery to AerosimRC, needs option flag, currently linked to baroaltitude option
2013-04-02 19:29:07 +03:00
Oleg Semyonov
3e815ca8d5
build: get rid of build/ground subdirectory, fix qt-creator builds
...
This changeset:
- moves all ground targets one level up, under build directory. The
build/ground was created as a workaround, now unnecessary;
- fixes QtCreator builds, they are separated from command line builds;
- moves GCS autogenerated files into openpilotgcs-synthetics directory.
The resulting build subdirectory now looks like:
build
openpilotgcs <- Qt-Creator build directory
openpilotgcs-synthetics <- version-info and opfw_resource
openpilotgcs_debug
openpilotgcs_release <- Makefile build directory
uavobject-synthetics
uavobjgenerator
NOTE: you should update the shadow build path in QtCreator to build,
not build/ground as before.
+review OPReview
2013-03-30 17:33:38 +02:00
Brian Webb
2568f41cf3
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-30 01:18:37 +01:00
Brian Webb
1cac81b3e8
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
...
Conflicts:
flight/targets/PipXtreme/System/inc/pios_config.h
flight/targets/RevoMini/System/inc/pios_config.h
2013-03-29 17:17:55 -07:00
Oleg Semyonov
4be3cd4978
Merge remote-tracking branch 'origin/amedee/OP-882' into next
2013-03-29 10:44:47 +02:00
sambas
c60a750d96
AeroSimRC plugin fixes and updates
2013-03-28 18:30:14 +02:00
sambas
5ded8c6dfc
VTOL path fixes
...
Flight mode fixes
POI mode
AutoLand Tests
Simple stabilization Shortest way yaw fix
GCS map and pathplanner fixes
2013-03-28 18:29:26 +02:00
Oleg Semyonov
beb13b32a9
OP-883: The 1st cleanup pass through PIOS and Makefiles system
2013-03-28 11:26:34 +02:00
Fredrik Arvidsson
c549218873
Fixed a bug related to the FusionAlgorithm selection in Revolution configuration.
2013-03-27 13:09:48 +01:00
Fredrik Arvidsson
0adb2b5b6f
Merge remote-tracking branch 'origin/filnet/OP-853_fix_HITL_Options_page' into next
2013-03-27 11:09:52 +01:00
Fredrik Arvidsson
0d87f7509f
Merge remote-tracking branch 'origin/filnet/OP-857_various_gcs_ui_polishing' into next
2013-03-27 11:08:52 +01:00
Fredrik Arvidsson
8423681d41
Merge remote-tracking branch 'origin/filnet/OP-833_gcs_options_dialog_ui_polishing' into next
2013-03-27 11:07:52 +01:00
Philippe Vanhaesendonck
8625eba054
Fix for OSX Lions compiler
...
OSX 10.7 and above will need the -fpermissive flag to compile
2013-03-26 22:57:08 +01:00
Philippe Renon
f00a972e0e
OP-833 cleaned up individual gadget options pages: dial and linear dial
2013-03-24 17:09:59 +01:00
Philippe Renon
eef25f4e9d
OP-857 OP-876 fixed regression introduced while fixing this issue
...
(settings were not handled well anymore)
- added timing debug messages
- minor cleanups
2013-03-24 16:50:17 +01:00
Oleg Semyonov
0957bbb498
Makefile: split GCS build directory into debug and release
...
Now by default GCS is built for release.
AeroSimRC also is placed under misc (as it is installed on Windows).
2013-03-24 13:06:13 +02:00
Oleg Semyonov
4082b1498a
Makefile: move opfw_resource rules from packaging to top Makefile
...
opfw_resource make target now depends on built firmware images. They are
referenced directly from Qt resource file generated. No extra copies
are now necessary.
2013-03-24 13:06:11 +02:00