1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-11 19:24:10 +01:00
Commit Graph

1363 Commits

Author SHA1 Message Date
Brian Webb
513c014f5a Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-05-11 17:44:23 -07:00
PT_Dreamer
f716f16b60 Fixes compile issues on Ubuntu with qt 4.8.0 2012-05-10 14:47:30 +01:00
Mike LaBranche
c066fdc5e6 add support for output channel assignment descriptions for helicp 2012-05-09 15:24:15 -07:00
James Cotton
a857530832 Update the MagicWaypoint gadget to use PathDesired instead of PositionDesired 2012-05-09 11:01:20 -05:00
James Cotton
37bb2cfb77 Finish getting rid of PositionDesired in favor of PathDesired and add the
ability to move the magic waypoint with the transmitter
2012-05-08 02:42:58 -05:00
James Cotton
0f2c41ac5d Merge branch 'revolution' into navigation
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
2012-05-07 21:53:10 -05:00
zedamota
75b3547e89 Merge branch 'ui_fixes' into next 2012-05-07 15:14:55 +01:00
zedamota
f753105c0f GCS - disable the boot and safeboot buttons during flash 2012-05-07 15:11:51 +01:00
Oleg Semyonov
a3906aa7ea Merge remote-tracking branch 'origin/hhrhhr/AeroSimRC_plugin' into os/aerosimrc 2012-05-07 16:09:35 +03:00
zedamota
9481be90af GCS - Changes reload button behavior, now loads data from persistence memory. 2012-05-07 14:02:58 +01: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
Laura Sebesta
c6526a07a4 Modified svg text field sizes to be a bit more aesthetic. 2012-04-28 11:11:57 -04: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
663b151f4a A few more bug fixes on metadata mods. 2012-04-22 20:49:37 -07:00
Brian Webb
aab47d6ed4 Final updates to throttled mode and further memeory reduction in the object manager and event dispatcher to reflect smaller data sizes in metadata. 2012-04-22 14:56:26 -07:00
Brian Webb
a1168b6658 Added additional status reporting to PipX config GUI. 2012-04-21 20:47:50 -07:00
Laura Sebesta
d9510a94eb Fixed firmware file chooser to be a little more intelligent. Especially important for windows users.
However, for Mac and Linux, this currently points to a directory relative to the build directory, which is helpful for devs, but not for users.
2012-04-21 22:03:43 -04:00
Brian Webb
eb6f175af4 Fixed metadata settings in object browswer, and removed update mode never from all uavobjects that used it (changed to manual). 2012-04-21 11:59:14 -07:00
Laura Sebesta
79940287dc Import UAV objects config gadget UI upgrades. Fixed table selectability, and progress bar. 2012-04-20 08:56:51 -04:00
Laura Sebesta
48d018f9bb Fixed [cm] vs. [m] unit discrepencies in PFD and xml files, as per revo update to [m-kg-s] units. 2012-04-20 06:11:44 -04:00
Laura Sebesta
73cafd742c Changed Help in help menu from displaying plugins to sending user to Wiki. 2012-04-19 19:10:42 -04:00
Laura Sebesta
0b7b86cd24 Turned off wheel scrolling! Also changed all wheel focus to strong focus. 2012-04-19 13:00:20 -04:00
Laura Sebesta
ac76628c84 Moved "Help" and "Export UAV Data..." to HELP menu. 2012-04-19 11:54:43 -04:00
Laura Sebesta
ddf45b79cd Fixed smartsave button instatiation race condition 2012-04-19 09:42:35 -04:00
Brian Webb
19166cc830 Added UPDATEMODE_THROTTLED to UAVObjects update modes. 2012-04-18 18:47:13 -07: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
Corvus Corax
c5a6ed7486 add missing headers and makefile entries 2012-04-17 16:25:39 +02:00
zedamota
45e34cbae0 Force CC attitude config page refresh on board connection. 2012-04-17 15:19:41 +01:00
zedamota
411c38aebf Fixes the incompatible message when the GIT tag has a leading zero. 2012-04-17 13:54:41 +01:00
James Cotton
af02eb6517 Merge branch 'sim' into testing
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-04-14 14:40:43 -05:00
Brian Webb
4936cd8fd2 Added PipXStatus and PipXSettings UAVObjects and added support the sending/receiving UAVTalk objects on the PipX. 2012-04-10 20:22:53 -07:00
James Cotton
26b73e3c8b Add path navigation mode to guidance. Works well in simulation. 2012-04-10 01:48:03 -05:00
James Cotton
dbcb47e249 Merge branch 'D-Lite/ubx-parser' into revolution_ubx 2012-04-09 17:34:34 -05:00
Werner Backes
56108b5381 Introduced GPSVelocity UAVObject 2012-04-09 22:59:38 +02:00
Brian Webb
5542d7c995 Updated configvehicletypewidget.cpp with metadata mods. 2012-04-05 18:50:47 -07:00
Dmitry Zaitsev
34b8564864 add emulated sonar output
40 degree beam, hardcoded.
2012-04-04 01:22:34 +04:00
James Cotton
33874402ea Store the mag node in the viewer widget 2012-04-03 09:17:56 -05:00
James Cotton
f4bd5a1c71 Add a camera tracker mode (on by default) and make the rotation apply in the
right coordinate system.
2012-04-03 09:17:56 -05:00
James Cotton
49d37a8382 Get rid of annoying black box around border of screen and use multithreading
for rendering.
2012-04-03 09:17:56 -05:00
James Cotton
86ac80e2f2 Add form to the OsgEarthView widget 2012-04-03 09:17:56 -05:00
James Cotton
c8d5a61316 Move the OSG logic into a standalone gadget instead of the widget gadget. This
will allow using the UI forms.  Fixed the issues with requiring a popout.  Also
the osgEarth takes LLA in the order long, lat, alt whereas our code takes lat,
long, alt.  This was causing the NED frame to be rotated 90 degrees.
2012-04-03 09:17:56 -05:00
James Cotton
e804de0a7a Get the attitude in there although there might be some convention problems on
the rotation
2012-04-03 09:17:56 -05:00
James Cotton
b2b44bd23b Render the model in earth 2012-04-03 09:17:56 -05:00
James Cotton
19111dacd2 Get the Osg Earth View plugin stub working 2012-04-03 09:17:55 -05:00
James Cotton
b67a74a400 Import stub for the Osg Earthview Plugin 2012-04-03 09:17:55 -05:00
James Cotton
84040d25b4 Add attitudesimulated object to capture the simulated state 2012-04-03 09:16:30 -05:00
James Cotton
cd5fad2ae9 Update the map to set locations with the home location representation 2012-04-03 03:42:34 -05:00
James Cotton
3eac69e953 Create stub for waypoint navigation 2012-04-03 03:42:32 -05:00
James Cotton
56af74d17c Fix map to work with the new HomeLocation (no ECEF) 2012-04-03 03:42:30 -05:00
James Cotton
a9aa6b696b Add object for setting the fusion algorithm 2012-04-03 03:42:24 -05:00
James Cotton
1911c7360d New NEDPosition object which is the transformed GPS location 2012-04-03 03:42:24 -05: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
6cb3abec80 Allow firmware compiled for 0x902 to be downloaded to 0x901 2012-03-22 00:42:23 -05:00
James Cotton
1eaf6f66fb Rename one of the boxes in the runnindevicewidget.ui to avoid warnings. 2012-03-22 00:42:22 -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
zedamota
4e6114d095 Merge remote-tracking branch 'remotes/origin/laurent/modelview' into next 2012-03-20 23:20:20 +00:00
Laurent Ribon
299f9fd5d3 Comment the line "VERSION = 2.2.0" 2012-03-20 00:10:31 +01:00
Laurent Ribon
b36be73ffb Add the possibility to set VBO usage when running.(No restart required)
Change Zoomm sensibility (made it more sensitive)
Remobe unecessary state variable :
 - load Error
 - init failed (An OpenGL init failed cause a Crash)
