Fredrik Arvidsson
b889035a24
Merge branch 'next' into thread/OP-39
2012-09-09 23:46:39 +02:00
chris pember
6a94cd49b5
reworked ALL the ui pages in windows so they work there, so pushing this for now, it just needs love in osx
2012-09-08 18:35:14 -07:00
Kenz Dale
9ebc32da3d
Eliminated several (dozen) compiler warnings.
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2012-08-23 18:03:17 +02:00
Fredrik Arvidsson
59d71c2b98
Merge branch 'next' into thread/OP-39
2012-08-09 11:17:52 +02:00
PT_Dreamer
821f954276
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-08-08 23:32:07 +01:00
Fredrik Arvidsson
86f210e7f4
OP-39 Added code to jump from the SetupWizard directly to the InputWizard in the ConfigurationPlugin to complete the vehicle setup and realize the 1-2-Fly idea.
...
Re-factored some code in the ConfigurationPlugin.
Fixed a bug in the Levelling page when performing levelling multiple times.
2012-08-03 18:31:47 +02:00
PT_Dreamer
205d370eec
GCS-Made the UI limits board specific
2012-08-02 16:34:48 +01:00
PT_Dreamer
9ab86f7c7e
GCS-Changed "wiki" help buttons to the standard ones.
...
Updated the links to tiny links.
2012-07-29 23:29:39 +01:00
PT_Dreamer
62bbe208af
GCS-Fixes wrong flight mode settings
2012-07-29 15:10:30 +01:00
PT_Dreamer
6b84b58bfe
GCS-Moved the wizard and calibration widgets to the stacked widget
...
so that they disapear during the wizard
2012-07-29 00:53:05 +01:00
PT_Dreamer
76f45b5218
Merge branch 'MikeL_MixerCurve' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/airframe.ui
ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp
2012-07-24 16:02:07 +01:00
PT_Dreamer
54ffe04e6d
Merge branch 'MikeL_MixerCurve' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
2012-07-24 15:23:21 +01:00
Chris Pember
1d1ef0dfce
removed all the pushbutton stylesheets, hid all the apply buttons
2012-07-21 10:58:05 -07:00
PT_Dreamer
2464fe9a2e
GCS-Make flight mode switch and accessory channels move acording
...
to user command.
2012-07-20 12:47:03 +01:00
Mike LaBranche
0c6bd52a57
Tweek: ConfigInputWidget, change default flightmode for fm1 from Manual to Stabilized1;
...
result of changing aircraft default to multirotor.
2012-07-09 21:34:31 -07:00
Oleg Semyonov
954cd9febc
FlightMode GUI: remove ugly right slider
2012-07-04 07:46:38 +03:00
Oleg Semyonov
dd398e9bd5
FlightMode GUI: update right slider on settings change
2012-07-04 00:13:20 +03:00
Oleg Semyonov
12106c5549
FlightMode GUI: replace numeric value by slider
2012-07-03 17:20:10 +03:00
Oleg Semyonov
727e67d7fd
Even more optimize FlightMode switch position calculation
...
This runs in a high frequency loop and should use as little of
floating point as possible. Thanks to Kenn for the idea.
2012-06-25 11:41:42 +03:00
Oleg Semyonov
2c896c9e91
Do not care about FlightMode channel if only one flight mode configured
2012-06-25 01:52:06 +03:00
Oleg Semyonov
02fa6fde09
Optimize FlightMode switch position calculation
2012-06-25 00:30:42 +03:00
Oleg Semyonov
cd6387d0a6
Add support for more than 3-pos FlightMode switches
...
It is now possible to have 1 to 6 flight mode switch positions
(usefull for guidance, position hold and similar use).
The input channel range is divided into N (1 to 6) zones and each
zone represents a flight mode. Default is 3 zones (backward compatible),
but more can be chosen.
How to use: configure Tx mixers in a way they provide required number
of different values for the same FlightMode channel. For instance,
using Turnigy 9X radio with ER9X firmware, one can create a mixer like
this:
-100 MAX ID0 Manual
R -50 MAX ID1 Stabilized1 (Rate)
R 0 MAX ID2 Stabilized2 (Attitude)
R 50 MAX RUD PositionHold
R 100 MAX ELE ReturnToBase
And set number of flight mode positions to 5. As a result, the 3-pos
switch (ID0, ID1, ID2) will provide first three flight modes, the rudder
D/R switch will override those and enable the 4th flight mode, and
elevator D/R switch will have highest precedence and activate the 5th
flight mode.
This will change the ManualControlSettings objectID.
2012-06-23 22:10:19 +03:00
Mike LaBranche
4807eb730f
Compiler Warning kill: rearrange ctor member init order in ConfigInputWidget
2012-06-16 13:38:05 -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
Kenn Sebesta
90e4686d70
Typo correction in airframe UI. Minor GUI upgrades to Input.
2012-03-26 11:49:10 -04: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
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
zedamota
91e3ee13fd
Fix input and output configuration layout issues.
2012-02-18 20:37:30 +00: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
4c1e33b0b3
WIP configtaskwidget enhancements.
2012-02-02 16:22:40 +00: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
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
Oleg Semyonov
5a2119b896
Add stick deadband option to the config GUI
2012-01-15 21:16:57 +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
James Cotton
14ee6e4fb5
When configuring a heli transmitter instruct the user to disable throttle hold.
2012-01-04 11:51:16 -06:00
James Cotton
d3cc67f5c4
Make the input wizard detect already inverted channels and preserve them.
2011-11-25 12:30:17 -06:00
James Cotton
fae611a01f
Fix bug where clicking back at last screen of input wizard would go back to
...
main screen and then in future buttons hung around for no reason
2011-11-25 11:30:12 -06:00
James Cotton
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
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
06fc5a1110
Input Configuration: Fix flight mode slider detection (looking at wrong channel
...
number).
2011-09-12 22:28:28 -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
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
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
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
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
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
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
zedamota
5d0095f00d
Started working on the multi receiver support
2011-08-04 16:58:41 +01:00
Oleg Semyonov
ad339d32a6
gcs: some cosmetic ui text changes
2011-07-28 23:26:07 +03: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
James Cotton
7153607b87
Reenable the receiver type input now that it is required.
2011-07-18 10:40:35 -05:00
zedamota
0d7393a8b3
OP-537 Move space to after the coma.
2011-06-22 10:11:19 +01:00
zedamota
61956d1ed2
OP-537 Fixed tooltips info
2011-06-21 19:14:39 +01:00
zedamota
0ae31593ba
OP-537 Fixes according to Osnwt suggestions
2011-06-21 18:58:46 +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
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
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
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
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
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
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
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
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
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
James Cotton
5ef47a1253
OP-449: Changed message in input configuration to correctly describe situation
...
where channels not mapped so receiver is not detected
2011-04-29 18:00:20 -05:00
edouard
da6530537b
OP-347 Implement the option to reverse the input controls on the config gadget: this is mostly useful for people with TX which do not offer this option. Tested on my small hex.
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3121 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-04-03 06:47:07 +00:00
peabody124
852e6072c3
Break the input and output configuration into separate config gadgets
...
Anyone who wants to, please improve my transmitter icon. I am not an artist.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3088 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-03-28 15:39:22 +00:00