Oleg Semyonov
2271b95816
Merge remote branch 'origin/next' into os/features/stick-deadband-next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp
ground/openpilotgcs/src/plugins/config/configtaskwidget.h
2012-02-23 08:32:27 +02:00
Oleg Semyonov
e62cc8914c
Merge remote branch 'origin/next' into os/features/pid-tuning-from-transmitter-next
...
Conflicts:
flight/CopterControl/Makefile
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/hwsettings.xml
2012-02-22 23:03:17 +02:00
Brian Webb
aea5374be9
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into Metadata-Mods
2012-02-20 19:11:23 -07:00
Brian Webb
43f6458f86
Reduced the sizeof the UAVObject metadata by:
...
1) Combining all binary or mode values into a single byte
2) Adding accessor functions to read/write the flag bits
3) Reduced the size of the time values from 32 bits to 16 bits
2012-02-20 18:45:18 -07:00
David Ankers
709c985b17
Update to Dado's work on the Stab UI
2012-02-21 03:53:00 +11:00
David Ankers
4a0d101f12
Start adding Dado's artwork and GUI changes
2012-02-19 18:05:33 +11:00
zedamota
91e3ee13fd
Fix input and output configuration layout issues.
2012-02-18 20:37:30 +00:00
zedamota
949785d212
Fixes shadow widgets values not being refreshed if master widget default value is equal the the UAVObj field value.
2012-02-18 16:58:10 +00:00
Oleg Semyonov
a01e38c277
Merge remote branch 'origin/master' into os/features/pid-tuning-from-transmitter
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadget.qrc
2012-02-13 11:51:00 +02:00
zedamota
74108e200b
Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into pt/gcs_uavobj_widget_framework
...
Conflicts:
ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp
ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h
ground/openpilotgcs/src/plugins/config/stabilization.ui
2012-02-11 22:29:03 +00:00
zedamota
c2d9af1e89
Finished framework and stab config showcase
2012-02-10 16:34:07 +00:00
zedamota
4cdf223bff
Added support for multiple apply/save buttons.
...
Added a few useful signals.
2012-02-08 20:15:14 +00:00
zedamota
5cfd763f2a
Bug fixes and showcase UI setup (partial).
2012-02-07 20:29:32 +00:00
zedamota
e2c6a9d58a
Added Dado's UI.
...
Several scale bug fixes.
Added lots of debug info, will clean later.
2012-02-06 17:33:54 +00:00
zedamota
6d6111b9ac
Moved framework to its own plugin
2012-02-05 18:16:38 +00:00
zedamota
32ebdb63a3
Preparatory commit before moving framework to a better location.
2012-02-05 14:41:23 +00:00
zedamota
427acee559
Added support for objects value limits on the GCS to the GCS and generator.
2012-02-03 20:29:28 +00:00
zedamota
4c1e33b0b3
WIP configtaskwidget enhancements.
2012-02-02 16:22:40 +00:00
James Cotton
bd77b7e5a2
Fix stupid commit on my part. Thanks for heads up brian.
2012-01-31 19:26:48 -06:00
James Cotton
eaf9a4bded
Merge branch 'master' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
2012-01-31 17:30:05 -06:00
James Cotton
c69717edd8
DOS2UNIX cc_hw_settings.ui to make merge work
2012-01-31 17:29:29 -06:00
James Cotton
72be7bb809
Don't use usleep for the poor windows kiddies.
2012-01-31 16:32:15 -06:00
James Cotton
7990d209a8
Fix package deployment script for OSX to make sure the SVG pixmap shows up
2012-01-31 14:48:24 -06:00
James Cotton
a2979125b7
Remove the hardcoded .svg from the QLabel and load it dynamically. This will
...
be useful for CC3D.
2012-01-31 14:47:56 -06:00
James Cotton
318354a115
Fix resizing issue with input wizard
2012-01-31 13:31:14 -06:00
James Cotton
d07b386beb
Revert "made the input wizard background transparent"
...
This reverts commit c5a2afcc2c
.
2012-01-31 13:09:01 -06:00
James Cotton
3a66f70eae
Input config: Increase the delay after detecting a channel to ask for next one
2012-01-31 11:25:18 -06:00
James Cotton
e3f89eb958
Input config: Increase the delay after detecting a channel to ask for next one
2012-01-31 11:24:19 -06:00
Oleg Semyonov
369629ad34
Add "Reset To Defaults" button to Stabilization configuration tab
...
Also add tootips to Reset/Apply/Save buttons.
2012-01-31 04:44:54 +11:00
Oleg Semyonov
911f8fde03
Add "Reset To Defaults" button to Stabilization configuration tab
...
Also add tootips to Reset/Apply/Save buttons.
2012-01-31 04:27:59 +11:00
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
81fea31b34
made the input wizard background transparent
2012-01-27 17:54:14 +00:00
zedamota
242bfe6c69
added new Transmitter artwork to the input wizard.
2012-01-25 20:29:40 -06:00
zedamota
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
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
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
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