2012-03-19 20:41:28 +01:00
Laurent Ribon
081769fb7b Make method setVboEnable not inline.
There is more stuf to do.
2012-03-19 20:38:21 +01: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
Laurent Ribon
75d1f74090 Modify the modelview gadget widget in order to make it work with the
latest vesrion of GLC_lib and Qt4.8
2012-03-14 20:03:39 +01:00
Laurent Ribon
a636abef43 Activate Modelview plugin with QT4.8 2012-03-14 19:57:50 +01:00
Laurent Ribon
5eeafa227c Replace GLC_lib OpenPilot version to the latest GLC_lib version. 2012-03-14 19:57:11 +01: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
Dmitry Zaitsev
3a5b0c2329 plugins: add hitlv2 in build tree 2012-03-10 05:56:56 +04:00
Dmitry Zaitsev
c68af6de78 HITL: initial commit
plugin for simulator: https://github.com/hhrhhr/Aerosim-plugin-for-CopterControl
2012-03-10 05:56:07 +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
James Cotton
3c92e1cbcf Set the grahpicssystem to "raster" in the code after the reported performance
benefits.  This can be overriden on the commandline with -graphicssystem
2012-03-02 18:14:23 -06:00
zedamota
6d004f06f5 Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next 2012-03-02 18:48:11 +00:00
zedamota
05ef028f9d GCS - Make the save/apply operation result icons disappear when the form contents changes. 2012-03-02 18:47:24 +00:00
James Cotton
21699a3fce Set the grahpicssystem to "raster" in the code after the reported performance
benefits.  This can be overriden on the commandline with -graphicssystem
2012-02-29 22:22:43 -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
Dmytro Poplavskiy
3d05256a36 Welcome page UI tweaks
To make it closer to proposed design.

