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

943 Commits

Author SHA1 Message Date
Oleg Semyonov
b02b64ece9 Change to GLC_lib to make it compile on Windows with Qt 4.8.0 2012-02-16 01:17:56 +02:00
Oleg Semyonov
4b06f68f11 Need to link a few new libraries for the QML stuff (windows) 2012-02-16 01:16:09 +02:00
James Cotton
32b156b686 Update dependencies on the Util gadget relating to the Settings gadget. Fixes
clean build.
2012-02-14 18:16:00 -06:00
James Cotton
68836b4a48 Disable ModelView with linux-g++-64 since it causes segfaults 2012-02-14 16:25:35 -06:00
David Ankers
688f3d9c84 Merge branch 'welcome' into next 2012-02-15 07:59:20 +11:00
James Cotton
7c65bcc5ac Merge remote-tracking branch 'origin/pt/gcs_uavobj_widget_framework' into next 2012-02-14 14:24:23 -06:00
James Cotton
03d12915af Merge remote-tracking branch 'origin/os/features/better-version-info-and-uav-export' into next 2012-02-14 13:39:00 -06:00
James Cotton
af189cc0ab Merge remote-tracking branch 'origin/remote/origin/banig/ScopeChanges' into next 2012-02-14 13:24:49 -06:00
James Cotton
bb89b82865 Merge branch 'next' into GCS_QML_Dmytro 2012-02-14 12:35:14 -06:00
James Cotton
c111e26958 Patch from Kenz to suppress warnings about unknown object IDs until end of
parsing
2012-02-13 14:55:44 -06:00
Oleg Semyonov
a01e38c277 Merge remote branch 'origin/master' into os/features/pid-tuning-from-transmitter
Conflicts:
	ground/openpilotgcs/src/plugins/config/configgadget.qrc
2012-02-13 11:51:00 +02:00
zedamota
855cc0f663 Fixes the BT telemetry not working on non windows OSs. 2012-02-12 17:27:26 +00:00
zedamota
74108e200b Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into pt/gcs_uavobj_widget_framework
Conflicts:
	ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
	ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp
	ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h
	ground/openpilotgcs/src/plugins/config/stabilization.ui
2012-02-11 22:29:03 +00:00
zedamota
aea1e45de7 Added some documentation to the new framework 2012-02-11 21:38:27 +00:00
zedamota
1da2cf5166 Added support for multiple instances objects. 2012-02-11 18:35:36 +00:00
banig
2aead6a7c6 Made method name more descriptive 2012-02-11 16:17:20 +02:00
banig
8e1a7ae709 Add warning to let user know if Scope refresh interval is quicker than the telemetry data 2012-02-11 15:59:34 +02:00
Dmytro Poplavskiy
e6df2ca6d3 Replaced the welcome page with a QML based one.
It's still necessary to replace the mode images with the correct ones.
2012-02-11 10:14:13 +10:00
zedamota
c2d9af1e89 Finished framework and stab config showcase 2012-02-10 16:34:07 +00:00
sambas
81f01a0b96 Merge remote-tracking branch 'remotes/origin/next' into qwt_6.0.1_upgrade
Conflicts:
	ground/openpilotgcs/src/libs/qwt/src/qwt_global.h
	ground/openpilotgcs/src/libs/qwt/src/src.pro
2012-02-10 17:27:23 +02:00
zedamota
4cdf223bff Added support for multiple apply/save buttons.
Added a few useful signals.
2012-02-08 20:15:14 +00:00
zedamota
5cfd763f2a Bug fixes and showcase UI setup (partial). 2012-02-07 20:29:32 +00:00
zedamota
e2c6a9d58a Added Dado's UI.
Several scale bug fixes.
Added lots of debug info, will clean later.
2012-02-06 17:33:54 +00:00
Corvus Corax
b4a8eda8db Merge branch 'corvuscorax/Smoothed_Scope' into next
Conflicts:
	ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2012-02-06 16:35:13 +01:00
