rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-13 20:48:42 +01:00
Code Issues Releases Activity
9,698 Commits 5 Branches 8 Tags 266 MiB
ca607ad924
Commit Graph

2951 Commits

Author SHA1 Message Date
PT_Dreamer
f6443fc995 Merge branch 'stac/package-opfw-resources' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate 2012-10-06 19:50:17 +01:00
PT_Dreamer
4e4ed172c1 GCS-Added fw bundle resource to the uploader plugin 2012-10-06 19:46:33 +01:00
chris pember
827b8b9486 added groupboxes to the pages that were loose 2012-10-06 11:43:03 -07:00
Fredrik Arvidsson
2af2a732fb Complete set of new icons. 2012-10-06 16:12:15 +02:00
chris pember
f6c4b4b57b fixed one last settings page 2012-10-06 02:09:50 -07:00
chris pember
c2641fd21d added scroll areas to all the preference settings screens 2012-10-06 01:55:24 -07:00
Fredrik Arvidsson
08be8f5e8f Merge branch 'next' into thread/config_art 2012-10-06 10:45:08 +02:00
Fredrik Arvidsson
ffe6c0bcb5 Added icons and updated some other code. 2012-10-06 10:42:57 +02:00
PT_Dreamer
519e240a6e GCS-Fix file copying on linux 
It got reverted on a merge
 2012-10-06 01:44:20 +01:00
PT_Dreamer
a313a54c17 GCS-Added temp resource file containing fw 2012-10-06 01:43:44 +01:00
PT_Dreamer
5d24bc55a6 GCS-Created wizard firmware autoupdate page 2012-10-06 01:42:33 +01:00
PT_Dreamer
2c4f50c4f5 GCS-Export uploader functions 2012-10-06 01:40:25 +01:00
PT_Dreamer
8c2a5e9d06 GCS-Uploader Auto update function 
Quick and dirty autoupdate function.
The uploader plugin is in need of a major refactoring to separate the
logic from the UI. This will be on my TODO list.
 2012-10-06 01:35:34 +01:00
Fredrik Arvidsson
eb35ba4cbb Added even more new icons. 2012-10-05 18:16:04 +02:00
Fredrik Arvidsson
a57435f183 Added more new icons. 2012-10-05 16:24:56 +02:00
James Cotton
2191befe17 Merge remote-tracking branch 'revo/brian/rfm22_rf2' into revo 
Conflicts:
	flight/PiOS/Common/pios_rfm22b.c
 2012-10-05 08:20:35 -05:00
Fredrik Arvidsson
d765ac01d5 Added new icons and fixed icon states when selected/highlighted. 2012-10-05 14:30:37 +02:00
chris pember
919202875e temp fix for the sizing of the hitlv2 page to stop the squashing 2012-10-05 19:35:25 +10:00
David Ankers
bcc39b7fad Make options window taller, turn on OpenGL by default on the map, we 
already use this for the QML PFD and no issues reported.
 2012-10-05 18:47:00 +10:00
David Ankers
7e8aa7079c Make uploader plugin board images looks nicer, spotted by Steve, fixed by 
Steve.
 2012-10-05 17:39:13 +10:00
Fredrik Arvidsson
28afadf8b9 Added first icons and started to fix with icon states. 2012-10-05 08:16:26 +02:00
David Ankers
d42f4089ed Updated tab Icons from Steve, match the welcome screen icons 2012-10-05 15:26:45 +10:00
chris pember
649a5b4b1e temp fix for the sizing of the hitlv2 page to stop the squashing 2012-10-04 21:12:19 -07:00
Brian Webb
5724fa083c RFM22B: Added link quality calculation based on number of dropped packets. Also added packet error correction, which apparently wasn't being done before. 2012-10-04 21:11:40 -07:00
chris pember
a536f74722 temp fix for the sizing of the multi page that will allow folks on tiny screens to have a uavo browser if they want 2012-10-05 13:25:49 +10:00
James Cotton
82efb91fad Add developer GCS config layout 2012-10-04 20:44:00 -05:00
David Ankers
aaea66a5d0 Fix splitter on Scopes screen 2012-10-05 11:18:16 +10:00
David Ankers
2573e84e76 Change Welcome screen icon by popular request 2012-10-05 10:18:29 +10:00
James Cotton
99a0eeae3d Merge commit 'e89ae3389d95603fccdcda535ab6cbed97099851' into revo 2012-10-04 16:38:26 -05:00
James Cotton
13cabd2ea4 Merge branch 'next' into revo 
Conflicts:
	flight/PiOS/Common/pios_rfm22b.c
 2012-10-04 16:38:08 -05:00
PT_Dreamer
d9afd58ee2 GCS-Added layouts to new wiz 2012-10-04 15:37:16 +01:00
PT_Dreamer
29111b3529 GCS-Map fixes 
Find place now works when the user presses enter
Find place goes to zoom level 12.
Don't go to UAV position on HW connect if "follow UAV" mode is not set
 2012-10-04 12:32:30 +01:00
PT_Dreamer
ac8d399d8d GCS-Fixes Flight data tab icon not being displayed 2012-10-04 12:15:20 +01:00
chris pember
e89ae3389d temp fix for the sizing of the multi page that will allow folks on tiny screens to have a uavo browser if they want 2012-10-03 23:46:46 -07:00
David Ankers
af7fffdab6 Add Gadgets to HiTL screen 2012-10-04 13:09:54 +10:00
David Ankers
6b2ac1cf39 Spelling on browser config, add size settings to options so things don't 
get scrunched.
 2012-10-04 12:52:36 +10:00
Laura Sebesta
35f7b4903f Several files still needed to have comments removed. 
Missed merge in git. Retry.
 2012-10-03 15:10:58 -05:00
PT_Dreamer
a1ebdc38fa Merge branch 'thread/OP-39' of ssh://git.openpilot.org/OpenPilot into next 2012-10-03 14:13:28 +01:00
Fredrik Arvidsson
4f84c4ba3b Merge branch 'next' into thread/OP-39 2012-10-02 23:20:28 +02:00
Fredrik Arvidsson
a47687cff8 OP-39 Added correct dependencies to SetupWizard plugin specification. 
Renamed FlashPage to FlashDance, eeh, no SavePage :)
Removed unnecessary dependency in setupwizard.pro
Fixed a bug with the Next button on the first page.
Fixed a bug with the cancel button on the last page.
 2012-10-02 23:17:56 +02:00
James Cotton
71e1a14e93 GCS Uploader: Add a backward compatibility condition for RM1 using RM2 firmware 2012-10-02 09:37:55 -05:00
Fredrik Arvidsson
13f10949e8 OP-39 Removed an unnecessary struct declaration. Changed some texts. Removed some empty lines. 2012-10-01 21:50:00 +02:00
PT_Dreamer
8744e3dc93 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-10-01 13:42:59 +01:00
Kenz Dale
b740fefa56 Fixed bug by which aerosimrc plugin was not compiled. 2012-10-01 12:03:30 +02:00
Fredrik Arvidsson
138848453f OP-39 Changed the Radio Setup Wizard to go to the Arming Settings screen after the last step in the wizard. Changed the info text in a dialog. 2012-09-30 17:27:20 +02:00
Fredrik Arvidsson
eed564a3c4 OP-39 Adding label to indicate when leveling is done in a more clear way. 2012-09-30 14:41:58 +02:00
Fredrik Arvidsson
ede0c2ebf9 OP-39 Small adjustment. 2012-09-30 14:24:54 +02:00
Fredrik Arvidsson
949569fdec OP-39 Added handling of switching to correct tab in input configuration section when starting Radio Setup Wizard. 2012-09-30 14:19:31 +02:00
Fredrik Arvidsson
3fa2d504bb Merge branch 'next' into thread/OP-39 2012-09-30 13:37:24 +02:00
Fredrik Arvidsson
19875fb70b OP-39 Fixed controller identification bug. Now using telemetry manager to receive notifications about connect/disconnect. 
Changed text on last page in wizard.
 2012-09-30 13:35:35 +02:00
Stacey Sheldon
ed24d93ab1 gcs gamepad: teach GCS that an accel is not a gamepad 
The gcscontrolgadget expects all gamepad devices to have
at least 4 axes of control.  The SDL layer (on Linux anyway)
will detect the accelerometer that's built into some laptops
as a gamepad with 3 axes.

This change prevents the accel from being selected and
subsequently flooding the console with errors from
gcscontrolgadget every 10ms.
 2012-09-29 21:47:26 -04:00
PT_Dreamer
4edf78d1cd GCS-No more hidden settings. 2012-09-29 22:44:52 +01:00
Fredrik Arvidsson
fdec9ce149 OP-39 Fixed a lot of textual stuff. 
Changed layout on some pages to make room for longer texts.
Changed default neutral value for output from 1080 to 1000.
Renamed 'Hexacopter H' to 'Hexacopter X'
 2012-09-29 11:47:16 +02:00
Fredrik Arvidsson
3b9e50ad51 Merge branch 'next' into thread/OP-39 2012-09-29 09:43:50 +02:00
PT_Dreamer
b637bfaca9 Revert "Changed UAVO browser erase icon to reset icon." 
This reverts commit 85ed1c364d.
 2012-09-28 19:36:46 +01:00
PT_Dreamer
399fc7fe85 Merge branch 'cp/extraGUIchanges' of ssh://git.openpilot.org/OpenPilot into next 2012-09-28 11:55:33 +01:00
PT_Dreamer
dfa60f16b3 Revert "Changed UAVO browser erase icon to reset icon." 
This reverts commit 85ed1c364d.

Change voted against by 2 lead devs on the review.
 2012-09-28 11:53:19 +01:00
James Cotton
e4faece356 Merge remote-tracking branch 'origin/cp/extraGUIchanges' into next 2012-09-28 01:12:46 -05:00
James Cotton
61f1140645 Merge branch 'revo' into rm2 2012-09-28 01:01:35 -05:00
James Cotton
5c13c31c08 Merge branch 'next' into revo 
Conflicts:
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
 2012-09-28 01:00:10 -05:00
chris pember
e2389af30d fixed the stylesheets vertical sliders. pushing to correct branch 2012-09-27 21:06:19 -07:00
chris pember
c6c8ff9487 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-09-27 20:41:33 -07:00
chris pember
5306b2cb71 fixed the stylesheets so the vertical sliders arent broken looking anymore 2012-09-27 20:41:01 -07:00
Stacey Sheldon
9896a0d416 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-27 22:42:44 -04:00
James Cotton
29a970564f Merge remote-tracking branch 'origin/kenz/uavo_util_fixes' into next 2012-09-27 14:07:47 -05:00
Laura Sebesta
a899c87c56 Remove superflous UAVO update call. 
Add documentation.

Remove commented code.
 2012-09-27 19:21:00 +02:00
Laura Sebesta
09b8980881 Fixed copy-pasta error. 2012-09-27 18:06:48 +02:00
Laura Sebesta
9ec05d8928 Added dialog to request altitude when settings HomeLocation via the map. 
Fixed bug in setHomeLocation, by which altitude was scaled inappropriately.
 2012-09-27 14:44:26 +02:00
Laura Sebesta
f532f3cda5 Rewrote uavobjectutilmanager.cpp, such that upon UAVO changes it returns com 
Updated homelocationutil to remove references to ECEF and RNE.
 2012-09-27 11:45:59 +02:00
Fredrik Arvidsson
efd953b00c OP-39 Fixed a bug in Welcome page button. 2012-09-27 08:18:50 +02:00
James Cotton
26408e286f GCS Stabilization: Force the apply button to always be there as I can't find expert mode 2012-09-26 09:49:33 -05:00
James Cotton
0fa4b062a4 Merge branch 'next' into revo 2012-09-26 00:43:02 -05:00
Fredrik Arvidsson
f42085f6ac Merge branch 'next' into thread/OP-39 2012-09-26 00:44:34 +02:00
Fredrik Arvidsson
e7e95412e8 OP-39 Fixed Wizard Style so that it looks ok on Mac and Windows 
Changed the output calibration part of the wizard so that it is a part of the wizard flow instead of a separate flow inside one page.
 2012-09-26 00:42:17 +02:00
James Cotton
f77df97699 OSGEarth: Remove function definition without implementation. 2012-09-25 13:24:08 -05:00
James Cotton
7d8c61d33d OSGEarth: Remove reference to caching. Uses old API. 2012-09-25 13:19:18 -05:00
PT_Dreamer
43f85d9617 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-09-25 10:44:32 +01:00
PT_Dreamer
551c56f3c0 Merge branch 'pt/UAVO_Hash' of ssh://git.openpilot.org/OpenPilot into next 2012-09-25 10:43:59 +01:00
chris pember
b09041cb9f moved the autotune checkbox up top like the other modules 2012-09-25 00:16:31 -07:00
chris pember
b4ac6a0b86 couple little tweaks, is perfect on linux and windows, close enough on osx 2012-09-24 23:46:34 -07:00
chris pember
36f830e4d3 couple little tweaks, ys, this is endless 2012-09-24 23:28:43 -07:00
chris pember
fc55a52ff4 merged kens branches, changed the wording a little on the pre-autotune page, just need someone to look at one small bit of oddness with the save and apply buttons on autotune page 2012-09-24 21:41:41 -07:00
chris pember
d7eb662761 Merge branch 'kenz/erase2reset' of ssh://git.openpilot.org/OpenPilot into cp/extraGUIchanges 2012-09-24 20:26:30 -07:00
chris pember
086232406d Merge branch 'kenz/extraGUIchanges' of ssh://git.openpilot.org/OpenPilot into cp/extraGUIchanges 2012-09-24 20:26:04 -07:00
chris pember
ee801431d6 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-09-24 19:41:59 -07:00
Laura Sebesta
2caf635acd A couple artwork fixes for reversed motors. 2012-09-24 22:36:39 +02:00
Laura Sebesta
9d5d67a45a Added swapping of artwork when multirotor direction reversed. 2012-09-24 22:01:19 +02:00
PT_Dreamer
af36409e80 Merge branch 'dmytro/pfd_qml' of ssh://git.openpilot.org/OpenPilot into next 2012-09-24 19:02:51 +01:00
Laura Sebesta
c3a402e52f Add support for coaxial helicopter. 
Untested.
 2012-09-24 19:17:38 +02:00
PT_Dreamer
c04318493a GCS- Fixes compile error 2012-09-24 13:38:14 +01:00
PT_Dreamer
8b91e19733 GCS/Telemetry Fixes reconnection loop 
This fixes a situation where the telemetry would keep looping from the
connected to the reconnecting state. One of the situations this was
happening was going from "halt" to "boot"
 2012-09-24 12:32:46 +01:00
PT_Dreamer
c8de27cbaf GCS/Uploader Changes acording to review 
Changed template comments.
Added UAVO hash to the GCS help dialog
 2012-09-24 12:17:32 +01:00
PT_Dreamer
4e08fa548f GCS/Uploader- Added leading zeros to git hash 2012-09-24 11:50:15 +01:00
Laura Sebesta
85ed1c364d Changed UAVO browser erase icon to reset icon. 2012-09-24 10:24:37 +02:00
chris pember
616a27ca82 fixed that path error PT brought up in forum i hope 2012-09-23 22:34:40 -07:00
PT_Dreamer
dc10917f70 GCS-Yaw mixing level reverse button 
Changed the slider values from -100/+100 to 0/100 and wrote the code for
the invert checkbox.
NOT TESTED
 2012-09-23 22:50:05 +01:00
Fredrik Arvidsson
3ef26a633a OP-39 Moved reboot page to directly after Rx config page. 
Added partial save to support changed hardware settings.
Made it possible to skip leveling procedure.
Changed some texts.
Changed isRebootRequired() criteria.
 2012-09-23 21:58:37 +02:00
Fredrik Arvidsson
5ecf04fb15 OP-39 Restricting connection device to USB when using the wizard. Changed text accordingly. 2012-09-23 14:11:32 +02:00
Dmytro Poplavskiy
dbbdb62173 Added the readymap based earth files 2012-09-23 19:30:10 +10:00
Dmytro Poplavskiy
28f028064a Fixed the osgearth cache only configuration 
osgEarth enables it even if OSGEARTH_CACHE_ONLY is set to false
it's necessary to unset it instead
 2012-09-23 19:13:05 +10:00
PT_Dreamer
4e1081179b GCS-Auto Tuning 
Added code to allow module to be enabled using the checkbox
 2012-09-22 23:17:06 +01:00
chris pember
de924ccf5f just doing local commits so I can grab it in my own branch, just spacing changes and a little rearrangement 2012-09-22 11:09:08 -07:00
chris pember
2e89db5315 Merge branch 'cp/extraGUIchanges' into next 2012-09-22 10:40:09 -07:00
chris pember
7d8c662aef added the auto tune checkbox, changed the wording on the pre-autotune page 2012-09-22 10:37:22 -07:00
Fredrik Arvidsson
6eaa2daab1 OP-39 Fixed some layout issues on the output calibration page. 2012-09-22 11:21:12 +02:00
Fredrik Arvidsson
81efc2a931 Merge branch 'next' into thread/OP-39 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
 2012-09-22 10:58:55 +02:00
chris pember
8551f837b4 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-09-21 20:44:51 -07:00
David Ankers
570917f331 Remove old versions from source, however, they are still in the Artwork 
folder.
 2012-09-22 10:47:10 +10:00
Nuno Guedes
432642952c Test Quad updated with CC3D 
- Old Test Quad versions (OP Pro+AHRS+GPS) renamed to "old".
- New Test Quad versions updated with CC3D
 2012-09-22 10:43:23 +10:00
PT_Dreamer
c3b9e7a992 GCS-UAVObject Browser 
Changed the save and load buttons order
 2012-09-21 19:03:40 +01:00
PT_Dreamer
738cc44930 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-09-21 18:56:21 +01:00
PT_Dreamer
8f23905a99 GCS- Input config gadget 
Text changes only from Berkely
 2012-09-21 18:40:55 +01:00
Kevin Vertucio
98db6469f9 copy/content revisions and corrections 
Fixed some corrections missed in SetupWizard

Signed-off-by: Kevin Vertucio <kevin.vertucio@eurorscg.com>
 2012-09-21 07:52:24 -04:00
chris pember
d5661bec3e adjusted the autotune page into 2 tabbed pages 2012-09-20 22:19:40 -07:00
Kevin Vertucio
7797a99bb1 copy/content revisions and corrections. 
More corrections in SetupWizard plugin