* Aligned the background OP logo to the bottom-right corner
* Don't upscale the OP logo
* Fixed width of community panel
* Changed the vertical layout of icons and community panel
* Fixed color of community panel titles
* Use styled text for next containing &,
   this fixes rendering but "..." are not displayed
2012-02-25 20:17:55 +11:00
Corvus Corax
a16c392bc6 Change to GLC Lib to make it compile on Linux with QT 4.8.0. 2012-02-24 14:28:48 +01: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
David Ankers
f6303b80a5 Constructor was called directly, GCC 4.6.1 on X64 Linux was not a fan
This fixes the build
2012-02-19 14:44:49 +11:00
David Ankers
d79eea0468 Use new icons for welcome plugin 2012-02-19 14:18:32 +11:00
David Ankers
0a352e179a Add Steve's new icons 2012-02-19 13:12:27 +11:00
zedamota
6fdec3364a Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next 2012-02-18 20:38:22 +00: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
David Ankers
80715fbec3 Update Plist info for Mac 2012-02-18 08:38:01 +11:00
James Cotton
fbb0b1173a More work from Kenz to improve the matlab parser 2012-02-16 04:24:10 -06:00
Oleg Semyonov
b02b64ece9 Change to GLC_lib to make it compile on Windows with Qt 4.8.0 2012-02-16 01:17:56 +02:00
Oleg Semyonov
4b06f68f11 Need to link a few new libraries for the QML stuff (windows) 2012-02-16 01:16:09 +02:00
James Cotton
32b156b686 Update dependencies on the Util gadget relating to the Settings gadget. Fixes
clean build.
2012-02-14 18:16:00 -06:00
James Cotton
68836b4a48 Disable ModelView with linux-g++-64 since it causes segfaults 2012-02-14 16:25:35 -06:00
David Ankers
688f3d9c84 Merge branch 'welcome' into next 2012-02-15 07:59:20 +11:00
James Cotton
7c65bcc5ac Merge remote-tracking branch 'origin/pt/gcs_uavobj_widget_framework' into next 2012-02-14 14:24:23 -06:00
James Cotton
03d12915af Merge remote-tracking branch 'origin/os/features/better-version-info-and-uav-export' into next 2012-02-14 13:39:00 -06:00
James Cotton
af189cc0ab Merge remote-tracking branch 'origin/remote/origin/banig/ScopeChanges' into next 2012-02-14 13:24:49 -06:00
James Cotton
bb89b82865 Merge branch 'next' into GCS_QML_Dmytro 2012-02-14 12:35:14 -06:00
James Cotton
fea4accb07 Patch from Kenz to suppress warnings about unknown object IDs until end of
parsing
2012-02-13 16:36:05 -06:00
James Cotton
81ceb9c17a Precompute CRC table in a global constant. Also if datasize for unknown object
is > 256 ignore it since corrupt data.
2012-02-13 16:27:44 -06:00
James Cotton
c111e26958 Patch from Kenz to suppress warnings about unknown object IDs until end of
parsing
2012-02-13 14:55:44 -06: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
855cc0f663 Fixes the BT telemetry not working on non windows OSs. 2012-02-12 17:27:26 +00:00
James Cotton
34ca5777dd Kalman filter for altitude 2012-02-11 21:08:19 -06: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
aea1e45de7 Added some documentation to the new framework 2012-02-11 21:38:27 +00:00
zedamota
1da2cf5166 Added support for multiple instances objects. 2012-02-11 18:35:36 +00:00
banig
2aead6a7c6 Made method name more descriptive 2012-02-11 16:17:20 +02:00
banig
8e1a7ae709 Add warning to let user know if Scope refresh interval is quicker than the telemetry data 2012-02-11 15:59:34 +02:00
Dmytro Poplavskiy
e6df2ca6d3 Replaced the welcome page with a QML based one.
It's still necessary to replace the mode images with the correct ones.
2012-02-11 10:14:13 +10:00
zedamota
c2d9af1e89 Finished framework and stab config showcase 2012-02-10 16:34:07 +00:00
sambas
81f01a0b96 Merge remote-tracking branch 'remotes/origin/next' into qwt_6.0.1_upgrade
Conflicts:
	ground/openpilotgcs/src/libs/qwt/src/qwt_global.h
	ground/openpilotgcs/src/libs/qwt/src/src.pro