zedamota
35c5391d53 Corrected file headers 2012-02-05 20:07:19 +00:00
sambas
a263ee7885 unix:!mac should solve all problems 2012-02-05 21:45:47 +02:00
zedamota
6d6111b9ac Moved framework to its own plugin 2012-02-05 18:16:38 +00:00
zedamota
32ebdb63a3 Preparatory commit before moving framework to a better location. 2012-02-05 14:41:23 +00:00
Dmytro Poplavskiy
861b21a18d Added a QML viewer plugin.
UAV objects used in PFD are available in the QMl context.
2012-02-05 22:33:14 +10:00
Dmytro Poplavskiy
aead288304 Generate properties for UAVDataObject fields.
Also changed UAVObject::requestUpdate() and UAVObject::update() to be slots.

This makes possible to use objects directly from QML.
2012-02-05 13:58:17 +10:00
zedamota
427acee559 Added support for objects value limits on the GCS to the GCS and generator. 2012-02-03 20:29:28 +00:00
zedamota
4c1e33b0b3 WIP configtaskwidget enhancements. 2012-02-02 16:22:40 +00:00
sambas
fedc62b6c3 OPReview-159: Linux posix timer thing fix 2012-02-02 16:34:46 +02:00
David Ankers
213a915f67 Remove flightplanner screen 2012-02-01 20:09:43 +11:00
James Cotton
bd77b7e5a2 Fix stupid commit on my part. Thanks for heads up brian. 2012-01-31 19:26:48 -06:00
James Cotton
eaf9a4bded Merge branch 'master' into next
Conflicts:
	ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