Signed-off-by: Kevin Vertucio <kevin.vertucio@eurorscg.com>
 2012-09-20 21:34:14 -04:00
Fredrik Arvidsson
69621ba2f8 Merge branch 'next' into thread/OP-39 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
 2012-09-20 23:53:33 +02:00
Fredrik Arvidsson
607497758f OP-39 Changed to one single wizard button on the welcome page. KISS :) 2012-09-20 23:08:09 +02:00
James Cotton
aff29b5af5 GCS: Add some plugin dependencies. Thanks to Amedee for finding these. 2012-09-20 15:55:16 -05:00
James Cotton
64d8f64ea7 Matlab parser: small fix from Kenz 2012-09-20 15:28:47 -05:00
PT_Dreamer
8bd4a8c6fd GCS - Very small UI fix on the autotuning page 2012-09-20 10:22:52 +01:00
David Ankers
7f71769c5b Add Nuno's new models 2012-09-20 13:17:18 +10:00
David Ankers
b921e3213f Minor tweak to make top row splitters better on smaller screens 2012-09-20 12:55:42 +10:00
Dmytro Poplavskiy
6174fa2d7f PFD: display the side-slip indicator 2012-09-20 09:17:10 +10:00
Dmytro Poplavskiy
608297fbd3 Changed the default PFD widget to qml based one 2012-09-20 09:14:49 +10:00
Kevin Vertucio
8f8dd12615 copy revisions and corrections in SetupWizard plugin 
Signed-off-by: Kevin Vertucio <kevin.vertucio@eurorscg.com>
 2012-09-19 10:14:59 -04:00
PT_Dreamer
f8387bfaaa GCS-Only update the aiframe config widget after all relevant objects are updated 
This was deleted by someone with any aparent reason.
 2012-09-18 14:23:35 +01:00
PT_Dreamer
0d30138571 GCS-Reduced UAVO hash bytes displayed from 20 to 8 2012-09-18 13:51:44 +01:00
Fredrik Arvidsson
d80954e13a OP-39 Changed the layout of the welcome screen and placed the wizard buttons grouped with all other buttons. 2012-09-18 12:48:57 +02:00
Fredrik Arvidsson
57169ceeb2 OP-39 Fixed a bug when changing receiver type in wizard. The channel group type was not correctly set in manual control settings. 
Added support in code for all known DSM types (2/X10Bit/X11Bit). Still have to add/create GUI/Icons to enable selection of specific protocol.
Renamed some enums to have better and more correct names.
 2012-09-17 21:40:42 +02:00
Fredrik Arvidsson
30c1523b80 OP-39 Fixed a bug causing output rate for channel 2 and max channel rate for channel 0 to be wrong when configuring a hexacopter. 2012-09-17 20:00:26 +02:00
PT_Dreamer
fb073059ad GCS-Use uavo definition hash to check for compatability 
Unfortunately had to change the iap object.
 2012-09-17 17:08:15 +01:00
David Ankers
633286ab73 Grammar change: accidently added and extra extra word. Drifter credit 2012-09-17 22:30:01 +10:00
David Ankers
715aa6543b Fixed a couple of more spelling mistakes spotted by Drifter (Thanks!) 2012-09-17 22:26:21 +10:00
David Ankers
b9597e96f9 Spelling fix with input wizard, add a t to transmitter spotted by Drifter. 
Conflicts:

	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
 2012-09-17 22:20:33 +10:00
David Ankers
ca7ce48a4e Spelling fix with input wizard, add a t to transmitter spotted by Drifter. 2012-09-17 22:11:51 +10:00
Fredrik Arvidsson
7363a2a266 OP-39 Unmade the mistake :) 2012-09-17 07:12:30 +02:00
Stacey Sheldon
6f9f737c35 gcs uavo: remove obsolete UAVOs from project for GCS 2012-09-16 21:42:05 -05:00
David Ankers
410a9a1837 Add Steve's curve bg 2012-09-17 09:04:36 +10:00
Fredrik Arvidsson
806097fd56 OP-39 Added reboot page to wizard. User needing to reboot should NOT forget it now. 
Added code to invoke Vehicle Setup Wizard and Radio Wizard from Welcome page.
 2012-09-16 23:03:15 +02:00
Fredrik Arvidsson
098c0d43fd OP-39 Hopefully fixed the servo calibration neutral value issue. 2012-09-16 16:21:51 +02:00
Stacey Sheldon
754f58c33a Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Revolution/Makefile.osx
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-16 09:56:35 -04:00
Fredrik Arvidsson
bd3d3708eb Merge branch 'next' into thread/OP-39 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
	ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadget.h
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.h
	ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui
	ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui
	ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.h
	ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.ui
	ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui
	ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
	ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
 2012-09-16 15:14:47 +02:00
Dmytro Poplavskiy
6049f47296 Merge branch 'next' into dmytro/pfd_qml 2012-09-16 13:31:06 +10:00
Dmytro Poplavskiy
150314ff98 PFD qml: align elements to pixels grid 
It improves the rendering quality,
sub pixels accuracy gives no benefits in placing PFD elements
 2012-09-16 10:03:28 +10:00
Stacey Sheldon
9a5ba841cf Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/pathaction.xml
	shared/uavobjectdefinition/waypointactive.xml
 2012-09-15 19:55:47 -04:00
PT_Dreamer
fa2aa81079 First pass on using the uavo hash to check compatability between GCS and FW 2012-09-15 23:02:45 +01:00
James Cotton
51683ffb65 Merge branch 'next' into revo 
Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/plugins.pro
 2012-09-15 16:31:30 -05:00
chris pember
80c86b0b26 omg I think I fixed the mac spacing,linux and windows tweak test 2012-09-15 12:59:16 -07:00
chris pember
556c8b4464 omg I think I fixed the mac spacing, just checking on windows build now 2012-09-15 12:27:59 -07:00
Fredrik Arvidsson
e3b5727dc1 OP-39 Fixed some layout stuff. 2012-09-15 11:06:19 +02:00
Kevin Vertucio
3236f432b9 Content revisions and updates to SetupWizard plugin 
Corrected grammar and spelling.
Revised Wizard introduction, multirotor platform descriptions for QuadX, Quad+, Tricopter.

Signed-off-by: Kevin Vertucio <kevin.vertucio@eurorscg.com>
 2012-09-14 11:32:09 -04:00
PT_Dreamer
c88c4f0fc0 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
 2012-09-14 14:12:16 +01:00
Dmytro Poplavskiy
a8e6f4991b Added "use OpenGL" option to qml based PFD 2012-09-14 08:50:02 +10:00
Fredrik Arvidsson
463c14bf84 OP-39 Removed the motor max rate calibration steps from the wizard. Hardcoded max rate to 1900 ms for now. 
Fixed a bug with button enable/disable in the output calibration page.
 2012-09-13 23:49:08 +02:00
Fredrik Arvidsson
4a09886e91 Merge branch 'next' into thread/OP-39 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
 2012-09-13 22:11:37 +02:00
PT_Dreamer
9f0ad56745 GCS-Minor cleaning acording to review comments 2012-09-13 16:25:32 +01:00
James Cotton
42213b21f7 Make OSG selection a QMake config option (OSG) 
To include this module from the command line:
    make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
 2012-09-13 09:46:03 -05:00
James Cotton
69688813b5 GCS Build: Include UAVTalk in SystemHealth dependencies 2012-09-13 09:28:46 -05:00
chris pember
9fbaa4410f new quick gui fixes branch, changed input form so the checkbox for calibrate is now a button, resized that and the wizard button to not be ginormous. no new functionality added, just desing changes 2012-09-12 19:12:23 -07:00
James Cotton
36242fa70e Delete file that shouldn't have been committed 2012-09-12 16:06:47 -05:00
PT_Dreamer
abbf858123 Fixes special settings not being saved. 2012-09-12 21:57:49 +01:00
PT_Dreamer
d4cd0a9f89 GCS- Config fix and new copy method for data collections 2012-09-12 13:39:35 +01:00
PT_Dreamer
7b1f9bf14e Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-09-12 11:10:15 +01:00
PT_Dreamer
c11958c9b6 GCS-Review comments changes 
Added font mixer curve font size to linux default and wide stylesheets
Change Node class name to MixerNode to ease stylesheet access
Changed language selection to top of the list
 2012-09-12 11:09:30 +01:00
James Cotton
223a3473c2 Merge branch 'next' into revo-mini 2012-09-12 02:03:39 -05:00
James Cotton
f9fd2bd1af Merge branch 'pidt1' into next 2012-09-11 23:39:50 -05:00
David Ankers
a4729ea27c Changes to default config, make UAVOB fill left side, add logging as it 
fits on system better, add GPS desplay gadget also.
 2012-09-12 07:49:16 +10:00
Fredrik Arvidsson
a5335a0ace OP-39 Minor fixes 2012-09-11 20:05:07 +02:00
James Cotton
7cb6e71fae Remove a Q_UNUSED where the parameter doesn't exist. 2012-09-11 10:21:01 -05:00
James Cotton
2488b48f50 Merge branch 'usb_fixes' into next 2012-09-11 10:18:45 -05:00
James Cotton
d74b9c9b9f Revert changes from Kenn in pjrc_rawhid which conflict with usb cleanup 2012-09-11 10:18:31 -05:00
James Cotton
509e7a2ec1 Merge remote-tracking branch 'origin/hyper/gcs-levelling-fixes' into next 2012-09-11 03:05:47 -05:00
Dmytro Poplavskiy
02c00fabb2 GCS/PFDqml: split the world view to smaller parts 
Ground and sky is rendered as QML Rectangle with gradients;
Pitch scale and center line are rendered separately from the world
element, so they always fit the maximum texture size.
 2012-09-11 15:25:13 +10:00
Dmytro Poplavskiy
288cb40c92 Updated the pfd.svg file 
compass-band has a hidden vertical square to make the vertical limit.

New IDs:
world-bg (group of sky and ground)
sky (blue part of the world)
ground (orange part of the world)
pitch_scale (the center scale)
world-centerline (the centerline in the center of the world and in 
the middle of the sky and ground)

By muralha
 2012-09-11 15:22:04 +10:00
Dmytro Poplavskiy
53d8fa4666 Added the border parameter to the svg image provider 
it's useful to extent the image by 1 pixel sometimes,
so the AA area is not clipped.
 2012-09-11 15:19:19 +10:00
Dmytro Poplavskiy
18a9ad3aa8 PFD: split the compass band to parts to fit the texture limit 
On older graphics cards the texture size limit
may be smaller than the compass band width,
QML downscales the element to fit the texture.

To avoid this, split compass band to tiles.

Added parameter like hslice=2:8 to svg image provider
and SvgElementImage.
 2012-09-11 15:16:58 +10:00
Fredrik Arvidsson
7d7d1644bc OP-39 Fixed disabling of wizard buttons during bias calculation and saving of configuration. 2012-09-10 22:55:02 +02:00
Fredrik Arvidsson
37abf82fc2 OP-39 Added saving as image to the connection diagram dialog. 2012-09-10 22:37:39 +02:00
James Cotton
c97e3ddb3d Merge branch 'usb_fixes' into revo-mini 
Conflicts:
	ground/openpilotgcs/src/plugins/rawhid/pjrc_rawhid_mac.cpp
	ground/openpilotgcs/src/plugins/rawhid/rawhid.cpp
 2012-09-10 15:21:27 -05:00
James Cotton
38e9d105aa Merge branch 'pidt1' into test2 
Conflicts:
	flight/Modules/ManualControl/inc/manualcontrol.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-10 14:37:52 -05:00
James Cotton
386a9d41ef Merge branch 'next' into test2 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m
 2012-09-10 14:29:26 -05:00
PT_Dreamer
09f950ff76 GCS Fixes -clean-config command line argument segfault 2012-09-10 19:46:13 +01:00
Richard Flay (Hyper)
5b7fb6bcef Minor improvement to GCS bias calibration logic, plus minor UI behaviour tweak 2012-09-10 22:22:36 +09:30
James Cotton
59dcbf5cb6 GCS OSX: More refinements to the USB code to make it more robust and work for reset/halt. 2012-09-10 02:04:59 -05:00
James Cotton
e027c25071 OSX USB: Add write and read mutexs to avoid closing mid write. 2012-09-10 00:32:40 -05:00
James Cotton
f8e5654ff4 Remove some comments 2012-09-09 23:45:04 -05:00
James Cotton
26ff40b5f3 GCS OSX: Work on how the receive threads are stopped properly 2012-09-09 23:43:38 -05:00
James Cotton
604e125251 GCS RawHID: Refactor the code to move most of the 
functionality into one class.  Removed support for
multiple open devices since we can just use multiple
classes.
 2012-09-09 17:10:50 -05:00
Fredrik Arvidsson
b889035a24 Merge branch 'next' into thread/OP-39 2012-09-09 23:46:39 +02:00
Fredrik Arvidsson
d337fcf1d8 OP-39 Finished up motor/servo calibration, actuator settings. 
Bug fixes after initial testing end2end testing.
I am making a note here: First successful 1-2-Fly! session ever!
 2012-09-09 23:44:42 +02:00
James Cotton
741207ddc0 GCS OSX HID: Tweak the closing so that it doesn't crash. Still fails to unregister 
the input callback.
 2012-09-09 13:03:57 -05:00
James Cotton
8bb6a2600f GCS Serial: Was double detecting USBCDC devices. 2012-09-09 11:40:14 -05:00
James Cotton
06fc1ed963 GCS USB: More the opening and closing code into the read 
thread to simplify some threading issues on OSX.  Should
not influence other operating systems.
 2012-09-09 11:04:52 -05:00
PT_Dreamer
78a4241ba2 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
 2012-09-09 13:04:29 +01:00
PT_Dreamer
ba575edbbc Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 
OPReview 248
 2012-09-09 12:30:09 +01:00
Dmytro Poplavskiy
4cc13c9eea GCS/PFDqml: use the correct sceneSize for svg element images 
Pass the element source size instead of the scene source size
to ensure the element is not downscalled.
 2012-09-09 16:58:54 +10:00
chris pember
6a94cd49b5 reworked ALL the ui pages in windows so they work there, so pushing this for now, it just needs love in osx 2012-09-08 18:35:14 -07:00
James Cotton
b84f833287 GCS Uploader: Remove dialog about another board since it's 
not used for any boards now.
 2012-09-08 20:05:07 -05:00
James Cotton
44d271ac79 GCS USB: Get rid of some unnecessary code 2012-09-08 20:04:44 -05:00
James Cotton
cf1c986550 OSX USB: Close more handles properly 2012-09-08 19:48:33 -05:00
James Cotton
3f11c398db GCS USB: Start with polling enabled so it acts like before and grabs first available USB device 2012-09-08 19:46:45 -05:00
James Cotton
1aadcf4e70 GCS USB: Make sure to fully unregister all the callbacks when disconnect. 2012-09-08 19:31:32 -05:00
James Cotton
9b7060a491 GCS USB: Increase the max timeout before giving up on stopping the USB threads. 2012-09-08 19:07:14 -05:00
James Cotton
82f752685a GCS ConnectionManager: When polling is disabled don't automatically connect to boards either. 2012-09-08 19:06:03 -05:00
James Cotton
2ec8434941 OSX USB: Make sure to store the run loop handle before connecting the signals that can use it. 2012-09-08 16:06:01 -05:00
James Cotton
6840b8934b GCS ConnectionManager: More cleaner code structure. 2012-09-08 16:05:51 -05:00
James Cotton
8e8cbd0b75 GCS ConnectionManager: Use some cleaner code coventions 2012-09-08 15:45:08 -05:00
James Cotton
19eaa77a15 Remove some comments and unused variables 2012-09-08 15:32:12 -05:00
James Cotton
65ef8a59b4 GCS ConnectionManager: Get rid of all the copies of various forms of the names and 
store a handle to the IConnection::device and generate the appropriate names from
consistent functions.
 2012-09-08 15:14:06 -05:00
James Cotton
1ca8abb3c8 GCS ConnectionManager: Properly check it is the active connection before closing it when a USB device is disconnected. 2012-09-08 14:31:16 -05:00
James Cotton
3563c7376f GCS ConnectionManager: When plugging in a new device don't glitch the connectionwq 2012-09-08 14:04:59 -05:00
James Cotton
9912432e84 GCS ConnectionManager: Remove some commented code 2012-09-08 13:33:50 -05:00
James Cotton
44e7c4542f GCS USB: Implement structure for only adding new devices but need a way of 
identifying them
 2012-09-08 13:23:37 -05:00
James Cotton
e5ab9f0fda GCS ConnectionManager: Consolidate the unregistering and registering devices 
into one method
 2012-09-08 12:53:00 -05:00
James Cotton
e6bcf96e2a GCS USB: Remove unused include file 2012-09-08 12:47:15 -05:00
Richard Flay (Hyper)
c5745b0817 Fixes/tweaks to GCS levelling code. Fixed a deadlock and take more samples 2012-09-08 15:58:39 +09:30
Fredrik Arvidsson
3a38cb2cc1 OP-39 Added new button graphix. 
Implemented servo min/max/neutral calibration.
Added check for Actuator module alarm before running calibrarion.
 2012-09-07 07:35:43 +02:00
PT_Dreamer
6325263a1d Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
 2012-09-06 12:41:08 +01:00
Fredrik Arvidsson
0871cd3db2 OP-39 More Motor and servo calibration code. 2012-09-05 00:58:53 +02:00
James Cotton
2f65fc1e8e Merge branch 'next' into relay_tuning 
Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-04 10:43:04 -05:00
Fredrik Arvidsson
51dc691ab8 OP-39 Motor and servo calibration code. 2012-09-04 01:28:28 +02:00
Dmytro Poplavskiy
1102587570 GCS/PFDqml: fixed compass rendering 
Converted AttitudeActual.Yaw to -180..180 range,
so the whole compass band is always filled
 2012-09-03 15:23:51 +10:00