2012-02-10 17:27:23 +02:00
James Cotton
6d6c7cac60 Added CRC calculation to the matlab log parsing 2012-02-10 08:07:51 -06:00
zedamota
4cdf223bff Added support for multiple apply/save buttons.
Added a few useful signals.
2012-02-08 20:15:14 +00:00
James Cotton
d5207c19f0 Fix for accidentally including inssetings back into build 2012-02-08 09:46:51 -06:00
James Cotton
49a03a868b Merge branch 'altitudehold' into revolution_overo
Conflicts:
	flight/OpenPilot/UAVObjects.inc
	flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
	flight/Revolution/Makefile
	flight/Revolution/ins.c
2012-02-07 23:00:29 -06: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
James Cotton
dbcb499d7f Add object to monitor the overo link status. Current just records the bytes/s
being sent and the connected status (based on sending more than 500 bytes per
second)
2012-02-06 09:37:31 -06:00
Corvus Corax
b4a8eda8db Merge branch 'corvuscorax/Smoothed_Scope' into next
Conflicts:
	ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2012-02-06 16:35:13 +01:00
zedamota
35c5391d53 Corrected file headers 2012-02-05 20:07:19 +00:00
sambas
a263ee7885 unix:!mac should solve all problems 2012-02-05 21:45:47 +02: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
Dmytro Poplavskiy
861b21a18d Added a QML viewer plugin.
UAV objects used in PFD are available in the QMl context.
2012-02-05 22:33:14 +10:00
Dmytro Poplavskiy
aead288304 Generate properties for UAVDataObject fields.
Also changed UAVObject::requestUpdate() and UAVObject::update() to be slots.

