James Cotton
dba47a7d41
Remove the connection to refreshWidgetValues() in output widget. Mike was
...
right and it's not needed since hte configTaskWidget takes care of this
connection.
2012-06-11 13:22:37 -05:00
James Cotton
93b77becc0
More the system task priority down and increase the timeout for erasing the
...
flash so it says completed. However, it still blocks the system for a long
time. During an erase the heartbeat will flash at 10 Hz to indicate what's
happening.
This still blocks telemetry even after lowering hte system priority (and there
is a vTaskDelay) which makes me think that the SPI bus being locked is blocking
Sensors or somethign else. This should not be permited when the system is
armed.
The reason the system locks up during the erase is that the file system
operations occur within the event dispatcher thread. It is very bad practice
for anything to block this (i.e. callbacks should never take very long). We
should probably move the object persistence handling into the system thread or
something but that can be a separate issue.
2012-06-11 12:03:32 -05:00
James Cotton
6f09b6d087
Fix misnamed slot in the output widget
2012-06-11 11:31:28 -05:00
Brian Webb
71287e4cb4
Fixed setting of the PairID on PipX GCS and added selection for broadcast mode.
2012-06-09 10:54:24 -07:00
James Cotton
7b8110a457
Merge branch 'MikeL' into next
2012-06-07 11:31:41 -05:00
PT_Dreamer
5da9efd673
GCS/MapLib - Several fixes, changes and enhancements.
2012-06-06 20:52:00 +01:00
James Cotton
aa5832b1e8
Remove some style sheets that got dragged back in from conflict
2012-06-06 13:01:15 -05:00
James Cotton
5e01617cbd
Merge branch 'next' into MikeL
...
Conflicts:
ground/openpilotgcs/src/plugins/config/airframe.ui
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
ground/openpilotgcs/src/plugins/config/configoutputwidget.h
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h
2012-06-06 11:58:06 -05:00
Mike LaBranche
01820904a2
Merge conflict resolution: alter configvehicle,configoutput refreshWidgetsValues
...
signatures to conform to virtual in ConfigTaskWidget;
add multirotor mixer sliders to apply/save dirty monitor, fix slider signals;
2012-06-06 08:58:18 -07:00
Brian Webb
6f9c6ae86d
Only show PipX config gadget when the PipX is connected.
2012-06-05 19:34:42 -07:00
Brian Webb
4e68f6543e
Added tracking of dropped packets to PipX and turned off visible text on signal strength meters.
2012-06-04 21:18:13 -07:00
Brian Webb
7abf32e4c2
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2-gui-upgrades
2012-06-04 18:24:20 -07:00
Mike LaBranche
682ab20f94
add accels.h, gyros.h zapped during conflict resolution
2012-06-04 17:13:55 -07:00
Mike LaBranche
0ba8345c51
Merge branch 'next' into MikeL
...
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
2012-06-04 16:59:31 -07:00
Mike LaBranche
bf591ebe45
Merge branch 'next' into MikeL
...
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
2012-06-04 15:38:57 -07:00
James Cotton
ff0a3a156e
Merge remote-tracking branch 'origin/os/AeroSimRC' into next
2012-06-04 12:25:59 -05:00
Laura Sebesta
054f15c529
Added digital RSSI output to GUI.
2012-06-03 12:06:07 +03:00
James Cotton
1e8db9f7e7
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-wheel' into next
2012-05-28 17:51:55 -05:00
James Cotton
52a3d0079e
Clean up the output widget a bit with whole it interfaces to the
...
configTaskWidget. Uses more of the parent functionality.
2012-05-28 14:11:25 -05:00
Oleg Semyonov
5739dfbfc8
Merge remote-tracking branch 'origin/next' into os/aerosimrc
...
Conflicts:
shared/uavobjectdefinition/gcsreceiver.xml
2012-05-28 21:46:43 +03:00
James Cotton
ea03f8f220
Remove the specific function for the setSpinningArmed flag. This is now done
...
differently with the configTaskWidget style.
2012-05-28 11:23:43 -05:00
James Cotton
1689424620
Merge branch 'ui_unbreak' into next
2012-05-28 11:23:35 -05:00
Mike LaBranche
e2d1f67d9e
Add virtual updateObjectsFromWidgets to configccattitude;
...
reset calibration progress bar to 0% upon successful apply/save.
2012-05-27 10:20:31 -07:00
Mike LaBranche
1b2ffde116
Keep up: spelling disableWheelEvents; add pushbutton setAttribute for osx.
2012-05-26 16:49:02 -07:00
James Cotton
5fb615c3e5
Remove stylesheet on subpanel of input.ui as it doesn't look consistent across
...
platforms.
2012-05-26 14:09:42 -05:00
James Cotton
126671ae4c
Add line from Kenz that fixes button overlap on OSX
2012-05-26 10:33:27 -05:00
Laura Sebesta
888b8fb0c9
Disabled wheel scrolling, improved tab order.
2012-05-26 12:00:16 +03:00
James Cotton
dd9e2de4b9
Match small spacing between TxPid and CameraStab
2012-05-26 03:11:39 -05:00
James Cotton
1a4e358f7c
Remove custom style from airframe
2012-05-26 03:11:38 -05:00
James Cotton
8682937f8a
Remove custom style sheets from camerastab. At least that was applied widget
...
wide, but still should be done to look nice cross platform (or from a window
specific runtime command).
2012-05-26 03:11:38 -05:00
James Cotton
60af442f27
Remove the custom stylesheet from the txpid .ui group boxes
2012-05-26 03:11:38 -05:00
James Cotton
a6e1837161
Remove stylesheets for stabilization ui group boxes as they don't work properly
...
on all platforms. Also removed custom fonts as these don't work consistently
across platforms.
Basically don't customize shit in the .ui file. Generate a stylesheet and
let's properly validate them and/or have one per platform. Even things like
changing font sizes behave inconsistently.
Don't specify the size of buttons, at least to any precision. It will not work
across platforms.
2012-05-26 03:11:38 -05:00
Laura Sebesta
0e505a396e
Fixed scrolling issues in plugin by adding all elements to a parent QFrame widget,
...
and then activating scrolling in configpipxtremewidget.cpp constructor.
2012-05-26 03:11:38 -05:00
James Cotton
4683a1dcc3
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-05-26 03:09:16 -05:00
James Cotton
a24375ca71
Fix bug introduced with PiPX merge where the refreshWidgetsValues(UAVObject *)
...
gained the parameter. However, objects that had overriden that method were now
creating a new method and not getting called at the right time. This fixes the
Output and Aircraft type panels
2012-05-26 03:07:36 -05:00
James Cotton
7698913d38
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-scroll' into next
2012-05-25 23:51:30 -05:00
Mike LaBranche
94df1847fc
Bugfix: update ccpm swash mix slider visibility via ui instead of stored config;
...
sliders now appear/disappear as user selects link checkboxes
2012-05-25 19:36:39 -07:00
James Cotton
5a6e02a688
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next
2012-05-25 20:37:23 -05:00
Mike LaBranche
b5ac4306d3
Delete commented code using direct vector object referencing
2012-05-25 11:47:38 -07:00
Mike LaBranche
e9e6aece21
Bugfix: ccpm_ui - change sliders signal sliderMoved to valueChanged;
...
resolves related spinboxes not always staying in synch
2012-05-25 11:29:38 -07:00
Laura Sebesta
5061f86e00
Fixed scrolling issues in plugin by adding all elements to a parent QFrame widget,
...
and then activating scrolling in configpipxtremewidget.cpp constructor.
2012-05-25 11:45:28 +03:00
Mike LaBranche
7fb96f1acd
Bugfixes in configwidgets;
...
Refactor mixer type and vector set/get, named vector elements;
2012-05-24 09:38:34 -07:00
Mike LaBranche
2db4f6b2b6
Resolves mixer/advanced tab switching issue;
...
semi-centralized channelNames;
renames ConfigCcpmWidget
2012-05-22 09:55:50 -07:00
Laura Sebesta
ce139a12cc
Missed a final typo.
2012-05-22 01:22:47 +03:00
Laura Sebesta
f4376b3445
Corrected small typo: disbleMouseWheelEvents vs. disableMouseWheelEvents
2012-05-22 01:20:23 +03:00
Mike LaBranche
64688be0a1
Refactor configwidgets for multirotor,fixedwing,heli,ground;
...
VehicleConfig subclasses ConfigTaskWidget and adds guiconfigdata bit storage;
Align channelbox items so 'None' is first;
2012-05-21 11:28:29 -07:00
Brian Webb
68d66d4181
Fixed firmware description in PipX status.
2012-05-17 20:35:17 -07:00
Brian Webb
44a1663eb9
Fixed transparent comm on PipX.
2012-05-16 19:02:53 -07:00
Mike LaBranche
ed54716436
add gui config data bit storage to fixedwing,multirotor,ground vehicles
2012-05-14 10:05:40 -07:00
Brian Webb
a3269aaf2f
Reverted some file permission changes.
2012-05-13 14:24:57 -07:00
Brian Webb
68d12b1b2f
Fixed some bugs with setting PairIDs in GCS.
2012-05-13 14:24:00 -07:00
Brian Webb
ec67742ff6
Added configuration of COM ports on PipX.
2012-05-12 13:16:36 -07:00
Mike LaBranche
5e07e742ef
revised to use GUIConfigManager.GetChannelDescriptions
2012-05-11 21:53:02 -07:00
Mike LaBranche
3a3dc4b888
extend GUIConfigData to support all vehicle types; add GUIConfigDataManager class to get/set
2012-05-11 21:48:46 -07:00
Brian Webb
dd02873908
Reverted changed mode.
2012-05-11 17:53:53 -07:00
Brian Webb
1f5dbcf57c
Mostly complete PipX configuration GUI.
2012-05-11 17:51:18 -07:00
Brian Webb
513c014f5a
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-11 17:44:23 -07:00
Mike LaBranche
c066fdc5e6
add support for output channel assignment descriptions for helicp
2012-05-09 15:24:15 -07:00
Oleg Semyonov
a3906aa7ea
Merge remote-tracking branch 'origin/hhrhhr/AeroSimRC_plugin' into os/aerosimrc
2012-05-07 16:09:35 +03:00
Brian Webb
454144f46c
Pairing and saving settings working.
2012-05-06 20:47:21 -07:00
Laura Sebesta
bcc1885785
Added tooltips to beginners stab. tab.
2012-05-06 17:53:43 -04:00
Brian Webb
ef4828032b
Fixed failed merge with next.
2012-05-06 12:38:13 -07:00
Kenn Sebesta
40e215ae27
Fixed bug in configvehicletypewidget.cpp that prevented Octo Coax X from being selected.
...
Fixed labelnames in airframes.ui that were causing compile warnings.
2012-05-06 12:22:43 -04:00
Brian Webb
480371a43e
Resolving merge with origin/next
2012-05-05 09:53:54 -07:00
Brian Webb
e83fec0463
Merged latest origin/next.
2012-05-05 09:40:44 -07:00
zedamota
3e32b8db70
GCS - Fixes wrong mixer value being displayed.
2012-05-05 12:30:37 +01:00
James Cotton
474c5c96d3
Change field name back to ILimit to correctly reflect how it works in the code
2012-05-04 15:26:58 -05:00
James Cotton
3ef01569b8
Merge remote-tracking branch 'origin/kenz/PT_UI_fixes' into next
...
Conflicts:
flight/OpenPilot/System/openpilot.c
shared/uavobjectdefinition/positionactual.xml
shared/uavobjectdefinition/positiondesired.xml
shared/uavobjectdefinition/velocityactual.xml
shared/uavobjectdefinition/velocitydesired.xml
2012-05-04 13:21:23 -05:00
James Cotton
65829a6513
Update the revo configuration to be consistent with the new meta data format.
2012-05-03 21:09:25 -05:00
Brian Webb
44d95003f3
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-03 17:56:08 -07:00
James Cotton
3155324384
Merge branch 'next' into cc3d
...
Conflicts:
Makefile
ground/openpilotgcs/src/plugins/config/configahrswidget.cpp
shared/uavobjectdefinition/ahrscalibration.xml
shared/uavobjectdefinition/ahrssettings.xml
shared/uavobjectdefinition/attituderaw.xml
2012-05-03 16:31:49 -05:00
zedamota
c8655acd2d
Merge remote-tracking branch 'remotes/origin/kenzPT' into PT_ui_fixes
2012-04-27 18:49:17 +01:00
Kenn Sebesta
38f9c99596
Changed Basic stabilization UI to remove scaling from full stick movement, etc...
...
in order that the Basic and Advanced tabs correspond.
2012-04-27 09:30:30 -04:00
jb
8fc3958f80
Made the scroll event filter a member of the parent class.
2012-04-26 12:29:00 +01:00
Laura Sebesta
4fedbd7df4
Changed the number of significant digits in many fields.
2012-04-25 06:31:21 -04:00
Brian Webb
a1168b6658
Added additional status reporting to PipX config GUI.
2012-04-21 20:47:50 -07:00
Laura Sebesta
0b7b86cd24
Turned off wheel scrolling! Also changed all wheel focus
to strong focus
.
2012-04-19 13:00:20 -04:00
Brian Webb
f4164d97bd
Merge remote-tracking branch 'origin/next' into Brian-Metadata-Mods
2012-04-17 19:34:44 -07:00
Brian Webb
a65b073c58
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-04-17 17:43:17 -07:00
Brian Webb
16da443405
Added PipX config widget (not complete).
2012-04-17 17:40:24 -07:00
Laura Sebesta
dddbd77a89
Changed all to StrongFocus.
...
Added limits to Ki*ILimit
2012-04-17 18:48:47 -04:00
Laura Sebesta
e143f98793
Fixed steps in spin boxes.
2012-04-17 17:35:48 -04:00
Laura Sebesta
46584209fb
Fixed foxus problems in basic tab.
2012-04-17 17:14:03 -04:00
Laura Sebesta
c6c5e18992
Fixed outputchannelform.ui tab order and tab focus.
2012-04-17 16:32:07 -04:00
zedamota
45e34cbae0
Force CC attitude config page refresh on board connection.
2012-04-17 15:19:41 +01:00
Brian Webb
5542d7c995
Updated configvehicletypewidget.cpp with metadata mods.
2012-04-05 18:50:47 -07:00
Brian Webb
df0a1c2ac1
Upgraded Brian-Metadata-Mods to current next.
2012-04-01 12:25:13 -07:00
Brian Webb
496a323b7f
Fixed indentaion.
2012-03-31 07:59:44 -07:00
Laura Sebesta
6461b91f18
Removed commented code, as per reviewer comments. Made other small reviewer requested changes. Fixed bug with capitalization.
2012-03-29 00:54:11 -04:00
Kenn Sebesta
90e4686d70
Typo correction in airframe UI. Minor GUI upgrades to Input.
2012-03-26 11:49:10 -04:00
Laura Sebesta
ad499c8946
Removed extraneous configccpmwidget.h and configccpmwidget.cpp.
2012-03-25 18:42:32 -04:00
Laura Sebesta
88a46f9062
Merge GroundVehicle into latest next
2012-03-25 12:21:58 -04:00
James Cotton
f3de06bd0f
For some reason leaving this tab on the second tab by default (while not
...
correct) causes crashes which is bad.
2012-03-23 00:56:46 -05:00
James Cotton
56233e262b
Remove unnecessary decimals for roll/pitch/yaw rates.
2012-03-22 11:35:29 -05:00
James Cotton
c7ff2a46c7
Merge remote-tracking branch 'origin/laurent/modelview' into revolution
...
Conflicts:
flight/CopterControl/Makefile
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
2012-03-22 02:58:24 -05:00
James Cotton
6350ec575e
Merge remote-tracking branch 'origin/os/features/stick-deadband-next' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
2012-03-21 16:03:40 -05:00
Brian Webb
aba3789d87
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into Brian-Metadata-Mods
2012-03-18 13:28:11 -07:00
banigreyling
761924e855
Made the config look-and-feel more consistent according to the stabilization panel
2012-03-11 18:56:43 +02:00
banigreyling
02b0da9b33
Made the config look-and-feel more consistent according to the stabilization panel
2012-03-11 17:21:12 +02:00
Stacey Sheldon
5060ad311b
gcs: remove reference to obsolete ui_ahrs.h file
2012-03-10 14:52:32 -05:00
banigreyling
909083c124
Input panel changes
2012-03-10 20:50:14 +02:00
Dmitry Zaitsev
933dfa8609
GCSReciver: fix UI and increase number of channels
2012-03-10 06:00:00 +04:00
James Cotton
11e7f58b63
Merge remote-tracking branch 'origin/os/features/pid-tuning-from-transmitter-next' into next
2012-03-05 00:18:17 -06:00
James Cotton
f20e5da9ed
Merge branch 'next' into revolution
...
Conflicts:
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configrevowidget.h
ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2012-03-03 11:41:41 -06:00
zedamota
37975dc00a
GCS-Fixes new stabilization controls decimal places
2012-02-29 18:28:26 +00:00
David Ankers
d38a173bed
Bug: Spinbox for PitchRateKp was linked to the wrong UAVObject
2012-02-26 16:40:08 +11:00
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
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