1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-06 17:46:07 +01:00
Commit Graph

529 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
James Cotton
7776cc529b Remove the old AHRS configuration gadget 2011-12-13 20:32:43 -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
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
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
fcbb00f757 config outputs now uses dropdown boxes for the update freq. 2011-11-29 17:01:02 +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
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
77058807b4 Added some more debug messages to help catch bugs, no that there are any. 2011-11-26 00:04:36 +00:00
zedamota
2b94a1538b Make the outputs test function disable when the connection is lost. 2011-11-25 23:50:54 +00: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
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
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
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
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
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
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
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
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
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
032fa759ac Fixes the zero while arming checkbox and and OP-575 2011-10-12 16:43:14 +01: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
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
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
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
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
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
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
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
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
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
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
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
James Cotton
923e33195b Merge branch 'next' into camera_stabilization 2011-08-11 12:06:50 -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
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
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
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
zedamota
5d0095f00d Started working on the multi receiver support 2011-08-04 16:58:41 +01: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
951cae948e Make config gadget use new widget in icon panel. 2011-08-03 10:03:49 +02:00
zedamota
1b34376797 Added "changes not saved" message warning to config gadget 2011-08-02 17:06:17 +01:00
Stacey Sheldon
1299e110c4 gcs: update CC hw settings to use hwsettings RcvrPort field 2011-08-02 01:22:04 -04:00
zedamota
cdf4d112ce Finished refactoring airframe config widget 2011-08-01 13:28:58 +01: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
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
05f6904e09 Fix tab order. Switch to using unum for tabs. 2011-07-21 15:35:59 +01: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
Oleg Semyonov
2f7065e5b5 Merge remote branch 'origin/bugfix-ground' 2011-07-13 00:08:31 +03:00
zedamota
30967a47d2 Merge remote-tracking branch 'remotes/origin/OP-537_PT_Dreamer' into bugfix-ground 2011-07-06 18:37:41 +01:00
James Cotton
46ae7eb17b Merge remote-tracking branch 'origin/bugfix-ground' into heli_stabilization 2011-06-30 19:40:22 -05: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
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
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
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
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
Oleg Semyonov
0ba605812e OP-522: fixed throttle calibration if input channel is reversed 2011-06-19 02:15:23 +03: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
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
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
elafargue
9d89f1e180 OP-528 Make the manual and maximum RPY rates available in the config gadget 2011-06-09 13:12:03 +02: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
elafargue
a7dccb6648 OP-502 If a board is not connected, the "Save" button is grayed out. The "Apply" button is still enable, which enables creating configurations purely offline. 2011-06-07 16:56:16 +02:00
elafargue
3077dec24d Merge branch 'bugfix-ground' into OP-369_Edouard_UAVSettings_ImportExport 2011-06-05 18:42:39 +02:00
elafargue
3d676d05df Merge branch 'bugfix-ground' of git.openpilot.org:OpenPilot into bugfix-ground 2011-06-05 18:41:46 +02:00
elafargue
e5e85fa47a Get rid of the "Request" button on the config gadget: it now tracks object updates and automatically keeps its state synchronized with UAVOBject changes. 2011-06-05 18:40:52 +02:00
James Cotton
2e089e2816 Changed text when using test output mode to remove deprecated comment about
arming.
2011-06-05 10:58:08 -05:00
elafargue
f4b19fe65a OP-369 Settings Import/Export for the Airframe. Also sanitized UAV Object saving in flash in one central location in the uavobjectutils library. 2011-06-02 16:08:19 +02:00
elafargue
bd35d9bff4 Forgot the configinputwidget.cpp file in previous commit. 2011-05-31 22:56:33 +02:00
elafargue
90024d69e4 Improve inline help icons, place them next to request/apply/save buttons where the eye logically goes when surveying the UI. Open for comments of course. 2011-05-31 21:20:38 +02:00
David Carlson
614fd138e4 Change the help button setup from in-line help to one per page. Will no longer open an HTML window, but will open the relevant section on the wiki using the OS default browser. 2011-05-31 00:16:01 -07:00
elafargue
887a23a3cf OP-510 Issue with patch in source file, sorry. 2011-05-30 07:38:37 +02:00
elafargue
46824dea4e OP-510: wider fix for Yaw channel servo fix which should improve the 'mixer not saving' issue too, as well as retrieving settings from the board for Yaw mode. 2011-05-30 07:29:26 +02:00
elafargue
93dd254c77 Merge branch 'bugfix-ground' of git.openpilot.org:OpenPilot into bugfix-ground
Conflicts:
	ground/openpilotgcs/src/plugins/config/configairframewidget.cpp