James Cotton
a3b75a3cc7 Merge remote-tracking branch 'origin/kenz/matlab_parser_vectorizing' into next 2012-09-02 19:23:18 -05:00
James Cotton
db083aa0e9 Merge branch 'android' into next 2012-09-02 19:19:23 -05:00
Fredrik Arvidsson
b150375ff5 Merge branch 'next' into thread/OP-39 2012-09-03 01:05:47 +02:00
Fredrik Arvidsson
a44ea92df7 OP-39 Output calibration functionality. Connection diagram updates. 2012-09-03 01:01:57 +02:00
Dmytro Poplavskiy
99b898c5c2 GCS/PFDqml: display the VSI bar 
updated pfd.svg file with new compass and VSI bar
 2012-09-02 13:33:29 +10:00
James Cotton
c9f66f5145 Merge branch 'revo' into revo-mini 
Conflicts:
	androidgcs/AndroidManifest.xml
	androidgcs/res/layout/gcs_home.xml
	androidgcs/res/values/strings.xml
	androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
	androidgcs/src/org/openpilot/androidgcs/HomePage.java
	flight/PipXtreme/System/pios_board.c
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-01 16:57:27 -05:00
James Cotton
2c003d8b0b PathCompiler: Link up the path compiler to the map again. Got broken in the merge. 2012-09-01 16:50:08 -05:00
James Cotton
6bfb2a5e45 Merge branch 'next' into revo 
Conflicts:
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/libs/utils/coordinateconversions.h
	ground/openpilotgcs/src/plugins/opmap/opmap.pro
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
	shared/uavobjectdefinition/waypoint.xml
 2012-09-01 16:18:03 -05:00
chris pember
26b682122b fixed the text on the mixer, need mike or someone to hook up the reverse button for the yaw mixer, as well as change the range on the slider 2012-09-01 11:11:44 -07:00
chris pember
77ea0277d0 made some more adjustments to the stylesheet for osx, sliders in particular 2012-09-01 01:20:51 -07:00
chris pember
704cad9313 fixed up the feed forward tab, as well as renamed advanced to feed forward on the tab 2012-08-31 21:55:10 -07:00
chris pember
777bad5708 fixed the vertical sliders, fixed input/output header spacing over the config sliders, switched around the progress bar in stabi ui, more to come 2012-08-30 23:00:25 -07:00
Fredrik Arvidsson
df987ab57f OP-39 Connection diagram changes. 
Fixed a bug levelling util and changed rate from 100ms to 30ms.
 2012-08-30 22:13:44 +02:00
James Cotton
60051e88cc Calibration: Fix both accels and gyros to 30 ms. Should be reasonably sustainable through USB. 2012-08-30 11:38:15 -05:00
Kenz Dale
b9fe954d87 Added simulator support for AirspeedActual UAVO. 2012-08-29 16:28:02 +02:00
Kenz Dale
034b366578 Fixed timer bug in baroAlt. 2012-08-29 16:09:01 +02:00
Kenz Dale
e123a88262 Added UAVO for airspeeds. 2012-08-29 16:04:47 +02:00
Kenz Dale
ff0de79147 Improved default HiTL timer periods for more reactivity. 2012-08-29 14:41:45 +02:00
Kenz Dale
037182f522 Fixed bug which prevented HiTL timers from functioning as intended. 2012-08-29 14:41:23 +02:00
Kenz Dale
f888eaed41 Implemented gcsReceiver. 2012-08-29 14:24:58 +02:00
Kenz Dale
494b3d156e Fixed bug by which attitude HiTL settings were not taken into account. 2012-08-29 14:23:14 +02:00
Kenz Dale
d9139c6529 Extended HiTL API to the rest of the simulators. 2012-08-29 12:35:46 +02:00
Kenz Dale
cb377e0f1d Fixed typo, changed some wording to be clearer. 2012-08-29 12:15:27 +02:00
James Cotton
75db9f5941 OP-669: Gyros were not being sent at a rapid rate during calibration making the results quite noisy. 
Now both accels and gyros require a minimum number of updates before calibration completes.

Thanks to ti.dyer for the report and fix.
 2012-08-29 04:29:55 -05:00
chris pember
528cea9418 almost done fixing any spacing isues, changed the font so its bigger, added some new stylesheet properties to linux and osx 2012-08-28 23:27:36 -07:00
James Cotton
3e6f98b2e8 Update the OSX packaged icons to those from 3rdeyepro / dacat. 2012-08-28 18:32:49 -05:00
Fredrik Arvidsson
d647e9d6bb Merge branch 'thread/OP-39' of ssh://git.openpilot.org/OpenPilot into thread/OP-39 2012-08-28 18:13:35 +02:00
Fredrik Arvidsson
41f2a49bb2 OP-39 Added outputcalibration page to wizard. 2012-08-28 18:11:49 +02:00
Fredrik Arvidsson
955b1f489e OP-39 Fixed svg file 2012-08-28 16:19:32 +02:00
Fredrik Arvidsson
8c1fbb0352 Merge branch 'next' into thread/OP-39 2012-08-27 21:23:30 +02:00
Fredrik Arvidsson
66534ae91c OP-39 Fiddling around with connection diagram. 
Updated some GUI.
Started on motor calibration function.
 2012-08-27 07:19:46 +02:00
James Cotton
001c43c090 Increase timeout to shut down the telemetry threads. Might fix some OSX USB related crashes. 2012-08-25 23:44:58 -05:00
Stacey Sheldon
144fea1bd1 gcs: fix pipx-related typos in GCS 
This also fixes the auto-selecting of FW images for
pipx in the uploader GUI by making the board name
match fw_pipxtreme.
 2012-08-25 23:22:56 -05:00
Stacey Sheldon
d4794d139f gcs: fix pipx-related typos in GCS 
This also fixes the auto-selecting of FW images for
pipx in the uploader GUI by making the board name
match fw_pipxtreme.
 2012-08-25 23:46:40 -04:00
James Cotton
446870d869 TxPID: Set the timeOut to NULL after deleting it. I had a segfault from here. 2012-08-25 19:37:50 -05:00
James Cotton
524540895f Never ask if there are other devices to enumerate. We don't do that anymore for any active boards. 2012-08-25 19:32:06 -05:00
PT_Dreamer
96e8d668b2 GCS-UI Fixes 
Fixes rotation of board on hw settings page
Fixes airframe size on airframe settings page
 2012-08-24 17:50:28 +01:00
Fredrik Arvidsson
4d701a2f7a OP-39 Updated some GUI. Changed stylesheet on some elements. Switched button graphix and added new graphix. 2012-08-24 16:22:21 +02:00
Kenz Dale
7c49d47046 Rearranged HiTL preferences layout to make more efficient use of space. 2012-08-24 13:50:26 +02:00
Kenz Dale
00963e3647 Fixed bug where actCommand was unassigned. 
Added in some additional functionality for appropriately setting update rates.
 2012-08-24 13:23:36 +02:00
Kenz Dale
91852e8550 Updated xml file to reflect changes in HiTL. 2012-08-24 13:21:53 +02:00
Fredrik Arvidsson
49bdb731f5 OP-39 Added button for Radio Config Wizard. 
Cleaned up the GUI, removed all group boxes and aligned components on pages.
Changed place of rapid and default esc buttons.
Set the size of the wizard to a fix size.
Updated some of the texts.
Changed font sizes.
Added resources.
Started the connection diagram implementation.
 2012-08-24 00:48:09 +02:00
Fredrik Arvidsson
962fa3958a Merge branch 'thread/OP-39' of ssh://git.openpilot.org/OpenPilot into thread/OP-39 2012-08-23 18:38:26 +02:00
Fredrik Arvidsson
bc9181ba04 OP-39 Added dialog for the connection diagram. 2012-08-23 18:37:55 +02:00
Kenz Dale
0ff46af74c Changes requested in review. 
All cosmetic (removing comments or fixing whitespaces), so does not affect functionality.
 2012-08-23 18:10:27 +02:00
Kenz Dale
76b0d3b1da Redefined isIntermediateValueHelper as class static. 2012-08-23 18:03:19 +02:00
Kenz Dale
9ebc32da3d Eliminated several (dozen) compiler warnings. 
Conflicts:

	ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
 2012-08-23 18:03:17 +02:00
Kenz Dale
def4601008 Moved HiTLnew to HiTL. 2012-08-23 17:26:37 +02:00
Kenz Dale
569f3736f9 Removed HiTLv2 sources. 2012-08-23 17:14:47 +02:00
Kenz Dale
05db4c64b1 Got rid of some compiler warnings, and fixed a few whitespaces. 2012-08-23 17:14:21 +02:00
Kenz Dale
05f131fa46 Refactored HiTL to add functionality created by hrrrrr in HiTLv2. 2012-08-23 17:11:20 +02:00
PT_Dreamer
3a0ca3c724 GCS-ConfigTaskWidget 
Fixes the dirty status being wrongly set
 2012-08-23 16:07:10 +01:00
Fredrik Arvidsson
cd0ff804eb OP-39 Added new graphics for buttons. 
Added fix trying to handle when config plugin is not loaded in workspace and we are trying to jump to Input Wizard on the end page of the wizard.
 2012-08-23 16:28:57 +02:00
Oleg Semyonov
c47c8c373d Merge remote-tracking branch 'origin/os/CameraStab-use-ConfigTaskWidget' into next 2012-08-23 13:41:34 +03:00
Oleg Semyonov
b946d8162a CameraStab UI: add comment about reference implementation 2012-08-23 13:39:37 +03:00
Kenz Dale
cf9b04d0ac Finished port, but still untested. 2012-08-23 10:34:24 +02:00
Laura Sebesta
d4a1fb28c7 Merged HiTLv2 into HiTLnew. AeroSimRC support in HiTLnew is currently untested. 2012-08-23 10:29:58 +02:00
James Cotton
a99b5454eb Merge remote-tracking branch 'origin/os/CameraStab-use-ConfigTaskWidget' into next 2012-08-22 08:06:34 -05:00
PT_Dreamer
bd913d1333 Merge branch 'dmytro/welcome_page_update' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-22 13:29:57 +01:00
Dmytro Poplavskiy
13a10b309a Fixed segfault when ScrollDecorator is destroyed 
looks like the qt declarative bug, as a workaround
unset the source componet on destruction.
 2012-08-22 09:00:29 +10:00
Fredrik Arvidsson
b804bc4634 Merge branch 'next' into thread/OP-39 2012-08-21 23:18:53 +02:00
Fredrik Arvidsson
8e66133b2d OP-39 Added reset of stabilization data to default values when wizard writes its configuration. 2012-08-21 23:10:38 +02:00
Oleg Semyonov
ffd5220071 CameraStab UI: some reformatting and comments 2012-08-21 22:09:53 +03:00
PT_Dreamer
8bb94e052b Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/camerastabilization.ui
	ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp
	ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.h
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
 2012-08-21 17:05:36 +01:00
PT_Dreamer
caecc0e3ff GCS- Added missing definition to h file. Something went wrong with 
the merge.
 2012-08-21 16:19:55 +01:00
Laura Sebesta
a94142ec30 Fixed several compile warning complaints. 
Conflicts:

	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
 2012-08-21 16:18:58 +01:00
PT_Dreamer
da41a30273 Merge branch 'dmytro/welcome_page_update' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-21 14:56:42 +01:00
PT_Dreamer
adba241131 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
 2012-08-21 14:51:50 +01:00
PT_Dreamer
fa465c54a8 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 
Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
 2012-08-21 14:46:16 +01:00
PT_Dreamer
e7a7a30e19 GCS-Created new command line option to allow choosing the config file 
to use. This is a last resort option to mac problems displaying the
initial dialog.
 2012-08-21 14:41:53 +01:00
Stacey Sheldon
1f1b240b2a Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
 2012-08-20 21:22:02 -04:00
Fredrik Arvidsson
5199d9e738 Merge branch 'next' into thread/OP-39 2012-08-21 01:09:02 +02:00
Fredrik Arvidsson
c483d42937 OP-39 Added mixer and motor configuration for Hexa and Octocopters. 
Changed so that the Flex port is set to be serial telemetry port by default.
Added some description texts for the different multirotor types.
Fixed disabling/enabling of Cancel and Back buttons during processing like bias calculation and saving of configuration.
Converted summary text to html and added some formatting of the text.
Added message if no controller is connected on saving the configuration.
 2012-08-21 01:07:38 +02:00
James Cotton
d58831d3f1 GCS: Add conditial flag to include OGS plugins. Must compile with qmake CONFIG+=OSG 
To include this module from the command line:
make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
 2012-08-20 15:36:18 -05:00
PT_Dreamer
0c240cffa5 GCS/OPMap- Change one of the function names to proper camelcase 2012-08-20 16:21:12 +01:00
PT_Dreamer
56b094abab GCS/OPMap - Changed the date of the license header on both the lib and plugin 2012-08-20 16:10:17 +01:00
James Cotton
4a0d43cb54 GCS: When PipX is detected do not make it the active configuration tab to prevent the dialog about dirty tabs appearing. 
Conflicts:

	ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
 2012-08-19 21:20:18 -05:00
James Cotton
237ec188f9 GCS: When PipX is detected do not make it the active configuration tab to prevent the dialog about dirty tabs appearing. 2012-08-19 21:17:37 -05:00
Fredrik Arvidsson
10b9f00fac OP-39 Added setting of default flightmodes.. 2012-08-20 00:14:17 +02:00
Fredrik Arvidsson
9205400cf0 OP-39 Implemented functionality for reliable writing of UAVOs to controller board. 
Removed the option to configure the board without having it connected.
Added Tri, QuadX and QuadP configuration code.
Updated some of the texts.
 2012-08-19 23:25:50 +02:00
James Cotton
d186069ebd Update hardcoded OSG paths. Very dirty I need to fix this properly. 2012-08-19 12:48:48 -05:00
PT_Dreamer
84d55ca416 GCS-Added a few overloaded functions so that object and field pointers 
can be used with confitaskwidget framework
 2012-08-19 14:41:57 +01:00
PT_Dreamer
45e21acefd GCS- Get rid of the double hwsettings update. setData triggers an 
update so the other functions should be used instead.
MixerSettings should be refactored next.
 2012-08-19 14:41:09 +01:00
PT_Dreamer
83097ecffb GCS/OPMap- bumped up the QPixmap max cache value 2012-08-19 01:43:49 +01:00
PT_Dreamer
42119f8d67 GCS/OPMap- UAVItem - removed everything that doesn't belong 
on the paint function
 2012-08-19 01:40:05 +01:00
PT_Dreamer
4b8bfcb997 GCS/OPMap - Changed several foreach chield methods to signal/slot 2012-08-18 23:04:31 +01:00
PT_Dreamer
2a4c54a073 Revert "Fixed several compile warning complaints." 
These touch much more than the map lib and plugin so they should
be base on next and sent for review

This reverts commit ca4fbd5102.
 2012-08-18 20:09:04 +01:00
PT_Dreamer
c6706ce6b2 Merge branch 'pt/MapEnhancements' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements 
Conflicts:
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
 2012-08-18 20:01:32 +01:00
Oleg Semyonov
0afd923708 CameraStab UI: more comments to serve as a self-documented code sample 
Also disabled "module enable" checkbox reload/default actions.
 2012-08-18 20:45:05 +03:00
PT_Dreamer
f56b4b8a9b GCS/MapLib - Switched to a signal slot aproach on several functions which need 
to be propagated.
 2012-08-18 18:07:39 +01:00
Laura Sebesta
ca4fbd5102 Fixed several compile warning complaints. 2012-08-18 14:18:10 +02:00
Laura Sebesta
b7298f890f homeitem.cpp fixed to erase the safe area when turning off ShowSafeArea. 2012-08-18 09:28:30 +02:00
Laura Sebesta
375ecfb369 Streamlined paint function. 2012-08-18 09:23:09 +02:00
Laura Sebesta
d3daa06713 Improved filtered groundspeed calculation. Now the filtering rise time no longer on the refresh rate. 2012-08-18 09:19:59 +02:00
Laura Sebesta
28f382d472 Disabled dragging and dropping of UAV and Home icons. 2012-08-18 09:15:55 +02:00
Dmytro Poplavskiy
89023e8c41 Welcome page: display tooltips below buttons if necessary 
Useful on low res screen, to ensure tooltips are visible
 2012-08-18 11:30:50 +10:00
Kenz Dale
c484dcb1db Corrected mathematics for estimating rate of turn. 2012-08-17 17:26:15 +02:00
Kenz Dale
e3a60b7677 Merge branch 'pt/MapEnhancements' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements 2012-08-17 16:56:44 +02:00
Laura Sebesta
34efc4d3b7 Dramatic performance gains by turning on caching for homeitem and mapgraphicitem. 2012-08-17 16:47:11 +02:00
Kenz Dale
e648a778db Enabled caching for map widget. 2012-08-17 11:51:50 +02:00
Laura Sebesta
e52d141e3e Improved bounding rect dimensioning. 2012-08-17 10:11:45 +02:00
Laura Sebesta
7e55b31ca1 Fixed bounding box size. 
Conflicts:

	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.h
 2012-08-17 09:46:35 +02:00
Mike LaBranche
13e631a2e4 ConnectionManager: add connect/reconnect timer management into telemetryconnect/disconnect slots 2012-08-16 21:13:07 -07:00
David Ankers
ca7827e0cd Monkey work!! 2012-08-17 09:21:46 +10:00
Fredrik Arvidsson
98b5bc305b OP-39 Re-factored the configuration code to be implemented in a separate helper class to enable it to be used in a better and more stand alone way. The actual wizard class does not contain any uavo configuration code at all now. 
Added an interface that provides all configuration parameters for a vehicle.
Changed the default ESC to Rapid instead of Default 50Hz. Default ESC was renamed to Legacy ESC.
Started to implement mixer configuration.
Started to implement flight mode configuration code.
Cleaned up some code and removed warnings.
 2012-08-17 00:47:31 +02:00
PT_Dreamer
525dec1748 GCS-Added gradient to edit gadgets bar 2012-08-16 23:30:31 +01:00
dwobdar
92114bf952 Fixing white border in aircraft config screen. 2012-08-16 22:19:24 +02:00
PT_Dreamer
af61e983b8 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-16 19:39:07 +01:00
PT_Dreamer
b91afc2c12 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-16 19:37:55 +01:00
Laura Sebesta
699b2f3030 Cleaned up variable names, fixed bug in saving whereby the a log file could be saved over if the extension were not "opl". 2012-08-16 08:37:26 +02:00
Fredrik Arvidsson
16d0252d12 OP-39 Added some basic code to reset the mixers. Started to implement mixer configuration for all multirotors. 2012-08-16 00:27:40 +02:00
Laura Sebesta
69133c1427 Further optimized Matlab parsing. It now does most typecast as vectorized operations. 
The upshot is an approximately 50% performance boost.
 2012-08-16 00:13:19 +02:00
