James Cotton
ffb5bf7a7e
Merge remote-tracking branch 'origin/ccfly/channelformlayout' into next
2011-12-10 11:13:32 -06:00
James Cotton
686d5f2dcf
Merge remote-tracking branch 'origin/naiiawah/OP-595' into next
2011-12-10 11:05:14 -06:00
James Cotton
c9933e78c2
Update to joystick image for gcs controller to be much prettier.
2011-12-10 11:01:34 -06:00
naiiawah
6dc121fda6
Updated fix to preserve assert behavior by adding a check routine that
...
is called before trying to add an item.
2011-12-06 22:20:46 -07:00
zedamota
f18c980c4e
Small bug fix.
...
Added minus.wav witch is a copy of magic.was. "minus" file needed.
2011-12-06 13:13:20 +00:00
zedamota
b45044b8c3
Changed conditions base on strings to enums.
2011-12-06 09:59:28 +00: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
78e25b1b8c
Fixed conditions
...
Added support for negative values
Added support to "play once per update"
Added "never" rule for value sound
Several other bugfixes
2011-12-03 02:36:47 +00:00
Corvus Corax
b287d4f849
Merge remote branch 'origin/corvuscorax/logging-fix' into next
2011-11-30 19:17:54 +01:00
zedamota
fcbb00f757
config outputs now uses dropdown boxes for the update freq.
2011-11-29 17:01:02 +00:00
zedamota
5bc1a10774
Fixes the "halt" and "rescue" problems
2011-11-28 12:12:26 +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
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
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
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