2012-01-31 17:30:05 -06:00
James Cotton
c69717edd8 DOS2UNIX cc_hw_settings.ui to make merge work 2012-01-31 17:29:29 -06:00
James Cotton
7990d209a8 Fix package deployment script for OSX to make sure the SVG pixmap shows up 2012-01-31 14:48:24 -06:00
James Cotton
a2979125b7 Remove the hardcoded .svg from the QLabel and load it dynamically. This will
be useful for CC3D.
2012-01-31 14:47:56 -06:00
James Cotton
318354a115 Fix resizing issue with input wizard 2012-01-31 13:31:14 -06:00
James Cotton
d07b386beb Revert "made the input wizard background transparent"
This reverts commit c5a2afcc2c.
2012-01-31 13:09:01 -06:00
James Cotton
3a66f70eae Input config: Increase the delay after detecting a channel to ask for next one 2012-01-31 11:25:18 -06:00
James Cotton
e3f89eb958 Input config: Increase the delay after detecting a channel to ask for next one 2012-01-31 11:24:19 -06:00
David Ankers
a5ffdb7306 Merge branch 'master' into next 2012-01-31 05:32:49 +11:00
Oleg Semyonov
369629ad34 Add "Reset To Defaults" button to Stabilization configuration tab
Also add tootips to Reset/Apply/Save buttons.
2012-01-31 04:44:54 +11:00
Oleg Semyonov
911f8fde03 Add "Reset To Defaults" button to Stabilization configuration tab
Also add tootips to Reset/Apply/Save buttons.
2012-01-31 04:27:59 +11:00
zedamota
01c910cd2b OP-616 Fixes wrong HW version being displayed. 2012-01-29 21:49:11 +00:00
David Ankers
6c030482a5 Fix 64 bit compile 2012-01-30 04:51:11 +11:00
zedamota
c5a2afcc2c made the input wizard background transparent 2012-01-29 10:28:24 +11:00
zedamota
3d896ffaf5 Fixes scopegadget loading issues with Qt versions > 4.7.4 2012-01-29 10:25:07 +11:00
naiiawah
fdcea01100 numberOfDevices could be left unitialized if sendData or receiveData
fail in findDevices or if no one ever calls findDevices.  Added init of
var.
2012-01-28 15:12:27 -07:00
zedamota
f6d747d5f0 Fixes scopegadget failure to load with Qt versions > 4.7.4 2012-01-28 22:07:45 +00:00
zedamota
e1d471dc63 Fixes scopegadget loading issues with Qt versions > 4.7.4 2012-01-28 21:25:38 +00:00
David Ankers
e307ab4d74 Merge branch 'master' of ssh://git.openpilot.org/OpenPilot 2012-01-29 04:31:42 +11:00
David Ankers
0a1645587c Update deluxe dials 2012-01-29 04:30:43 +11:00
zedamota
81fea31b34 made the input wizard background transparent 2012-01-27 17:54:14 +00:00
zedamota
242bfe6c69 added new Transmitter artwork to the input wizard. 2012-01-25 20:29:40 -06:00
zedamota
0609cd56e5 Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next 2012-01-24 22:30:18 +00:00
zedamota
2c4ed09707 added new Transmitter artwork to the input wizard. 2012-01-24 22:29:08 +00:00
Oleg Semyonov
f7ac0b2645 Merge remote branch 'origin/master' into next 2012-01-24 17:27:34 +02:00
Oleg Semyonov
da650cee60 gcscontrol: keep joystick image aspect ratio
OP-619
2012-01-24 11:31:00 +02:00
James Cotton
7b69cebe04 Merge branch 'master' into next 2012-01-23 06:07:31 -06:00
Oleg Semyonov
9006dd558f gcscontrol: code style formatting and cleanup 2012-01-21 00:55:21 +02:00
Oleg Semyonov
7d15cbd720 gcscontrol: new joystick image with active stick area 2012-01-21 00:55:08 +02:00
Oleg Semyonov
5a2119b896 Add stick deadband option to the config GUI 2012-01-15 21:16:57 +02:00
Oleg Semyonov
5be5fe7aa6 ConfigTaskWidget: floating point scale in addUAVObjectToWidgetRelation()
This is required to map object field value range [0-1] to widget field
value range [0-100] (in percents).
2012-01-15 21:13:21 +02:00
Oleg Semyonov
91ba89eece ConfigTaskWidget: add QDoubleSpinBox to addUAVObjectToWidgetRelation() 2012-01-15 21:13:19 +02:00
Oleg Semyonov
13cee28ead ConfigInputWidget: fix getting enum options from UAVO field
Should not use known field order to get UAVO field. This breaks
a widget after adding any float field to the object since after
sorting this field will have index 0 and shift other fields.

This fix should have some runtime checks to make sure the field
was really found, but it should be fixed through the whole GCS
code in a separate cleanup.
2012-01-15 21:13:18 +02:00
Oleg Semyonov
873ff617ab Improve UAVObjects export and import file formats
Changed file format to be able to save settings and data together.
Old settings files still can be imported. Data export will also contain
settings, so we always have the system settings with the system state.

Sample file:

<!DOCTYPE UAVObjects>
<uavobjects>
    <version>
        ...
    </version>
    <data>
        <object id="0xC409985A" name="AccessoryDesired">
            <field values="0" name="AccessoryVal"/>
        </object>
        ...
    </data>
    <settings>
        <object id="0xF2875746" name="ActuatorSettings">
        ...
    </settings>
</uavobjects>
2012-01-15 18:37:57 +02:00
Oleg Semyonov
421cf89544 Fix device info struct fields and variable names, better version info messages
- fixed deviceDescriptorStruct field names
  (gitTag->gitHash, buildDate->gitDate, description->gitTag);

- fixed variable names
  (onBoardDescrition->onBoardDescription, LoadedDescrition->LoadedDescription);

- version info in exported UAV files looks now like this:

<version>
    <hardware revision="1" serial="51ff6b064883545366621987" type="4"/>
    <firmware tag="master" date="20120104 17:51" hash="14ee6e4f"/>
    <gcs tag="os/features/version-info" date="20120115 12:57" hash="236fae56"/>