PT_Dreamer
57d4aaaf17 GCS-Handle reload for unbounded objects 2012-08-15 22:50:09 +01:00
PT_Dreamer
a78766c7b2 Merge branch 'os/CameraStab-use-ConfigTaskWidget' of ssh://git.openpilot.org/OpenPilot into CameraStab-use-ConfigTaskWidget 2012-08-15 12:52:51 +01:00
PT_Dreamer
93124bbfee GCS-Fixed reload operation, sorry Oleg 2012-08-15 12:37:00 +01:00
Oleg Semyonov
fd9f1491ba CameraStab UI: fix spacing and add comments according to OP coding style guidelines 
More info:
http://wiki.openpilot.org/display/Doc/Coding+Style
http://qt-project.org/wiki/Qt_Coding_Style
 2012-08-15 10:31:19 +03:00
PT_Dreamer
d3c5fcfa7e GCS-Handle reload operation config camera stab 2012-08-15 00:13:26 +01:00
Fredrik Arvidsson
2b541219bf OP-39 Added condition for multirotor type. If PWM input option is enable only up to Hex is selectable, otherwise Octo is selectable to. 
Added initial configuration code that applies the users choices in the UAVOs.
Changed order of pages so that Input page comes before vehicle page.
 2012-08-15 01:04:54 +02:00
PT_Dreamer
ae962f507b GCS-Couple of bug fixes and created a new defaultRequested signal 2012-08-14 23:55:53 +01:00
PT_Dreamer
2ddb0e63d2 GCS-Couple of bug fixes and created a new defaultRequested signal 2012-08-14 23:02:08 +01:00
Mike LaBranche
8c3488e220 TelemetryMonitorWidget: add op-131 support for connect/disconnect signals 
from telemetrymonitor, slots and timers in connectionmanager;
 2012-08-14 12:35:53 -07:00
PT_Dreamer
0f8974178a GCS-Fixes crash if autoLoadWidgets is called after addUAVObject 2012-08-14 18:12:07 +01:00
Oleg Semyonov
64e5ff8e6d CameraStab UI: rescan widget if changed during UAVObject update 2012-08-14 17:52:44 +03:00
Oleg Semyonov
c8e90a537e CameraStab UI: use ConfigTaskWidget API to take care of other widgets 2012-08-14 17:15:53 +03:00
Oleg Semyonov
a0977b405b CameraStab UI: use ConfigTaskWidget API with objrelation dynamic property 
This supports most of widgets which are directly related to UAVObjects.
 2012-08-14 17:12:55 +03:00
Dmytro Poplavskiy
69bd17c6a8 Welcome page: display the scroll decorator 
To give a hint the news list is scrollable
 2012-08-14 23:06:31 +10:00
Dmytro Poplavskiy
81d4fd3740 Updated welcome page to work better on small screen 
if the buttons grid overlaps vertically with wizard buttons,
move it left to use only the space left to wizard buttons;

Hide the OpenPilot Logo when workspace buttons don't
fir the screen;

Limit the size of community panel on small screen
 2012-08-14 22:54:08 +10:00
Dmytro Poplavskiy
31cb4b7ea5 Welcome page: added wizard buttons 
Not connected to anything yet, may be necessary
to update the workspace names once new workspaces added.
 2012-08-14 22:46:35 +10:00
PT_Dreamer
40da558131 GCS-Update the path to the stylesheets on Mac to. 2012-08-13 22:48:45 +01:00
James Cotton
e9a355077f Look for the default configurations in a platform dependent location, 
unfortunately.
 2012-08-13 22:42:17 +01:00
PT_Dreamer
1c344bb4fe Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into CC3D_Release 2012-08-13 22:28:25 +01:00
Fredrik Arvidsson
25d13e4c35 Merge branch 'next' into thread/OP-39 2012-08-13 19:54:26 +02:00
Fredrik Arvidsson
bc6709cfb3 Added button imgaes for the wizard and created a resource file to host them. 2012-08-13 19:52:39 +02:00
Chris Pember
dc5cec8c06 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-12 22:09:04 -07:00
Chris Pember
b4da3b5e54 added a little padding for the scroll area in airframe form so in windows it doesnt get squashed...i hope. 2012-08-12 22:08:56 -07:00
James Cotton
edec288812 Update the config file so the mag scopes selection works 2012-08-13 10:34:55 +10:00
Laura Sebesta
62041f40ad Changed variable from static to class static. 2012-08-12 23:36:27 +02:00
James Cotton
63e490a922 Update the config file so the mag scopes selection works 2012-08-12 16:12:21 -05:00
James Cotton
3a0c259de3 Update the config file so the mag scopes selection works 2012-08-12 16:11:49 -05:00
James Cotton
18d63f7e9c Merge commit 'b19a0947fb72dc069540561ffeb6983ee318fcb9' into revo 2012-08-12 14:39:30 -05:00
James Cotton
75db0fcb35 Merge branch 'next' into revo 
Conflicts:
	flight/Modules/GPS/GPS.c
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/systemalarms.xml
 2012-08-12 14:38:38 -05:00
Mike LaBranche
c414f80fd7 Merge branch 'pt/CC3D_Release' of ssh://gitolite@git.openpilot.org/OpenPilot.git into CC3D_Release 2012-08-12 08:40:43 -07:00
PT_Dreamer
1a22eef491 GCS-Several changes according to review comments 2012-08-11 23:36:00 +01:00
PT_Dreamer
f4bd4c3120 Merge branch 'pt/MapEnhancements' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements 2012-08-11 22:03:09 +01:00
PT_Dreamer
619b4ffa8c GCS-Prevent the map from being dragged beyond the available imagery. 
Previous way seemed broken, looked ugly and like a bug.
 2012-08-11 19:58:14 +01:00
Chris Pember
180313031f Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-11 11:29:47 -07:00
Chris Pember
6e413d1779 locked the column headers in airframe yaw and txPID so they hopefully dont go all gigantic in windows 2012-08-11 11:29:38 -07:00
PT_Dreamer
9379eb73d7 GCS-Fix stylesheet not being saved. 2012-08-10 03:03:52 +01:00
PT_Dreamer
254f98aad5 GCS-Updated configuration file with the latest changes 2012-08-09 22:47:48 +01:00
PT_Dreamer
3df35b933c Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-09 22:42:35 +01:00
PT_Dreamer
b0e6566114 GCS- Handle loading of the configuration file. Stylesheets files 
are now loaded from mainwindow instead of main.
 2012-08-09 22:33:13 +01:00
PT_Dreamer
dae15702ed GCS-Delete previously used stylesheet and configuration files 2012-08-09 22:31:51 +01:00
PT_Dreamer
e2d7e824ed GCS-Created new wide and default stylesheets and configurations just as an example. 
Currently they are the same.
 2012-08-09 22:30:31 +01:00
PT_Dreamer
9da1372e54 GCS-Change the way the stylesheets are copied (was not working for me) 
Also copy the default configuration xml files. These are now on
the shared folder together with the stylesheet instead of being
inside a resource file.
Stylesheets and configuration files are now copied from SRC/SHARED to
APP/SHARED
 2012-08-09 22:25:34 +01:00
PT_Dreamer
e033004656 GCS-Added new dialog to let the user choose from a list of available 
configurations uppon startup when no valid configuration is found
 2012-08-09 22:22:09 +01:00
Dmytro Poplavskiy
93dd153fc4 Enabled text antialiasing for a number of widgets 
Unlike QPainter::setRenderHints(),
QGraphicsView::setRenderHints() set the render hints  to flags passed as parameter,
so QPainter::TextAntialiasing flag is cleared.

changint it to setRenderHint or adding QPainter::TextAntialiasing
value fixes the AA text rendering.
 2012-08-09 22:04:40 +10:00
Fredrik Arvidsson
59d71c2b98 Merge branch 'next' into thread/OP-39 2012-08-09 11:17:52 +02:00
David Ankers
5bf98a03c7 Align the new telem to the center, it's bugging me. 2012-08-09 18:12:56 +10:00
David Ankers
92a9a57bf7 Make options Window a better size, fixes a load of the cramped layout. 2012-08-09 15:42:00 +10:00
David Ankers
40e25ff8e2 Turn on sounds by default 2012-08-09 14:58:07 +10:00
Dmytro Poplavskiy
518358c8f7 Re-enabled the notify plugin with Qt 4.8 
On all the platform except of Qt 4.8.0 on Mac,
this combination crashes.

Fixed in Qt 4.8.1, QTBUG-23128
 2012-08-09 09:06:14 +10:00
Dmytro Poplavskiy
d358591726 Fixed possible notification plugin deadlock 
Protecting with mutex stateChanged(Phonon::State)
and starting/stopping playback looks dangerous,
the media player may emit another state change leading to deadlock.

The mutex should not be necessary here
since all the slots are executed in the main thread.

Changing the objectUpdated(UAVObject*) connection type
to Qt::QueuedConnection is not strictly necessary,
signals between threads are queued by default,
it serves more the documentation purpose.
 2012-08-09 09:05:59 +10:00
Dmytro Poplavskiy
f4ff84d41a Notify plugin cleanup 
Removed a few unused SoundNotifyPlugin members
 2012-08-09 09:05:39 +10:00
PT_Dreamer
821f954276 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-08 23:32:07 +01:00
Mike LaBranche
0f35e5f776 Merge branch 'pt/CC3D_Release' of ssh://gitolite@git.openpilot.org/OpenPilot.git into CC3D_Release 2012-08-08 15:05:57 -07:00
James Cotton
f530702ce9 Merge branch 'android' into sim_android 
Conflicts:
	androidgcs/AndroidManifest.xml
	androidgcs/res/layout/gcs_home.xml
	androidgcs/res/layout/pfd.xml
	androidgcs/res/layout/system_alarms.xml
	androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
	androidgcs/src/org/openpilot/androidgcs/BluetoothDevicePreference.java
	androidgcs/src/org/openpilot/androidgcs/CompassView.java
	androidgcs/src/org/openpilot/androidgcs/Controller.java
	androidgcs/src/org/openpilot/androidgcs/HomePage.java
	androidgcs/src/org/openpilot/androidgcs/Logger.java
	androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java
	androidgcs/src/org/openpilot/androidgcs/ObjectEditor.java
	androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java
	androidgcs/src/org/openpilot/androidgcs/Preferences.java
	androidgcs/src/org/openpilot/androidgcs/SystemAlarmActivity.java
	androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java
	androidgcs/src/org/openpilot/androidgcs/UAVLocation.java
	androidgcs/src/org/openpilot/uavtalk/Telemetry.java
	androidgcs/src/org/openpilot/uavtalk/TelemetryMonitor.java
	androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java
	androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java
	androidgcs/src/org/openpilot/uavtalk/UAVObject.java
	androidgcs/src/org/openpilot/uavtalk/UAVObjectField.java
	androidgcs/src/org/openpilot/uavtalk/UAVObjectManager.java
	androidgcs/src/org/openpilot/uavtalk/UAVTalk.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java
	flight/Modules/GPS/GPS.c
 2012-08-08 15:50:28 -05:00
James Cotton
7cca5696a2 Merge remote-tracking branch 'origin/pt/boardbased_ui_limits' into next 2012-08-08 14:11:24 -05:00
Laura Sebesta
fe6ea7e0e2 Fixed getUAVPosition to use position actual data correctly. 
Refactored coordinate conversion names in order to be clearer, since
two identically named functions-- one in revo, one here-- performed
very different maths.
 2012-08-08 20:58:13 +02:00
Kenz Dale
f3e1e768ad Refactored variable names to be more helpful. 2012-08-08 20:57:41 +02:00
Kenz Dale
6b3cb29ea1 Fixed maximum size for title bar in map widget. 2012-08-08 20:56:29 +02:00
James Cotton
06a6e367b0 Merge remote-tracking branch 'origin/hyper/OP-661' into next 2012-08-08 13:49:48 -05:00
Chris Pember
ee217ad17e fixed aircraft page, with different layout 2012-08-07 20:53:02 -07:00
Chris Pember
0d079f2059 fixed aircraft page, were some minor adjustments I wanted to make 2012-08-07 14:29:16 -07:00
PT_Dreamer
74cd57e8a0 GCS - IFDEFed everything pathplanner related. 2012-08-07 22:03:40 +01:00
Chris Pember
820162fa27 fixed aircraft page, specifically multirotor page so it works better 2012-08-07 13:53:13 -07:00
Chris Pember
36707aef67 fixed save area in all forms, shrunk down the output form upper groupbox a bit 2012-08-07 11:33:21 -07:00
Chris Pember
3fb6e35b7f Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-07 10:48:13 -07:00
PT_Dreamer
9dca82a6db GCS-Created new stylesheet rule for the config plugin list 
Reverted increase of list width.
 2012-08-07 12:25:04 +01:00
Chris Pember
f75d710bcd fixed save area in camerastab ui form to make skinny 2012-08-06 20:07:50 -07:00
PT_Dreamer
fc32ec8d8f Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-06 22:55:57 +01:00
PT_Dreamer
2963fd2658 GCS - Increased tabbed widget width on the config page. 2012-08-06 22:55:35 +01:00
James Cotton
7a214dc6cb AndroidGCS: Clean up some warnings in UAVO templates 2012-08-06 16:55:00 -05:00
James Cotton
a067c0b0de AndroidGCS: Make sure the rest of the UAVO IDs are working as positive long 
values instead of ints.
 2012-08-06 16:54:57 -05:00
James Cotton
fc7e9d2b2b AndroidGCS: Change the UAVO generation to suppress warnings 2012-08-06 16:54:57 -05:00
James Cotton
ae40f88600 AndroidGCS: Convert UAVObject IDs to longs from ints because they are meant to 
be unsigned uint32 which is unsupported by java.
 2012-08-06 16:54:57 -05:00
James Cotton
9960411ead Finish porting the meta data changes from GCS and update all the UAVOs 2012-08-06 16:54:55 -05:00
James Cotton
f338625092 Removed various debugging outputs and exceptions for now (will add back in a 
more principled manner later).  Also updated the auto generated code.
 2012-08-06 16:54:19 -05:00
James Cotton
9a4c158690 Java autogenerated code to be more compatible with gcs code 2012-08-06 16:54:18 -05:00
James Cotton
f0e4c10cfa Continuing to work on the java code to be more consistent with GCS code 2012-08-06 16:54:17 -05:00
James Cotton
1810fb61a0 Update the object template to be more consistent with ground code 2012-08-06 16:54:17 -05:00
PT_Dreamer
40415f606e Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-06 19:01:48 +01:00
Chris Pember
89a8b05422 fixed tab order, a little spacing tweak onadvanced page 2012-08-06 10:32:01 -07:00
James Cotton
f6692c07fe AndroidGCS: Clean up some warnings in UAVO templates 2012-08-06 01:17:19 -05:00
Chris Pember
c600014f2f merged the weak leveling and axis lock to same group 2012-08-05 14:04:42 -07:00
Chris Pember
bcb23bb779 pre-spinner value align shift 2012-08-05 12:44:36 -07:00
Chris Pember
56dfed2e8b pre-spinner value align shift 2012-08-05 12:41:19 -07:00
Laura Sebesta
d7b123f836 Remove OSG from Mac compile of GCS. 2012-08-05 20:36:00 +02:00
James Cotton
cd6a2fb7da AndroidGCS: Make sure the rest of the UAVO IDs are working as positive long 
values instead of ints.
 2012-08-05 04:41:57 -05:00
James Cotton
35d57911f9 AndroidGCS: Change the UAVO generation to suppress warnings 2012-08-05 04:11:33 -05:00
James Cotton
33132e8ebd AndroidGCS: Convert UAVObject IDs to longs from ints because they are meant to 
be unsigned uint32 which is unsupported by java.
 2012-08-05 04:09:05 -05:00
Chris Pember
17bcdb6113 resized the default buttons areas, moved the entire sensor tuning to expert, fixed apply layout spacing 2012-08-04 23:03:56 -07:00
Chris Pember
72749a1ce1 resized the default buttons areas, moved the entire sensor tuning to expert, still WIP 2012-08-04 23:03:00 -07:00
James Cotton
d201cad768 Connect correct signal to relay tuning so the UI populates the calculated 
stabilization settings.
 2012-08-04 12:03:53 -05:00
Chris Pember
0d2e307885 resized the save area on stabi page, added axislock and weakleveling to advanced menu 2012-08-03 22:01:54 -07:00
Mike LaBranche
0643f59b85 Merge branch 'pt/CC3d_Release' of ssh://gitolite@git.openpilot.org/OpenPilot.git into CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/popupwidget.cpp
 2012-08-03 14:36:16 -07:00
Mike LaBranche
38e521fc1a TelemetryWidget: set AlignCenter, chasing osx render correctness. 2012-08-03 13:52:35 -07:00
PT_Dreamer
df61d33f66 GCS- Added the ability to have more than 1 ui limit per index 2012-08-03 18:57:24 +01:00
PT_Dreamer
d043d53a3d Merge branch 'pt/boardbased_ui_limits' of ssh://git.openpilot.org/OpenPilot into pt/boardbased_ui_limits 2012-08-03 18:16:50 +01:00
PT_Dreamer
4d19062059 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/boardbased_ui_limits 2012-08-03 18:14:51 +01:00
Fredrik Arvidsson
3bc1fbd8f1 Merge branch 'next' into thread/OP-39 2012-08-03 18:33:39 +02:00
Fredrik Arvidsson
86f210e7f4 OP-39 Added code to jump from the SetupWizard directly to the InputWizard in the ConfigurationPlugin to complete the vehicle setup and realize the 1-2-Fly idea. 
Re-factored some code in the ConfigurationPlugin.
Fixed a bug in the Levelling page when performing levelling multiple times.
 2012-08-03 18:31:47 +02:00
Mike LaBranche
83c920799d TelemetryWidget: rescaled .svg; transparent background; hide data rates when not connected. 2012-08-03 09:24:26 -07:00
James Cotton
c3df203d7c Make the autotune UI allow recomputing the values based on the measured system 
properties.
 2012-08-03 09:37:45 -05:00
