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
Stacey Sheldon
f5e9a9365c
gcs config: fix case on revo config gadget includes
2012-01-28 21:00:15 -05: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
James Cotton
3ab40b713e
Add exception to allow uploading firmware for 0x402 boards to 0x401 boards
2012-01-24 16:58:56 -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
James Cotton
4b3dcc4cc2
Make the leveling panel not crash for new gyro/accel objects but still needs
...
tweaking for CC3D.
2012-01-24 16:14:41 -06:00
James Cotton
c242ab8b86
Merge branch 'next' into revolution3
...
Conflicts:
flight/AHRS/ahrs.c
flight/AHRS/pios_board.c
flight/Bootloaders/Revolution/Makefile
flight/CopterControl/System/pios_board.c
flight/INS/pios_board.c
flight/OpenPilot/Makefile
flight/OpenPilot/System/openpilot.c
flight/OpenPilot/System/pios_board.c
flight/PiOS/Boards/STM32103CB_CC_Rev1.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/Makefile
flight/Revolution/System/inc/pios_config.h
flight/Revolution/test.c
2012-01-24 10:46:35 -06: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
c84240e485
Merge branch 'next' into revolution3
...
Conflicts:
flight/PiOS/STM32F10x/pios_bmp085.c
flight/PiOS/STM32F10x/pios_exti.c
2012-01-23 06:51:30 -06:00
James Cotton
7b69cebe04
Merge branch 'master' into next
2012-01-23 06:07:31 -06:00
James Cotton
bb0bfe0ae4
Merge branch 'next' into revolution3
...
Conflicts:
flight/Bootloaders/CopterControl/Makefile
flight/Bootloaders/PipXtreme/Makefile
flight/Bootloaders/Revolution/inc/pios_config.h
flight/CopterControl/Makefile
flight/INS/inc/pios_config.h
flight/Libraries/taskmonitor.c
flight/Modules/Altitude/altitude.c
flight/Modules/Attitude/attitude.c
flight/OpenPilot/Makefile
flight/OpenPilot/Makefile.posix
flight/OpenPilot/System/inc/pios_usb_board_data.h
flight/OpenPilot/System/inc/taskmonitor.h
flight/OpenPilot/System/pios_board.c
flight/OpenPilot/System/taskmonitor.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_bmp085.c
flight/PiOS/STM32F4xx/pios_iap.c
flight/PiOS/pios.h
flight/Revolution/System/inc/pios_config.h
flight/Revolution/System/inc/taskmonitor.h
flight/Revolution/System/taskmonitor.c
ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp
shared/uavobjectdefinition/systemalarms.xml
shared/uavobjectdefinition/taskinfo.xml
2012-01-21 11:27:03 -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
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