rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity
4,491 Commits 5 Branches 8 Tags 266 MiB
e34f618d89
Commit Graph

795 Commits

Author SHA1 Message Date
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
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
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
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
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
James Cotton
2050ce3fe1 Merge branch 'fix_input' into next 2011-10-23 15:29:12 -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
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
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
Edouard Lafargue
c06c08e831 Merge branch 'next' into ed_mac_halt_bug 2011-10-03 23:05:52 +02: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
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
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