James Cotton
dfd1aceb06 More work on autotune from GCS 2012-08-03 09:37:45 -05:00
James Cotton
c365a9c7ff Add stub for the autotune configuration widget 2012-08-03 09:37:45 -05:00
James Cotton
9ce7d9b4ac Add UAVOs for relay tuning 2012-08-03 09:37:44 -05:00
James Cotton
6948f1dc41 Merge remote-tracking branch 'origin/master' into next 
Conflicts:
	package/winx86/translations/strings_de.nsh
 2012-08-03 09:35:18 -05:00
David Ankers
8ec9355a29 Merge remote-tracking branch 'origin/pt/CC3d_Release' into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/stabilization.ui
 2012-08-03 15:41:33 +10:00
David Ankers
c673e5c586 Merge remote-tracking branch 'origin/CC3D_Release' into pt/CC3D_Release 2012-08-03 15:38:09 +10:00
Chris Pember
4de9cd89f7 micro GCs layout, redesigned layouts again for stabi screen 2012-08-02 22:14:39 -07:00
Mike LaBranche
5320a73adc TelemetryWidget: tweeks and bugfixes. 2012-08-02 21:19:25 -07:00
Mike LaBranche
f5bd860be1 TelemetryWidget: tweek datarate text locations. 2012-08-02 20:32:55 -07:00
Mike LaBranche
9ebf6d916a TelemetryMonitorWidget: tx/rx labels, 7 nodes, tx/rx rate text. 2012-08-02 19:33:20 -07:00
Mike LaBranche
63e5fc80ce TelemetryMonitorWidget: Alpha version with 12 dots. 2012-08-02 16:11:18 -07:00
PT_Dreamer
352f18bec0 GCS-Allow for more than 1 limit per index 2012-08-02 23:56:02 +01:00
David Ankers
4357f092a9 Remove a couple of artifact numbers from the PFD, start work on spacing 
and layout.
 2012-08-03 08:15:57 +10:00
David Ankers
64ab589c1b Fix from Berkely to the Uploader.ui 2012-08-03 06:28:08 +10:00
David Ankers
38e392d49e Update status bargraphs, stab mode is no longer hidden. Soem work to go on 
other SVGs yet but these looks better than they did.

Removed GPS Staus from the top status bar, this will be intergraded in to
the PFD
 2012-08-03 05:59:20 +10:00
Laura Sebesta
3e23163dde Improved static and update behavior. 2012-08-02 20:21:29 +02:00
Fredrik Arvidsson
40d5761a1d Merge branch 'next' into thread/OP-39 2012-08-02 19:51:36 +02:00
James Cotton
62bb4601c5 Finish porting the meta data changes from GCS and update all the UAVOs 2012-08-02 12:49:34 -05:00
Kenz Dale
3e4f2e21ce Added context menu for switching UAV text output off. 2012-08-02 19:13:54 +02:00
PT_Dreamer
cb26100d65 GCS - Dummy commit to see if crucible notices this branch 2012-08-02 16:48:37 +01:00
James Cotton
72de0c622a Removed various debugging outputs and exceptions for now (will add back in a 
more principled manner later).  Also updated the auto generated code.
 2012-08-02 10:40:34 -05:00
James Cotton
a9066494c7 Java autogenerated code to be more compatible with gcs code 2012-08-02 10:40:34 -05:00
James Cotton
0abd2ee671 Continuing to work on the java code to be more consistent with GCS code 2012-08-02 10:40:33 -05:00
James Cotton
7ab3f5b47e Update the object template to be more consistent with ground code 2012-08-02 10:40:33 -05:00
PT_Dreamer
205d370eec GCS-Made the UI limits board specific 2012-08-02 16:34:48 +01:00
Kenz Dale
e26e996734 Added in time rings, using proper scaling. 2012-08-02 14:43:26 +02:00
Fredrik Arvidsson
6913b1b4de Added Levelling functionality. 2012-08-02 13:44:14 +02:00
PT_Dreamer
f0d6f78ba3 GCS- Fixes compile under Win. 2012-08-02 12:32:43 +01:00
Kenz Dale
d30da01ca8 Added additional message. Improved significant digit formatting. 2012-08-02 11:36:36 +02:00
Kenz Dale
3b9e3c0054 Added support for trend lines and text info on map. 2012-08-02 10:58:55 +02:00
PT_Dreamer
c4d11c40bd GCS-Fixes some value not being reloaded when reload button is pressed 
on stab screen.
 2012-08-01 17:50:48 +01:00
PT_Dreamer
8c69fff234 GCS - More fixes to the dirty status of the config widgets 2012-08-01 15:17:05 +01:00
PT_Dreamer
06455d7bfb Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-01 14:42:53 +01:00
PT_Dreamer
0553534318 GCS - Fixed dynamic loaded widgets (according to board type) not 
alerting for unsaved changes
 2012-08-01 14:42:21 +01:00
PT_Dreamer
599d46b8fa GCS - Fixed nasty memory leak 2012-08-01 14:41:00 +01:00
PT_Dreamer
1d42b64965 GCS-Kenz arrow and text request - 5$ please 2012-08-01 13:41:22 +01:00
David Ankers
44b13a19ee Move to the QML PFD by default! Yay 2012-08-01 20:59:44 +10:00
Richard Flay (Hyper)
6d34795494 Re-enabled simposix SDCard support, and removed obsolete SDCard alarm usage from System module 2012-08-01 19:53:59 +09:30
PT_Dreamer
af98f4c2a6 GCS- Fixed board rotation being overwriten when calibrating. 2012-08-01 10:12:52 +01:00
PT_Dreamer
faee578010 GCS- Fixes from Dmytro to new PFD qml file. 2012-08-01 09:47:11 +01:00
PT_Dreamer
4f2522cd0a Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-01 09:32:59 +01:00
Mike LaBranche
84c7325eb9 SvgImageProvider signature correction to use utils_global macro QTCREATOR_UTILS_EXPORT 2012-08-01 09:40:33 +10:00
Mike LaBranche
4c3c94eba5 SvgImageProvider signature correction to use utils_global macro QTCREATOR_UTILS_EXPORT 2012-07-31 16:15:58 -07:00
Fredrik Arvidsson
e891cd2dc3 Added some more wizard pages. The basic structure for multirotors is in place. 2012-08-01 00:21:15 +02:00
Ryan Hunter
4d257860c8 Moved the matlab files to matlab folder for GCS plugin 2012-07-31 13:26:35 -05:00
David Ankers
5da204f4b7 Change welcome plugin to use Steve's system icons 2012-08-01 02:51:34 +10:00
David Ankers
67ba889659 Swap icons for firmware and system tabs, matches Steve's icons better and 
makes more sense
 2012-08-01 02:45:15 +10:00
David Ankers
a8fd51985a Add Steve's system icons for the Welcome Plugin 2012-08-01 02:44:06 +10:00
Fredrik Arvidsson
348cdfaed7 Merge branch 'next' into thread/OP-39 2012-07-31 18:04:58 +02:00
PT_Dreamer
68740940de Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/popupwidget.cpp
 2012-07-31 16:17:29 +01:00
Dmytro Poplavskiy
a140c76a6f Hide terrain related options if compiled without OSG 2012-08-01 00:35:21 +10:00
Dmytro Poplavskiy
ce00c0bc4d Fixed compilation with OSG enabled 
trivial .pro file fix
 2012-08-01 00:34:25 +10:00
Dmytro Poplavskiy
68652ef643 PFD qml: Load Terrain and World views dynamicaly 
Moved them to separate qml files
loaded by reqest using Loader.

This allows to keep PFD working even if one of views
can't be loaded and avoids the cost of loading expensive
views like camera.
 2012-08-01 00:32:46 +10:00
Dmytro Poplavskiy
4e28a529db Merge branch 'CC3D_Release' into dmytro/pfd_qml 2012-07-31 23:43:16 +10:00
PT_Dreamer
1f7b95805e GCS-Added Hyper's fix to glc crashes under certain systems. 2012-07-31 12:18:05 +01:00
David Ankers
f5a2591d81 Correct default paths for qml pfd files 2012-07-31 09:03:24 +10:00
Mike LaBranche
a306b31c9c Resolve build errors: add Q_DECL_EXPORT to SvgImageProvider; 
change unsetenv to qputenv.
 2012-07-31 08:44:59 +10:00
Mike LaBranche
5cab871ac6 PopupWidget, Bugfix: put the mixer back into the frame at the same size it started from; 
keeps it from oversetting neighbors when the dialog is closed.
 2012-07-31 08:44:34 +10:00
Werner Backes
b8450d4a07 Fixed World Magnetic Model to accept altitude in meters instead of kilometers 2012-07-31 00:18:10 +02:00
Mike LaBranche
5398d96839 PopupWidget: Start the dialog at twice the size of the embedded widget. 2012-07-30 15:02:18 -07:00
Mike LaBranche
6adafbc4bf PopupWidget, Bugfix: put the mixer back into the frame at the same size it started from; 
keeps it from oversetting neighbors when the dialog is closed.
 2012-07-30 14:45:56 -07:00
Mike LaBranche
b490fdb6e9 Resolve build errors: add Q_DECL_EXPORT to SvgImageProvider; 
change unsetenv to qputenv.
 2012-07-30 14:30:03 -07:00
David Ankers
c93cfc5d50 Fixed qmake copy of qss by borrowing code from Oleg who has a better 
handle on qmake than I guess I ever will.
 2012-07-31 04:11:33 +10:00
David Ankers
f00874efa2 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-31 02:51:55 +10:00
David Ankers
574fbe2fd9 Copy one file at a time with cp 2012-07-31 02:50:41 +10:00
PT_Dreamer
b15091fead GCS - Made the GCS compile without OSG support 2012-07-30 16:11:36 +01:00
PT_Dreamer
d8c2bb3292 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-30 15:25:59 +01:00
PT_Dreamer
7884b7002e Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	HISTORY.txt
 2012-07-30 15:24:36 +01:00
PT_Dreamer
1927e8bce9 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-30 14:55:24 +01:00
PT_Dreamer
bb66dc9535 GCS- Made the importexport dialog close when GCS closes. 2012-07-30 14:53:57 +01:00
David Ankers
31a788e44e Change the icon to go to the system page, icon is still wrong but now at 
least the button works.
 2012-07-30 22:28:28 +10:00
David Ankers
0b055d61fd Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-30 22:00:20 +10:00
David Ankers
b997a4a7fe Make connect button use onclicked() signal rather than onpressed() 2012-07-30 21:58:36 +10:00
Kenz Dale
0874b3db62 Fixed GPS position to include gps heading. 2012-07-30 13:37:56 +02:00
Sambas
2c8929525d Optional modules for Revolution, compiles but not flight tested. 2012-07-30 12:20:18 +03:00
PT_Dreamer
c6088b5417 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/camerastabilization.ui
	ground/openpilotgcs/src/plugins/config/stabilization.ui
	ground/openpilotgcs/src/plugins/config/txpid.ui
 2012-07-30 00:12:15 +01:00
PT_Dreamer
9ab86f7c7e GCS-Changed "wiki" help buttons to the standard ones. 
Updated the links to tiny links.
 2012-07-29 23:29:39 +01:00
Chris Pember
ef04025d05 couple small sizing issues in stabi, and spacer in hw settings 2012-07-29 15:14:40 -07:00
Chris Pember
ddf04abc5e Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-29 14:54:19 -07:00
Chris Pember
005f08cbc2 added help buttons, removed wiki buttons, fixed input spacing, misc text fixes, tooltips, removed headings from input chan form 2012-07-29 14:51:39 -07:00
Oleg Semyonov
51b7e11160 AeroSimRC: remove unused MSVC options 2012-07-30 00:08:43 +03:00
Oleg Semyonov
dcf68c2359 AeroSimRC: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible) 2012-07-30 00:03:01 +03:00
Oleg Semyonov
e75a2718f1 Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible) 2012-07-29 23:59:54 +03:00
David Ankers
ca22b54b86 Change dates on copyright 2012-07-30 06:28:40 +10:00
Oleg Semyonov
fc51680e6c Windows packaging: fix MinGW DLL locations for Qt 4.8.1+ (4.8.0 compatible) 2012-07-29 23:08:59 +03:00
PT_Dreamer
62bbe208af GCS-Fixes wrong flight mode settings 2012-07-29 15:10:30 +01:00
PT_Dreamer
4dc5e4580d Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/airframe.ui
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
	ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
 2012-07-29 14:28:59 +01:00
David Ankers
cc512715b9 Update icon to a better one 2012-07-29 22:25:06 +10:00
Dmytro Poplavskiy
c7b8fe9efd Moved terrain rendering to background thread 
osgEarth may block the main thread during network io,
the rendering is moved to OsgEarthItemRenderer
class, running in the bg thread.

May require Qt 4.8.0+ to work correctly.
 2012-07-29 22:15:24 +10:00
David Ankers
19b101bc4b Make a start on the new layout 2012-07-29 21:28:32 +10:00
Dmytro Poplavskiy
9d884ca12c PFD terrain view: switch between GPS and predefined positions. 2012-07-29 16:05:59 +10:00
Dmytro Poplavskiy
ec3919d2b7 Enabled osgEarth caching 2012-07-29 12:17:10 +10:00
PT_Dreamer
6b84b58bfe GCS-Moved the wizard and calibration widgets to the stacked widget 
so that they disapear during the wizard
 2012-07-29 00:53:05 +01:00
PT_Dreamer
14b7666c1b GCS-disabled the reload board data button while it is doing its work. 
minimized uavo transactions when button is pressed.
 2012-07-29 00:44:08 +01:00
PT_Dreamer
4530a13f93 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-28 19:08:28 +01:00
David Ankers
27fca079d8 Change language used per David J's suggestion 2012-07-29 04:07:55 +10:00
PT_Dreamer
5f8c6dc7af Remove unwanted file 2012-07-28 19:06:54 +01:00
David Ankers
9395df6d2d Make size of labels consistant 2012-07-29 03:27:51 +10:00
David Ankers
1fca385fc4 Change RPY to Roll,Pitch and Yaw for the mixer on the aircraft screen, as 
per mikes suggestion
 2012-07-29 03:00:17 +10:00
David Ankers
deefe31546 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into jose5 2012-07-29 01:54:51 +10:00
David Ankers
fef831ec2b Add stylesheets and ensure they are copied on build 2012-07-29 01:53:45 +10:00
PT_Dreamer
c8e94ed874 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into CC3D_Release 2012-07-28 15:06:26 +01:00
PT_Dreamer
dc4254d7d8 GCS-Several UI fixes according to beta testers reports. 2012-07-28 15:04:55 +01:00
Dmytro Poplavskiy
999e5e9cc5 Fixed uninitialized terrainEnabled property 2012-07-28 21:00:02 +10:00
David Ankers
83ae672533 Gonfig gadget now gets the whole of the screen. 2012-07-28 17:26:43 +10:00
James Cotton
eae94b2188 Use setField instead of setData in SetConfigData because that doesn't trigger a 
transaction immediately before the smartSaveButton tries to trigger one.
 2012-07-28 00:00:50 -05:00
James Cotton
bd3ebe5b61 Undo the previous patch to abort transactions if one is pending, but throw a 
warning still
 2012-07-27 21:09:58 -05:00
James Cotton
cddabf76cf Remove some debugging output that was a bit verbose 2012-07-27 21:09:58 -05:00
James Cotton
542483beec Rephrase "SUCCESS: Mixer saved ok" to Configuration OK since it does not 
reflect if the save succeeded and the button does.
 2012-07-27 21:09:58 -05:00
James Cotton
12192ae0cd Remove commented and debugging code 2012-07-27 21:09:57 -05:00
James Cotton
150139b711 Don't need to call updated() in the SetConfigData because the ConfigTaskWidget 
architecture will call that
 2012-07-27 20:38:50 -05:00
James Cotton
a75ed21012 Fix tab indentation to be consistent with QT Creator 2012-07-27 20:15:00 -05:00
James Cotton
9f1a8416f5 Treat the tricopter yaw channel like the other motor channels 2012-07-27 20:14:19 -05:00
James Cotton
9d82538a09 If we set FirmwareIAPObj to update on change then initial object retrieval will 
force it to be fetched before emitting the autopilotConnected signal.
 2012-07-27 16:16:16 -05:00
James Cotton
6ba8f3ca9e Fix from hyper to catch when multiple object requests stack up 2012-07-27 16:16:12 -05:00
PT_Dreamer
bf6790f554 GCS-Made the changes to vehicleconfig final and reenabled the 
system settings update call.
 2012-07-27 16:12:15 -05:00
PT_Dreamer
1955e8b842 GCS-Comment out the updated statements on vehicleconfig.cpp 
TODO check if this brings other problems. REVERT commit if it does
 2012-07-27 16:12:12 -05:00
James Cotton
330fd26f4a If we set FirmwareIAPObj to update on change then initial object retrieval will 
force it to be fetched before emitting the autopilotConnected signal.
 2012-07-27 20:57:23 +01:00
James Cotton
1803f26e9a Fix from hyper to catch when multiple object requests stack up 2012-07-27 20:55:45 +01:00
PT_Dreamer
c375d2e79d GCS-Made the changes to vehicleconfig final and reenabled the 
system settings update call.
 2012-07-27 18:42:20 +01:00
PT_Dreamer
4003cd70a8 GCS-Made rate Kd roll and pitch link when checkbox is checked. 2012-07-27 09:13:53 -05:00
PT_Dreamer
ddb144ebb5 GCS-Made rate Kd roll and pitch link when checkbox is checked. 2012-07-27 11:55:01 +01:00
PT_Dreamer
9d76c32cf5 GCS-Comment out the updated statements on vehicleconfig.cpp 
TODO check if this brings other problems. REVERT commit if it does
 2012-07-27 11:45:58 +01:00