This makes possible to use objects directly from QML.
2012-02-05 13:58:17 +10: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
sambas
fedc62b6c3 OPReview-159: Linux posix timer thing fix 2012-02-02 16:34:46 +02:00
David Ankers
213a915f67 Remove flightplanner screen 2012-02-01 20:09:43 +11: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
David Ankers
a5ffdb7306 Merge branch 'master' into next 2012-01-31 05:32:49 +11: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
zedamota
01c910cd2b OP-616 Fixes wrong HW version being displayed. 2012-01-29 21:49:11 +00:00
David Ankers
6c030482a5 Fix 64 bit compile 2012-01-30 04:51:11 +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
3d896ffaf5 Fixes scopegadget loading issues with Qt versions > 4.7.4 2012-01-29 10:25:07 +11:00
naiiawah
fdcea01100 numberOfDevices could be left unitialized if sendData or receiveData
fail in findDevices or if no one ever calls findDevices.  Added init of
var.
2012-01-28 15:12:27 -07:00
zedamota
f6d747d5f0 Fixes scopegadget failure to load with Qt versions > 4.7.4 2012-01-28 22:07:45 +00:00
zedamota
e1d471dc63 Fixes scopegadget loading issues with Qt versions > 4.7.4 2012-01-28 21:25:38 +00:00
David Ankers
e307ab4d74 Merge branch 'master' of ssh://git.openpilot.org/OpenPilot 2012-01-29 04:31:42 +11:00
David Ankers
0a1645587c Update deluxe dials 2012-01-29 04:30:43 +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
James Cotton
3ab40b713e Add exception to allow uploading firmware for 0x402 boards to 0x401 boards 2012-01-24 16:58:56 -06:00
zedamota
0609cd56e5 Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next 2012-01-24 22:30:18 +00: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
c242ab8b86 Merge branch 'next' into revolution3
Conflicts:
	flight/AHRS/ahrs.c
	flight/AHRS/pios_board.c
	flight/Bootloaders/Revolution/Makefile
	flight/CopterControl/System/pios_board.c
	flight/INS/pios_board.c
	flight/OpenPilot/Makefile
	flight/OpenPilot/System/openpilot.c
	flight/OpenPilot/System/pios_board.c
	flight/PiOS/Boards/STM32103CB_CC_Rev1.h
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/Revolution/Makefile
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/test.c
2012-01-24 10:46:35 -06:00
Oleg Semyonov
f7ac0b2645 Merge remote branch 'origin/master' into next 2012-01-24 17:27:34 +02:00
Oleg Semyonov
da650cee60 gcscontrol: keep joystick image aspect ratio
OP-619
2012-01-24 11:31:00 +02:00
James Cotton
c84240e485 Merge branch 'next' into revolution3
Conflicts:
	flight/PiOS/STM32F10x/pios_bmp085.c
	flight/PiOS/STM32F10x/pios_exti.c
2012-01-23 06:51:30 -06:00
James Cotton
7b69cebe04 Merge branch 'master' into next 2012-01-23 06:07:31 -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
9006dd558f gcscontrol: code style formatting and cleanup 2012-01-21 00:55:21 +02:00
Oleg Semyonov
7d15cbd720 gcscontrol: new joystick image with active stick area 2012-01-21 00:55:08 +02: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
873ff617ab Improve UAVObjects export and import file formats
Changed file format to be able to save settings and data together.
Old settings files still can be imported. Data export will also contain
settings, so we always have the system settings with the system state.

Sample file:

<!DOCTYPE UAVObjects>
<uavobjects>
    <version>
        ...
    </version>
    <data>
        <object id="0xC409985A" name="AccessoryDesired">
            <field values="0" name="AccessoryVal"/>
        </object>
        ...
    </data>
    <settings>
        <object id="0xF2875746" name="ActuatorSettings">
        ...
    </settings>
</uavobjects>
2012-01-15 18:37:57 +02:00
Oleg Semyonov
421cf89544 Fix device info struct fields and variable names, better version info messages
- fixed deviceDescriptorStruct field names
  (gitTag->gitHash, buildDate->gitDate, description->gitTag);

- fixed variable names
  (onBoardDescrition->onBoardDescription, LoadedDescrition->LoadedDescription);

- version info in exported UAV files looks now like this:

<version>
    <hardware revision="1" serial="51ff6b064883545366621987" type="4"/>
    <firmware tag="master" date="20120104 17:51" hash="14ee6e4f"/>
    <gcs tag="os/features/version-info" date="20120115 12:57" hash="236fae56"/>
