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
Brian Webb
2b6345850b
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-24 00:58:41 +01:00
Fredrik Arvidsson
510a7d70ad
Merge remote-tracking branch 'origin/next' into thread/OP-816_Setup_Wizard_Revo_Support
2013-03-23 16:38:26 +01:00
Alessio Morale
9244b511ac
Merge branch 'amorale/OP-872_OP-867_thread-Config_revo_support' into next
2013-03-23 13:12:43 +01:00
Alessio Morale
2f2499f8c4
OP-867 fixed intentation
2013-03-23 13:10:57 +01:00
Philippe Renon
8af1af6afa
OP-833 cleaned up individual gadget options pages
2013-03-21 01:26:29 +01:00
Philippe Renon
5b648d1f33
OP-853 new HITL options page had last tab selected by default (now it is
...
the first)
2013-03-20 21:32:06 +01:00
Philippe Renon
8c499aad7a
OP-853 fixed badly broken HITL Options page (not perfect but better than
...
previous version)
2013-03-19 22:23:20 +01:00
Philippe Renon
e39f70536b
OP-857 OP-876 fixed issue that prevented default size of Options dialog
...
to be taken into account on 1st launch of GCS (with no user settings)
2013-03-19 22:10:47 +01:00
Philippe Renon
23077d3326
OP-857 OP-876 fixed issue that prevented default size of Options dialog to
...
be taken into account on 1st launch of GCS (with no user settings)
2013-03-19 22:08:40 +01:00
Kevin Vertucio
45a3bb975c
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-03-19 10:14:50 -04:00
Philippe Renon
936f851166
Merge remote-tracking branch 'origin/thread/OP-864_Remove_Configuration_Prompt' into filnet/OP-857_various_gcs_ui_polishing
2013-03-19 04:34:32 +01:00
Philippe Renon
90fbf9bdab
OP-833 removed unused ConfigGadgetConfiguration and
...
ConfigGadgetOptionsPages classes
2013-03-17 19:34:33 +01:00
Fredrik Arvidsson
73d61f810a
Merge branch 'next' into thread/OP-816_Setup_Wizard_Revo_Support
2013-03-16 08:53:04 +01:00
Alessio Morale
5ca228ebce
Merge branch 'amorale/OP-872_HandleAllOutputs' into thread/OP-867_Config_Revo_Support
...
+review OPReview
2013-03-14 23:34:48 +01:00
Alessio Morale
dfb69e1b17
Merge remote-tracking branch 'origin/kevinv033/OP-791' into next
2013-03-14 21:36:44 +01:00
Alessio Morale
be8e5d159b
OP-872 handle all outputs for CC/CC3D and Revolution
2013-03-14 20:13:02 +01:00
Alessio Morale
3f98676a3b
OP-871 Fix: it is not possible to halt a Revo board in firmware update page
...
+review OPReview
2013-03-13 03:24:25 +01:00
Brian Webb
10de32d6f6
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-13 01:41:01 +01:00
Philippe Renon
ef72e13a18
OP-857 OP-860 minor improvments to the connection widget
...
- made it wider so it can at least display the string "USB: CopterControl"
- added a tooltip to the connection combo box that will display the
currently selected connection
- other minor code cleanups
2013-03-12 22:43:11 +01:00
Philippe Renon
9b495b4d5e
OP-857 OP-869 fixed style sheet issues:
...
- removed wide style sheets
- added style sheet common to all platforms
- fixed broken styles for QTabWidget and QGroupBox on Windows
- fixed broken style for QTabWidget on Linux
2013-03-12 22:43:10 +01:00
Alessio Morale
86c525b2d3
Merge remote-tracking branch 'origin/thread/OP-856_Revolution_HW_Settings' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/config.pro
2013-03-12 19:59:07 +01:00
Fredrik Arvidsson
b21517cd87
OP-867 Code cleanup. Added missing combo boxes to 'dirty pool'.
2013-03-12 07:35:20 +01:00
Brian Webb
d5795b2118
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-12 01:36:34 +01:00
Fredrik Arvidsson
f27a69802d
OP-867 Added output rate settings for revolution.
2013-03-11 23:22:10 +01:00
Alessio Morale
6b6a3bcd9f
Merge remote-tracking branch 'origin/thread/OP-864_Remove_Configuration_Prompt' into next
2013-03-11 21:15:30 +01:00
Kevin Vertucio
22c966711d
added autogenerated version info file
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-03-11 15:35:08 -04:00
Philippe Renon
21c581bacd
OP-833 minor options page cleanup: removed some uneeded separator lines
2013-03-10 21:02:00 +01:00
Fredrik Arvidsson
e0bd933baa
OP-856 Changed USB GUI. Changed the rules for validation of configurations.
2013-03-10 18:51:15 +01:00
Brian Webb
6e7e2d39f3
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-10 15:54:08 +01:00
Oleg Semyonov
f1214df633
OP-792: Remove unused yet GUI in addition to flight modes
...
This reverts commit 0e9d7137ff
.
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
OP-792 #comment Now this feature is removed from GUI too
2013-03-10 00:57:41 +02:00
Philippe Renon
96a1e1d8c9
OP-857 OP-859 fixed various glitches in Commmunity panel:
...
Show three lines of news instead of one;
Fixed improper eliding of news text;
Moved News scroll bar to the right so it won't overlap the news text;
Removed clipping in Sites panel that caused the Os to be clipped.
2013-03-09 17:32:46 +01:00
Philippe Renon
31e3e73799
OP-857 OP-858 Added space between name and unit in Scope gadget legend
2013-03-09 17:32:45 +01:00
Philippe Renon
1859fd4ca5
OP-833 minor options page cleanup: removed some uneeded separator lines
2013-03-09 17:26:40 +01:00
Brian Webb
e70f0f2c21
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-09 01:43:46 +00:00
Kevin Vertucio
98e12d192a
removed extraneous commented code
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-03-08 11:25:57 -05:00
Alessio Morale
ffbb0a5a8e
Merge remote-tracking branch 'origin/amorale/op-848_mpu6000_configurability' into next
2013-03-08 00:08:15 +01:00
Alessio Morale
c47ecd044e
Merge branch 'filnet/OP-803_gadget_config_set_twice_on_restore' into next
2013-03-08 00:07:34 +01:00
Brian Webb
3a8c5494ca
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-07 13:57:51 +00:00
Alessio Morale
6a408e6a0a
Merge branch 'filnet/OP-682_fix_for_crash_on_firmware_uploader_gadget' into next
2013-03-07 00:14:08 +01:00
Philippe Renon
1d9deae77d
OP-682 fixed regression that prevented uploading of valid fw + renamed
...
youdont check box to confirmCheckBox + minor cleanups
2013-03-06 22:01:05 +01:00
Fredrik Arvidsson
b6746259c8
OP-864 Fixed some debug logging cosmetic problems.
2013-03-04 20:38:16 +01:00
Fredrik Arvidsson
82a89700e1
OP-864 Fixed sloppy errors (hopefully).
2013-03-04 18:36:23 +01:00
Fredrik Arvidsson
99ae18990e
OP-856 Removed redundant code. Changed image of Revolution board to one with white PCB.
2013-03-04 08:04:55 +01:00
Fredrik Arvidsson
2cd3485cf6
OP-816 Fixed Revolution identification and Revolution + OPLink firmware auto-update functionality.
2013-03-03 19:33:24 +01:00
Fredrik Arvidsson
e2e3089cf5
OP-864 Made OpenPilotGCS.xml the default configuration on first start. If this file is missing for some reason the selection dialog will appear. The configuration can also be set as a command line option.
2013-03-03 16:56:52 +01:00
Fredrik Arvidsson
9e870e6ae3
OP-856 Added enabling/disabling of required modules depending on port configuration. Added rules for port configuration.
2013-03-03 14:17:37 +01:00
Kevin Vertucio
4c95e5c613
fixed indentation
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-03-01 09:13:32 -05:00
Kevin Vertucio
e4d516424e
fixed indentation and clean up formatting
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-03-01 09:10:26 -05:00
Kevin Vertucio
c07142fa53
fixed some grammatical errors and formatting
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-03-01 08:59:02 -05:00
Kevin Vertucio
8a59b5c07a
clean up formatting from review comments
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-03-01 08:53:04 -05:00
Fredrik Arvidsson
de026a13fc
OP-856 Basic implementation of hardware settings page.
2013-02-28 08:13:21 +01:00
Fredrik Arvidsson
e710f3bb91
OP-856 Basic renaming from PRO to Revolution
2013-02-26 07:37:14 +01:00
Brian Webb
fff6e81e0b
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-02-24 23:11:39 +00:00
Brian Webb
d9baa372c7
Added frequency hopping to the RFM22B driver. Currently it defaults to 128 channels between 430 and 440 MHz.
2013-02-24 23:05:51 +00:00
Philippe Renon
ed83f282a5
OP-834 home location related error reporting improvments and comment
...
cleanups
2013-02-23 18:35:07 +01:00
Philippe Renon
8bd3c09860
OP-834 fixed bad Q_ASSERT around effective code
2013-02-23 18:35:07 +01:00
Philippe Renon
538723696a
OP-834 restored "dead" code that was commented out by mistake
2013-02-23 18:35:07 +01:00
Philippe Renon
6d75dd0c6f
OP-834 added FIXME comment for bad Q_ASSERT around effective code and
...
commented out a bunch of dead code (that dead code includes the suspicious
Q_ASSERT uses)
2013-02-23 18:35:07 +01:00
Philippe Renon
43786badfa
OP-834 fixed bad Q_ASSERT around effective code
2013-02-23 18:35:07 +01:00
Philippe Renon
4350e48bfc
OP-682 OP-850 fixed more uploader gadget crashes and button state issues
2013-02-21 01:34:17 +01:00
Philippe Renon
adc9c008c4
iOP-803 redid spurious commit in order to avoid undoing OP-805 (need to be
...
more carefull or sleep more...)
2013-02-18 22:28:09 +01:00
Brian Webb
cf7c929030
Added the ability to store bindings and configuration paramaters for multiple (up to 8) modems from an OPLink controller modem.
2013-02-18 01:49:13 +00:00
Brian Webb
46baec52ef
Merge remote-tracking branch 'origin/next' into brian/rfm22_multibind
2013-02-17 01:21:12 +00:00
Alessio Morale
e27a07631e
op-848 MPU6000 support user configurabe accel/gyro scales and filter bandwidth.
...
board definitions can override any of this settings for special applications.
Also include cleanup from "magic numbers" and fix for inverted ranges
2013-02-17 02:02:12 +01:00
Voha
6c24561ec4
* fix build error
2013-02-15 23:31:47 +01:00
Voha
8c5cded61a
OP-845: *fix code style
2013-02-15 23:31:47 +01:00
Voha
e4f98b31c6
fix code style
2013-02-15 23:31:47 +01:00
Voha
427bbd0a80
fixed reading serial number from USB device on mac platform
2013-02-15 23:31:46 +01:00
Oleg Semyonov
790e771b54
Merge remote-tracking branch 'origin/laurent/translations' into next
2013-02-11 22:05:29 +02:00
Oleg Semyonov
c8ce31f7a9
Merge remote-tracking branch 'origin/next' into theothercliff/elevon_cam_stab
2013-02-11 01:03:33 +02:00
Brian Webb
57b4d8c720
RFM22: Added support for binding to multiple remove OPLinks.
2013-02-08 01:56:22 +00:00
Brian Webb
e50e645e7b
Merge remote-tracking branch 'origin/next' into brian/oplink_ppm_out
2013-02-07 13:39:21 +00:00
Philippe Renon
69fb6f6de3
OP-833 gcs options dialog polishing: zeroed margin of top level widget
2013-02-06 23:27:05 +01:00
James Cotton
5e20705347
Windows copy data: Use the environmental $$(QTMINGW) variable to locate
...
files to copy into the package. This makes it more robust against various
relative locations of mingw and qt.
It may be necessary to move all SDL-related files (SDL.dll, static libraries
and include files) from, for instance, .\QtSDK\Desktop\Qt\4.8.1\mingw\bin
to .\QtSDK\mingw\bin to be found.
Conflicts:
ground/gcs/copydata.pro
ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro
2013-02-03 01:06:07 +02:00
Philippe Renon
3ab33cf163
OP-833 gcs options dialog polishing:
...
- createOptionsPage() now returns NULL to avoid having empty page in
Options dialog
- removed Gadget from gadget name
- added some TODOs for for further cleanups
2013-02-02 16:09:53 +01:00
Philippe Renon
6b3e0c7ee3
OP-833 gcs options dialog polishing: zeroed margin of top level widget
2013-02-02 16:08:37 +01:00
Philippe Renon
03ca63978b
OP-833 gcs options dialog polishing:
...
- zeroed margin of top level widget
- chnaged size policy of scrollArea from Expanding to Minimum to get a
tighter fit
2013-02-02 16:06:13 +01:00
Philippe Renon
96651e302a
OP-833 gcs options dialog polishing: zeroed margin of top level widget
2013-02-02 16:03:54 +01:00
Philippe Renon
d8ce755cfd
OP-833 gcs options dialog polishing:
...
- increased width of splitter handle from default (6) to 9
- removed bottom Line widget
2013-02-02 15:58:47 +01:00
Brian Webb
a4faa22c4b
Merge remote-tracking branch 'origin/brian/rfm22_autoconf' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2013-01-31 13:40:32 +00:00
Cliff Geerdes
6806e895cc
First version. Passes simple tests.
2013-01-30 18:57:32 -05:00
filnet
d03db9c6d1
OP-803 remove spurious commit
2013-01-29 23:12:55 +01:00
filnet
3e9c819850
OP-803 more cleanups
2013-01-28 23:13:47 +01:00
filnet
e8659cf9d5
OP-682 added some comments
2013-01-26 15:10:30 +01:00
filnet
813aaf5d85
OP-682 fixed two crashes on firmware uploader gadget.
...
crash 1 : would happen when clicking Halt and then Boot as soon as the Boot button became enabled.
crash 2 : would happen when clicking Boot and then quickly pressing then Open button.
2013-01-24 22:36:00 +01:00
Fredrik Arvidsson
3705a2d0a8
OP-786 Moved the actual file and the dependency to gcsversioninfo.pri to the /app sub project from the /plugins/coreplugin project. This was necessary since the new splash screen depends on defines in the generated gcsversioninfo.h header file.
...
Changed position of the revision text to make it look nicer.
2013-01-24 15:22:15 +01:00
Kevin Vertucio
bb999ae44f
cleanup formatting
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-01-24 08:04:55 -05:00
Kevin Vertucio
0cfed60638
added OP Icon to About GCS Version tab
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-01-24 07:09:36 -05:00
Kevin Vertucio
63657c6586
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into kevinv033/OP-791
2013-01-23 22:09:40 -05:00
Alessio Morale
1a303aa85f
Merge remote-tracking branch 'origin/next' into amorale/bigmerge
2013-01-23 19:47:32 +01:00
Kevin Vertucio
24068a6638
set dialog windowFlags for a frameless window.
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-01-22 14:05:02 -05:00
Kevin Vertucio
03ad1e55f5
converted "About Authors" and "About OpenPilot GCS" to QML
...
added dependent QML files
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-01-22 00:26:46 -05:00
filnet
a9d2679e39
OP-803 minor cleanups
2013-01-20 17:32:55 +01:00
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
filnet
1e3aeaf988
OP-803 fix attempt
2013-01-16 23:43:22 +01:00
filnet
481005cc69
OP-803 transparent refactoring - moved specific save/restore code
...
from SplitterOrView to UAVGadgetView and made some methods private
2013-01-16 22:30:16 +01:00
Alessio Morale
de44495055
OP-796 defaults USE_PATHPLANNER to enabled
2013-01-14 01:28:33 +01:00
filnet
ae9def7f11
OP-805 - fixed GCS Options page crash by removing configurations for which
...
an options page could not be created.
2013-01-13 18:33:07 +01:00
Alessio Morale
635b1e98e4
OP-806 Fix mapwidget/uavitem.cpp to show CAS using AirspeedActual.CalibratedAirspeed
2013-01-12 16:57:28 +01:00
Alessio Morale
da76d775f9
OP-800 Remove WayointEditor as it was supeseed by PathActionEditor
2013-01-12 16:53:48 +01:00
Alessio Morale
a89a2cfb47
OP-801 replaced GetLLA with NED2LLA_HomeLLA
2013-01-11 01:11:07 +01:00
Alessio Morale
672519e559
OP-797 PFDGadgetWidget should use AirspeedActual.CalibratedAirspeed instead of BaroAirspeed
2013-01-11 01:11:07 +01:00
Alessio Morale
60eb36ab36
OP-799 removed Waypoint import export from uavsettingsimportexportfactory.cpp as it is handled by pathActionEditor
2013-01-11 01:11:06 +01:00
Alessio Morale
19c95a4f1b
OP-798 uavobjectutil/devicedescriptorstruct.h miss a case for 0x903-revomini target
2013-01-11 01:11:06 +01:00
Alessio Morale
eaaad5edd1
OP-794 Revert "GCS Stabilization: Force the apply button to always be there as I can't find expert mode"
...
This reverts commit 26408e286f
.
2013-01-11 01:10:11 +01:00
Brian Webb
be444db7f8
Added PPM output to OPLink firmware
2013-01-04 06:51:27 -07:00
Laurent Lalanne
c83bb4b450
My first commit...
...
Rescan sources to get new strings to be translated,
Updated openpilotgcs_fr.ts, translation in progress,
Little changes in Qml files used in Welcome plugin : Titles translations with qsTr(), dont work in labels.
2013-01-03 13:59:06 +01:00
filnet
a45578c250
OP-781: reorganized imports
2012-12-30 19:04:02 +01:00
filnet
d0447b5e06
OP-781: cleaned up; added comments; removed some debug code; fixed tabs
...
into spaces
2012-12-30 18:27:51 +01:00
Brian Webb
9f3d7a24f8
Merge branch 'revo-fixes' of ssh://git.openpilot.org/OpenPilot into brian/rfm22_autoconf
...
Conflicts:
flight/RevoMini/Makefile
2012-12-30 07:59:09 -07:00
filnet
87632e6e13
OP-781: initial commit for slow Option Dialog creation fix; fix consists
...
in lazilly creating option pages when user selects them instead of
creating them all upfront. Dummy placeholder widget (QLabel) are initially
created instead of the real option page; this commit also fixes a minor
issue where the left tree selection would not be in sync with the
displayed option page (see Jira for more details).
2012-12-30 13:34:12 +01:00
Corvus Corax
37df2bcbf4
OP-742: Merge branch 'corvuscorax/airspeed_fixes' into revo-fixes
...
Conflicts:
flight/RevoMini/Makefile
2012-12-29 12:09:58 +01:00
Oleg Semyonov
810a01ba28
Merge remote-tracking branch 'origin/master' into next
...
Conflicts:
HISTORY.txt
2012-12-21 14:12:32 +02:00
Oleg Semyonov
55b35543a7
Last minute release notes update
2012-12-21 00:33:37 +02:00
Brian Webb
e0acb41379
Removed some unintended changes to RevoMini.
2012-12-15 10:35:51 -07:00
Brian Webb
3a1803b7a1
Added RFM22B (OPLink) receiver.
2012-12-13 21:07:19 -07:00
Brian Webb
6ffe518509
RFM22B: Improved link stability, and added tracking of error encountered in the processes of transmitting and receiving.
2012-12-11 17:44:15 -07:00
Brian Webb
6ed9b63da9
RFM22B: Changing configuration parameters over-the-air working. Added tracking of Tx/Rx sequence number. Still seeing too many resent packets.
2012-12-11 17:44:11 -07:00
Brian Webb
7aaa02268f
RFM22B: Added TX Resent to OPLink status. Also removed the need for the packet queue.
2012-12-11 17:44:08 -07:00
Brian Webb
ca31fe99ac
RFM22B: Fixed removal of the OPLink configuration window when the OPLink is disconnected.
2012-12-11 17:43:57 -07:00
Brian Webb
bd42083376
RFM22B: Changed the way the frequencies and power settings are set for the rfm22b device.
2012-12-11 17:43:55 -07:00
Brian Webb
dae382564a
RFM22B/RM: Added rfm22b com device, moved remaining functionality in the radio module to the rfm22 driver, and simplified configuration of the PipX/OPLink. The radio device now presents itself completely as a com device, both in RadioComBridge (OPLink devices) and Telemetry (RM). Also change the PipXStatus and PipXSettings UAVOs to OPLinkStatus/OPLinkSettings.
2012-12-11 17:43:53 -07:00
Brian Webb
4b90f81f6f
RFM22B: Modified the method of tracking RX errors, and now reporting Good, Corrected, Error, and Missed packets to the GCS. Also removed some less useful fields from the PipXStatus.
2012-12-11 17:43:49 -07:00
Oleg Semyonov
84c78f5e76
Merge remote-tracking branch 'origin/rel-12.10.2' into next
2012-12-04 15:31:53 +02:00
Oleg Semyonov
8ba73c2209
Merge remote-tracking branch 'origin/thread/OP-723' into rel-12.10.2
2012-12-04 12:27:21 +02:00
Oleg Semyonov
aa6886c305
[OP-703] Swap "About GCS" and "About plugins" menu items
2012-12-04 00:46:51 +02:00
Oleg Semyonov
2d938eaaa3
[OP-703] Rework GCS About dialog to remove 1.0.0 and show more repository info
2012-12-04 00:46:50 +02:00
Oleg Semyonov
8b2780bf71
Update CREDITS
2012-12-04 00:46:09 +02:00
Oleg Semyonov
510c443deb
[OP-724] Rename "AF Response Time" to "Attitude Filter RT" in UI to stop confusion with Input LPF RT
2012-12-02 13:55:41 +02:00
Oleg Semyonov
41d56b282e
[OP-724] Remove LPF from throttle input channel (not necessary)
2012-12-02 13:50:03 +02:00
a*morale
43f5bf09c2
Changed missing PipX labels for setup wizard
2012-12-02 13:39:03 +02:00
a*morale
903bbffc6b
Changed reference to PipXtreme to OPLink on config tab and Firmware tab/OP-750
2012-12-02 13:39:02 +02:00
Oleg Semyonov
cc98962c36
[OP-724] Provide generic gimbal type
2012-11-29 18:03:05 +02:00
Oleg Semyonov
8adc2abd77
[OP-724] Now most camera options can be set independently per each axis.
2012-11-29 17:39:10 +02:00
Oleg Semyonov
8f5fb5aeb0
[OP-724] Add camera gimbal filtering and feed forward options
...
This is a partial rework of Cossacs' camera gimbal software.
This patch adds LPF to airframe attitude used for camera stabilisation
and feed forward for camera actuators. Either of options can be
disabled on the compilation level to save flash and RAM if not
required.
Original Cossacs' code was optimized and code flow shortcuts were
added where applicable.
2012-11-29 17:39:08 +02:00
Oleg Semyonov
ee333f1569
[OP-724] Add manual control input filtering (useful for camera gimbal)
...
This is a partial rework of Cossacs' camera gimbal software.
This patch adds LPF to some of manual control inputs. Mostly
useful are accessory channels (for camera gimbal control) and
yaw channel (for smooth filming). The code may be used for
stand-alone CC[3D]-based gimbal software, but also should work
for complete FC+camera system.
2012-11-29 17:39:07 +02:00
Oleg Semyonov
ea1199603b
Merge remote-tracking branch 'origin/rel-12.10.2' into next
...
Conflicts:
MILESTONES.txt
2012-11-29 17:31:50 +02:00
Oleg Semyonov
46533c5a3b
[OP-746] Fix text for the "Upgrade" button (it is not used but to be in sync)
2012-11-26 17:51:43 +02:00
Oleg Semyonov
089f4a7915
[OP-746] Fix invalid tooltip for the "Upgrade" button of the Vehicle setup wizard (copy/paste error)
2012-11-26 17:41:35 +02:00
Oleg Semyonov
08b9c9aa29
[OP-749] Fix GCS Tricopter config typo: "Tricopter Yaw MOTOR channel" (should be a servo)
2012-11-26 17:37:38 +02:00
Oleg Semyonov
e0b5f23d71
Merge branch 'thread/OP-545' into rel-12.10.2
2012-11-24 19:27:57 +02:00
Oleg Semyonov
73488b70fa
OP-545 Remove unnecessary qDebug statement
2012-11-24 19:14:56 +02:00
Fredrik Arvidsson
0e55f3c74d
OP-723 Changed default locale to English. Updated default configuration files to have <OverrideLanguage> tag set to en_US.
2012-11-24 14:55:46 +01:00
Oleg Semyonov
5f4b028a93
Merge branch 'danks/credits' into rel-12.10.2
2012-11-23 13:09:23 +02:00
Oleg Semyonov
38dfd19c8d
OP-721 Minor credits fixes
2012-11-23 12:58:35 +02:00
James Cotton
9b930c577c
GCS Config Gadget: Fix the file name for the pipx icons in the code and
...
name the icons correctly
2012-11-22 15:57:29 +02:00
Corvus Corax
264f631df6
Merge branch 'corvuscorax/baro_fixes' into revo-fixes
2012-11-22 11:51:36 +01:00
Oleg Semyonov
8ce2757353
Merge remote-tracking branch 'origin/thread/OP-690' into rel-12.10.2
2012-11-21 17:38:29 +02:00
Oleg Semyonov
56dba23d2a
Merge branch 'thread/OP-716' into rel-12.10.2
2012-11-21 17:19:45 +02:00
Fredrik Arvidsson
02ae803a3e
OP-690 Changed some texts in information dialog to better describe what the actual problem is.
2012-11-21 07:32:19 +01:00
Fredrik Arvidsson
b97d355526
OP-716 Corrected a spelling error.
2012-11-21 07:22:26 +01:00
Fredrik Arvidsson
f3b55a1062
OP-716 Changed tool tip to something more verbose and meaningful.
2012-11-20 23:53:52 +01:00
Fredrik Arvidsson
a0cb604e32
OP-716 Replaced AccelTau checkbox with numeric spinbox. Max value was set to 0,20 and min value to 0,00, step size 0,01. Added tooltip hinting to set to 0 to disable.
2012-11-20 19:25:57 +01:00
Fredrik Arvidsson
f0a3de4d72
OP-545 Changed URL for help page in Import/Export plugin.
2012-11-19 21:43:10 +01:00
Fredrik Arvidsson
f1590a4f66
OP-690 Added flight status check on system Reset similar to the check on Halt. Re-factored method to get hold of current FlightStatus UAVO from UAVOManager.
2012-11-19 19:43:38 +01:00
Oleg Semyonov
a2a12cd34c
Merge remote-tracking branch 'origin/rel-12.10.2' into next
2012-11-19 01:52:15 +02:00
Fredrik Arvidsson
08fd9a8153
OP-686 Added code to disable wizard buttons during firmware upgrade procedure. Re-factored some code and fixed some minor bugs.
2012-11-19 01:29:14 +02:00
Fredrik Arvidsson
4a16909cb3
OP-690 Show dialog if halt is invoked and the board is armed or arming (not disarmed).
2012-11-18 22:40:05 +01:00
Oleg Semyonov
8332f32519
Merge remote-tracking branch 'origin/os/OP-691_Fix_camera_config_issues' into rel-12.10.2
...
Conflicts:
HISTORY.txt
2012-11-18 21:53:16 +02:00
Oleg Semyonov
5c57de868f
[OP-728] Improve tooltip text for GCS arm timeout field
2012-11-18 20:55:54 +02:00
PT_Dreamer
3bfbfdf7b3
OP-702
...
Fixes problem with enums uploading and saving on the object browser
2012-11-18 20:16:25 +02:00
Fredrik Arvidsson
1695fda4e2
OP-716 Changed default AccelTau to 0.1. This value seems to be a good value after reading some reports on the forums.
2012-11-17 17:45:10 +01:00
Fredrik Arvidsson
2eeba593db
OP-716 Added default TauAccel == 0.15 to wizard.
2012-11-17 10:30:57 +01:00
Fredrik Arvidsson
95455e2378
OP-716 Added checkbox to enable accelerator filtering (cyr fix)
2012-11-16 21:22:13 +01:00
Oleg Semyonov
8134db4453
ModelView: set rear view as default (makes more sense for R/C than front view)
2012-11-15 22:23:39 +02:00
Oleg Semyonov
9ece418912
AutoTune UI: add warning to reboot the board (something is better than nothing)
...
Until better solution is provided, it is better to warn users that they
must reboot board to enable the module.
2012-11-14 17:49:37 +02:00
Oleg Semyonov
0e9d7137ff
Revert "HotFix: temporary disable AutoTune UI until better tested"
...
The "next" is the bleeding edge of development, so put back
autotune stuff temporary disabled for RELEASE-12.10.1.
This reverts commit a17d0f8084
.
2012-11-14 17:28:23 +02:00
Oleg Semyonov
79f95983da
Merge remote-tracking branch 'origin/rel-12.10.2' into next
2012-11-14 17:26:18 +02:00
Oleg Semyonov
9d6810dda8
GCS vehicle config: use better function name for readability [OP-691]
2012-11-14 02:00:26 +02:00
Corvus Corax
fe7d2e8bca
removed pathplannersettings module from gcs
2012-11-11 14:57:39 +01:00
Oleg Semyonov
db63f73859
GCS vehicle config: do not reset existing camera/accessory mixers [OP-691]
...
Still no fix for helicopter config (some code refactoring is desired).
2012-11-11 15:01:30 +02:00
Richard Flay (Hyper)
b620c6ebc8
Added support for Mode 3 and Mode 4 to the TX Configuration Wizard. Fixed a number of bugs and issues in the wizard. Made some changes to wizard text and layouts as well.
2012-11-11 00:31:06 +02:00
James Cotton
5f80268396
GCS Config: Crashing for an unknown board seems a bit harsh.
2012-11-11 00:31:05 +02:00
David Ankers
43e6b38b54
Spelling of Spectrum to Spektrum
2012-11-11 00:31:05 +02:00
Corvus Corax
e9da78406a
Merge branch 'corvuscorax/baro_fixes' into corvuscorax/airspeed_fixes
2012-11-08 09:48:01 +01:00
Corvus Corax
b09027afe5
Completely refactored airspeed module, now a pure sensor input module without any complex sensor fusion features -- changed driver for mpxv analog airspeed to be more versatile
2012-11-08 01:31:21 +01:00
Corvus Corax
5981d9acd6
removed surplus NEDposition uavobject
2012-11-06 10:13:09 +01:00
Stacey Sheldon
9d1825f8a8
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
shared/uavobjectdefinition/groundtruth.xml
2012-11-01 23:23:33 -04:00
Corvus Corax
f5ad9ae3f0
OPmap: fixed some bugs introduced by merge with james/revo
2012-11-01 07:22:15 +01:00
Sambas
019691e49d
Compile fixes
2012-10-30 20:50:58 +01:00
PT_Dreamer
a01930b12f
GCS-PathPlanner
...
Fixes UAVO to DataModel convertion.
2012-10-30 15:13:52 +00:00
PT_Dreamer
06e56165c5
GCS-PathPlanner
...
Fixes loading path from file.
2012-10-30 13:48:02 +00:00
Stacey Sheldon
5aa3777078
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
flight/Modules/Telemetry/telemetry.c
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-10-30 00:41:35 -04: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
PT_Dreamer
c31f08d350
GCS-PathPlanner
...
Fixes and enhancements.
2012-10-28 16:55:08 +00:00
Oleg Semyonov
245e1e36cb
Remove extra "Firmware tag" string from "On Device" uploader panel
2012-10-26 22:58:19 +03:00
PT_Dreamer
994b9d209a
Merge branch 'hyper/add-mode3-mode4-to-GCS-tx-input-wizard' of ssh://git.openpilot.org/OpenPilot into next
2012-10-26 19:46:04 +01:00
Oleg Semyonov
a17d0f8084
HotFix: temporary disable AutoTune UI until better tested
2012-10-26 16:14:36 +03:00
Laura Sebesta
b84b8f656c
Brought out several air parameter functions from IL2 simulator and added them to the global simulator.cpp file.
2012-10-23 11:59:14 +02:00
Laura Sebesta
5e785d4524
Added body-frame acceleration to ground truth UAVO and to flight simulator output.
...
Conflicts:
shared/uavobjectdefinition/groundtruth.xml
2012-10-23 11:50:00 +02:00
Laura Sebesta
433d723251
Added groundtruth simulation support.
...
This new UAVO serves principally to log data for future comparison with
onboard estimation techniques.
Conflicts:
ground/openpilotgcs/src/plugins/hitl/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitl/simulator.h
2012-10-23 11:47:58 +02:00
Oleg Semyonov
721cb16c2b
Adopt to the latest release policy
...
See http://wiki.openpilot.org/display/Doc/Release+policy
2012-10-22 23:44:01 +03:00
Oleg Semyonov
5184dc1087
Revert "Temporary fix for build label (until better system is implemented)"
...
This reverts commit 5c141d458d
.
2012-10-22 22:52:13 +03:00
Kenz Dale
1ab1ea5899
Save ~150 bytes by moving GPSDataProtocol to SystemSettings.
...
All credit to Anstron.
2012-10-22 16:47:22 +02:00
Laura Sebesta
617196f106
Deleted last of the old HiTL files that didn't get automatically deleted in the merge.
2012-10-21 10:44:08 +02: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
Richard Flay (Hyper)
7b7bb0ff24
Added support for Mode 3 and Mode 4 to the TX Configuration Wizard. Fixed a number of bugs and issues in the wizard. Made some changes to wizard text and layouts as well.
2012-10-19 20:30:42 +10:30
James Cotton
aba5c65e93
GCS Config Gadget: Fix the file name for the pipx icons in the code and
...
name the icons correctly
2012-10-17 01:06:45 -05:00
James Cotton
298b052c7d
GCS Config: Crashing for an unknown board seems a bit harsh.
2012-10-17 00:57:28 -05:00
David Ankers
ec85cd7305
Spelling of Spectrum to Spektrum
2012-10-17 13:28:07 +11:00
James Cotton
c1f9948a81
Merge branch 'master' into next
2012-10-16 14:26:35 -05:00
David Ankers
93c76ec4bf
Update credits inside the GCS based on the project and not just code.
2012-10-17 03:27:12 +11:00
Laura Sebesta
350fc8db3b
Fixed HiTL bug by which gps velocity was not being updated.
2012-10-16 11:59:58 +02:00
Fredrik Arvidsson
dd7b69dbbc
Fixed so that the actuator state error message box does not open behind the wizard. Changed the text to be more informative.
2012-10-16 00:37:15 +02:00
Oleg Semyonov
5c141d458d
Temporary fix for build label (until better system is implemented)
2012-10-16 01:14:12 +03:00
PT_Dreamer
b318861619
GCS-Fix eventloop on the connect board while loop
2012-10-15 19:39:20 +01:00
Fredrik Arvidsson
e78cd29c5f
Changed port assignments when Spectrum Rx is choosen.
2012-10-15 00:06:13 +02:00
PT_Dreamer
e43d3dd7db
GCS-Show first 4 bytes of uavohash instead of last 4.
2012-10-14 19:32:19 +01:00
Fredrik Arvidsson
173cf041cb
Fixed texts in Vehicle Setup Wizard.
...
Added new icons for PipX.
Enabled hyper link to esc wiki page on wizard output page.
2012-10-14 16:46:28 +02:00
PT_Dreamer
70d7d16aff
GCS-Debug message to understand different uavohash behaviour
2012-10-14 14:52:04 +01:00
PT_Dreamer
30959b460d
GCS-Airframe config
...
Fixes rounding issues. Needs TESTING.
2012-10-14 13:15:09 +01:00
sambas
731ac9bc48
Y6 Pitch and Yaw mixer load fix
2012-10-14 12:08:37 +01:00
PT_Dreamer
d25061ac0a
GCS-Hides wizard to display dialog
2012-10-14 01:10:30 +01:00
chris pember
4226af60a4
GCS-Fix growing button on the calibration page
2012-10-13 19:26:05 +01:00
PT_Dreamer
2b48cf3d90
GCS-Ensure wizard is top window
2012-10-13 18:57:02 +01:00
James Cotton
28d3cdcd7a
SetupWizard: Store a flag if the wizard is running to prevent starting two.
...
This is still not as good as getting that dialog modal since the user can get
it lost behind the main window.
2012-10-13 17:48:57 +01:00
James Cotton
b99b221a6d
Setup Wizard: Trigger the wizard with show() instead of exec() as using
...
exec blocks the main application event loop.
2012-10-13 17:46:31 +01:00
PT_Dreamer
ae80370b1d
GCS-Fixes custom mixer saving bug
2012-10-13 17:45:41 +01:00
PT_Dreamer
c6936870c1
GCS-Fixes custom mixer saving bug
2012-10-12 18:32:54 +01:00
James Cotton
96afe7cffd
Merge remote-tracking branch 'origin/stac/add-debug-consoles' into next
2012-10-12 08:07:44 -05:00
James Cotton
d0ee515daf
Merge remote-tracking branch 'origin/kenz/coax_heli' into next
2012-10-12 08:06:13 -05:00
Laura Sebesta
2bad221ec2
Merge branch 'kenz/hitl_merge' into next
2012-10-12 07:41:17 +02:00
PT_Dreamer
d8f99b4096
GCS - Remove test button
2012-10-11 22:33:05 +01:00
PT_Dreamer
c99d048eb9
GCS-Wizard
...
Be a bit more verbose on one of the board update messages.
2012-10-11 14:59:18 +01:00
Fredrik Arvidsson
18f2d8e219
Added new button graphix for upgrade button on autoupdate page. Changed the texts slightly to be less offending. ;)
2012-10-11 13:31:02 +02:00
Stacey Sheldon
f0e0c2e79e
console: add debug console via USB CDC/VCP interface
...
The USB VCP Port has a new DebugConsole setting that
routes all output destined for PIOS_COM_DEBUG to the
emulated serial port.
To enable this in your build, you'll have to build like:
- make fw_coptercontrol_clean
- make fw_coptercontrol ENABLE_DEBUG_CONSOLE=YES
You can then output formatted text to the console
like this:
#if defined(PIOS_INCLUDE_DEBUG_CONSOLE)
PIOS_COM_SendFormattedString(PIOS_COM_DEBUG,
"foo is %u\r\n",
foo);
#endif /* PIOS_INCLUDE_DEBUG_CONSOLE */
Please ensure that all of your debug output is
wrapped with these macros so that your debug
code doesn't bloat the firmware image.
2012-10-11 00:51:09 -04:00
Stacey Sheldon
6088c05946
console: add support for serial debug consoles
...
Serial ports now have a new HW setting called DebugConsole
which can be used to dump internal state to a serial port
for debug.
To enable this feature, you need to:
- make fw_coptercontrol_clean
- make fw_coptercontrol ENABLE_DEBUG_CONSOLE=YES
- configure one of the serial ports as DebugConsole in the GCS
- save settings
- power-cycle your board
Things to note:
- The console is at 57600,8N1.
- This is not currently configurable via the GCS.
- You can only have a single console enabled at a time.
2012-10-11 00:22:07 -04:00
PT_Dreamer
ea3eb984f4
Merge branch 'pt/wiz_autoupdate' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate
2012-10-10 18:26:28 +01: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
zedamota
27fd597795
GCS-Try to fix blanked out dialog on OSX.
2012-10-10 17:36:58 +01:00
zedamota
47f94143b7
GCS- Detect fw bundle presence in a not so ugly way
2012-10-10 16:38:57 +01:00
zedamota
fb27c5d93c
GCS-Fw Auto update - Try to fix win build
2012-10-10 16:36:13 +01:00
James Cotton
0c3084b9b1
OPMap: Line got missed in merge
2012-10-10 09:41:44 -05:00
James Cotton
3110678321
Merge branch 'dynamic_uavo_next' into revo
...
Conflicts:
androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXSettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/RelayTuning.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
2012-10-10 08:27:11 -05:00
Fredrik Arvidsson
befa5da671
Fixed layouts in the setup wizard and made the wizard resizeable.
2012-10-10 00:36:29 +02:00
Laura Sebesta
4b3994a550
Merge branch 'next' into kenz/hitl_merge
...
Conflicts:
ground/openpilotgcs/src/plugins/plugins.pro
2012-10-09 22:47:20 +02:00
Fredrik Arvidsson
fc69eaa205
Merge branch 'next' into pt/wiz_layouts
2012-10-09 21:56:27 +02:00
Oleg Semyonov
d60be79133
GCS: fix plugin build dependencies
...
They should reflect the pro/pri files included and be sufficient to
build. Chained dependencies should be built by the make system.
2012-10-09 21:57:58 +03:00
PT_Dreamer
d1b78faeb3
Revert "GCS-Config wizard"
...
This reverts commit 4b5c88589c
.
2012-10-09 18:59:01 +01:00
Fredrik Arvidsson
d98c2aacf3
Merge branch 'next' into pt/wiz_layouts
2012-10-09 19:56:04 +02:00
PT_Dreamer
4b5c88589c
GCS-Config wizard
...
Made the wizard set stab1,2,3 as default flight modes for multis
2012-10-09 00:16:22 +01:00
PT_Dreamer
047201211b
GCS-Change config file name
...
This is to force a new configuration to be loaded and used.
2012-10-08 22:36:32 +01:00
Laura Sebesta
c2b49b6ef3
Merge branch 'kenz/cc_hitl_merge' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
2012-10-08 15:30:27 +02:00
Laura Sebesta
db8563f69f
Fix aerosimrc hitl merge issues.
2012-10-08 00:41:58 +02:00
PT_Dreamer
64d2922e71
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate
...
Conflicts:
ground/openpilotgcs/share/share.pro
2012-10-07 21:01:21 +01:00
Fredrik Arvidsson
c03ac35780
Added functionality for skipping autoupdate page if no firmware is available in resource bundle.
2012-10-07 21:49:07 +02:00
chris pember
bb2637054b
hopefully fixed any conflicts
2012-10-07 10:57:53 -07:00
chris pember
ee031fe80d
Merge branch 'next' into cp/extraGUIchanges
...
Conflicts:
ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowseroptionspage.ui
2012-10-07 10:32:21 -07:00
chris pember
1d345d6916
Merge branch 'next' into cp/extraGUIchanges
...
Conflicts:
ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetoptionspage.ui
2012-10-07 10:20:38 -07:00
PT_Dreamer
25bb91682b
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-10-07 13:21:04 +01:00
Laura Sebesta
b0182a47e3
Fixed csv export error, and increased resolution of all variables to 10 significant digits.
...
(10 sig. dig. are required for full resolution GPS latitude and longitude output.)
2012-10-07 09:09:15 +02:00
Laura Sebesta
22d7c8947e
Removed extraneous comments.
2012-10-07 08:50:24 +02:00
PT_Dreamer
4ef8b78ff8
GCS-Made autouploader fetch fw from fw bundle
...
Fw bundle is built with "make package_resource".
This target is a dependency of the package target but needs testing
on the different systems.
If the bundle is not present the build will not fail and
the wizard will jump the autoupdate page (not working FIXME)
2012-10-06 23:24:21 +01:00
PT_Dreamer
f6443fc995
Merge branch 'stac/package-opfw-resources' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate
2012-10-06 19:50:17 +01:00
PT_Dreamer
4e4ed172c1
GCS-Added fw bundle resource to the uploader plugin
2012-10-06 19:46:33 +01:00
chris pember
827b8b9486
added groupboxes to the pages that were loose
2012-10-06 11:43:03 -07:00
Fredrik Arvidsson
2af2a732fb
Complete set of new icons.
2012-10-06 16:12:15 +02:00
chris pember
f6c4b4b57b
fixed one last settings page
2012-10-06 02:09:50 -07:00
chris pember
c2641fd21d
added scroll areas to all the preference settings screens
2012-10-06 01:55:24 -07:00
Fredrik Arvidsson
08be8f5e8f
Merge branch 'next' into thread/config_art
2012-10-06 10:45:08 +02:00
Fredrik Arvidsson
ffe6c0bcb5
Added icons and updated some other code.
2012-10-06 10:42:57 +02:00
PT_Dreamer
a313a54c17
GCS-Added temp resource file containing fw
2012-10-06 01:43:44 +01:00
PT_Dreamer
5d24bc55a6
GCS-Created wizard firmware autoupdate page
2012-10-06 01:42:33 +01:00