PT_Dreamer
0f86432224 GCS-Added missing resources to the UAVO browser 2012-07-27 11:19:41 +01:00
PT_Dreamer
30c1596129 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-26 15:22:59 +01:00
PT_Dreamer
3cb9d70298 GCS-Made the UAVO browser view options persistent. 2012-07-26 15:22:12 +01:00
PT_Dreamer
95fb9255cc GCS-Made the buttons on the object browser smaller. 2012-07-26 14:09:33 +01:00
zedamota
4e96c743ba GCS-Make UAVO saving code more verbose. 2012-07-26 13:03:27 +01:00
zedamota
7a9835d3cf GCS-Fix compile under win. 2012-07-26 12:51:44 +01:00
James Cotton
0ed5b84ee9 Move the try catch when parsing overo files 2012-07-25 14:41:10 -05:00
James Cotton
41f80eb34f Disable offset nulling while performing GCS mag calibration. 2012-07-25 11:26:37 -05:00
James Cotton
d1e6dcc2f0 First pass implementation of William Premerlani's magnetometer bias correction 2012-07-25 11:07:40 -05:00
Chris Pember
48b3cf7101 fixed the airframe form so it scrolls AND has the shiny new popups 2012-07-24 23:46:21 -07:00
Laura Sebesta
44a3dad912 Fixed incorrect UAVO field in PFD. 
Made scope gadget widget non-existent field message more helpful.
 2012-07-25 01:34:38 +02:00
PT_Dreamer
8c4806fa14 Revert "OP-39 Start and End pages added. Placeholder text added." 
This reverts commit 559be15142.

Conflicts:

	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
	ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.cpp
	ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
 2012-07-24 22:32:54 +01:00
PT_Dreamer
82dc7e5957 Revert "OP-39 Initial commit. Created new sub project to plugins project." 
This reverts commit 532fc3071a.

Conflicts:

	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
	ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.cpp
	ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
 2012-07-24 22:32:08 +01:00
PT_Dreamer
717b0d4561 Revert "OP-39 Added some pages and some functionality to the OP SetupWizard." 
This reverts commit ebe76e4ae6.
 2012-07-24 22:10:17 +01:00
PT_Dreamer
76773cd1c5 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowser.ui
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserwidget.h
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h
 2012-07-24 21:53:58 +01:00
PT_Dreamer
667276cd61 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-24 20:29:59 +01:00
James Cotton
82219d2511 Make matlab log processing support overo UAVtalk packets now 2012-07-24 14:08:14 -05:00
PT_Dreamer
c8fdfb5dab Merge branch 'MikeL_MixerCurve' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/pipxtreme.ui
 2012-07-24 16:04:03 +01:00
PT_Dreamer
76f45b5218 Merge branch 'MikeL_MixerCurve' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/airframe.ui
	ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
	ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp
 2012-07-24 16:02:07 +01:00
PT_Dreamer
54ffe04e6d Merge branch 'MikeL_MixerCurve' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-07-24 15:23:21 +01:00
Kenz Dale
aa5e5a9b01 Removed "airspeed" field from Airspeed UAVO. Now everything is done either with true airspeed or calibrated airspeed 2012-07-24 15:15:21 +02:00
Dmytro Poplavskiy
f95bd8bc1b Initial implementation of QML based PFD widget 
It uses the same pfd.svg file as original PFD widget;
depends on osgearth for terrain rendering
 2012-07-23 17:19:24 +10:00
Dmytro Poplavskiy
69eb685d7b Moved svgimageprovider from qmlview plugin to utils lib 
To be reused by other qml based plugins.
 2012-07-23 15:36:53 +10:00
Stacey Sheldon
f5db83bd20 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	flight/Libraries/inc/NMEA.h
	flight/Modules/GPS/GPS.c
	flight/Modules/GPS/NMEA.c
	flight/Modules/GPS/UBX.c
	flight/Modules/GPS/inc/NMEA.h
	flight/Modules/GPS/inc/UBX.h
	flight/Modules/PathPlanner/inc/pathplanner.h
	flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	flight/SimPosix/UAVObjects.inc
	ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/qdebughandler.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/gpsvelocity.xml
 2012-07-22 23:39:37 -04:00
Dmytro Poplavskiy
6ee34931ac Expose SVG elements geometry to QML side 
This allows to reuse the existing svg file like pfd.svg
without manually positioning individual svg element.
 2012-07-23 12:21:34 +10:00
Oleg Semyonov
0c092970ca Merge remote-tracking branch 'origin/os/aerosimrc-update' into next 2012-07-22 14:35:11 +03:00
James Cotton
93faf131b0 Merge branch 'next' into revo 
Conflicts:
	flight/Modules/GPS/GPS.c
	flight/Modules/GPS/NMEA.c
	flight/Modules/GPS/UBX.c
	flight/Modules/GPS/inc/NMEA.h
	flight/Modules/GPS/inc/UBX.h
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/waypointeditor/waypointeditorplugin.h
	shared/uavobjectdefinition/gpsvelocity.xml
 2012-07-22 00:43:19 -05:00
James Cotton
e239424ddd Fix some typos in the GCS calibration 2012-07-21 15:12:45 -05:00
Chris Pember
54dae87017 fixed the hw settings apply button autofill, removed commented lines from the config_cc_hw_widget.cpp file 2012-07-21 12:28:55 -07:00
Oleg Semyonov
c3791532b8 AeroSimRC: fix spelling in imported sources (thanks Jose) 2012-07-21 21:32:59 +03:00
Chris Pember
a53158bec1 removed all the pushbutton stylesheets, hid all the apply buttons, applied same design ideas to the HW and the attitude forms 2012-07-21 11:26:37 -07:00
Stacey Sheldon
eafd525323 Merge remote-tracking branch 'origin/D-Lite/ubx-parser-next' into next 2012-07-21 14:22:10 -04:00
Chris Pember
1d1ef0dfce removed all the pushbutton stylesheets, hid all the apply buttons 2012-07-21 10:58:05 -07:00
James Cotton
6eb0fd2b3b Validate the mag and accel calibration before setting to prevent block NAN on 
the FC side.
 2012-07-21 12:13:20 -05:00
Chris Pember
06e9fe0a28 removed all the pushbutton stylesheets, fixed the scrollbar area colors, compacted UI a bit more for smaller screens, misc text changes 2012-07-21 10:07:47 -07:00
Oleg Semyonov
c80e5a2bc9 AeroSimRC: (bugfix) replace non-standard _copysign() by copysign() 2012-07-20 23:13:41 +03:00
Oleg Semyonov
fc18749d1a AeroSimRC: resemble the AeroSIM-RC directory in build/ground 
... to make easier to copy plugin files into AeroSimRC folder.
 2012-07-20 17:53:21 +03:00
PT_Dreamer
ece35e7025 GCS-Added missing PipX PNG. 2012-07-20 12:55:37 +01:00
PT_Dreamer
2464fe9a2e GCS-Make flight mode switch and accessory channels move acording 
to user command.
 2012-07-20 12:47:03 +01:00
Kenz Dale
1d976b3095 dded support for multiple airspeed sources. Added GPS airspeed estimation. Extended BaroAirspeed UAVO. Added new AirspeedSettings UAVO. 2012-07-20 13:08:54 +02:00
James Cotton
7492d34d25 Merge branch 'overo_control' into revo 2012-07-19 08:35:39 -05:00
James Cotton
5ebd368b18 Merge branch 'next' into revo 
Conflicts:
	flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
 2012-07-19 08:35:30 -05:00
PT_Dreamer
74183db46e Merge branch 'cp_gui_fixes' of ssh://git.openpilot.org/OpenPilot into cp_gui_fixes 2012-07-19 13:23:24 +01:00
PT_Dreamer
41c0736b9b GCS- Added Expert mode setting. To make it visible go to 
tools->options->general_settings and click one of the checkboxes
to give focus to the form, then just press F7 and you will see
hidden settings.
 2012-07-19 13:22:36 +01:00
PT_Dreamer
bc5a1dd43b GCS - added an UDP UAVTalk mirror. 2012-07-19 11:55:24 +01:00
Oleg Semyonov
58de9dbd47 AeroSimRC: import the simulator plugin (proxy) source into the GCS tree 
Original location is:
  git@github.com:hhrhhr/Aerosim-plugin-for-CopterControl.git
 2012-07-19 12:47:03 +03:00
Oleg Semyonov
9e33751df3 AeroSimRC: add copyright and license comments to HITLv2 plugin 2012-07-19 12:40:28 +03:00
David
86d6724739 Change the wording to be less harsh 2012-07-19 07:04:09 +10:00
David
707f63b884 Change the wording to be less harsh 2012-07-19 07:02:49 +10:00
James Cotton
be892e236d Merge remote-tracking branch 'origin/rghunter/udp_control' into next 2012-07-18 12:43:17 -05:00
PT_Dreamer
205e71e06e GCS- Allow stylesheets to be loaded from files acording to OS. 
Use "linux.qss", "macos.qss" and "windows.qss" filenames and
place them on the app directory.
 2012-07-18 12:41:13 +01:00
PT_Dreamer
ad260e98bb GCS - Added PNGs, should have been part of previous commit. 2012-07-18 12:10:54 +01:00
Chris Pember
719a556b78 fixed the colos for all the forms so its not a topographic map greyscale look now, still converting the buttons all back to non style sheet 2012-07-17 21:54:38 -07:00
Fredrik Arvidsson
ebe76e4ae6 OP-39 Added some pages and some functionality to the OP SetupWizard. 2012-07-17 01:24:22 +02:00
Mike LaBranche
9507a79c6d MultiRotor Config, Bugfix: include TriYaw channel in getChannelDescriptions 2012-07-16 17:01:51 -05:00
Mike LaBranche
9f67e24ee5 MultiRotor Config, Bugfix: include TriYaw channel in getChannelDescriptions 2012-07-16 17:01:39 -05:00
Mike LaBranche
d8e685a226 MixerCurve, Tweek: adjust positive node text location. 2012-07-16 13:30:36 -07:00
Mike LaBranche
faa7fafcbd MultiRotor Config, Bugfix: include TriYaw channel in getChannelDescriptions 2012-07-16 13:08:12 -07:00
James Cotton
719772c98a Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next 2012-07-16 11:42:29 -05:00
James Cotton
de2cee1b7f Merge remote-tracking branch 'origin/pt/haltfixes' 2012-07-16 11:27:46 -05:00
PT_Dreamer
a1593968f1 GCS-Changes uploader device pictures from SVG to some very 
nice looking PNGs.
TODO-PNG for PIPX
 2012-07-16 13:20:11 +01:00
James Cotton
6b101d71af Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo 2012-07-15 12:32:35 -05:00
James Cotton
3e44389fa8 Merge remote-tracking branch 'origin/pt/haltfixes' into next 2012-07-15 11:23:57 -05:00
Chris Pember
27b53bf092 deleted the commented lines, tried resizing the margins and I couldnt get it to look quite right, so I ditched it. 2012-07-14 21:26:38 -07:00
PT_Dreamer
3879baf263 GCS/OPMap-Fixes the jump and error destination number 2012-07-14 20:14:42 +01:00
Chris Pember
d612f67b8d more GUI changes and reorganizations 2012-07-14 11:50:17 -07:00
Mike LaBranche
4a13554e1f MixerCurve: disable command buttons; add conventional Reset/Advanced buttons; 
move min/max/step into SettingsGroup;
 2012-07-14 07:25:57 -07:00
James Cotton
5f337afb36 Add a setting to determine when the overo module logs 2012-07-14 09:21:38 -05:00
Mike LaBranche
685fb4e1d4 MixerCurve bugs and tweeks: don't popup if already a popup; enable drawing only text in nodes; 
trap close/done/accept/reject events as closePopup();
 2012-07-13 22:41:58 -07:00
Mike LaBranche
cb66f5000a MixerCurve, add support for node background image. 2012-07-13 16:34:29 -07:00
Mike LaBranche
d2c99fefaf MixerCurve, Popup Dialog Support. 2012-07-13 13:44:56 -07:00
James Cotton
d150fd5331 Merge branch 'next' into revo 
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
	shared/uavobjectdefinition/manualcontrolsettings.xml
 2012-07-13 10:40:14 -05:00
Chris Pember
268b941542 UI changes to the GCS interface pages 2012-07-12 22:23:37 -07:00
Oleg Semyonov
1d1915d2be GCS Input widget: make RC inputs the default tab 2012-07-13 01:55:00 +03:00
Mike LaBranche
2be7721a0f MixerCurve, Commands on/off button. 2012-07-12 12:40:51 -07:00
Mike LaBranche
a5e117101b Mixercurve, change command location/colors; add tooltips; subdue node colors. 2012-07-12 10:49:22 -07:00
Kenz Dale
bc87319a03 Minor int vs. unsigned int bugfix. 2012-07-12 14:41:41 +02:00
Kenz Dale
8c252f4474 Fixed bug in throttle. Slightly reworked UDP config page. Added comments to matlab file. 2012-07-12 14:39:36 +02:00
Mike LaBranche
e1b469b130 MixerCurve: simplified. 2012-07-11 21:49:05 -07:00
Brian Webb
3fabdb9963 Fixed conflicted merge with origin/next. 2012-07-11 19:25:05 -07:00
Oleg Semyonov
cfb8d24941 GCS Input widget: make RC inputs the default tab 2012-07-12 01:41:24 +03:00
James Cotton
53be9e5fdb Merge remote-tracking branch 'origin/dwillis/OP-646' into next 
Conflicts:
	ground/openpilotgcs/src/plugins/systemhealth/systemhealthgadgetwidget.cpp
 2012-07-11 13:10:02 -05:00
Chris Pember
9d32e1789b UI changes to the GCS interface pages 2012-07-10 20:53:31 -07:00
Fredrik Arvidsson
559be15142 OP-39 Start and End pages added. Placeholder text added. 2012-07-11 01:00:41 +02:00
Werner Backes
f1b846593f Fixed line endings 2012-07-10 11:40:55 +02:00
Werner Backes
6751a4cd8b Satellite constellation display shouldn't display satellites with 
negative elevation angle.
 2012-07-10 11:01:45 +02:00
Werner Backes
0424172398 Better separation between UBX and NMEA parser 
Make GPS protocol a user selectable option
Support for UBX protocol on CopterControl
 2012-07-10 11:01:41 +02:00
Mike LaBranche
0c6bd52a57 Tweek: ConfigInputWidget, change default flightmode for fm1 from Manual to Stabilized1; 
result of changing aircraft default to multirotor.
 2012-07-09 21:34:31 -07:00
David Willis
37ecfdcf1f Modify to show all alarm descriptions when no specific alarm is clicked on 2012-07-09 23:42:59 +01:00
Mike LaBranche
584d173de6 Merge branch 'ConfigHardware' into MikeL_MixerCurve 2012-07-09 15:32:23 -07:00
Fredrik Arvidsson
532fc3071a OP-39 Initial commit. Created new sub project to plugins project. 
Added plug-in and registering menu item to start the wizard.
Created SetupWizard sub class of QWizard to host logic for wizard traversal and data collection.
 2012-07-10 00:26:59 +02:00
Kenz Dale
4df81c5f85 UDP Control Plugin. Initial merge for review. 2012-07-09 18:18:57 +02:00
Mike LaBranche
923345762b mixercurve, dblspindelegate names 2012-07-09 09:07:22 -07:00
Mike LaBranche
898bd7dbf1 rename doublespindelegate files 2012-07-09 08:59:52 -07:00
PT_Dreamer
58a9e9a6f7 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-07-09 15:07:47 +01:00
PT_Dreamer
93f7494930 GCS/USB-Increase USB write timeout, this prevents 
PipX from becoming disconnected to the GCS.
TODO:Handle timeouts in a better way
 2012-07-09 14:39:17 +01:00
Mike LaBranche
efdd42da0c Merge branch 'next' of ssh://gitolite@git.openpilot.org/OpenPilot.git into ConfigHardware 2012-07-08 18:36:09 -07:00
Mike LaBranche
9c716abb11 Bugfixes: get both confighardware and firmware widgets to show CC3D image if detected. 2012-07-08 18:34:23 -07:00
Stacey Sheldon
5a5694883d Merge remote-tracking branch 'op-public/next' into revo-next 2012-07-08 19:32:51 -04:00
PT_Dreamer
4c9327da7e GCS-Fixes some crashes on hw disconnection. 2012-07-09 00:15:21 +01:00
Stacey Sheldon
54a161a3d4 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
 2012-07-08 18:14:09 -04:00
David Willis
e15615b2e4 Add all new alarm descriptions to resource file. Modify to show OK message and general usage tooltip. 2012-07-08 23:04:39 +01:00
Mike LaBranche
ea60769680 Tweeks: restore 'step' curve logic to original; adjust node text position, clipping; 2012-07-08 10:38:15 -07:00
Fredrik Arvidsson
cbb66e5997 OP-642 Fixed meta data state bug. 2012-07-08 16:45:58 +02:00
Fredrik Arvidsson
9f9d294f6c OP-359 Fixed colors, hilight time and meta data state bug when switching using scientific editors and not. 2012-07-08 16:43:47 +02:00
Fredrik Arvidsson
3c32490f7e OP-642 Hopefully fixed color and highlight time bug that occurred after changing categorized node mode. 2012-07-08 16:17:59 +02:00
Laura Sebesta
ef599edd51 Updated OPPlots.m to be compatible with the current home approach. 2012-07-08 11:13:19 +02:00
Mike LaBranche
a328ab9973 Bugfix: step curvetype; Tweek: adjust node value position and color. 2012-07-07 21:56:07 -07:00
Mike LaBranche
13cd6c56f7 bugfix: correct spelling, multirotor widget 2012-07-07 17:49:51 -07:00
Mike LaBranche
5c0984cfba Merge branch 'next' of ssh://gitolite@git.openpilot.org/OpenPilot.git into MikeL_MixerCurve 2012-07-07 12:48:23 -07:00
Mike LaBranche
a6568dc468 merge next conflict resolution 2012-07-07 12:47:07 -07:00
Mike LaBranche
0e3236553b Merge next conflict resolution 2012-07-07 12:41:43 -07:00
Mike LaBranche
0a4101c915 VehicleConfig, multirotor, slight refactor; 2012-07-07 10:07:04 -07:00
Mike LaBranche
594453d191 MixerCurve, Tweek: use base curve min to init custom curve2 2012-07-07 09:00:59 -07:00
Mike LaBranche
9c1f9d6b74 MixerCurve, Bugfix: make custom curve2 aware of throttle vs pitch curvetypes 2012-07-07 08:45:28 -07:00
PT_Dreamer
42d06ef7d9 GCS/OPMap-fixes math error which was causing wrong wp location 
and high processor usage
 2012-07-07 16:05:28 +01:00
Mike LaBranche
c3057dc72e VehicleConfig Bugfix/tweek: change getChannelDescs to static in all airframes; 
avoids entire widget creation just to get channel descs.
 2012-07-07 08:02:10 -07:00