</version>
2012-01-15 18:37:42 +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
Oleg Semyonov
99e73a4ae9 Merge branch 'master' into os/features/pid-tuning-from-transmitter 2012-01-14 23:38:21 +02:00
Michael Rumpler
1b314ee256 * cleaned up notifyplugin
cause:
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp:104:6:
   warning: unused parameter ‘configInfo’ [-Wunused-parameter]
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp:353:6:
   warning: unused parameter ‘values’ [-Wunused-parameter]
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:73:10:
   warning: unused parameter ‘parent’ [-Wunused-parameter]
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:451:6:
   warning: unused parameter ‘rangeStr’ [-Wunused-parameter]
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:512:7:
   warning: unused parameter ‘oldstate’ [-Wunused-parameter]
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:527:6:
   warning: unused parameter ‘deselected’ [-Wunused-parameter]

   implemented solution:
   fixed all of them (commented out var name)

* fixed bug in check code

   cause:
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp:
   In member function ‘void SoundNotifyPlugin::checkNotificationRule(NotificationItem*, UAVObject*)’:
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp:398:109:
   warning: suggest parentheses around comparison in operand of ‘|’ [-Wparentheses]

   implemented solution:
   this is an obvious bug that is syntactically correct but leads to a
   warning with a good compiler so this bug can be found. fixed that to use
   logical or instead of bitwise or.

