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

878 Commits

Author SHA1 Message Date
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
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
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
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
Stacey Sheldon
1543a6dbd3 hwsettings: allow disabling of USB telemetry entirely
The GCS hwsettings config widget now disallows any
configuration that disables both HID and VCP telemetry
over the USB port.

The firmware will allow it if the UAVObj is set manually.

This allows a mechanism to reduce RAM usage by another
500 more bytes if USB telemetry can be sacrificed in
certain configurations.
2011-12-30 23:05:38 -05:00
Stacey Sheldon
e980bb863f uavobj browser: add object size to tree display 2011-12-30 23:05:38 -05:00
Stacey Sheldon
bd9f3569db gcs uavtalk: Add full state-level debug logs
These logs are disabled by default, and can be
turned on at compile time by defining:
  UAVTALK_DEBUG
at the top of uavtalk.cpp.

These logs proved very helpful in diagnosing a
serial comms issue.
2011-12-30 23:05:37 -05:00
Stacey Sheldon
fa9702db97 gcs serial: fix broken baud rate selection
The difference between 56000 and 57600 baud is very
important.

When using a USB to serial adapter that is capable
of synthesizing arbitrary baud rates, these errors
resulted in a completely mismatched/unusable serial
link.
2011-12-30 23:05:37 -05:00
Stacey Sheldon
ad793f0b81 hwsettings: add HID and VCP config to hwsettings gui 2011-12-30 23:05:37 -05:00
Stacey Sheldon
87be56eff7 hwsettings: add support for com-bridge to hwsettings config gui 2011-12-30 23:05:36 -05:00
Stacey Sheldon
458d3467ab gcs: properly label ttyACM devices in gcs pull-down selector 2011-12-30 23:05:33 -05:00
dankers
7892f9699d Add minus for notify as requested 2011-12-29 22:25:17 +11:00
James Cotton
24af36bba3 Merge remote-tracking branch 'origin/pt/configurable_gcs_serial_speed' into next 2011-12-24 09:50:59 -06:00
naiiawah
6dcf55c41e Killed off file that should not have been checked in to Git. 2011-12-18 13:36:49 -07:00
James Cotton
99201d152a Patch from Kenn to speed up matlab parsing by preallocating arrays 2011-12-16 15:30:48 -06:00
James Cotton
b56c11d1d9 Merge remote-tracking branch 'origin/stac/logging_fixes' into next 2011-12-16 13:54:49 -06:00
Corvus Corax
716bb8ec56 GCS:Scope: Backward Compatibility: Set Interpolation to minimum (1) when not set in config file 2011-12-15 23:49:01 +01:00
James Cotton
889a84da04 Revert "GCS/ScopePlugin: Allow SoftwareInterpolation of measurement value"
This reverts commit 4f485f7d61.
2011-12-13 11:04:21 -06:00
James Cotton
98ee21ead3 Revert "GCS/Scope: CSV export exports non-interpolated data"
This reverts commit 99215458c2.
2011-12-13 11:04:20 -06:00
James Cotton
bf98fe14c3 Revert "GCS/Scope: Make smooth interpolation (and internal sum) be long term correct despite limited floating point accuracy, but keep constant overhead"
This reverts commit 78278683cc.
2011-12-13 11:04:20 -06:00
James Cotton
40e7bf5c59 Revert "GVS/Scope: Bugfix: Export all known data points into CSV not just one per screen redraw"
This reverts commit 2ce3365861.
2011-12-13 11:04:20 -06:00
dankers
000373b421 Update default linear dials to deluxe 2011-12-14 02:24:25 +11:00
Corvus Corax
2ce3365861 GVS/Scope: Bugfix: Export all known data points into CSV not just one per screen redraw 2011-12-12 09:48:05 -06:00
Corvus Corax
78278683cc GCS/Scope: Make smooth interpolation (and internal sum) be long term correct despite limited floating point accuracy, but keep constant overhead 2011-12-12 09:48:05 -06:00
Corvus Corax
99215458c2 GCS/Scope: CSV export exports non-interpolated data 2011-12-12 09:48:05 -06:00
Corvus Corax
4f485f7d61 GCS/ScopePlugin: Allow SoftwareInterpolation of measurement value 2011-12-12 09:48:05 -06:00
Stacey Sheldon
a19bbb7ea3 csvlog: Do not scale data written to CSV files
The autoscaling values used by the scope gadget were
being applied to the raw data being written to the CSV
files.  This resulted in the CSV file containing data
that had a variable scale, thus making it useless.
2011-12-10 16:50:51 -05:00
Stacey Sheldon
8c0c39ca53 uavobjgen: Update matlab template to accept a logfile path
This makes the generated .m file more generally useful.
2011-12-10 16:50:51 -05:00
James Cotton
24d6c971e6 These layout sizes work on mac too now. 2011-12-10 12:50:30 -06:00
James Cotton
ffb5bf7a7e Merge remote-tracking branch 'origin/ccfly/channelformlayout' into next 2011-12-10 11:13:32 -06:00
James Cotton
686d5f2dcf Merge remote-tracking branch 'origin/naiiawah/OP-595' into next 2011-12-10 11:05:14 -06:00
James Cotton
c9933e78c2 Update to joystick image for gcs controller to be much prettier. 2011-12-10 11:01:34 -06:00
naiiawah
6dc121fda6 Updated fix to preserve assert behavior by adding a check routine that
is called before trying to add an item.
2011-12-06 22:20:46 -07:00
zedamota
f18c980c4e Small bug fix.
Added minus.wav witch is a copy of magic.was. "minus" file needed.
2011-12-06 13:13:20 +00:00
zedamota
b45044b8c3 Changed conditions base on strings to enums. 2011-12-06 09:59:28 +00:00
Michael Schulz
8a9b508392 layout fix for last 2 columns of outputchannelform 2011-12-05 21:14:52 +01:00
James Cotton
fd93b08cab Merge remote-tracking branch 'origin/pt/combobox_output' into next 2011-12-05 00:38:47 -06:00
James Cotton
354867bdb1 Keep indenting using spaces. 2011-12-04 22:33:27 -06:00
James Cotton
783510de57 Add break that Brian caught 2011-12-04 22:31:07 -06:00
zedamota
78e25b1b8c Fixed conditions
Added support for negative values
Added support to "play once per update"
Added "never" rule for value sound
Several other bugfixes
2011-12-03 02:36:47 +00:00
Corvus Corax
b287d4f849 Merge remote branch 'origin/corvuscorax/logging-fix' into next 2011-11-30 19:17:54 +01:00
zedamota
fcbb00f757 config outputs now uses dropdown boxes for the update freq. 2011-11-29 17:01:02 +00:00
zedamota
5bc1a10774 Fixes the "halt" and "rescue" problems 2011-11-28 12:12:26 +00:00
Corvus Corax
15c1ca4af1 GVS/Scope: Bugfix: Export all known data points into CSV not just one per screen redraw 2011-11-26 22:51:20 +01:00
Corvus Corax
5af9a2558c GCS/Scope: Make smooth interpolation (and internal sum) be long term correct despite limited floating point accuracy, but keep constant overhead 2011-11-26 22:06:46 +01:00
Corvus Corax
dfd18d43b5 GCS/Scope: CSV export exports non-interpolated data 2011-11-26 22:06:21 +01:00
Michael Schulz
9b32d2f119 little layout fix for channelforms 2011-11-26 13:59:37 +01:00
zedamota
54bd0af16d Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next 2011-11-26 00:07:43 +00:00
zedamota
27de9fcb08 Some tweaks to detection and connection timings. Should fix some issues with "halt". 2011-11-26 00:06:45 +00:00
zedamota
77058807b4 Added some more debug messages to help catch bugs, no that there are any. 2011-11-26 00:04:36 +00:00
zedamota
9eaf09860c Delay the running device info fetching by 1 second. 2011-11-25 23:59:42 +00:00
zedamota
2b94a1538b Make the outputs test function disable when the connection is lost. 2011-11-25 23:50:54 +00:00
naiiawah
3303313908 Fixes for OP-595:
Changed the UAV import of saved settings to not pull in invalid enum
values. Will warn on the dialog that an element of the UAVObject was
invalid and turn off the "save" checkbox. Also will send a qDebug output
showing the UAVObject name and the invalid enum value.
2011-11-25 16:12:38 -07:00
James Cotton
d3cc67f5c4 Make the input wizard detect already inverted channels and preserve them. 2011-11-25 12:30:17 -06:00
James Cotton
fae611a01f Fix bug where clicking back at last screen of input wizard would go back to
main screen and then in future buttons hung around for no reason
2011-11-25 11:30:12 -06:00
James Cotton
60664f6a26 Merge remote-tracking branch 'origin/ccfly/outputchannelform' into next 2011-11-25 10:48:41 -06:00
Corvus Corax
6913d14e82 GCS:Logging: Correctly adhere to replay speed, and check logfile for plausibility/corruption 2011-11-25 15:11:58 +01:00
James Cotton
856f8a9b6c Merge remote-tracking branch 'origin/pt/version-mismach-warning' into next 2011-11-21 07:38:16 -06:00
James Cotton
084b175290 Removed general error message for savign. Places using the save should
reliably provide feedback.
2011-11-21 07:25:07 -06:00
zedamota
a1f3035f15 added tooltip to the pfd stating the current refresh rate 2011-11-20 20:47:37 +00:00
zedamota
0875831f6d made the firmware date display on a more user friendly format 2011-11-20 18:18:51 +00:00
zedamota
1632d354a1 Fix the don't show this again option 2011-11-19 18:47:41 +00:00
Corvus Corax
44c8c9fbe5 GCS/ScopePlugin: Allow SoftwareInterpolation of measurement value 2011-11-18 21:09:30 +01:00
Michael Schulz
93267dd26f Implemented suggestions from code review
* reduced top and bottom margins of outputchannelform
* removed obsolete methods in configoutputwidget.h
* fixed comment block
* switched to static accessor methods for UAVO
2011-11-17 20:51:17 +01:00
Michael Schulz
d307446fdf Merge remote-tracking branch 'origin/next' into outputchannelform 2011-11-14 21:14:45 +01:00