2011-05-30 07:26:44 +02:00
David Carlson
eb337c6e5c Fix for tri yaw channel being reset. 2011-05-29 21:07:22 -07:00
PeterG
8b80b35964 Remove " Gadget" from gadget names since it adds nothing useful. 2011-05-29 09:51:39 +02:00
PeterG
3a7f8c7fc5 Remove empty options pages for config, pipxtreme and uploader gadgets. 2011-05-29 09:42:26 +02:00
elafargue
b702db2549 OP-510 Fix for setting tail servo on tricopter, and retrieving tail servo settings. Please test thoroughly and report! 2011-05-29 09:37:19 +02:00
Stacey Sheldon
3a755dcdbb gcs: fix id of quad-x image in SVG
The quad-x image was missing in the GCS config gadget.

GCS expects the quad-x image to have id=quad-X (upper
case X).
2011-05-28 22:17:40 -04:00
elafargue
79c2c16ae4 Fix: Y6 multirotor drawing was wrong for motors 3 and 4. 2011-05-28 11:21:07 +02:00
dankers
97e383afce Small text fix for windows and Mac, praying it works on linux 2011-05-27 14:31:58 +10:00
elafargue
9cb380fba3 Make sure the "Advanced" settings is not selected by default in the airframe config UI. 2011-05-25 21:25:29 +02:00
elafargue
cc9fa772c0 Improvement: now the config output panel in the config gadget remains up to date all the time, no need to click on the "request" button after setting up the mixers. 2011-05-17 22:23:08 +02:00
David Carlson
21213dd3c5 Merge branch 'master' into OP-495_CheBuzz_HelpButtons
Conflicts:
	ground/openpilotgcs/src/plugins/config/output.ui
2011-05-17 01:06:28 -07:00
David Carlson
b1ec27bd75 Add help buttons to the config gadget UI. Also connect all signals to its slot in configgadgetwidget.cpp. Also some very trivial .html help files. 2011-05-16 21:54:23 -07:00
elafargue
b2587a5b9f Improvement & bugfix: now the output config tab in the config gadget only shows the channel assignments as labels, not dropdowns, and more importantly does not try to save them when clicking on save/apply! 2011-05-17 00:34:25 +02:00
David Carlson
d076418895 Merge branch 'master' into OP-495_CheBuzz_HelpButtons 2011-05-15 19:36:38 -07:00
elafargue
f9212cda7b Last minute default settings refinement.
CC Attitude UI improvement.
2011-05-13 08:24:34 +02:00
elafargue
ab7fdfcc1f OPReview-40 : Disable min/max output channel range controls when doing a servo test, in order to avoid mistakes by careless users. 2011-05-12 16:32:38 +02:00
David Carlson
5bddbc4108 Add help buttons at relevant places within config gadget. This is only the UI change and the buttons have no effect currently. 2011-05-12 03:37:34 -07:00
James Cotton
69c27aa1ce Move "zero while arming" option to below other CC Attitude widgets. Was
overlapping other fields.
2011-05-11 17:45:14 -05:00
elafargue
1c09f85be2 Merge branch 'master' into bugfix-ground 2011-05-09 16:50:11 +02:00
James Cotton
fb8417a0ff Merge remote-tracking branch 'origin/op_475_476_calibrate_during_arming' 2011-05-09 09:23:16 -05:00
elafargue
c36b6a715b OP-451 Add a tooltip for input configuration channel reversal checkboxes, as requested. 2011-05-09 14:24:36 +02:00
elafargue
1f88060671 Merge branch 'master' into bugfix-ground 2011-05-09 14:21:11 +02:00
David Carlson
b89909756c Increase accel bias samples to 60. Add debuging output if enabled during calibration. Add check for the possibility of multiple signals arriving before slot is disconnected and causing bias to be calculated incorrectly. 2011-05-09 02:55:05 -07:00
elafargue
9dc3dde2c8 Small UI fix to avoid labels looking ugly on config input panel. 2011-05-09 11:19:55 +02:00
elafargue
2b11fa6ee6 Add support for Gyro bias calibration upon arming configuration in the CC Attitude config gadget. 2011-05-08 09:33:54 +02:00
elafargue
b0baee3d17 Hooked the autoupdate on CC Attitude widget on autopilot connect. 2011-05-05 23:02:42 +02:00
James Cotton
7e418866be Update the AttitudeSetting object to make the board rotation more human
readable and update the GCS fields appropriately.
2011-05-05 13:04:56 -05:00
James Cotton
3d3a4e9572 OP-481: Make max TurboPWM through Config gadget 400 Hz, and change tabstop
order to make more sense.
2011-05-05 01:13:58 -05:00
James Cotton
21a71e5294 Merge branch 'master' into spin_while_armed
Added back the "Spin arming" button to output panel and made it work
Conflicts:
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/config/output.ui
2011-05-05 00:23:51 -05:00
elafargue
4c80b458c4 OP-468 Config gadget now detects CopterControl and Mainboard and updates its controls to setup TurboPWM accordingly. 2011-05-03 16:50:31 +02:00
David Carlson
46566d05e8 The "Dave is not a robot" bug. Small case change for config gadget artwork, quad images. 2011-05-02 23:25:54 -07:00