* fixed bug in include file (error in compilation under Linux)

   cause:
   In file included from
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp:47:0:
   /projects/OpenPilot/git/ground/openpilotgcs/src/plugins/notify/notifytablemodel.h:86:39:
   error: reference ‘_list’ cannot be declared ‘mutable’ [-fpermissive]

   implemented solution:
   removed the mutable flag, as this is wrongly used on a reference (and
   therefore correctly causing a compile-time error
2012-01-11 22:16:26 +01:00
zedamota
63bb2874d7 OP-608
Camera Stabilization settings not being read from CC board into GCS if CC is started first.

Created connection callback only to be called after all plugins are loaded.
2012-01-10 17:03:58 +00:00
zedamota
dbd9fcda28 OpenPilot OP-611
disable Flash button during operation
2012-01-09 16:53:59 +00:00
zedamota
00cb66ae79 OpenPilot OP-602
Please add a Help button on the Firmware page
2012-01-09 16:35:35 +00:00
zedamota
38392ee638 several fixes to the notify plugin 2012-01-09 16:09:50 +00:00
zedamota
9f2b71a351 Convert filename to lowercase 2012-01-09 14:06:27 +00:00
zedamota
553dab50fb Merge branch 'notify-plugin-merged' into next
Conflicts:
	ground/openpilotgcs/share/openpilotgcs/sounds/default/minus.wav
2012-01-09 14:02:04 +00:00
sambas
dd26e7c80f qwt 6.0.1 upgrade, sadly doesn't fix QT-4.8.0 scopeplugin in windows. 2012-01-08 12:13:51 +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
James Cotton
82d91d9830 Talked PT into a simpler firmware mismatch warning in exchange for more
photoshop.
2012-01-04 11:51:12 -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
Stacey Sheldon
b9eecadbe2 alarms: add BootFault alarm to system health SVG files
Original changes provided by Jose, text was slightly
modified to match alarm name.
2012-01-02 23:35:39 -05:00
Stacey Sheldon
4fd40ca0d2 gcs uploader: add support for "Safe Boot" to the GCS uploader
When halted in the bootloader or while rescuing a board, the
user can press the "Safe Boot" button in the uploader gadget
to force the FW to boot with a default hwsettings configuration.

The default conditions of the hwsettings uavo will disable all
optional modules, disable all serial port config, and ensure that
the board can communicate via the USB HID telemetry interface.

Once booted in this mode, a user can easily reconfigure the
hwsettings uavo through the config GUI and save the fixed
settings to the board to be used on the next reboot.  No need
to wipe all settings just to recover from a non-functional
HW config.

NOTE: The GCS needs to grow some very clear visual clues to
      indicate when the board has booted in safe mode.  The
      firmware helpfully raises a (new) critical alarm called
      BootFault whenever it boots in safe mode.
2012-01-02 14:27:07 -05:00
James Cotton
1b6ff0e470 Merge remote-tracking branch 'origin/os/features/advanced-camera-stabilization' into next 2012-01-02 11:38:27 -06:00
James Cotton
a2b067e4d5 Fix GUI bug for the GCS controller 2012-01-02 09:19:50 -06:00
Oleg Semyonov
77a459af5c Merge remote branch 'origin/next' into os/TxPID-module 2012-01-02 14:49:54 +02: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
James Cotton
21714911e8 Convert log files to structure of array instead of array of struct from Kenz 2012-01-01 13:19:07 -06:00
James Cotton
ef05cafaca Merge branch 'revolution' into altitudehold
Conflicts:
	flight/Libraries/insgps13state.c
	flight/OpenPilot/Makefile
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-01-01 10:50:35 -06:00
Stacey Sheldon
d43258f2fb gcs uavtalk: improve readability of debug logging 2012-01-01 09:24:22 -05:00
Stacey Sheldon
5c0921e92c fault: add optional fault insertion module
This module and its associated settings uavo can be used
to test various fault conditions during initialization.

To enable the module, add the TEST_FAULTS=YES to your make
command line:
  make fw_coptercontrol TEST_FAULTS=YES

Once this module is part of your firmware load, you can
enable it in the hwsettings uavo and then select the
type of fault to insert by editing the faultsettings uavo.
On the next reset, the configured fault will be inserted
into the init sequence to allow you to test the boot fault
recovery code.

With a fault inserted, you should see 3 failed boot attempts
followed by a successful (recovery) boot.  You will see the
BootFault alarm set to Critical, and the RAM version of your
hwsettings will be reset to defaults.  Since the defaults have
all optional modules disabled, the fault module will be out of
the way during the recovery boot.

You can then "Load" the flash version of the hwsettings uavo
in the object browser, disable the Fault module and then "Save"
the hwsettings module back to the board.  The next reset will
boot normally without the fault inserted.
2011-12-30 23:05:39 -05: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
e980bb863f uavobj browser: add object size to tree display 2011-12-30 23:05:38 -05:00
Stacey Sheldon
bd9f3569db gcs uavtalk: Add full state-level debug logs
These logs are disabled by default, and can be
turned on at compile time by defining:
  UAVTALK_DEBUG
at the top of uavtalk.cpp.

These logs proved very helpful in diagnosing a
serial comms issue.
2011-12-30 23:05:37 -05:00
Stacey Sheldon
fa9702db97 gcs serial: fix broken baud rate selection
The difference between 56000 and 57600 baud is very
important.

When using a USB to serial adapter that is capable
of synthesizing arbitrary baud rates, these errors
resulted in a completely mismatched/unusable serial
link.
2011-12-30 23:05:37 -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
Stacey Sheldon
458d3467ab gcs: properly label ttyACM devices in gcs pull-down selector 2011-12-30 23:05:33 -05:00
dankers
7892f9699d Add minus for notify as requested 2011-12-29 22:25:17 +11:00
James Cotton
e34f618d89 Accel fields shouldn't be capitalized in the scope config 2011-12-24 16:15:13 -06: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
zedamota
761da06b6f small fix and some cleaning 2011-12-24 10:37:38 -06:00
zedamota
5e43f85cc4 Make the GCS serial telemetry speed configurable 2011-12-24 10:37:38 -06:00
James Cotton
24af36bba3 Merge remote-tracking branch 'origin/pt/configurable_gcs_serial_speed' into next 2011-12-24 09:50:59 -06:00
Oleg Semyonov
7fbbb0e6af Merge remote branch 'origin/next' into os/TxPID-module 2011-12-24 15:44:16 +02:00
James Cotton
0024cbaa51 Merge branch 'next' into revolution_sensors 2011-12-18 16:28:30 -06:00
naiiawah
6dcf55c41e Killed off file that should not have been checked in to Git. 2011-12-18 13:36:49 -07:00
James Cotton
2b5f0bccc6 Merge branch 'next' into revolution_sensors 2011-12-16 15:31:14 -06:00
James Cotton
99201d152a Patch from Kenn to speed up matlab parsing by preallocating arrays 2011-12-16 15:30:48 -06:00
James Cotton
b56c11d1d9 Merge remote-tracking branch 'origin/stac/logging_fixes' into next 2011-12-16 13:54:49 -06:00
Corvus Corax
716bb8ec56 GCS:Scope: Backward Compatibility: Set Interpolation to minimum (1) when not set in config file 2011-12-15 23:49:01 +01:00
James Cotton
4b6aab0513 Merge remote-tracking branch 'origin/stac/logging_fixes' into revolution_sensors
Conflicts:
	ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2011-12-14 10:38:05 -06:00
James Cotton
9f50391fc5 Merge branch 'next' into revolution_sensors
Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
2011-12-13 20:50:10 -06:00
James Cotton
fc2465675a Update the config file to no longer point to the old AttitudeRaw object 2011-12-13 20:47:52 -06:00
James Cotton
7776cc529b Remove the old AHRS configuration gadget 2011-12-13 20:32:43 -06:00
James Cotton
bdc7f762d6 Remove old test class that uses outdated objects (AttitudeRaw) 2011-12-13 20:24:57 -06:00
James Cotton
9143a716cf Disable HITL until it is update to the new sensor objects 2011-12-13 20:24:09 -06:00
James Cotton
889a84da04 Revert "GCS/ScopePlugin: Allow SoftwareInterpolation of measurement value"
This reverts commit 4f485f7d61.
2011-12-13 11:04:21 -06:00
James Cotton
98ee21ead3 Revert "GCS/Scope: CSV export exports non-interpolated data"
This reverts commit 99215458c2.
2011-12-13 11:04:20 -06:00
James Cotton
bf98fe14c3 Revert "GCS/Scope: Make smooth interpolation (and internal sum) be long term correct despite limited floating point accuracy, but keep constant overhead"
This reverts commit 78278683cc.
2011-12-13 11:04:20 -06:00
James Cotton
40e7bf5c59 Revert "GVS/Scope: Bugfix: Export all known data points into CSV not just one per screen redraw"
This reverts commit 2ce3365861.
2011-12-13 11:04:20 -06:00
dankers
000373b421 Update default linear dials to deluxe 2011-12-14 02:24:25 +11:00
James Cotton
a37a17a4fb Created a separate Sensor module and Attitude module for revolution 2011-12-12 21:40:39 -06:00
James Cotton
d22e0e66dd Create separate UAVOs for the sensors. 2011-12-12 13:05:40 -06:00
Corvus Corax
2ce3365861 GVS/Scope: Bugfix: Export all known data points into CSV not just one per screen redraw 2011-12-12 09:48:05 -06:00
Corvus Corax
78278683cc GCS/Scope: Make smooth interpolation (and internal sum) be long term correct despite limited floating point accuracy, but keep constant overhead 2011-12-12 09:48:05 -06:00
Corvus Corax
99215458c2 GCS/Scope: CSV export exports non-interpolated data 2011-12-12 09:48:05 -06:00
Corvus Corax
4f485f7d61 GCS/ScopePlugin: Allow SoftwareInterpolation of measurement value 2011-12-12 09:48:05 -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
Stacey Sheldon
a19bbb7ea3 csvlog: Do not scale data written to CSV files
The autoscaling values used by the scope gadget were
being applied to the raw data being written to the CSV
files.  This resulted in the CSV file containing data
that had a variable scale, thus making it useless.
2011-12-10 16:50:51 -05:00
Stacey Sheldon
8c0c39ca53 uavobjgen: Update matlab template to accept a logfile path
This makes the generated .m file more generally useful.
2011-12-10 16:50:51 -05:00
James Cotton
bfaed9c7e0 Merge remote-tracking branch 'origin/corvuscorax/Smoothed_Scope' into next 2011-12-10 15:20:25 -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
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
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