David
452e3d6a22 spacing 2012-07-07 21:39:21 +10:00
Fredrik Arvidsson
4bc951025f Merge branch 'next' into thread/OP-359 2012-07-07 13:14:16 +02:00
David
99c033bc3b Case issue with the SVG, updated comments 2012-07-07 21:08:11 +10:00
Fredrik Arvidsson
115f9ba473 OP-359 Added setting in UAVO browser widget to enable/disable editors 
using scientific notation.
 2012-07-07 12:57:11 +02:00
David
ec864c71cb Add update from dcat, fix prop directions 2012-07-07 20:46:57 +10:00
David
9ed60a2283 Lets default to MultiRotor and to a Quad X type as it is most common 2012-07-07 20:10:36 +10:00
David
4d5ddba2f9 Rename quad-shapes to multi-rotor shapes 2012-07-07 16:44:15 +10:00
Mike LaBranche
b95290a32f Bugfix: reset min/max ui spinboxes on curvetype change. 2012-07-06 21:47:08 -07:00
Mike LaBranche
6a12701e63 Bugfix: wire up the mixercurvewidget to the dirty manager rather than the parent MixerCurve 2012-07-06 16:12:53 -07:00
Mike LaBranche
dc4c6c74e4 Tweek: set min/max spinboxes to match the settings table when edited. 2012-07-06 15:16:54 -07:00
PT_Dreamer
61dea64a76 GCS/OPMap-Increase several value limits and added 
missing label on the wp editor.
 2012-07-06 23:02:56 +01:00
Mike LaBranche
44140931ae Tweek: resize the settings table row heights. 2012-07-06 15:02:34 -07:00
PT_Dreamer
66ed4552be GCS/OPMap-add apply and cancel buttons to the wp editor 2012-07-06 22:57:20 +01:00
Mike LaBranche
a794bf1dba Merge branch 'next' of ssh://gitolite@git.openpilot.org/OpenPilot.git into MikeL_MixerCurve 2012-07-06 14:03:01 -07:00
Mike LaBranche
51891881db Tweeks: verify heli init's curves correctly; mixer pre-allocates a spindelegate 
so we can reset min/max later
 2012-07-06 14:01:53 -07:00
PT_Dreamer
71a35b2dd8 GCS/OPMap-make the waypoint numbers start with 1. 
This is only visual, internal implementation is still zero based
 2012-07-06 21:57:43 +01:00