</version>
2012-01-15 18:37:42 +02:00
Oleg Semyonov
5c20f1e37d ConfigTaskWidget: add some qDebug() statements for unhandled widget types 2012-01-15 00:34:23 +02:00
Oleg Semyonov
4fcd0f97c5 ConfigTaskWidget: add QDoubleSpinBox to addUAVObjectToWidgetRelation() 2012-01-15 00:34:22 +02:00
Oleg Semyonov
6444d6b3f6 TxPID: add module configuration GUI 2012-01-15 00:34:20 +02:00
Oleg Semyonov
99e73a4ae9 Merge branch 'master' into os/features/pid-tuning-from-transmitter 2012-01-14 23:38:21 +02:00
Michael Rumpler
1b314ee256 * cleaned up notifyplugin
cause:
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp:104:6:
   warning: unused parameter ‘configInfo’ [-Wunused-parameter]
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp:353:6:
   warning: unused parameter ‘values’ [-Wunused-parameter]
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:73:10:
   warning: unused parameter ‘parent’ [-Wunused-parameter]
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:451:6:
   warning: unused parameter ‘rangeStr’ [-Wunused-parameter]
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:512:7:
   warning: unused parameter ‘oldstate’ [-Wunused-parameter]
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:527:6:
   warning: unused parameter ‘deselected’ [-Wunused-parameter]

   implemented solution:
   fixed all of them (commented out var name)

* fixed bug in check code

   cause:
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp:
   In member function ‘void SoundNotifyPlugin::checkNotificationRule(NotificationItem*, UAVObject*)’:
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp:398:109:
   warning: suggest parentheses around comparison in operand of ‘|’ [-Wparentheses]

   implemented solution:
   this is an obvious bug that is syntactically correct but leads to a
   warning with a good compiler so this bug can be found. fixed that to use
   logical or instead of bitwise or.

