zedamota
5bc1a10774
Fixes the "halt" and "rescue" problems
2011-11-28 12:12:26 +00:00
Corvus Corax
15c1ca4af1
GVS/Scope: Bugfix: Export all known data points into CSV not just one per screen redraw
2011-11-26 22:51:20 +01:00
Corvus Corax
5af9a2558c
GCS/Scope: Make smooth interpolation (and internal sum) be long term correct despite limited floating point accuracy, but keep constant overhead
2011-11-26 22:06:46 +01:00
Corvus Corax
dfd18d43b5
GCS/Scope: CSV export exports non-interpolated data
2011-11-26 22:06:21 +01:00
Michael Schulz
9b32d2f119
little layout fix for channelforms
2011-11-26 13:59:37 +01:00
zedamota
54bd0af16d
Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next
2011-11-26 00:07:43 +00:00
zedamota
27de9fcb08
Some tweaks to detection and connection timings. Should fix some issues with "halt".
2011-11-26 00:06:45 +00:00
zedamota
77058807b4
Added some more debug messages to help catch bugs, no that there are any.
2011-11-26 00:04:36 +00:00
zedamota
9eaf09860c
Delay the running device info fetching by 1 second.
2011-11-25 23:59:42 +00:00
zedamota
2b94a1538b
Make the outputs test function disable when the connection is lost.
2011-11-25 23:50:54 +00:00
naiiawah
3303313908
Fixes for OP-595:
...
Changed the UAV import of saved settings to not pull in invalid enum
values. Will warn on the dialog that an element of the UAVObject was
invalid and turn off the "save" checkbox. Also will send a qDebug output
showing the UAVObject name and the invalid enum value.
2011-11-25 16:12:38 -07:00
James Cotton
d3cc67f5c4
Make the input wizard detect already inverted channels and preserve them.
2011-11-25 12:30:17 -06:00
James Cotton
fae611a01f
Fix bug where clicking back at last screen of input wizard would go back to
...
main screen and then in future buttons hung around for no reason
2011-11-25 11:30:12 -06:00
James Cotton
60664f6a26
Merge remote-tracking branch 'origin/ccfly/outputchannelform' into next
2011-11-25 10:48:41 -06:00
Corvus Corax
6913d14e82
GCS:Logging: Correctly adhere to replay speed, and check logfile for plausibility/corruption
2011-11-25 15:11:58 +01:00
James Cotton
856f8a9b6c
Merge remote-tracking branch 'origin/pt/version-mismach-warning' into next
2011-11-21 07:38:16 -06:00
James Cotton
084b175290
Removed general error message for savign. Places using the save should
...
reliably provide feedback.
2011-11-21 07:25:07 -06:00
zedamota
a1f3035f15
added tooltip to the pfd stating the current refresh rate
2011-11-20 20:47:37 +00:00
zedamota
0875831f6d
made the firmware date display on a more user friendly format
2011-11-20 18:18:51 +00:00
zedamota
1632d354a1
Fix the don't show this again option
2011-11-19 18:47:41 +00:00
Corvus Corax
44c8c9fbe5
GCS/ScopePlugin: Allow SoftwareInterpolation of measurement value
2011-11-18 21:09:30 +01:00
Michael Schulz
93267dd26f
Implemented suggestions from code review
...
* reduced top and bottom margins of outputchannelform
* removed obsolete methods in configoutputwidget.h
* fixed comment block
* switched to static accessor methods for UAVO
2011-11-17 20:51:17 +01:00
Michael Schulz
d307446fdf
Merge remote-tracking branch 'origin/next' into outputchannelform
2011-11-14 21:14:45 +01:00
Michael Schulz
9bd74bb591
minor fixes due to last merge
2011-11-14 21:13:34 +01:00
Oleg Semyonov
b2887a25a7
New 3D model: Ricoo (by muralha)
2011-11-14 16:05:10 +02:00
zedamota
e2c4b2f978
Simple mismatch detection, needs testing to find if message is clear enough for users.
2011-11-13 17:39:05 +00:00
zedamota
ad13cee7a1
Added the basis for GCS and FW version mismatch warning.
2011-11-13 16:05:36 +00:00
Oleg Semyonov
de6e450b5f
Merge branch 'next' into os/TxPID-module
...
Conflicts:
flight/CopterControl/Makefile
flight/CopterControl/System/coptercontrol.c
ground/uavobjgenerator/generators/generator_common.h
shared/uavobjectdefinition/hwsettings.xml
component free heap used
----------------------------
Nothing 2544 -
PWM 2416 128
PPM 2392 152
DSM 2448 96
S.Bus 2432 112
GPS (port only) 2352 192
GPS (port+module) 1296 1248
CameraStab 2080 464
Telemetry 1912 632
TxPID 2272 272
2011-11-13 16:25:58 +02:00
James Cotton
3e4a33169c
Merge remote-tracking branch 'origin/dwillis/gcs_gui_fixes' into next
2011-11-12 21:49:56 -06:00
James Cotton
f0b22519be
Merge remote-tracking branch 'origin/corvuscorax/CC_GPS' into next
2011-11-12 21:30:53 -06:00
Oleg Semyonov
951b7c27c2
gcs: fix typo in the GUI
2011-11-12 23:09:52 +02:00
zedamota
deac94253e
small fix and some cleaning
2011-11-11 23:42:36 +00:00
zedamota
a8dbeb2c91
Make the GCS serial telemetry speed configurable
2011-11-11 23:09:44 +00:00
Michael Schulz
ea5caa24d5
Merge remote-tracking branch 'origin/next' into outputchannelform
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
2011-11-11 22:57:33 +01:00
James Cotton
e108bcafed
Merge remote-tracking branch 'origin/naiiawah/uploader_detection' into next
2011-11-11 10:56:17 -06:00
James Cotton
40b2b654b7
Merge remote-tracking branch 'origin/pt/OP586' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
ground/openpilotgcs/src/plugins/config/configoutputwidget.h
2011-11-11 10:51:04 -06:00
James Cotton
207e2b9e0e
Merge remote-tracking branch 'origin/pt/OP587' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
2011-11-11 10:06:20 -06:00
zedamota
f5c7dba0b1
Merge remote-tracking branch 'remotes/origin/nick/notify-plugin-fixes' into nick/notify-plugin-merged
2011-11-11 15:33:27 +00:00
Corvus Corax
aa69027cb2
Merge branch 'next' into CC_GPS
2011-11-11 11:44:11 +01:00
Michael Schulz
0ac62c77de
Output widget: Converted to an array of output channels.
2011-11-09 19:59:20 +01:00
James Cotton
6fd2426a90
Patch from Kenn for the matlab processing function to fix issue with multiple
...
isntance objects
2011-11-09 12:49:50 -06:00
James Cotton
813ac65159
OP-592: Also fix so it reads the values for channels 9 and 10 correctly
2011-11-07 15:58:08 -06:00
James Cotton
af6eeca8ee
Allow camera stabilization to control outputs 9 and 10. Also add a friendly
...
message to indicate when the output is already assigned.
2011-11-07 15:53:57 -06:00
David Willis
3f8f2c4da1
Add ifdef to retain default behaviour on OSX
2011-11-06 21:13:10 +00:00
Brian Mahaffy
e1dbf3b75c
Changed the uploader gadget to not ask if you want to plug in another
...
board, but only when using CC.
2011-11-05 23:22:56 -06:00
David Willis
3dd708a564
Set drop down width using list box size hint as necessary
2011-11-05 02:04:34 +00:00
Oleg Semyonov
53bef754c3
Merge remote branch 'origin/next' into os/alternative_spektrum_driver
2011-11-04 21:43:12 +02:00
James Cotton
c6bf1845a3
Fix combination on multiple cores with the debuggadget
2011-11-02 17:00:10 -05:00
Oleg Semyonov
2ec0b7d767
Merge branch 'next' into os/alternative_spektrum_driver
2011-11-02 23:02:34 +02:00
Oleg Semyonov
481bff2578
spektrum: code style fixes accoring to OPReview-122
2011-11-01 18:48:07 +02:00
Oleg Semyonov
0aad612720
spektrum: the same type of DSM receivers is now allowed on both CC ports
2011-11-01 01:16:43 +02:00
Oleg Semyonov
0116e6a007
spektrum: rework DSM2/DSMJ/DSMX driver for explicit DSMX resolution support
...
- both CC serial ports are now disabled by default (no telemetry);
- serial ports now have DSM2, DSMX (10bit) and DSMX (11bit) options;
- ReceiverGroups now have DSM (MainPort) and DSM (FlexiPort) options.
For DSM2 protocol there is an explicit resolution bit in the stream, so
the DSM2 should be selected. For DSMX there is no such bit, and user
should choose the resolution from the list configuring the spektrum port.
ReceiverGroups have single DSM option which is handled by the same driver.
Downside: this implementation saves received frame first, unrolls by the
end of frame. This should be ok, but may be improved by unrolling channels
on the fly in the rx callback.
Another minor difference is that a ChannelGroup is now bound to port:
DSM (MainPort) or DSM (FlexiPort). This was considered as acceptable
solution in order to not have 6 DSM options for each ChannelGroup and
even more in case of new DSM protocol variations.
Known problem: it is not possible to choose same protocols like
DSM2/DSM2 for two ports. It can be enabled by adding an exception to
common rule, though.
The DSMX throttle channel misbehavior (zero value) is not treated
specially yet. It should trigger the failsafe being out of bounds.
More info and data dumps are required to handle this properly.
2011-10-30 19:29:03 +02:00
James Cotton
eb5e053a3e
Input configuration: Make the sticks move during the limit setting. Makes the
...
UI more intuitive.
2011-10-27 08:35:20 -05:00
James Cotton
a8f0c5a622
Output widget: Add lines from Sambas to indicate which speeds alter channels
...
7-10. Currently it doesn't indicate appropriately if those are actually
available...
2011-10-25 11:49:26 -05:00
James Cotton
27bf2b383e
Merge remote-tracking branch 'origin/james/remap_outputs' into next
2011-10-23 18:35:25 -05:00
James Cotton
2050ce3fe1
Merge branch 'fix_input' into next
2011-10-23 15:29:12 -05:00
Oleg Semyonov
6a9208e8c3
Merge branch 'next' into os/TxPID-module
2011-10-22 23:34:58 +03:00
Oleg Semyonov
f71361ca83
Merge branch 'next' into os/GPS-on-CopterControl_next_v2
...
Conflicts:
flight/Modules/System/systemmod.c
2011-10-22 23:00:47 +03:00
Corvus Corax
167010e8a0
UAVTalk: Fixed bug in parser failing to handle length of multi-instanceobjects
...
UAVTalk (on GCS): Fixed a null pointer dereference when receiving in a NACK
2011-10-21 02:04:29 +02:00
James Cotton
a1cd6d580c
During output testing disable the reverse checkbox
2011-10-20 08:39:30 -05:00
James Cotton
b6df727d1a
Disable the input wizard while running simple calibration
2011-10-20 08:31:58 -05:00
James Cotton
5c04268205
Input configuration: Make sure during the 500 ms between detecting a channel
...
and requesting next nothing else can trigger.
2011-10-20 08:26:46 -05:00
James Cotton
fd96616c32
Delete large section of unused code
2011-10-20 07:51:00 -05:00
James Cotton
14fa739748
Add dialog box to indicate when test outputs won't work.
2011-10-20 07:20:23 -05:00
James Cotton
46aa8916c6
Fix segfault when selected motors 9 or 10. Also make labels show up in output
...
panel.
2011-10-20 06:56:56 -05:00
zedamota
cfbfbe1209
Only one output configuration at a time is now able to receive user input while the test outputs is enabled.
2011-10-16 00:57:59 +01:00
James Cotton
0193187d0c
Make the UI support 10 output channels
2011-10-15 16:59:42 -05:00
zedamota
ca20187dcf
Made UAVObject import disable the outputs test - see OP-587
2011-10-15 21:16:34 +01:00
James Cotton
08e077e8cb
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2011-10-13 23:16:56 -05:00
James Cotton
1d5364878a
Update CameraStab icon with Muralha's new one
2011-10-13 23:16:09 -05:00
zedamota
8d5b310f1f
Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next
2011-10-12 16:44:11 +01:00
zedamota
032fa759ac
Fixes the zero while arming checkbox and and OP-575
2011-10-12 16:43:14 +01:00
Nickolay
20757c2efd
+complete all features; +testing in progress;
2011-10-12 08:36:05 +03:00
James Cotton
ef34f6b674
Merge remote-tracking branch 'origin/ed_mac_halt_bug' into next
2011-10-11 10:23:19 -05:00
Edouard Lafargue
6514ea5262
Finally, a fix for the Mac UAVTalk issues: it was all caused by a wrong RunLoop pointer reference
...
because of multithreading.
2011-10-11 00:10:27 +02:00
James Cotton
7da8cb2079
CC: After attitude calibration always reenable BiasCorrectGyro. Fixes odd bug
...
if people have it crash in the middle.
2011-10-08 14:15:48 -05:00
James Cotton
4b04a5d9ea
Merge remote-tracking branch 'origin/pt/mixer_bug' into next
2011-10-06 21:33:59 -05:00
Edouard Lafargue
de8478718c
Attempt to make USB faster on Mac. Breaks the Firmware upload system!!!
2011-10-05 00:38:56 +02:00
Nickolay
6a5589ef51
+multiple selection with D&D completed; +support of enum and range for value completed;
2011-10-04 01:59:37 +03:00
Edouard Lafargue
c06c08e831
Merge branch 'next' into ed_mac_halt_bug
2011-10-03 23:05:52 +02:00
Nickolay
82ec3199d7
+dynamic field UI;
2011-09-29 20:26:46 +03:00
Oleg Semyonov
a38c569cd0
HwSettings: move Telemetry and add GPS port speed to the HwSettings object
...
TelemetrySettings object removed (saved 200+ bytes of RAM). Telemetry
port speed moved to the HwSettings object. Added GPS port speed setting.
GCS code updated to reflect changes and support both fields.
2011-09-28 22:11:42 +03:00
Oleg Semyonov
53c098dd08
Merge branch 'next' into os/GPS-on-CopterControl_next_v2
...
Conflicts:
flight/OpenPilot/System/pios_board.c
flight/OpenPilot/UAVObjects.inc
shared/uavobjectdefinition/hwsettings.xml
2011-09-28 22:02:02 +03:00
zedamota
898d3c980d
Cosmetic changes to the Debug plugin
...
One more fix to the mixer bug
2011-09-27 22:10:39 +01:00
James Cotton
a53f2353a5
Merge branch 'ed_mac_halt_bug' into next
2011-09-25 15:19:22 -05:00
zedamota
797bb38081
mixer bug fix.
...
Also added a new debug plugin witch shows the debug messages normally not available on release builds
2011-09-25 19:30:32 +01:00
James Cotton
3e61e21e89
Output config UI: Add labels for what things are
2011-09-25 10:50:06 -05:00
Edouard Lafargue
822cbfbc81
Fix MacOS halt issues by using the USBMonitor to detect device re-insertion:wq:
2011-09-25 15:28:08 +02:00
zedamota
352620e0ed
Mixer bug while import fix (try to)
2011-09-23 13:48:27 +01:00
zedamota
246318af7b
Mixer bug fix try
2011-09-22 12:02:22 +01:00
Nickolay
1af42e1b32
+ notify table reordering some changes
2011-09-19 00:30:57 +03:00
Nickolay
1665ae8299
+reordering add some changes;
2011-09-19 00:26:49 +03:00
Oleg Semyonov
d923117c25
TxPID: optional module to tune PID settings using R/C transmitter
...
This module will periodically update values of stabilization PID settings
depending on configured input control channels. New values of stabilization
settings are not saved to flash, but updated in RAM. It is expected that the
module will be enabled only for tuning. When desired values are found, they
can be read via GCS and saved permanently. Then this module should be
disabled again.
2011-09-17 22:49:51 +03:00
unknown
56e71cd82e
+removed public members in notificationitem; +cosmetic changes; +fixed indentation;
2011-09-16 18:39:20 +03:00
Nickolay
c16e386e63
+reordering of table items - experimenting with D&D
2011-09-16 02:24:35 +03:00
Nickolay
e14e0a763b
- temporary remove assert in finished callback;
2011-09-15 01:35:19 +03:00
Nickolay
3af398d7f9
initial changes
2011-09-15 00:38:18 +03:00
James Cotton
06fc5a1110
Input Configuration: Fix flight mode slider detection (looking at wrong channel
...
number).
2011-09-12 22:28:28 -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
a5509965b2
Input configuration: add reverse checkbox and label for current neutral value
2011-09-09 00:54:47 -05:00
James Cotton
1a2750051a
Input wizard: Make collective pitch come first for helicopter mode transmitters
...
and tell person to use throttle hold so it's detected correctly.
2011-09-08 10:24:52 -05:00
James Cotton
bbdb176409
Input configuration: Make input channel into a dropdown box and make the
...
neutral position into a slider. During calibration the slider moves and the
min and max values are updated appropriately. Also make the collective channel
skippable in the configuration wizard.
2011-09-07 02:13:27 -05:00
James Cotton
cabfbc229d
Input config: Bring back old style calibration. I can't seem to make the input
...
widget list a class variable which isn't very safe (multipe instances of the
config gadget will act funny).
2011-09-06 22:19:12 -05:00
James Cotton
d496f81c68
GCS Input config: Change the layout a bit to make the spacing between rows
...
regular, and move some of the layout to the .ui file.
2011-09-06 17:50:55 -05:00
James Cotton
acfb28b04b
Heli configuration: Make swashplate leveling routine using static accessor
...
methods. Also got rid of incredibly annoying message when you tried to alt-tab
out of GCS.
2011-09-04 23:08:35 -05:00
James Cotton
a81f14a575
CCPM config: Fix the collective pass through mode for multi receiver support.
...
Now the user must configure Accessory# in the input configuration section
though.
2011-09-04 23:08:34 -05:00
James Cotton
6344bc8f83
Fix encoding no configccpmwidget.cpp
2011-09-04 23:08:34 -05:00
James Cotton
d28f0c4c78
GCS Config Stabilization: Increase maximum rate that can be entered to 500
...
deg/s from 300 deg/s for heli people.
2011-09-03 21:25:27 -05:00
James Cotton
e18288085c
OP-390 Make the object saving throw an error message on save failures.
2011-09-03 21:25:20 -05:00
James Cotton
1de58ebb87
Make scope gadget check if object exists before using it. Avoids segfaults
...
when scoped objects disappear.
2011-09-03 21:24:13 -05:00
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
James Cotton
fb689221fa
Merge remote-tracking branch 'origin/GCS_UIFixes_Dmytro' into next
2011-08-23 22:36:40 -05: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
ed51756191
Compilation fix on mac
...
It's safer to define GL_CLAMP_TO_EDGE if not available than
to include GL/glext.h.
2011-08-22 09:10:25 +10:00
Dmytro Poplavskiy
6e506161e0
Compilation fix
...
It's necessary to include GL/glext.h on windows for
GL_CLAMP_TO_EDGE define.
2011-08-22 07:34:59 +10:00
Dmytro Poplavskiy
69d5e7fe7e
Added missing Q_DECL_EXPORT to CachedSvgItem
2011-08-21 23:40:11 +10:00
Dmytro Poplavskiy
6b0da6bc72
Changed PFDGadgetWidget to use CachedSvgItem
2011-08-21 21:38:58 +10:00
Dmytro Poplavskiy
bbc137eabe
Added initial CachedSvgItem implementation
...
Texture is regenerated each time item is scaled
but it's reused during rotation, unlike the default
DeviceCoordinateCache mode.
2011-08-21 21:36:41 +10: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
James Cotton
0448b34a91
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2011-08-19 01:51:08 -05:00
James Cotton
f85ae84ec3
Merge branch 'camera_stabilization' into next
...
Conflicts:
flight/OpenPilot/System/pios_board_posix.c
2011-08-19 01:48:24 -05: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
Oleg Semyonov
2020e336d6
OP-290: allow GCS tabs to shrink (by eliding the text), less limit min window width
2011-08-16 20:58:39 +03: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
James Cotton
86b652bbab
Merge branch 'next' into camera_stabilization
2011-08-14 18:07:57 -05: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
Oleg Semyonov
2f7f920ef3
gcs: (uploader plugin) few firmware info string and icon changes
...
Also it looks like the date check clause doesn't work, needs to be checked.
2011-08-14 17:25:52 +03:00
Oleg Semyonov
ba58ec7e08
gcs: (uploader plugin) replace red warning icon with less serious yellow triangle
2011-08-14 17:25:50 +03:00
dankers
69f8aac967
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2011-08-13 06:12:08 +10:00
dankers
65cb05e212
hhrhhr's fix for modelview gimbal lock, thank you!!
2011-08-13 06:08:07 +10:00
James Cotton
923e33195b
Merge branch 'next' into camera_stabilization
2011-08-11 12:06:50 -05:00
James Cotton
39fcc5bde3
Revert "Telemetry: Remove a processObjectQueue() command that was triggering
...
warnings". Unfortunately this causes problems getting objects quickly on
linux. A complete fix to the connection speed issue on all platforms may
take some work.
This reverts commit 74d1762e4c
.
2011-08-11 12:05:52 -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
74d1762e4c
Telemetry: Remove a processObjectQueue() command that was triggering warnings
2011-08-10 06:15:13 -05: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
f23eaa8273
Make the Actuator pull from the CameraDesired fields
2011-08-09 21:47:42 -05:00
James Cotton
c4e272b9ad
Merge branch 'next' into camera_stabilization
2011-08-09 20:16:45 -05:00
James Cotton
c1adbf37aa
Also disable notify plugin on Qt 4.8 until this is fixed. Causing runtime
...
error when opening options.
2011-08-09 16:32:01 -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
Peter Gunnarsson
e1190fbbac
Change spacing of connectionmanager.
2011-08-08 13:50:46 +02:00
Peter Gunnarsson
cbc45c772f
Do not use QTabBar::setDocumentMode() on OS X.
2011-08-08 12:46:26 +02:00
Oleg Semyonov
247da8c24b
Merge remote branch 'origin/PeterG/OP-520_GCS_qtLibraryTarget' into next
2011-08-07 05:54:22 +03:00
Oleg Semyonov
d30c939c46
Merge remote branches 'origin/PeterG/OP-455_win7_log_file_dialog' and 'origin/PeterG/OP-549_GCS_reversed_dials' into next
2011-08-06 21:56:16 +03:00
James Cotton
852be35b5c
Merge branch 'next' into camera_stabilization
2011-08-05 18:52:14 -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
Peter Gunnarsson
12ba6addb0
Fix for OP-549 reversed dials by Dmitry Zaitsev
2011-08-05 15:33:45 +02:00
Peter Gunnarsson
11d5d0b6d1
Fix for OP-455
2011-08-05 12:22:08 +02:00
zedamota
5d0095f00d
Started working on the multi receiver support
2011-08-04 16:58:41 +01:00
PeterG
7205917562
Fix for generalsettings.ui
2011-08-04 17:30:18 +02:00
Peter Gunnarsson
76ee2c060c
OP-520 Change $$qtLibraryTarget to $$qtLibraryName
2011-08-04 15:17:08 +02: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
32f6cf7346
Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.
2011-08-04 11:55:18 +02:00
Peter Gunnarsson
4dd7ff3750
Remove unused ViewManager from MainWindow.
2011-08-03 10:58:42 +02:00
Peter Gunnarsson
f3db62bb4f
Remove unused code in splitterorview.cpp
2011-08-03 10:04:40 +02:00
Peter Gunnarsson
951cae948e
Make config gadget use new widget in icon panel.
2011-08-03 10:03:49 +02:00
Peter Gunnarsson
fc2e1c7fd7
Add new widgets with simpler code than what is used currently (FancyTabWidget).
2011-08-03 10:02:51 +02:00
zedamota
1b34376797
Added "changes not saved" message warning to config gadget
2011-08-02 17:06:17 +01:00
Stacey Sheldon
90b2625deb
rcvractivity: Add tracking of Rx channel activity
2011-08-02 01:27:37 -04:00
Stacey Sheldon
1299e110c4
gcs: update CC hw settings to use hwsettings RcvrPort field
2011-08-02 01:22:04 -04:00
Stacey Sheldon
829b8b83f6
rcvr: Add GCS receiver driver for rcvr via telemetry
...
This allows the GCS to emulate a receiver device via the
telemetry link.
Select "GCS" as your input type in the manualcontrol config
screen and calibrate it as normal.
Note: The expected values for the channels are in microseconds
just like a PWM or PPM input device. The channel values
are validated against minimum/maximum pulse lengths just
like normal receivers.
2011-08-02 01:22:04 -04:00
zedamota
cdf4d112ce
Finished refactoring airframe config widget
2011-08-01 13:28:58 +01:00
James Cotton
c5bf0ac657
Merge branch 'stac/refactor-usart-com' into camera_stabilization
2011-07-31 09:13:37 +09:00
James Cotton
96c2d24253
Merge branch 'next' into camera_stabilization
...
Conflicts:
flight/CopterControl/Makefile
flight/CopterControl/System/coptercontrol.c
flight/Modules/Actuator/actuator.c
flight/Modules/GPS/GPS.c
flight/Modules/ManualControl/manualcontrol.c
flight/Modules/Stabilization/stabilization.c
flight/Modules/System/systemmod.c
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/stabilizationdesired.xml
2011-07-30 10:06:10 +09: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
James Cotton
9840f12658
Disable ModelView on QT 4.8 until fixed.
2011-07-28 18:59:55 +09:00
James Cotton
f2e04f78b7
Change to GLC Lib to make it compile on OSX with QT 4.8.0. This might be
...
required for all OS's with 4.8.0
2011-07-28 18:08:22 +09: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
ba8985721c
Fix for bluetooth modules hanging. Turns out certain HW don't implement the EV_TXEMPTY system event. Hack was to create a timer which triggers a fake event every 10secs. It checks the bytestosend value so it shouldn't have any effect on full compliant HW.
2011-07-25 00:43:48 +01:00
Oleg Semyonov
400e07bbd1
gcs: change fw date format to match the fw info and GCS version strings
...
Use UTC time of last commit instead of local time of PC.
Use the same date/time string "YYYYMMDD HH:MM" as GCS uses in About dialog.
2011-07-22 21:29:59 +03:00
zedamota
05f6904e09
Fix tab order. Switch to using unum for tabs.
2011-07-21 15:35:59 +01:00
Oleg Semyonov
75233577dc
gcs: add new menu option for exporting current UAV data objects
...
This menu option is useful for technical support. It exports all
current UAV data objects to the XML, similar to settings. This data
can't be imported (it is useless), but can be published or passed to
the tech support for troubleshooting.
2011-07-21 16:51:47 +03:00