Mike LaBranche
382fecabbe Bugfixes: distingish between curve base min/max and client requested (multi's & 90% max); 
keep spindelegate synched with requested min/max's;
clean up a few old field based references;
make all nodes move when curve is flat;
 2012-07-06 13:38:46 -07:00
Mike LaBranche
06eb23abe6 MixerCurve, bugfix: min and max nodes no longer clipped. 2012-07-06 11:44:16 -07:00
Mike LaBranche
de590dfdd7 MixerCurve: Bwahaha, it resizes. 2012-07-06 11:28:46 -07:00
Mike LaBranche
eeb9ce9909 Bugfix: resolve curveUpdated() signal signature issue. 2012-07-06 10:43:24 -07:00
PT_Dreamer
96fb46b38d GCS/OPMap-comment cleaning 2012-07-06 11:26:27 +01:00
PT_Dreamer
de633d1bcc GCS/OPMap-Give lines of different colors different widths and z orders. 2012-07-06 11:25:35 +01:00
Mike LaBranche
8692855208 Bugfixes: spindelegate is online and fairly smart, knows min/max for curve; 
heli config is fully on board with integrated curve;
custom vehicle now displays 10 channels in custom grid;
mixercurve ui getting better;
 2012-07-05 15:31:36 -07:00
PT_Dreamer
2fa4afd4a7 GCS/OPMap-Make the wp editor show on wp doubleclick if it is 
already open
 2012-07-05 22:44:39 +01:00
PT_Dreamer
68fba80301 GCS/OPMap-Add remove leg button functionality. 2012-07-05 21:58:23 +01:00
Mike LaBranche
23aea6eac4 MixerCurve: integrated into all airframes. 2012-07-05 12:58:00 -07:00
Laura Sebesta
2d94e29fd9 GCS/OPMap-Added dialog box to confirm on clear waypoints. 
Also fixed some indenting.
 2012-07-05 19:53:14 +01:00
Laura Sebesta
9938f221e1 GCS/OPMap-Improved dialog message in mac ripper. We might also want to rename module, as "rip" is a somewhat loaded word. Pre-cache might be more neutral. 2012-07-05 19:52:08 +01:00
Laura Sebesta
fa643e8dbb GCS/OPMap-Added tooltip to home location in waypoint editor. 2012-07-05 19:50:16 +01:00
PT_Dreamer
d2d4d4dabd GCS/OPMap-Move line path arrow to the midle of the line. 2012-07-05 19:24:41 +01:00
Mike LaBranche
0c9e5c5e66 MixerCurve: Move code into \config folder; slice out doublespindelegate; 
enhanced mixercurve in all airframes except heli; layout is better, not there yet.
VehicleConfig, Bugfix: update custom mixer table to 10 channels.
 2012-07-04 10:21:48 -07:00
James Cotton
bdfefa25f2 Fix input label width to fit properly 2012-07-04 12:02:13 +02:00
James Cotton
58abe910d0 Merge remote-tracking branch 'origin/os/extended-flightmode-switch' into next 2012-07-04 11:52:38 +02:00
David
a3956c9c7c Change CPU gauge to be more meaningful 2012-07-04 15:07:06 +10:00
Oleg Semyonov
954cd9febc FlightMode GUI: remove ugly right slider 2012-07-04 07:46:38 +03:00
Oleg Semyonov
dd398e9bd5 FlightMode GUI: update right slider on settings change 2012-07-04 00:13:20 +03:00
Oleg Semyonov
4a75e226eb FlightMode GUI: attempt to fix label overlap on linux and OSX 2012-07-04 00:06:55 +03:00
Oleg Semyonov
12106c5549 FlightMode GUI: replace numeric value by slider 2012-07-03 17:20:10 +03:00
David
e0c4c97601 Remove redundant dial 2012-07-03 22:44:35 +10:00
James Cotton
e309ff7f2d Merge remote-tracking branch 'origin/MikeL_ConfigVehicle' into next 2012-07-03 14:19:33 +02:00
Oleg Semyonov
3cd293a5e6 Cosmetic FlightMode GUI fix (OPReview-228) 2012-07-03 11:04:18 +03:00
Mike LaBranche
8088f7aee9 MixerCurve: wire new curve into all airframes except heli; 
ConfigMultiRotor: Bugfix boundary condition on channel descriptions;
prune unused mixercurvewidget resets,values etc from vehicle specific configs
 2012-07-02 10:46:21 -07:00
James Cotton
534d559501 Merge remote-tracking branch 'origin/brian/multi-trans-telem' into next 2012-07-02 18:21:19 +02:00
James Cotton
9de47330b5 Indentation fix. Fixed copyright dates. 2012-07-02 17:55:00 +02:00
James Cotton
305d881724 Merge remote-tracking branch 'origin/dwillis/OP-646' into next 2012-07-02 17:45:08 +02:00
PT_Dreamer
5fd4daa8f8 GCS/Uploader - Some changes to fix "halt" on Linux 2012-07-02 16:11:34 +01:00
James Cotton
c9bf5f5d06 Merge branch 'next' into revo 2012-07-01 14:44:22 +02:00
Fredrik Arvidsson
d83bff100b Merge branch 'next' into thread/OP-642 2012-07-01 12:25:23 +02:00
Fredrik Arvidsson
069b5dda44 OP-642 Added a checkbox in the UAVOBrowser widget to select if the objects should be shown in a categorized manner or not. 
It is now possible to switch between categorized and 'classic' view.
 2012-07-01 09:58:55 +02:00
Stacey Sheldon
d9dca0b553 Merge branch 'wireshark-plugins' into next 2012-06-30 22:42:38 -04:00
Mike LaBranche
09a2a007a8 MixerCurve, Bugfix: use widget values for min/max for curve generation. 2012-06-30 15:27:42 -07:00
Mike LaBranche
7f3a810fa6 MixerCurve: alpha version of integrated mixer curve; 
only in fixedwing config currently.
 2012-06-30 14:35:38 -07:00
Brian Webb
3405bc3ebe Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-30 10:06:51 -07:00
Fredrik Arvidsson
32abd2e32f Merge branch 'next' into thread/OP-642 2012-06-30 16:51:19 +02:00
Fredrik Arvidsson
ee9912c45d OP-642 Added code to create category items in tree. Changed some support methods to handle the the now arbitrary depth of the uavo tree. Removed several hard coded functions depending on tree only being two levels deep. 
Changed implementation to use maps instead of lists to find tree items and meta items. This is probably much better performance wise, and the code gets much cleaner.
Changed the background highlight code to highlight all tree nodes that aren't TopTreeItem:s to enable category items to be highlighted.
Cleaned up some code.
 2012-06-30 16:45:08 +02:00
Corvus Corax
bf0bea49da Merge remote branch 'baseorigin/kenz/math_scope' into basenext 2012-06-29 11:22:38 +02:00
Corvus Corax
d2606e64e4 bitfields: bugfix for bugfix: forgot one line 2012-06-29 09:48:35 +02:00
Corvus Corax
8e790642a0 GCS Bitfield: size bugfix 2012-06-29 09:48:20 +02:00
Corvus Corax
2540ee53dc Merge commit '80f53b185c67d475ead43df97c4a62bcc36d7d90' into gcsbitfields 2012-06-29 09:45:44 +02:00
PT_Dreamer
8bc83d49a5 GCS/OPMap-Make the overlays opacity user selectable and persistent. 2012-06-29 01:20:38 +01:00
Mike LaBranche
1e985f3aed MixerCurve: start branch with integrated mixer curve widget featuring all heli coolness for every curve. 2012-06-28 16:01:27 -07:00
Mike LaBranche
604a8e06cd Enhancement: change mixercurve points from pass by value to pass by const ref; 2012-06-28 15:56:40 -07:00
David Willis
3125f4089d Add remaing alarm descriptions 2012-06-28 22:37:34 +01:00
PT_Dreamer
70bdbf49c3 GCS/OPMap- Fixes bad coordinate calculation on home drag. 2012-06-28 20:17:16 +01:00
James Cotton
cd311642dd Merge branch 'next' into revo 2012-06-28 10:35:47 +02:00
Mike LaBranche
5b64393f7f ConfigVehicle, all airframes: change return from throwConfigError to bool; 
eliminates channel checking redundancy.  Smart ptr new VehicleConfig()'s.
 2012-06-27 21:32:32 -07:00
zedamota
ee81296872 Merge remote-tracking branch 'remotes/origin/next' into MapEnhancements 2012-06-28 00:00:15 +01:00
zedamota
5eff06bdc1 GCS/OPMap-Fixes compilation under windows...again... 2012-06-27 23:54:41 +01:00
David Willis
7da39b23de Update alarm text. Add attitude critical and error descriptions 2012-06-27 23:33:40 +01:00
PT_Dreamer
b467a3e81e GCS/OPMap-Fixes compile under windows. 2012-06-27 15:06:53 +01:00
Mike LaBranche
3a8429d89b Merge branch 'next' of ssh://gitolite@git.openpilot.org/OpenPilot.git into MikeL_ConfigVehicle 2012-06-26 16:43:06 -07:00
Mike LaBranche
94ba42a3a9 MultirotorConfig, Bugfix: no default mixer values set for Tricopter; 
setting defaults now to roll(100), pitch(100), yaw(50)
 2012-06-26 16:34:36 -07:00
PT_Dreamer
6a85da9b46 GCS/OPMap-Fixes relative altitude refresh issue. 2012-06-27 00:25:40 +01:00
David Willis
bac7d171b0 Tweaked actuator critical text. Added r/c input critical and warning text 2012-06-26 23:17:19 +01:00
David Willis
14708a2e45 Updated to use html file as source of popup text. Updated to latest system health svg file. Support popup for actuator critical. 2012-06-26 22:14:56 +01:00
PT_Dreamer
96a8ff3a34 GCS/OPMap-Added relative altitude info to waypoint tooltip. 2012-06-26 20:47:14 +01:00
PT_Dreamer
2074889c9d GCS/OPMap-Clean commented out code. Delete some qDebugs 2012-06-26 20:22:55 +01:00
Fredrik Arvidsson
88a9b4cf89 Merge branch 'next' into thread/OP-642 2012-06-26 21:13:40 +02:00
PT_Dreamer
89d7f0adfd GCS/OPmap-Changed slot names to get rid of the automatic signal conection failure warning. 2012-06-25 21:11:07 +01:00
PT_Dreamer
2e97f1ac6a GCS/OPmap-Changed slot names to get rid of the automatic signal 
conection failure warning.
 2012-06-25 21:10:40 +01:00
PT_Dreamer
ecbf02fd33 GCS/OPMap-Added missing header information. Did some cleaning 2012-06-25 19:41:59 +01:00
Oleg Semyonov
727e67d7fd Even more optimize FlightMode switch position calculation 
This runs in a high frequency loop and should use as little of
floating point as possible. Thanks to Kenn for the idea.
 2012-06-25 11:41:42 +03:00
Oleg Semyonov
2c896c9e91 Do not care about FlightMode channel if only one flight mode configured 2012-06-25 01:52:06 +03:00
Oleg Semyonov
02fa6fde09 Optimize FlightMode switch position calculation 2012-06-25 00:30:42 +03:00
PT_Dreamer
55af80ffaf GCS/OPMap- handles home icon doubleclick. 
Visual changes to the waypoint editor.
 2012-06-24 20:05:27 +01:00
PT_Dreamer
b84af5c338 GCS/OPMap-Model/UAVO proxy class. 
Handles the convertion between flight plan data from the model
to/from UAVObjects.
 2012-06-24 20:04:13 +01:00
PT_Dreamer
2b85f1a9fd GCS/OPMap- Bugfixes to the model/map proxy. 
Dynamic overlay creation based on the path plan actions.
 2012-06-24 20:02:45 +01:00
PT_Dreamer
ff48babb46 GCS/OPMap- Small visual changes to the pathplanner editor. 
Add buttons to synchronize planner data with UAVObjects.
 2012-06-24 20:00:35 +01:00
PT_Dreamer
3466420a32 GCS - OPMap - small changes to the home editor. 2012-06-24 19:58:09 +01:00
PT_Dreamer
e34fc5be71 GCS - OPMap - allow different colors for overlays. 
This is so we can use a different color for each kind
of route ex:error destination, jump destination, next destination
 2012-06-24 19:57:02 +01:00
PT_Dreamer
2b9ad9dcb9 GCS - OPMap - Handle magic waypoint as special case with 
different picture. This is not used now but can be needed in
the future
 2012-06-24 19:55:23 +01:00
Mike LaBranche
fc5d0a0175 ConfigVehicleType, bugfix: set/get feedforward settings; 
refactor set/getMixerValue into vehicleConfig;
 2012-06-24 11:11:53 -07:00
David Willis
f492ea8527 First pass at popup info for alarms in system health widget 2012-06-24 01:22:43 +01:00
Brian Webb
43786c914d Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-23 15:01:53 -07:00
David
d43afddd14 Another Update from Chris 2012-06-24 06:54:24 +10:00
Oleg Semyonov
cd6387d0a6 Add support for more than 3-pos FlightMode switches 
It is now possible to have 1 to 6 flight mode switch positions
(usefull for guidance, position hold and similar use).

The input channel range is divided into N (1 to 6) zones and each
zone represents a flight mode. Default is 3 zones (backward compatible),
but more can be chosen.

How to use: configure Tx mixers in a way they provide required number
of different values for the same FlightMode channel. For instance,
using Turnigy 9X radio with ER9X firmware, one can create a mixer like
this:

     -100 MAX ID0   Manual
   R  -50 MAX ID1   Stabilized1 (Rate)
   R    0 MAX ID2   Stabilized2 (Attitude)
   R   50 MAX RUD   PositionHold
   R  100 MAX ELE   ReturnToBase

And set number of flight mode positions to 5. As a result, the 3-pos
switch (ID0, ID1, ID2) will provide first three flight modes, the rudder
D/R switch will override those and enable the 4th flight mode, and
elevator D/R switch will have highest precedence and activate the 5th
flight mode.

This will change the ManualControlSettings objectID.
 2012-06-23 22:10:19 +03:00
David
a242c2f383 From Gunnah, remove the odd letters from the QC artwork 2012-06-23 18:09:51 +10:00
Mike LaBranche
f6f98aa091 MixerCurveWidget refine setCurve logic 2012-06-22 17:31:14 -07:00
Mike LaBranche
9b25f68898 MixerCurveWidget: bugfix- don't delete edges in initNodes, just remove from scene; 
simplify and remove unused objects in configccpm;  respect min/max in initLinearCurve.
 2012-06-22 17:01:33 -07:00
Mike LaBranche
7eb0105886 MixerCurveWidget: enhance node value handling; draw node mixer value inside node; 2012-06-21 11:53:51 -07:00
Stacey Sheldon
f475088585 Merge remote-tracking branch 'op-public/next' into revo-next 2012-06-20 22:45:41 -04:00
Stacey Sheldon
5c7295549e gcs: fix incorrect file case on include path 
This breaks the Linux build.  Introduced in d03282d.
 2012-06-20 22:07:14 -04:00
Brian Webb
04f49498b2 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-20 18:34:56 -07:00
Brian Webb
7bd32253e5 Removed debug from GCS telemetry. 2012-06-20 18:34:16 -07:00
Brian Webb
3da382e828 Merge remote-tracking branch 'origin/next' into brian/multi-trans-telem 2012-06-20 17:43:17 -07:00
Mike LaBranche
5edd952ed6 VehicleConfig/mixer bugfix: keep the ui in synch when 'Save'ing from uavbrowser; 
spruce up vehicleconfig with a couple more helpers;
 2012-06-20 12:46:07 -07:00
Fredrik Arvidsson
3c754af484 OP-642 Added <category> element which is a string in uavo object type definition to be used in uavo browser to categorise uavo:s visually into subtrees. Category value is assigned in generated code and accessible via getter method. OP-644 Fixed option for uavo browser to enable disable hilights for objects which values wasn't really changed to indicate stream activity in uavo object tree. 2012-06-20 21:26:18 +02:00
PT_Dreamer
7425547b33 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-06-20 16:16:29 +01:00
PT_Dreamer
5216835e18 GCS - OPMap - test functions 2012-06-20 15:02:57 +01:00
PT_Dreamer
09a67af3e1 GCS - MapLib - added home item editor 2012-06-20 15:01:03 +01:00
PT_Dreamer
b8b46e90a3 GCS - OPMapLib - data model cleaning 2012-06-20 15:00:15 +01:00
PT_Dreamer
1299bbda93 GCS -OPMapLib - add relative altitude to waypoints 2012-06-20 14:59:23 +01:00
PT_Dreamer
3cf4676aef GCS - OPMap - create doubleclick signal on the home item 2012-06-20 14:58:33 +01:00
James Cotton
621c78e5cb Merge remote-tracking branch 'origin/MikeL_ConfigVehicle' into next 2012-06-20 09:35:18 +02:00
James Cotton
28c5a038d1 Merge remote-tracking branch 'origin/amorale/fix_osx_multiple_usb_serial' into next 2012-06-20 09:02:33 +02:00
Mike LaBranche
02cdc6feff MixerCurveWidget: make Node smarter by storing a value whenever pos changes; 
getCurve now reports back the list of node->getValue()
 2012-06-19 16:51:22 -07:00
Mike LaBranche
9da2ffff2f MixerCurveWidget: incorporate m_thread's delete leak fix, combined node+edge init 2012-06-19 15:22:11 -07:00
Mike LaBranche
04ea5f24fa MixerCurveWidget: first pass refactoring for performance; bugfix for negative values 2012-06-19 10:28:42 -07:00
Mike LaBranche
fe2aed328e bugfix: configccpmwidget, updatethrottlecurvevalue using wrong table index 2012-06-19 10:27:08 -07:00
Brian Webb
c05b41aca6 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-19 06:16:30 -07:00
Stacey Sheldon
4c47a36bda uavobjgenerator: Add generator for wireshark UAVO plugin 
Using 'make uavobjects_wireshark' now generates a complete
wireshark dissector that can decode all fields of the available
UAVObjects.
 2012-06-19 00:21:35 -04:00
PT_Dreamer
88a089804b GCS - added uavo per instance "new instance" signal. 2012-06-18 00:16:23 +01:00
PT_Dreamer
e71ab57ffa Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements 
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-06-17 23:56:27 +01:00
PT_Dreamer
35cf2fe374 GCS/OPMap - pathplanner - added modelUavoProxy class. 2012-06-17 20:09:21 +01:00
PT_Dreamer
5d07b67922 GCS/OPMap - pathplanner - graphical stuff and GUI done. UAVO interfacing left. 2012-06-17 19:24:02 +01:00
Fredrik Arvidsson
c8b4abc71f Added comments to the code. 2012-06-17 12:46:45 +02:00
Laura Sebesta
87900043a4 Typo fix. Grammarians will be extreamely glad to complement the OP team now that these errors haved disappeared. 2012-06-17 10:21:58 +03:00
Fredrik Arvidsson
0e4ffa7f6d Merge branch 'next' into thread/uavobrowser_perf 2012-06-17 09:21:22 +02:00
Mike LaBranche
4650d4909d Add virtual keyword ConfigTaskWidget:: dtor; assures correct child deletion 2012-06-16 13:39:58 -07:00
Mike LaBranche
4807eb730f Compiler Warning kill: rearrange ctor member init order in ConfigInputWidget 2012-06-16 13:38:05 -07:00
Oleg Semyonov
4120eb300c HITLv2: fix shared object name captitalization 2012-06-16 20:13:41 +03:00
Fredrik Arvidsson
d03282d9b0 Changed the way change hilight of three cells works to bring down the 
number of QTimer instances and the number of redraws to hopefully
increase performance.
Changed so that when a child gets hilighted it will hilight its parent.
 2012-06-16 17:38:05 +02:00
Brian Webb
0bf27de28d Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-16 08:28:03 -07:00
James Cotton
574cc13052 Add other states for bootfault such as Ok. 2012-06-15 23:20:09 -05:00
James Cotton
aea60198e8 Remove uSD from graphics now it's removed from alarms 2012-06-15 20:05:59 -05:00
James Cotton
62a60392e0 Fix system health to show sensors again 2012-06-15 20:03:55 -05:00
James Cotton
f8d196ffe8 Added support for board voltage monitor to battery module. 
The module can be configured to enable what's needed from board voltage, battery voltage and battery current measurement.
In GCS the POWER box in system healt will show alarm related to the supply voltage to the board.
If a power warning/critical alarm is raised, the warning condition is left even if the board voltage return to an acceptable value.

Conflicts:

	ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
	shared/uavobjectdefinition/systemalarms.xml
 2012-06-15 19:43:34 -05:00
James Cotton
416618a26f Show the altitude on the map 2012-06-15 16:01:15 -05:00
James Cotton
495bb280c7 Suppress long standing error message from telemetry we've had for ages. It 
probably should be fixed properly though.
 2012-06-15 15:51:40 -05:00
James Cotton
be360d3c21 Fix waypoint visualization in OPMap to work for multiple maps 2012-06-15 15:51:12 -05:00
James Cotton
5b2f4d6d91 Remove an outdated connect in waypointeditor 2012-06-15 14:56:55 -05:00
James Cotton
62436270e3 When moving waypoints on the map, keep the previous altitude 2012-06-15 13:15:45 -05:00
James Cotton
1ac807e1e0 Fix small bugt in the revo calibration 2012-06-15 13:15:21 -05:00
Laura Sebesta
23651cddd1 Refactored HiTL for a common API from simulators. Also added noise generator. In addition, PFD now displays calibrated airspeed. 
Also added throttle commands for all four channesl (it is now possible to fly a 747)
 2012-06-15 15:22:07 +03:00
James Cotton
07f8922f2f Merge remote-tracking branch 'origin/MikeL_ConfigVehicle' into revo 2012-06-14 19:18:23 -05:00
Mike LaBranche
c1689b2205 VehicleConfig: add set/getThrottleCurve, enhance configwidgets to consume; 
add resetMixerVector call in multirotor; ConfigVehicleType now VehicleConfig aware
 2012-06-14 15:40:17 -07:00
PT_Dreamer
82b7f9f08d GCS/OPmap lib - changed the flight planner to a model view aproach 2012-06-14 23:06:37 +01:00
James Cotton
97483bddad Fix some indentation in the mag calibration code and no need to clear the gyro 
accumulator.
 2012-06-14 10:07:45 -05:00
James Cotton
f1aad76f71 Reorder functions for six point calibration to make more sense (the order they 
are run) and add some comments
 2012-06-14 10:06:39 -05:00
James Cotton
a91c21f53f Don't restore the accel metadata after six point calibration unless it was 
actually saved and changed
 2012-06-14 09:57:46 -05:00
Brian Webb
6c8d8aeafb Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-14 06:55:52 -07:00
James Cotton
4f37be785e Merge branch 'next' into revo 2012-06-14 01:02:03 -05:00
James Cotton
70606a46a1 Include initial gyro bias calibration into the level calibration of revo like 
it is with CC.
 2012-06-13 23:07:23 -05:00
James Cotton
03705771dd Get the sensor noise measurement working again, but through GCS now 2012-06-13 22:11:00 -05:00
James Cotton
ce487c9b0a Fix the bias calculation for revo accels 2012-06-13 21:15:46 -05:00
James Cotton
293a2ee573 Rename some of the revo calibration methods 2012-06-13 18:14:20 -05:00
James Cotton
f07e1fc4e1 Separately store initial meta data for accel and mag 2012-06-13 18:09:10 -05:00
Mike LaBranche
a7ae258bc8 Bugfix, oops: missed a couple resetMixerVector opportunities. 2012-06-13 15:14:18 -07:00
Mike LaBranche
8de40c7847 BugFix: ConfigFixedWing reset the mixer vectors to zero prior to writing anew. 2012-06-13 15:09:54 -07:00
Mike LaBranche
8283d4280e UAVTalk, change private member QIODevice* io to smart pointer QPointer<QIODevice> 2012-06-13 14:57:43 -07:00
James Cotton
fc6f0f5d4d Actually disable the 6 point calibration define 2012-06-13 14:52:34 -05:00
James Cotton
28b967689f Remove some debugging output from configTaskWidget. In the case of the sensor 
calibration which doesn't have any fields associated this caused a null pointer
crash and wasn't useful anyway.
 2012-06-13 13:22:39 -05:00
James Cotton
d94ab30616 Make sure we don't use null pointers when refreshing the revo sensor bar graphs 2012-06-13 13:19:17 -05:00
James Cotton
7f15e87890 Make revo calibration UI use teh configtaskwidget system 2012-06-13 13:12:46 -05:00
James Cotton
7c8700b4e5 Suppress a warning and fix indentation in configgadgetwidget 2012-06-13 13:01:41 -05:00
James Cotton
49b51163bc Rename method and UI in revo calibration to fit new uavos and stop referring to 
things as AHRS
 2012-06-13 12:41:21 -05:00
James Cotton
8ded4618ef Only perform six point calibration on the mag. This code is #ifdef'd out 
because we might still want the option or need it for factory calibration.  I
usually find the accel scale is reproducibly at 0.98.
 2012-06-13 12:28:59 -05:00
James Cotton
c9e99295ed Merge branch 'next' into revo 2012-06-13 00:46:19 -05:00
Laura Sebesta
9409ea53da Minor GUI settings upgrades, to fit small screens better. 2012-06-13 08:40:29 +03:00
James Cotton
295fa4a8f3 Fix bug where the aircraft gadget initially shows the quad tab but the selector 
says plane.
 2012-06-12 23:12:53 -05:00
James Cotton
9218145aa9 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo 2012-06-12 22:53:30 -05:00
Brian Webb
c06412f83b Removed some qDebug from PipX configuration widget. 2012-06-12 20:00:58 -07:00
Brian Webb
aa8ba898fc Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-12 19:49:03 -07:00
Brian Webb
69a38ddd77 PipX configuration screen improvements. 2012-06-12 19:48:31 -07:00
James Cotton
1fad5c9fc2 Fix the stabilization expert UI so the label is in the right place 2012-06-12 01:52:32 -05:00
James Cotton
bfdda0e645 Fix the stabilization expert UI so the label is in the right place 2012-06-12 01:51:57 -05:00
Brian Webb
ce9d96e1b1 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-11 21:30:31 -07:00
Brian Webb
9c1549e6a2 Change return type from Telemetry::transactionTimeout back to void. 2012-06-11 21:24:56 -07:00
Brian Webb
952c6d9f32 Added support for multiple transactions to GCS telemetry. 2012-06-11 21:06:50 -07:00
James Cotton
9870abcd2f Fix some slots in config revo calibration 2012-06-11 14:42:08 -05:00
James Cotton
8b9c7277a6 Remove the connection to refreshWidgetValues() in output widget. Mike was 
right and it's not needed since hte configTaskWidget takes care of this
connection.
 2012-06-11 13:24:37 -05:00
James Cotton
dba47a7d41 Remove the connection to refreshWidgetValues() in output widget. Mike was 
right and it's not needed since hte configTaskWidget takes care of this
connection.
 2012-06-11 13:22:37 -05:00
James Cotton
a029fc4656 Merge branch 'next' into revo 
Conflicts:
	Makefile
 2012-06-11 12:05:38 -05:00
James Cotton
93b77becc0 More the system task priority down and increase the timeout for erasing the 
flash so it says completed.  However, it still blocks the system for a long
time.  During an erase the heartbeat will flash at 10 Hz to indicate what's
happening.

This still blocks telemetry even after lowering hte system priority (and there
is a vTaskDelay) which makes me think that the SPI bus being locked is blocking
Sensors or somethign else.  This should not be permited when the system is
armed.

The reason the system locks up during the erase is that the file system
operations occur within the event dispatcher thread.  It is very bad practice
for anything to block this (i.e. callbacks should never take very long).  We
should probably move the object persistence handling into the system thread or
something but that can be a separate issue.
 2012-06-11 12:03:32 -05:00
James Cotton
6f09b6d087 Fix misnamed slot in the output widget 2012-06-11 11:31:28 -05:00
James Cotton
c5a881086a Fix some slots in config revo calibration 2012-06-11 11:30:16 -05:00
James Cotton
ec64a50ef9 Fix the slot name in map gadget 2012-06-11 11:27:08 -05:00
James Cotton
6d06daa7cd Fix misnamed slot in the output widget 2012-06-11 11:21:08 -05:00
Sambas
0115c810f3 typo bugfix 2012-06-11 18:48:29 +03:00
Stacey Sheldon
c73cffce59 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	Makefile
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/Revolution/System/inc/pios_config.h
	package/Makefile

Fixed CRLF line end clobbering in:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/Common/pios_usb_util.c
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/PiOS/inc/pios_rfm22b_priv.h
	flight/PiOS/inc/pios_usb_util.h
 2012-06-10 19:01:11 -04:00
Brian Webb
71287e4cb4 Fixed setting of the PairID on PipX GCS and added selection for broadcast mode. 2012-06-09 10:54:24 -07:00
James Cotton
2db95a6b4f Move the Sensors label position to teh correct spot 2012-06-09 12:19:08 -05:00
James Cotton
207cc93af0 Update the system health diagram to include warnings from the sensors module 
and no longer show ahrs
 2012-06-09 12:11:45 -05:00
James Cotton
3af9ea9174 In OSG load an airframe model that matches the system settings. This needs to 
come from a resource file though.
 2012-06-08 13:01:50 -05:00
James Cotton
823538dbbb Forgot the fixed wing follower status 2012-06-08 10:46:40 -05:00
James Cotton
4c3ca17e34 Backport the fixed wing path follower 2012-06-08 10:46:39 -05:00
James Cotton
574ab3fcaa Make the VtolPathFollower an optional module 
Note that RTH mode right now checks that throttle control is enabled, but this
should only occur if the system is a VTOL.
 2012-06-08 10:46:38 -05:00
James Cotton
d54970a58a Fix from merging the UAV Trail option 2012-06-08 10:45:13 -05:00
James Cotton
f5b2575c88 Merge branch 'next' into revo 
Conflicts:
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/Revolution/System/inc/pios_config.h
	package/Makefile
 2012-06-07 12:45:06 -05:00
James Cotton
7b8110a457 Merge branch 'MikeL' into next 2012-06-07 11:31:41 -05:00
James Cotton
9b7a8dc15f Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next 2012-06-07 11:27:51 -05:00
James Cotton
51a6370733 Separate GPS/UAV trails and context menu settings 
Conflicts:

	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
 2012-06-07 09:51:11 -05:00
James Cotton
c689bcfb80 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo 2012-06-07 09:49:18 -05:00
James Cotton
1e041e5788 Merge remote-tracking branch 'origin/next' into revo 2012-06-07 09:49:09 -05:00
Sambas
6330d40215 Separate GPS/UAV trails and context menu settings 2012-06-07 17:46:30 +03:00
Oleg Semyonov
95f66ddd76 AeroSimRC: add default simulatorId to prevent GCS crashes w/o config 
GCS will crash when HITLv2 plugin is started if there is no
HITLv2 configuration in the OpenPilotGCS.xml. This is a workaround
to prevent this behavior. Better way might be to rework the GCS config
handling, but as a workaround this should work.
 2012-06-07 12:52:08 +03:00
PT_Dreamer
5da9efd673 GCS/MapLib - Several fixes, changes and enhancements. 2012-06-06 20:52:00 +01:00
James Cotton
aa5832b1e8 Remove some style sheets that got dragged back in from conflict 2012-06-06 13:01:15 -05:00
James Cotton
5e01617cbd Merge branch 'next' into MikeL 
Conflicts:
	ground/openpilotgcs/src/plugins/config/airframe.ui
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configoutputwidget.h
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h
 2012-06-06 11:58:06 -05:00
Mike LaBranche
01820904a2 Merge conflict resolution: alter configvehicle,configoutput refreshWidgetsValues 
signatures to conform to virtual in ConfigTaskWidget;
add multirotor mixer sliders to apply/save dirty monitor, fix slider signals;
 2012-06-06 08:58:18 -07:00
Brian Webb
6f9c6ae86d Only show PipX config gadget when the PipX is connected. 2012-06-05 19:34:42 -07:00
James Cotton
983153d87b Waypoint importing now works 2012-06-05 18:06:43 -05:00
James Cotton
4550eafa02 Add the ability to export waypoints to an xml file 2012-06-05 17:38:01 -05:00
James Cotton
b4d59d3e3e Dragging and dropping waypoints now works and updates the FC immediately. 2012-06-05 10:01:12 -05:00
James Cotton
302575714f Filter updates from the UAVOs if the waypoints haven't changed since they are 
set to periodic (and need to be right now until FC telemetry is fixed and sends
new instances).
 2012-06-05 08:30:42 -05:00
James Cotton
ff36e880e9 Fix for pathcompiler and waypoint table regarding signals and new instances 2012-06-05 08:10:20 -05:00
Brian Webb
4e68f6543e Added tracking of dropped packets to PipX and turned off visible text on signal strength meters. 2012-06-04 21:18:13 -07:00
Brian Webb
7abf32e4c2 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2-gui-upgrades 2012-06-04 18:24:20 -07:00
Mike LaBranche
682ab20f94 add accels.h, gyros.h zapped during conflict resolution 2012-06-04 17:13:55 -07:00
Mike LaBranche
0ba8345c51 Merge branch 'next' into MikeL 
Conflicts:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/Revolution/System/inc/pios_config.h
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
 2012-06-04 16:59:31 -07:00
Mike LaBranche
bf591ebe45 Merge branch 'next' into MikeL 
Conflicts:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/Revolution/System/inc/pios_config.h
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
 2012-06-04 15:38:57 -07:00
James Cotton
0b828fbdd0 Merge branch 'next' into revo 
Conflicts:
	Makefile
 2012-06-04 14:12:19 -05:00
James Cotton
ff0a3a156e Merge remote-tracking branch 'origin/os/AeroSimRC' into next 2012-06-04 12:25:59 -05:00
James Cotton
71e14a691e Merge branch 'next' into revo 2012-06-03 19:00:51 -05:00
Sambas
eb4f90f188 Check if Homelocation is set before calibration 2012-06-03 18:25:22 -05:00