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
534453e028
Delete unused gadget an references to unused objects
2012-01-04 21:11:31 -06: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
James Cotton
ef05cafaca
Merge branch 'revolution' into altitudehold
...
Conflicts:
flight/Libraries/insgps13state.c
flight/OpenPilot/Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-01-01 10:50:35 -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
e34f618d89
Accel fields shouldn't be capitalized in the scope config
2011-12-24 16:15:13 -06:00
James Cotton
902a2baef7
Fix the sign of the bias terms
2011-12-24 16:14:53 -06:00
James Cotton
710f95feeb
Get the 6pt calibration working again for revo
2011-12-24 15:58:12 -06:00
James Cotton
d78d345953
Configuration tab for revo
2011-12-24 14:08:08 -06:00
zedamota
761da06b6f
small fix and some cleaning
2011-12-24 10:37:38 -06:00
zedamota
5e43f85cc4
Make the GCS serial telemetry speed configurable
2011-12-24 10:37:38 -06:00
James Cotton
24af36bba3
Merge remote-tracking branch 'origin/pt/configurable_gcs_serial_speed' into next
2011-12-24 09:50:59 -06:00
Oleg Semyonov
7fbbb0e6af
Merge remote branch 'origin/next' into os/TxPID-module
2011-12-24 15:44:16 +02:00
James Cotton
0024cbaa51
Merge branch 'next' into revolution_sensors
2011-12-18 16:28:30 -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
2b5f0bccc6
Merge branch 'next' into revolution_sensors
2011-12-16 15:31:14 -06: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
4b6aab0513
Merge remote-tracking branch 'origin/stac/logging_fixes' into revolution_sensors
...
Conflicts:
ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2011-12-14 10:38:05 -06:00
James Cotton
9f50391fc5
Merge branch 'next' into revolution_sensors
...
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
2011-12-13 20:50:10 -06:00
James Cotton
fc2465675a
Update the config file to no longer point to the old AttitudeRaw object
2011-12-13 20:47:52 -06:00
James Cotton
7776cc529b
Remove the old AHRS configuration gadget
2011-12-13 20:32:43 -06:00
James Cotton
bdc7f762d6
Remove old test class that uses outdated objects (AttitudeRaw)
2011-12-13 20:24:57 -06:00
James Cotton
9143a716cf
Disable HITL until it is update to the new sensor objects
2011-12-13 20:24:09 -06: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
James Cotton
a37a17a4fb
Created a separate Sensor module and Attitude module for revolution
2011-12-12 21:40:39 -06:00
James Cotton
d22e0e66dd
Create separate UAVOs for the sensors.
2011-12-12 13:05:40 -06: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
James Cotton
33a12d829e
Merge branch 'next' into revolution
...
Conflicts:
flight/PiOS/Common/pios_flashfs_objlist.c
2011-12-11 22:55:54 -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
bfaed9c7e0
Merge remote-tracking branch 'origin/corvuscorax/Smoothed_Scope' into next
2011-12-10 15:20:25 -06: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
James Cotton
4dfdeb9418
Merge remote-tracking branch 'origin/ccfly/channelformlayout' into revolution
2011-11-27 10:24:29 -06:00
James Cotton
cd65df013e
Merge branch 'next' into revolution
...
Conflicts:
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
2011-11-26 22:52:32 -06: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
Michael Schulz
9bd74bb591
minor fixes due to last merge
2011-11-14 21:13:34 +01:00
James Cotton
684715930a
Merge branch 'next' into revolution
...
Conflicts:
flight/OpenPilot/Makefile
flight/Revolution/System/inc/openpilot.h
2011-11-14 10:11:53 -06:00
Oleg Semyonov
b2887a25a7
New 3D model: Ricoo (by muralha)
2011-11-14 16:05:10 +02:00
zedamota
e2c4b2f978
Simple mismatch detection, needs testing to find if message is clear enough for users.
2011-11-13 17:39:05 +00:00
zedamota
ad13cee7a1
Added the basis for GCS and FW version mismatch warning.
2011-11-13 16:05:36 +00:00
Oleg Semyonov
de6e450b5f
Merge branch 'next' into os/TxPID-module
...
Conflicts:
flight/CopterControl/Makefile
flight/CopterControl/System/coptercontrol.c
ground/uavobjgenerator/generators/generator_common.h
shared/uavobjectdefinition/hwsettings.xml
component free heap used
----------------------------
Nothing 2544 -
PWM 2416 128
PPM 2392 152
DSM 2448 96
S.Bus 2432 112
GPS (port only) 2352 192
GPS (port+module) 1296 1248
CameraStab 2080 464
Telemetry 1912 632
TxPID 2272 272
2011-11-13 16:25:58 +02:00
James Cotton
3e4a33169c
Merge remote-tracking branch 'origin/dwillis/gcs_gui_fixes' into next
2011-11-12 21:49:56 -06:00
James Cotton
f0b22519be
Merge remote-tracking branch 'origin/corvuscorax/CC_GPS' into next
2011-11-12 21:30:53 -06:00
Oleg Semyonov
951b7c27c2
gcs: fix typo in the GUI
2011-11-12 23:09:52 +02:00
zedamota
deac94253e
small fix and some cleaning
2011-11-11 23:42:36 +00:00
zedamota
a8dbeb2c91
Make the GCS serial telemetry speed configurable
2011-11-11 23:09:44 +00:00
Michael Schulz
ea5caa24d5
Merge remote-tracking branch 'origin/next' into outputchannelform
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
2011-11-11 22:57:33 +01:00
James Cotton
e108bcafed
Merge remote-tracking branch 'origin/naiiawah/uploader_detection' into next
2011-11-11 10:56:17 -06:00
James Cotton
40b2b654b7
Merge remote-tracking branch 'origin/pt/OP586' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
ground/openpilotgcs/src/plugins/config/configoutputwidget.h
2011-11-11 10:51:04 -06:00
James Cotton
207e2b9e0e
Merge remote-tracking branch 'origin/pt/OP587' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
2011-11-11 10:06:20 -06:00
zedamota
f5c7dba0b1
Merge remote-tracking branch 'remotes/origin/nick/notify-plugin-fixes' into nick/notify-plugin-merged
2011-11-11 15:33:27 +00:00
Corvus Corax
aa69027cb2
Merge branch 'next' into CC_GPS
2011-11-11 11:44:11 +01:00
Michael Schulz
0ac62c77de
Output widget: Converted to an array of output channels.
2011-11-09 19:59:20 +01:00
James Cotton
6fd2426a90
Patch from Kenn for the matlab processing function to fix issue with multiple
...
isntance objects
2011-11-09 12:49:50 -06:00
James Cotton
813ac65159
OP-592: Also fix so it reads the values for channels 9 and 10 correctly
2011-11-07 15:58:08 -06:00
James Cotton
af6eeca8ee
Allow camera stabilization to control outputs 9 and 10. Also add a friendly
...
message to indicate when the output is already assigned.
2011-11-07 15:53:57 -06:00
David Willis
3f8f2c4da1
Add ifdef to retain default behaviour on OSX
2011-11-06 21:13:10 +00:00
Brian Mahaffy
e1dbf3b75c
Changed the uploader gadget to not ask if you want to plug in another
...
board, but only when using CC.
2011-11-05 23:22:56 -06:00
David Willis
3dd708a564
Set drop down width using list box size hint as necessary
2011-11-05 02:04:34 +00:00
Oleg Semyonov
53bef754c3
Merge remote branch 'origin/next' into os/alternative_spektrum_driver
2011-11-04 21:43:12 +02:00
James Cotton
c6bf1845a3
Fix combination on multiple cores with the debuggadget
2011-11-02 17:00:10 -05:00
Oleg Semyonov
2ec0b7d767
Merge branch 'next' into os/alternative_spektrum_driver
2011-11-02 23:02:34 +02:00
Oleg Semyonov
481bff2578
spektrum: code style fixes accoring to OPReview-122
2011-11-01 18:48:07 +02:00
Oleg Semyonov
0aad612720
spektrum: the same type of DSM receivers is now allowed on both CC ports
2011-11-01 01:16:43 +02:00
Oleg Semyonov
0116e6a007
spektrum: rework DSM2/DSMJ/DSMX driver for explicit DSMX resolution support
...
- both CC serial ports are now disabled by default (no telemetry);
- serial ports now have DSM2, DSMX (10bit) and DSMX (11bit) options;
- ReceiverGroups now have DSM (MainPort) and DSM (FlexiPort) options.
For DSM2 protocol there is an explicit resolution bit in the stream, so
the DSM2 should be selected. For DSMX there is no such bit, and user
should choose the resolution from the list configuring the spektrum port.
ReceiverGroups have single DSM option which is handled by the same driver.
Downside: this implementation saves received frame first, unrolls by the
end of frame. This should be ok, but may be improved by unrolling channels
on the fly in the rx callback.
Another minor difference is that a ChannelGroup is now bound to port:
DSM (MainPort) or DSM (FlexiPort). This was considered as acceptable
solution in order to not have 6 DSM options for each ChannelGroup and
even more in case of new DSM protocol variations.
Known problem: it is not possible to choose same protocols like
DSM2/DSM2 for two ports. It can be enabled by adding an exception to
common rule, though.
The DSMX throttle channel misbehavior (zero value) is not treated
specially yet. It should trigger the failsafe being out of bounds.
More info and data dumps are required to handle this properly.
2011-10-30 19:29:03 +02:00
James Cotton
eb5e053a3e
Input configuration: Make the sticks move during the limit setting. Makes the
...
UI more intuitive.
2011-10-27 08:35:20 -05:00
James Cotton
0f8ae1e076
Merge branch 'next' into ins
...
Conflicts:
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
2011-10-26 13:18:44 -05:00
James Cotton
a8f0c5a622
Output widget: Add lines from Sambas to indicate which speeds alter channels
...
7-10. Currently it doesn't indicate appropriately if those are actually
available...
2011-10-25 11:49:26 -05:00
James Cotton
27bf2b383e
Merge remote-tracking branch 'origin/james/remap_outputs' into next
2011-10-23 18:35:25 -05:00
James Cotton
2050ce3fe1
Merge branch 'fix_input' into next
2011-10-23 15:29:12 -05:00
Oleg Semyonov
6a9208e8c3
Merge branch 'next' into os/TxPID-module
2011-10-22 23:34:58 +03:00
Oleg Semyonov
f71361ca83
Merge branch 'next' into os/GPS-on-CopterControl_next_v2
...
Conflicts:
flight/Modules/System/systemmod.c
2011-10-22 23:00:47 +03:00
Corvus Corax
167010e8a0
UAVTalk: Fixed bug in parser failing to handle length of multi-instanceobjects
...
UAVTalk (on GCS): Fixed a null pointer dereference when receiving in a NACK
2011-10-21 02:04:29 +02:00
James Cotton
a1cd6d580c
During output testing disable the reverse checkbox
2011-10-20 08:39:30 -05:00
James Cotton
b6df727d1a
Disable the input wizard while running simple calibration
2011-10-20 08:31:58 -05:00
James Cotton
5c04268205
Input configuration: Make sure during the 500 ms between detecting a channel
...
and requesting next nothing else can trigger.
2011-10-20 08:26:46 -05:00
James Cotton
fd96616c32
Delete large section of unused code
2011-10-20 07:51:00 -05:00
James Cotton
14fa739748
Add dialog box to indicate when test outputs won't work.
2011-10-20 07:20:23 -05:00
James Cotton
46aa8916c6
Fix segfault when selected motors 9 or 10. Also make labels show up in output
...
panel.
2011-10-20 06:56:56 -05:00
zedamota
cfbfbe1209
Only one output configuration at a time is now able to receive user input while the test outputs is enabled.
2011-10-16 00:57:59 +01:00
James Cotton
0193187d0c
Make the UI support 10 output channels
2011-10-15 16:59:42 -05:00
zedamota
ca20187dcf
Made UAVObject import disable the outputs test - see OP-587
2011-10-15 21:16:34 +01:00
James Cotton
08e077e8cb
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2011-10-13 23:16:56 -05:00
James Cotton
1d5364878a
Update CameraStab icon with Muralha's new one
2011-10-13 23:16:09 -05:00
zedamota
8d5b310f1f
Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next
2011-10-12 16:44:11 +01:00
zedamota
032fa759ac
Fixes the zero while arming checkbox and and OP-575
2011-10-12 16:43:14 +01:00
Nickolay
20757c2efd
+complete all features; +testing in progress;
2011-10-12 08:36:05 +03:00
James Cotton
ef34f6b674
Merge remote-tracking branch 'origin/ed_mac_halt_bug' into next
2011-10-11 10:23:19 -05:00
Edouard Lafargue
6514ea5262
Finally, a fix for the Mac UAVTalk issues: it was all caused by a wrong RunLoop pointer reference
...
because of multithreading.
2011-10-11 00:10:27 +02:00
James Cotton
7da8cb2079
CC: After attitude calibration always reenable BiasCorrectGyro. Fixes odd bug
...
if people have it crash in the middle.
2011-10-08 14:15:48 -05:00
James Cotton
4b04a5d9ea
Merge remote-tracking branch 'origin/pt/mixer_bug' into next
2011-10-06 21:33:59 -05:00
Edouard Lafargue
de8478718c
Attempt to make USB faster on Mac. Breaks the Firmware upload system!!!
2011-10-05 00:38:56 +02:00
Nickolay
6a5589ef51
+multiple selection with D&D completed; +support of enum and range for value completed;
2011-10-04 01:59:37 +03:00
Edouard Lafargue
c06c08e831
Merge branch 'next' into ed_mac_halt_bug
2011-10-03 23:05:52 +02:00
Nickolay
82ec3199d7
+dynamic field UI;
2011-09-29 20:26:46 +03:00
Oleg Semyonov
a38c569cd0
HwSettings: move Telemetry and add GPS port speed to the HwSettings object
...
TelemetrySettings object removed (saved 200+ bytes of RAM). Telemetry
port speed moved to the HwSettings object. Added GPS port speed setting.
GCS code updated to reflect changes and support both fields.
2011-09-28 22:11:42 +03:00
Oleg Semyonov
53c098dd08
Merge branch 'next' into os/GPS-on-CopterControl_next_v2
...
Conflicts:
flight/OpenPilot/System/pios_board.c
flight/OpenPilot/UAVObjects.inc
shared/uavobjectdefinition/hwsettings.xml
2011-09-28 22:02:02 +03:00
zedamota
898d3c980d
Cosmetic changes to the Debug plugin
...
One more fix to the mixer bug
2011-09-27 22:10:39 +01:00
James Cotton
cf6a59468f
Merge branch 'next' into ins
...
Conflicts:
flight/INS/Makefile
flight/Project/OpenOCD/stm32f1x.cfg
flight/Project/OpenOCD/stm32f2x.cfg
make/firmware-defs.mk
2011-09-27 01:02:06 -05:00
James Cotton
a53f2353a5
Merge branch 'ed_mac_halt_bug' into next
2011-09-25 15:19:22 -05:00
zedamota
797bb38081
mixer bug fix.
...
Also added a new debug plugin witch shows the debug messages normally not available on release builds
2011-09-25 19:30:32 +01:00
James Cotton
3e61e21e89
Output config UI: Add labels for what things are
2011-09-25 10:50:06 -05:00
Edouard Lafargue
822cbfbc81
Fix MacOS halt issues by using the USBMonitor to detect device re-insertion:wq:
2011-09-25 15:28:08 +02:00
zedamota
352620e0ed
Mixer bug while import fix (try to)
2011-09-23 13:48:27 +01:00
zedamota
246318af7b
Mixer bug fix try
2011-09-22 12:02:22 +01:00
Nickolay
1af42e1b32
+ notify table reordering some changes
2011-09-19 00:30:57 +03:00
Nickolay
1665ae8299
+reordering add some changes;
2011-09-19 00:26:49 +03:00
Oleg Semyonov
d923117c25
TxPID: optional module to tune PID settings using R/C transmitter
...
This module will periodically update values of stabilization PID settings
depending on configured input control channels. New values of stabilization
settings are not saved to flash, but updated in RAM. It is expected that the
module will be enabled only for tuning. When desired values are found, they
can be read via GCS and saved permanently. Then this module should be
disabled again.
2011-09-17 22:49:51 +03:00
unknown
56e71cd82e
+removed public members in notificationitem; +cosmetic changes; +fixed indentation;
2011-09-16 18:39:20 +03:00
Nickolay
c16e386e63
+reordering of table items - experimenting with D&D
2011-09-16 02:24:35 +03:00
Nickolay
e14e0a763b
- temporary remove assert in finished callback;
2011-09-15 01:35:19 +03:00
Nickolay
3af398d7f9
initial changes
2011-09-15 00:38:18 +03:00
James Cotton
1783817b96
INS: First pass at altitude hold code
2011-09-13 01:44:53 -05:00
James Cotton
535449baa9
Merge branch 'next' into ins
2011-09-12 22:41:19 -05:00
James Cotton
06fc5a1110
Input Configuration: Fix flight mode slider detection (looking at wrong channel
...
number).
2011-09-12 22:28:28 -05:00
James Cotton
400ba3bd47
Merge branch 'next' into ins
2011-09-12 18:57:11 -05:00
James Cotton
6bd52832be
Heli configuration: Now the collective passthrough uses the collective channel
...
only. Please note this requires all heli users to scrub their settings and
start over. Please erase your setting and be careful. Remove all blades.
2011-09-12 11:47:59 -05:00
James Cotton
6457276438
Merge branch 'input_configuration' into next
2011-09-11 18:52:35 -05:00
Oleg Semyonov
f5369f9338
Input Configuration: support all 18 S.Bus input channels
2011-09-12 02:06:50 +03:00
James Cotton
5d43a8dd36
Input configuration; Remove some old unused variables
2011-09-11 12:24:48 -05:00
James Cotton
3ff7bf7ed0
Input Configuration: Make sure the input channel form always is properly
...
aligned. I hope the fixed size behaves well across platforms.
2011-09-11 12:11:15 -05:00
James Cotton
ce1c56260d
Input Configuration: Refacfor the code a lot to clear up handling the state and
...
transitions to make back and cancel a bit more reliable.
2011-09-11 12:11:02 -05:00
James Cotton
01cd2ded57
Mainboard config: The rcvr port is used for PPM/PWM/Spektrum so make these one
...
setting that is mutually exclusive.
2011-09-10 14:20:51 -05:00
James Cotton
c2a8cc3faa
Mainboard config: The rcvr port is used for PPM/PWM/Spektrum so make these one
...
setting that is mutually exclusive.
2011-09-10 14:19:12 -05:00
James Cotton
3239fdf21b
Merge branch 'next' into ins
...
Conflicts:
flight/CopterControl/Makefile
flight/OpenPilot/System/pios_board.c
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
2011-09-09 08:33:34 -05:00
James Cotton
a5509965b2
Input configuration: add reverse checkbox and label for current neutral value
2011-09-09 00:54:47 -05:00
James Cotton
1a2750051a
Input wizard: Make collective pitch come first for helicopter mode transmitters
...
and tell person to use throttle hold so it's detected correctly.
2011-09-08 10:24:52 -05:00
James Cotton
bbdb176409
Input configuration: Make input channel into a dropdown box and make the
...
neutral position into a slider. During calibration the slider moves and the
min and max values are updated appropriately. Also make the collective channel
skippable in the configuration wizard.
2011-09-07 02:13:27 -05:00
James Cotton
cabfbc229d
Input config: Bring back old style calibration. I can't seem to make the input
...
widget list a class variable which isn't very safe (multipe instances of the
config gadget will act funny).
2011-09-06 22:19:12 -05:00
James Cotton
d496f81c68
GCS Input config: Change the layout a bit to make the spacing between rows
...
regular, and move some of the layout to the .ui file.
2011-09-06 17:50:55 -05:00
James Cotton
acfb28b04b
Heli configuration: Make swashplate leveling routine using static accessor
...
methods. Also got rid of incredibly annoying message when you tried to alt-tab
out of GCS.
2011-09-04 23:08:35 -05:00
James Cotton
a81f14a575
CCPM config: Fix the collective pass through mode for multi receiver support.
...
Now the user must configure Accessory# in the input configuration section
though.
2011-09-04 23:08:34 -05:00
James Cotton
6344bc8f83
Fix encoding no configccpmwidget.cpp
2011-09-04 23:08:34 -05:00
James Cotton
d28f0c4c78
GCS Config Stabilization: Increase maximum rate that can be entered to 500
...
deg/s from 300 deg/s for heli people.
2011-09-03 21:25:27 -05:00
James Cotton
e18288085c
OP-390 Make the object saving throw an error message on save failures.
2011-09-03 21:25:20 -05:00
James Cotton
1de58ebb87
Make scope gadget check if object exists before using it. Avoids segfaults
...
when scoped objects disappear.
2011-09-03 21:24:13 -05:00
James Cotton
5a9da23615
Make the object saving throw an error message on save failures.
2011-09-02 13:26:28 -05:00
James Cotton
1d04715476
INS: Rework how the sensor calibration behaves and clean up the interface a
...
bit.
2011-09-02 13:24:35 -05:00
James Cotton
3b20df22d1
Updates to config gadget for new INS objects
...
Make scope gadget check if object exists before using it. Avoids segfaults
when scoped objects disappear.
2011-09-01 12:21:37 -05:00
James Cotton
612d3336b4
This patch breaks backward compatibility with AHRS solidly.
...
Move the configuration files for INS from AHRS* to INS*. Strip out unused
fields in settings and merge calibration and settings since settings has
basically no information.
2011-09-01 12:21:33 -05:00
Stacey Sheldon
a72c657e21
rcvr activity: Speed up activity acquisition
...
Activity detection logic can now move through
the active receivers more quickly.
2011-08-27 20:17:56 -04:00
James Cotton
dc340596f5
Merge branch 'next' into GCS_ChangesToUI-RuntimeCFG
...
Conflicts:
flight/CopterControl/Makefile
flight/OpenPilot/System/pios_board.c
flight/OpenPilot/UAVObjects.inc
flight/PiOS/STM32F10x/pios_spektrum.c
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configgadget.qrc
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/hwsettings.xml
2011-08-27 15:26:05 -05:00
Corvus Corax
4bd72923e5
Merge branch 'CorvusCorax_unidirectional-GPS-com' into CC_GPS
...
Conflicts:
flight/Modules/GPS/GPS.c
flight/Modules/GPS/GTOP_BIN.c
flight/Modules/GPS/NMEA.c
shared/uavobjectdefinition/hwsettings.xml
2011-08-25 15:33:23 +02:00
James Cotton
fb689221fa
Merge remote-tracking branch 'origin/GCS_UIFixes_Dmytro' into next
2011-08-23 22:36:40 -05:00
zedamota
0d92e00125
Several bugfixes.
...
Created "simple wizard" button witch bypasses the sticks identification screen.
Small bugfix to fix GCS crashing if trying to upload a firmware bigger then the HW capacity.
2011-08-23 11:25:28 +01:00
Dmytro Poplavskiy
ed51756191
Compilation fix on mac
...
It's safer to define GL_CLAMP_TO_EDGE if not available than
to include GL/glext.h.
2011-08-22 09:10:25 +10:00
Dmytro Poplavskiy
6e506161e0
Compilation fix
...
It's necessary to include GL/glext.h on windows for
GL_CLAMP_TO_EDGE define.
2011-08-22 07:34:59 +10:00
Dmytro Poplavskiy
69d5e7fe7e
Added missing Q_DECL_EXPORT to CachedSvgItem
2011-08-21 23:40:11 +10:00
Dmytro Poplavskiy
6b0da6bc72
Changed PFDGadgetWidget to use CachedSvgItem
2011-08-21 21:38:58 +10:00
Dmytro Poplavskiy
bbc137eabe
Added initial CachedSvgItem implementation
...
Texture is regenerated each time item is scaled
but it's reused during rotation, unlike the default
DeviceCoordinateCache mode.
2011-08-21 21:36:41 +10:00
Dmytro Poplavskiy
b6b0703c28
GCS: Fixed stabilization settings layout on a small screen.
...
Put most of widgets into QScrollArea.
It looks the same on large enough screen but scrollbars
are added on netbook size screen.
2011-08-21 19:57:21 +10:00
zedamota
7bf9f4e817
Untested changes, should fix:
...
Spelling mistakes
Show inverted movement as soon as checkbox is checked.
Bring back flightmode change messagebox.
Layout issues (this was not a issue on win so not sure its fixed).
Support for flightmode binary switches neutral=min+(max-min)/2.
Flightmode slider not changing according to command.
Mode 1 roll on the right (still think it doesn't make sense :) )
2011-08-20 19:10:28 +01:00
James Cotton
368323fd59
Merge remote-tracking branch 'origin/james/erase_settings' into next
2011-08-20 13:07:01 -05:00
Corvus Corax
dfd301571a
HWSettings: Allow late Initialization and Start of Modules as defined in Makefile(available modules) and UAVObject(actually started modules)
2011-08-20 01:24:06 +02:00
James Cotton
0448b34a91
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2011-08-19 01:51:08 -05:00
James Cotton
f85ae84ec3
Merge branch 'camera_stabilization' into next
...
Conflicts:
flight/OpenPilot/System/pios_board_posix.c
2011-08-19 01:48:24 -05:00
zedamota
0a0d405fc1
Finished the new input configuration wizard. Fixed some bugs along the way.
...
Sending it for review now.
2011-08-17 12:43:08 +01:00
Oleg Semyonov
2020e336d6
OP-290: allow GCS tabs to shrink (by eliding the text), less limit min window width
2011-08-16 20:58:39 +03:00
zedamota
6a103ed332
Integrated artwork into the input config wizard. Some testing left to do before sending for review.
2011-08-16 16:06:18 +01:00
James Cotton
33e61b4405
OP-557: Make the tools erase menu item attempt to perform a full format on the
...
flash chip first, then fall back to erasing settings via the EraseSettings
object persistence. The later only removes UAVO instances that the firmware is
current aware of, so can create issues when jumping between versions.
2011-08-15 11:37:00 -05:00
zedamota
98f84e472b
Trying to get out of merge hell
2011-08-15 14:12:54 +01:00
James Cotton
86b652bbab
Merge branch 'next' into camera_stabilization
2011-08-14 18:07:57 -05:00
zedamota
e736b17cc4
Merge remote-tracking branch 'remotes/origin/next' into GCS_ChangesToUI-RuntimeCFG
...
Conflicts:
ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp
2011-08-14 15:48:16 +01:00
Oleg Semyonov
2f7f920ef3
gcs: (uploader plugin) few firmware info string and icon changes
...
Also it looks like the date check clause doesn't work, needs to be checked.
2011-08-14 17:25:52 +03:00
Oleg Semyonov
ba58ec7e08
gcs: (uploader plugin) replace red warning icon with less serious yellow triangle
2011-08-14 17:25:50 +03:00
dankers
69f8aac967
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2011-08-13 06:12:08 +10:00
dankers
65cb05e212
hhrhhr's fix for modelview gimbal lock, thank you!!
2011-08-13 06:08:07 +10:00
James Cotton
923e33195b
Merge branch 'next' into camera_stabilization
2011-08-11 12:06:50 -05:00
James Cotton
39fcc5bde3
Revert "Telemetry: Remove a processObjectQueue() command that was triggering
...
warnings". Unfortunately this causes problems getting objects quickly on
linux. A complete fix to the connection speed issue on all platforms may
take some work.
This reverts commit 74d1762e4c
.
2011-08-11 12:05:52 -05:00
James Cotton
e56dbfdb24
CameraStabilization: Bad memory error that Sambas caught
2011-08-11 11:02:12 -05:00
James Cotton
681444184c
CCHWSettings: Add help button in
2011-08-11 10:58:22 -05:00
James Cotton
669634782f
UI: Two aesthetic issues on cc_hw_settings.ui:
...
1) Don't override fonts when possible. It makes the layout inconsistent. We
should come up with a stylesheet/system wide way for things like this.
2) Left align the telemetry speed field instead of making it full screen width
3) Move the "Settings apply after restart" message out of the button row. This
makes the buttons not in the same location between panels.
2011-08-11 10:46:54 -05:00
James Cotton
508fdae125
On connect/disconnect load the .png HwConfig image. Drop the .svg from the qrc
...
file for consistency.
2011-08-11 10:32:53 -05:00
James Cotton
0f1fd8f8c1
Update HISTORY.txt and correct a help URL.
2011-08-11 00:00:04 -05:00
James Cotton
bbe3c1533a
Merge branch 'next' into camera_stabilization
2011-08-10 21:57:45 -05:00
James Cotton
a387532a94
Fixed some little race conditions that messed with the configuration UI. Added
...
message to indicate power cycle is required after enabling this module.
2011-08-10 21:57:17 -05:00
zedamota
e221ecbaf4
Finished coding part of new input calibration wizard. Waiting for some artwork to send it for review.
2011-08-10 15:24:35 +01:00
James Cotton
74d1762e4c
Telemetry: Remove a processObjectQueue() command that was triggering warnings
2011-08-10 06:15:13 -05:00
James Cotton
9748640210
Stabilization: Add the option for zeroing the PIDs when throttle is low to GUI
2011-08-10 04:15:37 -05:00
James Cotton
44cc9245e4
CameraStabilization: UI Seems to be working now.
2011-08-10 03:27:41 -05:00
James Cotton
11a98bb9e0
CameraStabilization: Create blank configuration panel
2011-08-09 22:52:02 -05:00
James Cotton
f23eaa8273
Make the Actuator pull from the CameraDesired fields
2011-08-09 21:47:42 -05:00
James Cotton
c4e272b9ad
Merge branch 'next' into camera_stabilization
2011-08-09 20:16:45 -05:00
James Cotton
c1adbf37aa
Also disable notify plugin on Qt 4.8 until this is fixed. Causing runtime
...
error when opening options.
2011-08-09 16:32:01 -05:00
James Cotton
7ce4412916
GCS: Make the icons in config gadget all .png files. The release mac build was
...
having issues with the SVG and 5/7 were png anyway.
2011-08-09 15:09:06 -05:00
James Cotton
224e75bfe5
Merge remote-tracking branch 'origin/PeterG/OP-290_GCS_workspaces' into next
2011-08-08 21:29:07 -05:00
Peter Gunnarsson
e1190fbbac
Change spacing of connectionmanager.
2011-08-08 13:50:46 +02:00
Peter Gunnarsson
cbc45c772f
Do not use QTabBar::setDocumentMode() on OS X.
2011-08-08 12:46:26 +02:00
Oleg Semyonov
247da8c24b
Merge remote branch 'origin/PeterG/OP-520_GCS_qtLibraryTarget' into next
2011-08-07 05:54:22 +03:00
Oleg Semyonov
d30c939c46
Merge remote branches 'origin/PeterG/OP-455_win7_log_file_dialog' and 'origin/PeterG/OP-549_GCS_reversed_dials' into next
2011-08-06 21:56:16 +03:00
James Cotton
852be35b5c
Merge branch 'next' into camera_stabilization
2011-08-05 18:52:14 -05:00
James Cotton
218438e6f8
CCPM Mixer: Field names should not be translated. This would break heli
...
support in non-english languages :)
2011-08-05 18:51:01 -05:00
James Cotton
faca2e9651
CCPMConfig: Convert requestCCPMUpdate function to using the static accessor
...
method for UAVObjects. This fixes a run time bug on OSX.
2011-08-05 18:29:34 -05:00
Peter Gunnarsson
12ba6addb0
Fix for OP-549 reversed dials by Dmitry Zaitsev
2011-08-05 15:33:45 +02:00
Peter Gunnarsson
11d5d0b6d1
Fix for OP-455
2011-08-05 12:22:08 +02:00
zedamota
5d0095f00d
Started working on the multi receiver support
2011-08-04 16:58:41 +01:00
PeterG
7205917562
Fix for generalsettings.ui
2011-08-04 17:30:18 +02:00
Peter Gunnarsson
76ee2c060c
OP-520 Change $$qtLibraryTarget to $$qtLibraryName
2011-08-04 15:17:08 +02:00
zedamota
2a1b830eaa
Merge remote-tracking branch 'remotes/origin/stac/support-multiple-receivers' into GCS_ChangesToUI-RuntimeCFG
2011-08-04 12:13:44 +01:00
Peter Gunnarsson
32f6cf7346
Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.
2011-08-04 11:55:18 +02:00
Peter Gunnarsson
4dd7ff3750
Remove unused ViewManager from MainWindow.
2011-08-03 10:58:42 +02:00
Peter Gunnarsson
f3db62bb4f
Remove unused code in splitterorview.cpp
2011-08-03 10:04:40 +02:00
Peter Gunnarsson
951cae948e
Make config gadget use new widget in icon panel.
2011-08-03 10:03:49 +02:00
Peter Gunnarsson
fc2e1c7fd7
Add new widgets with simpler code than what is used currently (FancyTabWidget).
2011-08-03 10:02:51 +02:00
zedamota
1b34376797
Added "changes not saved" message warning to config gadget
2011-08-02 17:06:17 +01:00
Stacey Sheldon
90b2625deb
rcvractivity: Add tracking of Rx channel activity
2011-08-02 01:27:37 -04:00
Stacey Sheldon
1299e110c4
gcs: update CC hw settings to use hwsettings RcvrPort field
2011-08-02 01:22:04 -04:00
Stacey Sheldon
829b8b83f6
rcvr: Add GCS receiver driver for rcvr via telemetry
...
This allows the GCS to emulate a receiver device via the
telemetry link.
Select "GCS" as your input type in the manualcontrol config
screen and calibrate it as normal.
Note: The expected values for the channels are in microseconds
just like a PWM or PPM input device. The channel values
are validated against minimum/maximum pulse lengths just
like normal receivers.
2011-08-02 01:22:04 -04:00
zedamota
cdf4d112ce
Finished refactoring airframe config widget
2011-08-01 13:28:58 +01:00
James Cotton
c5bf0ac657
Merge branch 'stac/refactor-usart-com' into camera_stabilization
2011-07-31 09:13:37 +09:00
James Cotton
96c2d24253
Merge branch 'next' into camera_stabilization
...
Conflicts:
flight/CopterControl/Makefile
flight/CopterControl/System/coptercontrol.c
flight/Modules/Actuator/actuator.c
flight/Modules/GPS/GPS.c
flight/Modules/ManualControl/manualcontrol.c
flight/Modules/Stabilization/stabilization.c
flight/Modules/System/systemmod.c
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/stabilizationdesired.xml
2011-07-30 10:06:10 +09:00
Oleg Semyonov
921905bd8c
gcs: some cosmetic ui form changes
...
Receiver message font made the same as for other info messages.
Changed few label alignments.
2011-07-28 23:28:59 +03:00
Oleg Semyonov
ad339d32a6
gcs: some cosmetic ui text changes
2011-07-28 23:26:07 +03:00
James Cotton
9840f12658
Disable ModelView on QT 4.8 until fixed.
2011-07-28 18:59:55 +09:00
James Cotton
f2e04f78b7
Change to GLC Lib to make it compile on OSX with QT 4.8.0. This might be
...
required for all OS's with 4.8.0
2011-07-28 18:08:22 +09:00
zedamota
c7cf52be39
Added embedded and gcs version info to exported uavobjects file.
2011-07-27 19:39:08 +01:00
zedamota
69083ee618
Merge remote-tracking branch 'remotes/origin/GCS_ChangesToUI-RuntimeCFG' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
ground/openpilotgcs/src/plugins/config/input.ui
2011-07-26 21:44:59 +01:00
zedamota
b9f1532598
Refractured the Airframe config widget.
...
Corrected some language mistakes.
2011-07-26 20:35:38 +01:00
zedamota
79404ab80e
Moved input type to hw config tab.
...
Created error message for unsupported configs.
2011-07-25 23:18:41 +01:00
zedamota
4dc5e7ea65
Fixed included file case.
...
Changed "throttle curve 1/2" to "curve 1/2".
2011-07-25 14:18:09 +01:00
zedamota
ba8985721c
Fix for bluetooth modules hanging. Turns out certain HW don't implement the EV_TXEMPTY system event. Hack was to create a timer which triggers a fake event every 10secs. It checks the bytestosend value so it shouldn't have any effect on full compliant HW.
2011-07-25 00:43:48 +01:00
Oleg Semyonov
400e07bbd1
gcs: change fw date format to match the fw info and GCS version strings
...
Use UTC time of last commit instead of local time of PC.
Use the same date/time string "YYYYMMDD HH:MM" as GCS uses in About dialog.
2011-07-22 21:29:59 +03:00
zedamota
05f6904e09
Fix tab order. Switch to using unum for tabs.
2011-07-21 15:35:59 +01:00
Oleg Semyonov
75233577dc
gcs: add new menu option for exporting current UAV data objects
...
This menu option is useful for technical support. It exports all
current UAV data objects to the XML, similar to settings. This data
can't be imported (it is useless), but can be published or passed to
the tech support for troubleshooting.
2011-07-21 16:51:47 +03:00
zedamota
3bf7dbd7e5
Added new hw config tab to the config gadget.
...
Created new helper class for update/save buttons which creates a visual feedback of the op result.
2011-07-19 14:50:42 +01:00
James Cotton
7153607b87
Reenable the receiver type input now that it is required.
2011-07-18 10:40:35 -05:00
James Cotton
efb2f315be
Small bug where a field was still referenced but didn't exist in UI.
2011-07-17 02:19:58 -05:00
James Cotton
7081bb926b
Group calibration items in UI as well
2011-07-16 11:16:47 -05:00
James Cotton
8f53ed2fc4
Group the axis limimts in the stabilization settings.
2011-07-16 11:07:30 -05:00
James Cotton
70943faec2
OP-550 UI Changes to make all fonts consistent in config gadget. Drop in the
...
bucket.
2011-07-16 03:26:36 -05:00
dankers
61e5d14d0d
Add Joe's frame renders to the ModelView configuration.
2011-07-13 23:57:59 +10:00
Oleg Semyonov
2f7065e5b5
Merge remote branch 'origin/bugfix-ground'
2011-07-13 00:08:31 +03:00
zedamota
283422b930
Fix for FW upload failing if placed on a folder with non latin1 chars
2011-07-12 21:36:54 +01:00
James Cotton
53ca934b2b
Merge branch 'heli_stabilization'
...
Conflicts:
flight/CopterControl/System/inc/pios_config.h
flight/Modules/Attitude/attitude.c
flight/Modules/ManualControl/manualcontrol.c
flight/Modules/Stabilization/stabilization.c
2011-07-12 13:28:20 -05:00
zedamota
30967a47d2
Merge remote-tracking branch 'remotes/origin/OP-537_PT_Dreamer' into bugfix-ground
2011-07-06 18:37:41 +01:00
Stacey Sheldon
cba0985f26
hwsettings: UAVObject to select hardware runtime hw config
2011-07-05 22:02:37 -04:00
James Cotton
46ae7eb17b
Merge remote-tracking branch 'origin/bugfix-ground' into heli_stabilization
2011-06-30 19:40:22 -05:00
elafargue
b729b67f33
Attempt at making the new uploader gadget a bit more compact for smaller screens, make warning icon consistent with the rest of the icons.
2011-06-26 12:18:00 +02:00
elafargue
c55602a466
OP-538 Included fixes into ground codebase, thanks.
2011-06-26 12:16:21 +02:00
James Cotton
e6ad21d881
Make gyro bias in deg/s * 100 to calibrate more precisely.
2011-06-24 10:51:07 -05:00
James Cotton
0dc541cbaa
Reformat attitude configuration gadget to use static access methods for
...
AttitudeSettings. This helps compiler catch errors.
2011-06-24 10:38:26 -05:00
James Cotton
ab7ff56d96
Compute initial gyro bias while calibrating to speed up convergence
2011-06-24 10:38:26 -05:00
James Cotton
28501842c3
Expose the rate D term which in simulations seems to help damp oscillations for
...
high RateKp terms. However it might be sensitive to gyro noise (vibrations).
In addition it is mathematically similar to lead shapign so probably only use
one or the other.
2011-06-24 10:38:25 -05:00
Oleg Semyonov
dc651b6604
Merge remote branch 'origin/OP-532_Heli_GUI_Improvements'
...
WARNING: this will wipe out system settings. Don't forget to export
settings first with old GCS and import using new GCS after upgrade.
2011-06-24 10:05:54 +03:00
Andrew Thoms
caf3c08ea2
OP-532 Improved visibility abd contrast of servo numbers on the
...
swashplate image
2011-06-24 01:38:29 -04:00
James Cotton
751bcba266
Merge remote-tracking branch 'origin/OP-515-PT_Dreamer'
2011-06-23 18:07:43 -05:00
zedamota
b67b6221d1
OP-515 took CPU serial from the devices screen
2011-06-23 17:42:54 +01:00
James Cotton
493fcaef2a
OP-193 OP-511: Add settings to scale the camera input output range
2011-06-23 00:47:27 -05:00
zedamota
0d7393a8b3
OP-537 Move space to after the coma.
2011-06-22 10:11:19 +01:00
Andrew Thoms
56050b0536
OP-532 Implemented scalling of swashplate image in GUI
2011-06-22 00:38:53 -04:00
zedamota
61956d1ed2
OP-537 Fixed tooltips info
2011-06-21 19:14:39 +01:00
zedamota
59352a2e9a
OP-537 Fix UI bug
2011-06-21 19:08:55 +01:00
zedamota
0ae31593ba
OP-537 Fixes according to Osnwt suggestions
2011-06-21 18:58:46 +01:00
zedamota
6910bbb4f1
OP-515 Changes according to Osnwt suggestions.
2011-06-21 18:09:37 +01:00
Andrew Thoms
97c22fb57c
OP-532 Better indication of unassigned servos in heli config UI
2011-06-20 22:40:22 -04:00
Andrew Thoms
438cb91709
OP-532 minor GUI improvements to highlight incorrect servo assignments
2011-06-20 22:20:19 -04:00
Andrew Thoms
cf342b4155
OP-532 make all swashplate lines draw even if servos not defined
2011-06-20 21:39:10 -04:00
Andrew Thoms
ca21863f91
OP-507 added more swashplate configurations
2011-06-20 21:33:11 -04:00
Andrew Thoms
177263c237
OP-532 minor UI changes to servo selection box visibilities
2011-06-20 21:04:51 -04:00
Oleg Semyonov
8bcdd62dbd
Merge branch 'bugfix-flight'
2011-06-21 00:49:32 +03:00
James Cotton
5e5f1bb3f1
Merge remote-tracking branch 'origin/OP-530-PT_Dreamer'
2011-06-20 14:09:24 -05:00
James Cotton
0f2e4730b4
Merge remote-tracking branch 'origin/OP-530-PT_Dreamer'
...
Note this requires redoing the mixer settings!
Conflicts:
shared/uavobjectdefinition/mixersettings.xml
2011-06-20 14:08:08 -05:00
zedamota
880905efba
OP-530 Change multirotor max throttle default value to 90%
2011-06-20 14:39:01 +01:00
zedamota
1c700c9e7c
OpenPilot OP-537
...
Make the GCS input configuration errors a bit more informative
2011-06-20 14:28:16 +01:00
zedamota
4d634ad304
Merge remote-tracking branch 'remotes/origin/OP-515-PT_Dreamer' into bugfix-ground
2011-06-20 11:21:45 +01:00
Andrew Thoms
e74c3390f7
OP-532 Minor UI layout changes
2011-06-20 00:31:30 -04:00
Oleg Semyonov
52d22c59d3
Revert "OP-522: fixed throttle calibration if input channel is reversed"
...
This reverts commit 0ba605812e
.
The real problem was not with this, but due to unexpected reverse
checkbox behaviour.
Reverse checkboxes are completely ignored at the start of calibration,
they can be even set checked initially. But change of checkbox does not
reverse the GCS control gadget display. This should probably be fixed.
2011-06-19 19:37:22 +03:00
Mathieu Rondonneau
d5cd3e0d2a
OP-423: fix problem in GCS when the config files get deleted.
...
GCS aborts on a table overflow when trying to set the axes with wrong number of channels.
2011-06-18 19:30:28 -07:00
zedamota
c6350492eb
Cleaning and formating
2011-06-19 00:56:35 +01:00
zedamota
a0eca05595
Many changes to the uploader Gadget
2011-06-19 00:50:38 +01:00
Oleg Semyonov
21f988321e
Merge branch 'master' into bugfix-ground
2011-06-19 02:18:06 +03:00
Oleg Semyonov
0ba605812e
OP-522: fixed throttle calibration if input channel is reversed
2011-06-19 02:15:23 +03:00
dankers
eecacc57f6
Update deluxe dials from London Flyer, added deluxe horizontal dial
...
Note: these are not used by default, commiting to master directly
2011-06-19 02:34:12 +10:00
Andrew Thoms
6578eba0a0
Op-532 prevented settings being retreived from hardware during an update
...
to hardware
2011-06-17 01:01:55 -04:00
Andrew Thoms
90f7062940
OP-532 Implementation of Collective pass-through mapping
2011-06-16 22:52:41 -04:00
Andrew Thoms
08822807b3
OP-532 Now saving channels to GUI config data structure
2011-06-16 00:33:07 -04:00
Andrew Thoms
5c5a07b101
OP-532 Updated GUI config data definition, UI, and implemented three
...
sliders in mixer generation code
2011-06-16 00:09:27 -04:00
Andrew Thoms
22269b658d
OP-532 improved UI layout for new controls
2011-06-15 00:39:13 -04:00
James Cotton
d7e08e5686
Merge branch 'heli_improvements'
2011-06-14 09:13:52 -05:00
Andrew Thoms
748d49817f
OP-532 Save and Load UI elements to new GUIConfigData UABObject Field
2011-06-14 00:53:42 -04:00
Andrew Thoms
1c1881663f
OP-532 Save and recall the new GUI config data to UAVObject
2011-06-14 00:10:28 -04:00
Andrew Thoms
23f9dc42cc
OP-532 Created union of struct to assist in type casting of GUI settings
...
to UAVObject
2011-06-13 21:40:39 -04:00
Andrew Thoms
651c65ad84
OP-532 Started with GUI configuration save to OP hardware
2011-06-13 20:46:53 -04:00
elafargue
b4d65102b1
Add "..." on import and export buttons
2011-06-13 18:59:53 +02:00
elafargue
54d57f1815
Merge branch 'bugfix-ground' of git.openpilot.org:OpenPilot into bugfix-ground
2011-06-13 18:56:30 +02:00
Pip
7b3241cca9
Fixed GCS export file selection problem - in windows.
2011-06-13 16:12:04 +01:00
elafargue
8807d6bf0f
OP-534 Disable arming completely when staring calibration procedure. Tells user to reconfigure arming manually afterwards.
2011-06-13 12:14:40 +02:00
Andrew Thoms
c8939e6e4f
Merge branch 'heli_improvements' into OP-532_Heli_GUI_Improvements
2011-06-12 23:21:00 -04:00
Andrew Thoms
2dab73a128
minor updates to UI code for visibility of controls
2011-06-12 00:31:22 -04:00
Andrew Thoms
6ad60a7971
Implemented UI code for new ccpm options checkboxes and sliders
2011-06-12 00:17:32 -04:00
Andrew Thoms
86f5d63045
Changed names of new ui components
2011-06-11 22:35:19 -04:00
Andrew Thoms
2454596211
Modified names of new controls
2011-06-11 22:21:33 -04:00
Andrew Thoms
f9bddb107d
changed label on single servo to 1st servo
2011-06-11 22:15:56 -04:00
Andrew Thoms
716f87e79b
Added linking between new controls on ui
2011-06-11 22:13:55 -04:00
Andrew Thoms
597838ba0c
Update CCPM config ui file for new options
2011-06-11 22:08:36 -04:00
zedamota
689eb2c588
Minor Cleaning
2011-06-12 00:49:05 +01:00
zedamota
cac495cebb
Fix custom mixer throttle 1 curve.
2011-06-11 19:39:24 +01:00
dankers
9c6f2e0aea
New deluxe linear dials, new files and not used by default so commiting to master.
2011-06-11 23:24:59 +10:00
Oleg Semyonov
5d0c7fe42e
Merge branch 'master' into heli_improvements
2011-06-11 12:19:07 +03:00
Oleg Semyonov
52d9438847
Merge remote branch 'origin/bugfix-ground'
2011-06-10 23:02:45 +03:00
dankers
d9607c44d8
Minor update from London flyer, readability on smaller screens improvement
2011-06-10 23:51:01 +10:00
dankers
314f596940
Update to Ed's PFD from London Flyer, adds slight look and feel improvments and removes the orange look.
...
Uses some look and feel from Guy's work also.
2011-06-10 21:40:30 +10:00
elafargue
c79cc1eb1a
OP-376 Make all dialogs more dynamic to cope with smaller screens & resizes.
2011-06-09 18:03:19 +02:00
Oleg Semyonov
bc3b23a4a2
Merge branch 'bugfix-ground' into heli_improvements
2011-06-09 15:58:11 +03:00
elafargue
9d89f1e180
OP-528 Make the manual and maximum RPY rates available in the config gadget
2011-06-09 13:12:03 +02:00
Oleg Semyonov
f766642f0d
Merge branch 'master' into heli_improvements
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
2011-06-09 10:11:27 +03:00
elafargue
1ac92643b7
Fix 'smart' throttle/flight mode channel assignment, it works now. Someone please test & report.
...
OP-522
2011-06-08 22:15:10 +02:00
James Cotton
3a3c88cefa
OP-522: When you unchecked Run Calibration it forces the Throttle neutral to 5%
...
of the range and the FlightMode to 50%.
Sorry there's also some indentation changes mixed into this patch.
2011-06-08 12:21:43 -05:00
zedamota
dcccae7270
Change throttle default max value to 0.95 on multis
2011-06-08 18:21:29 +01:00
James Cotton
f361603a10
OP-521: Fixed reversal of flight mode in GCS properly now I have hardware to
...
test it :)
2011-06-08 12:01:47 -05:00
James Cotton
68d6e7deba
OP-521: Fixed dangerous UI bug that reversed flight mode switch on GCS relative
...
to flight when flight mode switch input range was reversed. Also switche to
using static field method technique for compiler error checking (preferrable
when possible)
2011-06-07 17:35:21 -05:00
James Cotton
0b78ae07bb
OP-521: Match the flight logic for processing flight mode switch position on
...
GCS so the slider should always match what hte internal logic says.
2011-06-07 17:04:36 -05:00
Oleg Semyonov
268488a5b8
config: relax the CCPM mixer disclaimer (it has been used already)
2011-06-07 19:46:46 +03:00
Oleg Semyonov
b1d945c6f2
OP-369: remove completed TODO list, unify capitalization
2011-06-07 19:41:52 +03:00
elafargue
9b572407a7
Small compilation warning fixed and small typos
2011-06-07 17:15:16 +02:00
elafargue
dbba0afe0d
OP-369 Last improvements to import option.
2011-06-07 17:06:50 +02:00