* fixed bug in include file (error in compilation under Linux)

   cause:
   In file included from
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:47:0:
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifytablemodel.h:86:39:
   error: reference ‘_list’ cannot be declared ‘mutable’ [-fpermissive]

   implemented solution:
   removed the mutable flag, as this is wrongly used on a reference (and
   therefore correctly causing a compile-time error
2012-01-11 22:16:26 +01:00
zedamota
63bb2874d7 OP-608
Camera Stabilization settings not being read from CC board into GCS if CC is started first.

Created connection callback only to be called after all plugins are loaded.
2012-01-10 17:03:58 +00:00
zedamota
dbd9fcda28 OpenPilot OP-611
disable Flash button during operation
2012-01-09 16:53:59 +00:00
zedamota
00cb66ae79 OpenPilot OP-602
Please add a Help button on the Firmware page
2012-01-09 16:35:35 +00:00
zedamota
38392ee638 several fixes to the notify plugin 2012-01-09 16:09:50 +00:00
zedamota
9f2b71a351 Convert filename to lowercase 2012-01-09 14:06:27 +00:00
zedamota
553dab50fb Merge branch 'notify-plugin-merged' into next
Conflicts:
	ground/openpilotgcs/share/openpilotgcs/sounds/default/minus.wav
2012-01-09 14:02:04 +00:00
sambas
dd26e7c80f qwt 6.0.1 upgrade, sadly doesn't fix QT-4.8.0 scopeplugin in windows. 2012-01-08 12:13:51 +02:00
James Cotton
12e879ced9 Merge branch 'master' into next 2012-01-04 11:54:27 -06:00
James Cotton
14ee6e4fb5 When configuring a heli transmitter instruct the user to disable throttle hold. 2012-01-04 11:51:16 -06:00
James Cotton
82d91d9830 Talked PT into a simpler firmware mismatch warning in exchange for more
photoshop.
2012-01-04 11:51:12 -06:00
Stacey Sheldon
025ed0f43c Merge remote-tracking branch 'origin/stac/usb-composite-device-v2' into next
Conflicts:
	HISTORY.txt
2012-01-03 00:02:45 -05:00
Stacey Sheldon
b9eecadbe2 alarms: add BootFault alarm to system health SVG files
Original changes provided by Jose, text was slightly
modified to match alarm name.
2012-01-02 23:35:39 -05:00
Stacey Sheldon
4fd40ca0d2 gcs uploader: add support for "Safe Boot" to the GCS uploader
When halted in the bootloader or while rescuing a board, the
user can press the "Safe Boot" button in the uploader gadget
to force the FW to boot with a default hwsettings configuration.

The default conditions of the hwsettings uavo will disable all
optional modules, disable all serial port config, and ensure that
the board can communicate via the USB HID telemetry interface.

Once booted in this mode, a user can easily reconfigure the
hwsettings uavo through the config GUI and save the fixed
settings to the board to be used on the next reboot.  No need
to wipe all settings just to recover from a non-functional
HW config.

NOTE: The GCS needs to grow some very clear visual clues to
      indicate when the board has booted in safe mode.  The
      firmware helpfully raises a (new) critical alarm called
      BootFault whenever it boots in safe mode.
2012-01-02 14:27:07 -05:00
James Cotton
1b6ff0e470 Merge remote-tracking branch 'origin/os/features/advanced-camera-stabilization' into next 2012-01-02 11:38:27 -06:00
James Cotton
a2b067e4d5 Fix GUI bug for the GCS controller 2012-01-02 09:19:50 -06:00
Oleg Semyonov
77a459af5c Merge remote branch 'origin/next' into os/TxPID-module 2012-01-02 14:49:54 +02:00
Oleg Semyonov
e9ffa9d03a CameraStab: move defaults button to the right 2012-01-02 14:27:12 +02:00
Oleg Semyonov
6e09d61d87 CameraStab: fix button tooltips 2012-01-02 14:27:10 +02:00
Oleg Semyonov
f62330fefe CameraStab: add tooltips to all configuration settings 2012-01-02 14:27:08 +02:00
Oleg Semyonov
595c0978b3 CameraStab: add "Reset To Defaults" button
This loads the default settings (except output channels) to the GUI page
but does not apply them automatically. User can apply/save them or
reload current values from the board using UAVObjBrowser.
2012-01-02 14:27:07 +02:00
Oleg Semyonov
b01e332e03 CameraStab: rename UAVO field 2012-01-02 14:27:05 +02:00
Oleg Semyonov
9c35570df6 CameraStab: add advanced camera settings to the config GUI 2012-01-02 14:27:03 +02:00
James Cotton
21714911e8 Convert log files to structure of array instead of array of struct from Kenz 2012-01-01 13:19:07 -06:00
Stacey Sheldon
d43258f2fb gcs uavtalk: improve readability of debug logging 2012-01-01 09:24:22 -05:00
Stacey Sheldon
5c0921e92c fault: add optional fault insertion module
This module and its associated settings uavo can be used
to test various fault conditions during initialization.

To enable the module, add the TEST_FAULTS=YES to your make
command line:
  make fw_coptercontrol TEST_FAULTS=YES

Once this module is part of your firmware load, you can
enable it in the hwsettings uavo and then select the
type of fault to insert by editing the faultsettings uavo.
On the next reset, the configured fault will be inserted
into the init sequence to allow you to test the boot fault
recovery code.

With a fault inserted, you should see 3 failed boot attempts
followed by a successful (recovery) boot.  You will see the
BootFault alarm set to Critical, and the RAM version of your
hwsettings will be reset to defaults.  Since the defaults have
all optional modules disabled, the fault module will be out of
the way during the recovery boot.

You can then "Load" the flash version of the hwsettings uavo
in the object browser, disable the Fault module and then "Save"
the hwsettings module back to the board.  The next reset will
boot normally without the fault inserted.
2011-12-30 23:05:39 -05:00