rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-14 21:23:52 +01:00
Code Issues Releases Activity
9,002 Commits 5 Branches 8 Tags 266 MiB
1cfc7f1586
Commit Graph

2352 Commits

Author SHA1 Message Date
James Cotton
5e20705347 Windows copy data: Use the environmental $$(QTMINGW) variable to locate 
files to copy into the package.  This makes it more robust against various
relative locations of mingw and qt.

It may be necessary to move all SDL-related files (SDL.dll, static libraries
and include files) from, for instance, .\QtSDK\Desktop\Qt\4.8.1\mingw\bin
to .\QtSDK\mingw\bin to be found.

Conflicts:

	ground/gcs/copydata.pro
	ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro
 2013-02-03 01:06:07 +02:00
Philippe Renon
3ab33cf163 OP-833 gcs options dialog polishing: 
- createOptionsPage() now returns NULL to avoid having empty page in
  Options dialog
- removed Gadget from gadget name
- added some TODOs for for further cleanups
 2013-02-02 16:09:53 +01:00
Philippe Renon
6b3e0c7ee3 OP-833 gcs options dialog polishing: zeroed margin of top level widget 2013-02-02 16:08:37 +01:00
Philippe Renon
03ca63978b OP-833 gcs options dialog polishing: 
- zeroed margin of top level widget
- chnaged size policy of scrollArea from Expanding to Minimum to get a
  tighter fit
 2013-02-02 16:06:13 +01:00
Philippe Renon
96651e302a OP-833 gcs options dialog polishing: zeroed margin of top level widget 2013-02-02 16:03:54 +01:00
Philippe Renon
d8ce755cfd OP-833 gcs options dialog polishing: 
- increased width of splitter handle from default (6) to 9
- removed bottom Line widget
 2013-02-02 15:58:47 +01:00
Brian Webb
a4faa22c4b Merge remote-tracking branch 'origin/brian/rfm22_autoconf' into next 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
 2013-01-31 13:40:32 +00:00
Cliff Geerdes
6806e895cc First version. Passes simple tests. 2013-01-30 18:57:32 -05:00
filnet
d03db9c6d1 OP-803 remove spurious commit 2013-01-29 23:12:55 +01:00
filnet
3e9c819850 OP-803 more cleanups 2013-01-28 23:13:47 +01:00
filnet
e8659cf9d5 OP-682 added some comments 2013-01-26 15:10:30 +01:00
filnet
813aaf5d85 OP-682 fixed two crashes on firmware uploader gadget. 
crash 1 :  would happen when clicking Halt and then Boot as soon as the Boot button became enabled.
crash 2 : would happen when clicking Boot and then quickly pressing then Open button.
 2013-01-24 22:36:00 +01:00
Fredrik Arvidsson
3705a2d0a8 OP-786 Moved the actual file and the dependency to gcsversioninfo.pri to the /app sub project from the /plugins/coreplugin project. This was necessary since the new splash screen depends on defines in the generated gcsversioninfo.h header file. 
Changed position of the revision text to make it look nicer.
 2013-01-24 15:22:15 +01:00
Kevin Vertucio
bb999ae44f cleanup formatting 
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-01-24 08:04:55 -05:00
Kevin Vertucio
0cfed60638 added OP Icon to About GCS Version tab 
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-01-24 07:09:36 -05:00
Kevin Vertucio
63657c6586 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into kevinv033/OP-791 2013-01-23 22:09:40 -05:00
Alessio Morale
1a303aa85f Merge remote-tracking branch 'origin/next' into amorale/bigmerge 2013-01-23 19:47:32 +01:00
Kevin Vertucio
24068a6638 set dialog windowFlags for a frameless window. 
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-01-22 14:05:02 -05:00
Kevin Vertucio
03ad1e55f5 converted "About Authors" and "About OpenPilot GCS" to QML 
added dependent QML files

Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-01-22 00:26:46 -05:00
filnet
a9d2679e39 OP-803 minor cleanups 2013-01-20 17:32:55 +01:00
Alessio Morale
f293298118 Merge remote-tracking branch 'origin/revo-fixes' into amorale/revo-merge 
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	make/scripts/version-info.py
	package/Makefile.linux
 2013-01-19 20:23:48 +01:00
filnet
1e3aeaf988 OP-803 fix attempt 2013-01-16 23:43:22 +01:00
filnet
481005cc69 OP-803 transparent refactoring - moved specific save/restore code 
from SplitterOrView to UAVGadgetView and made some methods private
 2013-01-16 22:30:16 +01:00
Alessio Morale
de44495055 OP-796 defaults USE_PATHPLANNER to enabled 2013-01-14 01:28:33 +01:00
filnet
ae9def7f11 OP-805 - fixed GCS Options page crash by removing configurations for which 
an options page could not be created.
 2013-01-13 18:33:07 +01:00
Alessio Morale
635b1e98e4 OP-806 Fix mapwidget/uavitem.cpp to show CAS using AirspeedActual.CalibratedAirspeed 2013-01-12 16:57:28 +01:00
Alessio Morale
da76d775f9 OP-800 Remove WayointEditor as it was supeseed by PathActionEditor 2013-01-12 16:53:48 +01:00
Alessio Morale
a89a2cfb47 OP-801 replaced GetLLA with NED2LLA_HomeLLA 2013-01-11 01:11:07 +01:00
Alessio Morale
672519e559 OP-797 PFDGadgetWidget should use AirspeedActual.CalibratedAirspeed instead of BaroAirspeed 2013-01-11 01:11:07 +01:00
Alessio Morale
60eb36ab36 OP-799 removed Waypoint import export from uavsettingsimportexportfactory.cpp as it is handled by pathActionEditor 2013-01-11 01:11:06 +01:00
Alessio Morale
19c95a4f1b OP-798 uavobjectutil/devicedescriptorstruct.h miss a case for 0x903-revomini target 2013-01-11 01:11:06 +01:00
Alessio Morale
eaaad5edd1 OP-794 Revert "GCS Stabilization: Force the apply button to always be there as I can't find expert mode" 
This reverts commit 26408e286f.
 2013-01-11 01:10:11 +01:00
Brian Webb
be444db7f8 Added PPM output to OPLink firmware 2013-01-04 06:51:27 -07:00
Laurent Lalanne
c83bb4b450 My first commit... 
Rescan sources to get new strings to be translated,
Updated openpilotgcs_fr.ts, translation in progress,
Little changes in Qml files used in Welcome plugin : Titles translations with qsTr(), dont work in labels.
 2013-01-03 13:59:06 +01:00
filnet
a45578c250 OP-781: reorganized imports 2012-12-30 19:04:02 +01:00
filnet
d0447b5e06 OP-781: cleaned up; added comments; removed some debug code; fixed tabs 
into spaces
 2012-12-30 18:27:51 +01:00
Brian Webb
9f3d7a24f8 Merge branch 'revo-fixes' of ssh://git.openpilot.org/OpenPilot into brian/rfm22_autoconf 
Conflicts:
	flight/RevoMini/Makefile
 2012-12-30 07:59:09 -07:00
filnet
87632e6e13 OP-781: initial commit for slow Option Dialog creation fix; fix consists 
in lazilly creating option pages when user selects them instead of
creating them all upfront. Dummy placeholder widget (QLabel) are initially
created instead of the real option page; this commit also fixes a minor
issue where the left tree selection would not be in sync with the
displayed option page (see Jira for more details).
 2012-12-30 13:34:12 +01:00
Corvus Corax
37df2bcbf4 OP-742: Merge branch 'corvuscorax/airspeed_fixes' into revo-fixes 
Conflicts:
	flight/RevoMini/Makefile
 2012-12-29 12:09:58 +01:00
Oleg Semyonov
810a01ba28 Merge remote-tracking branch 'origin/master' into next 
Conflicts:
	HISTORY.txt
 2012-12-21 14:12:32 +02:00
Oleg Semyonov
55b35543a7 Last minute release notes update 2012-12-21 00:33:37 +02:00
Brian Webb
e0acb41379 Removed some unintended changes to RevoMini. 2012-12-15 10:35:51 -07:00
Brian Webb
3a1803b7a1 Added RFM22B (OPLink) receiver. 2012-12-13 21:07:19 -07:00
Brian Webb
6ffe518509 RFM22B: Improved link stability, and added tracking of error encountered in the processes of transmitting and receiving. 2012-12-11 17:44:15 -07:00
Brian Webb
6ed9b63da9 RFM22B: Changing configuration parameters over-the-air working. Added tracking of Tx/Rx sequence number. Still seeing too many resent packets. 2012-12-11 17:44:11 -07:00
Brian Webb
7aaa02268f RFM22B: Added TX Resent to OPLink status. Also removed the need for the packet queue. 2012-12-11 17:44:08 -07:00
Brian Webb
ca31fe99ac RFM22B: Fixed removal of the OPLink configuration window when the OPLink is disconnected. 2012-12-11 17:43:57 -07:00
Brian Webb
bd42083376 RFM22B: Changed the way the frequencies and power settings are set for the rfm22b device. 2012-12-11 17:43:55 -07:00
Brian Webb
dae382564a RFM22B/RM: Added rfm22b com device, moved remaining functionality in the radio module to the rfm22 driver, and simplified configuration of the PipX/OPLink. The radio device now presents itself completely as a com device, both in RadioComBridge (OPLink devices) and Telemetry (RM). Also change the PipXStatus and PipXSettings UAVOs to OPLinkStatus/OPLinkSettings. 2012-12-11 17:43:53 -07:00
Brian Webb
4b90f81f6f RFM22B: Modified the method of tracking RX errors, and now reporting Good, Corrected, Error, and Missed packets to the GCS. Also removed some less useful fields from the PipXStatus. 2012-12-11 17:43:49 -07:00
Oleg Semyonov
84c78f5e76 Merge remote-tracking branch 'origin/rel-12.10.2' into next 2012-12-04 15:31:53 +02:00
Oleg Semyonov
8ba73c2209 Merge remote-tracking branch 'origin/thread/OP-723' into rel-12.10.2 2012-12-04 12:27:21 +02:00
Oleg Semyonov
aa6886c305 [OP-703] Swap "About GCS" and "About plugins" menu items 2012-12-04 00:46:51 +02:00
Oleg Semyonov
2d938eaaa3 [OP-703] Rework GCS About dialog to remove 1.0.0 and show more repository info 2012-12-04 00:46:50 +02:00
Oleg Semyonov
8b2780bf71 Update CREDITS 2012-12-04 00:46:09 +02:00
Oleg Semyonov
510c443deb [OP-724] Rename "AF Response Time" to "Attitude Filter RT" in UI to stop confusion with Input LPF RT 2012-12-02 13:55:41 +02:00
Oleg Semyonov
41d56b282e [OP-724] Remove LPF from throttle input channel (not necessary) 2012-12-02 13:50:03 +02:00
a*morale
43f5bf09c2 Changed missing PipX labels for setup wizard 2012-12-02 13:39:03 +02:00
a*morale
903bbffc6b Changed reference to PipXtreme to OPLink on config tab and Firmware tab/OP-750 2012-12-02 13:39:02 +02:00
Oleg Semyonov
cc98962c36 [OP-724] Provide generic gimbal type 2012-11-29 18:03:05 +02:00
Oleg Semyonov
8adc2abd77 [OP-724] Now most camera options can be set independently per each axis. 2012-11-29 17:39:10 +02:00
Oleg Semyonov
8f5fb5aeb0 [OP-724] Add camera gimbal filtering and feed forward options 
This is a partial rework of Cossacs' camera gimbal software.

This patch adds LPF to airframe attitude used for camera stabilisation
and feed forward for camera actuators. Either of options can be
disabled on the compilation level to save flash and RAM if not
required.

Original Cossacs' code was optimized and code flow shortcuts were
added where applicable.
 2012-11-29 17:39:08 +02:00
Oleg Semyonov
ee333f1569 [OP-724] Add manual control input filtering (useful for camera gimbal) 
This is a partial rework of Cossacs' camera gimbal software.

This patch adds LPF to some of manual control inputs. Mostly
useful are accessory channels (for camera gimbal control) and
yaw channel (for smooth filming). The code may be used for
stand-alone CC[3D]-based gimbal software, but also should work
for complete FC+camera system.
 2012-11-29 17:39:07 +02:00
Oleg Semyonov
ea1199603b Merge remote-tracking branch 'origin/rel-12.10.2' into next 
Conflicts:
	MILESTONES.txt
 2012-11-29 17:31:50 +02:00
Oleg Semyonov
46533c5a3b [OP-746] Fix text for the "Upgrade" button (it is not used but to be in sync) 2012-11-26 17:51:43 +02:00
Oleg Semyonov
089f4a7915 [OP-746] Fix invalid tooltip for the "Upgrade" button of the Vehicle setup wizard (copy/paste error) 2012-11-26 17:41:35 +02:00
Oleg Semyonov
08b9c9aa29 [OP-749] Fix GCS Tricopter config typo: "Tricopter Yaw MOTOR channel" (should be a servo) 2012-11-26 17:37:38 +02:00
Oleg Semyonov
e0b5f23d71 Merge branch 'thread/OP-545' into rel-12.10.2 2012-11-24 19:27:57 +02:00
Oleg Semyonov
73488b70fa OP-545 Remove unnecessary qDebug statement 2012-11-24 19:14:56 +02:00
Fredrik Arvidsson
0e55f3c74d OP-723 Changed default locale to English. Updated default configuration files to have <OverrideLanguage> tag set to en_US. 2012-11-24 14:55:46 +01:00
Oleg Semyonov
5f4b028a93 Merge branch 'danks/credits' into rel-12.10.2 2012-11-23 13:09:23 +02:00
Oleg Semyonov
38dfd19c8d OP-721 Minor credits fixes 2012-11-23 12:58:35 +02:00
James Cotton
9b930c577c GCS Config Gadget: Fix the file name for the pipx icons in the code and 
name the icons correctly
 2012-11-22 15:57:29 +02:00
Corvus Corax
264f631df6 Merge branch 'corvuscorax/baro_fixes' into revo-fixes 2012-11-22 11:51:36 +01:00
Oleg Semyonov
8ce2757353 Merge remote-tracking branch 'origin/thread/OP-690' into rel-12.10.2 2012-11-21 17:38:29 +02:00
Oleg Semyonov
56dba23d2a Merge branch 'thread/OP-716' into rel-12.10.2 2012-11-21 17:19:45 +02:00
Fredrik Arvidsson
02ae803a3e OP-690 Changed some texts in information dialog to better describe what the actual problem is. 2012-11-21 07:32:19 +01:00
Fredrik Arvidsson
b97d355526 OP-716 Corrected a spelling error. 2012-11-21 07:22:26 +01:00
Fredrik Arvidsson
f3b55a1062 OP-716 Changed tool tip to something more verbose and meaningful. 2012-11-20 23:53:52 +01:00
Fredrik Arvidsson
a0cb604e32 OP-716 Replaced AccelTau checkbox with numeric spinbox. Max value was set to 0,20 and min value to 0,00, step size 0,01. Added tooltip hinting to set to 0 to disable. 2012-11-20 19:25:57 +01:00
Fredrik Arvidsson
f0a3de4d72 OP-545 Changed URL for help page in Import/Export plugin. 2012-11-19 21:43:10 +01:00
Fredrik Arvidsson
f1590a4f66 OP-690 Added flight status check on system Reset similar to the check on Halt. Re-factored method to get hold of current FlightStatus UAVO from UAVOManager. 2012-11-19 19:43:38 +01:00
Oleg Semyonov
a2a12cd34c Merge remote-tracking branch 'origin/rel-12.10.2' into next 2012-11-19 01:52:15 +02:00
Fredrik Arvidsson
08fd9a8153 OP-686 Added code to disable wizard buttons during firmware upgrade procedure. Re-factored some code and fixed some minor bugs. 2012-11-19 01:29:14 +02:00
Fredrik Arvidsson
4a16909cb3 OP-690 Show dialog if halt is invoked and the board is armed or arming (not disarmed). 2012-11-18 22:40:05 +01:00
Oleg Semyonov
8332f32519 Merge remote-tracking branch 'origin/os/OP-691_Fix_camera_config_issues' into rel-12.10.2 
Conflicts:
	HISTORY.txt
 2012-11-18 21:53:16 +02:00
Oleg Semyonov
5c57de868f [OP-728] Improve tooltip text for GCS arm timeout field 2012-11-18 20:55:54 +02:00
PT_Dreamer
3bfbfdf7b3 OP-702 
Fixes problem with enums uploading and saving on the object browser
 2012-11-18 20:16:25 +02:00
Fredrik Arvidsson
1695fda4e2 OP-716 Changed default AccelTau to 0.1. This value seems to be a good value after reading some reports on the forums. 2012-11-17 17:45:10 +01:00
Fredrik Arvidsson
2eeba593db OP-716 Added default TauAccel == 0.15 to wizard. 2012-11-17 10:30:57 +01:00
Fredrik Arvidsson
95455e2378 OP-716 Added checkbox to enable accelerator filtering (cyr fix) 2012-11-16 21:22:13 +01:00
Oleg Semyonov
8134db4453 ModelView: set rear view as default (makes more sense for R/C than front view) 2012-11-15 22:23:39 +02:00
Oleg Semyonov
9ece418912 AutoTune UI: add warning to reboot the board (something is better than nothing) 
Until better solution is provided, it is better to warn users that they
must reboot board to enable the module.
 2012-11-14 17:49:37 +02:00
Oleg Semyonov
0e9d7137ff Revert "HotFix: temporary disable AutoTune UI until better tested" 
The "next" is the bleeding edge of development, so put back
autotune stuff temporary disabled for RELEASE-12.10.1.

This reverts commit a17d0f8084.
 2012-11-14 17:28:23 +02:00
Oleg Semyonov
79f95983da Merge remote-tracking branch 'origin/rel-12.10.2' into next 2012-11-14 17:26:18 +02:00
Oleg Semyonov
9d6810dda8 GCS vehicle config: use better function name for readability [OP-691] 2012-11-14 02:00:26 +02:00
Corvus Corax
fe7d2e8bca removed pathplannersettings module from gcs 2012-11-11 14:57:39 +01:00
Oleg Semyonov
db63f73859 GCS vehicle config: do not reset existing camera/accessory mixers [OP-691] 
Still no fix for helicopter config (some code refactoring is desired).
 2012-11-11 15:01:30 +02:00
Richard Flay (Hyper)
b620c6ebc8 Added support for Mode 3 and Mode 4 to the TX Configuration Wizard. Fixed a number of bugs and issues in the wizard. Made some changes to wizard text and layouts as well. 2012-11-11 00:31:06 +02:00
James Cotton
5f80268396 GCS Config: Crashing for an unknown board seems a bit harsh. 2012-11-11 00:31:05 +02:00
David Ankers
43e6b38b54 Spelling of Spectrum to Spektrum 2012-11-11 00:31:05 +02:00
Corvus Corax
e9da78406a Merge branch 'corvuscorax/baro_fixes' into corvuscorax/airspeed_fixes 2012-11-08 09:48:01 +01:00
Corvus Corax
b09027afe5 Completely refactored airspeed module, now a pure sensor input module without any complex sensor fusion features -- changed driver for mpxv analog airspeed to be more versatile 2012-11-08 01:31:21 +01:00
Corvus Corax
5981d9acd6 removed surplus NEDposition uavobject 2012-11-06 10:13:09 +01:00
Stacey Sheldon
9d1825f8a8 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	shared/uavobjectdefinition/groundtruth.xml
 2012-11-01 23:23:33 -04:00
Corvus Corax
f5ad9ae3f0 OPmap: fixed some bugs introduced by merge with james/revo 2012-11-01 07:22:15 +01:00
Sambas
019691e49d Compile fixes 2012-10-30 20:50:58 +01:00
PT_Dreamer
a01930b12f GCS-PathPlanner 
Fixes UAVO to DataModel convertion.
 2012-10-30 15:13:52 +00:00
PT_Dreamer
06e56165c5 GCS-PathPlanner 
Fixes loading path from file.
 2012-10-30 13:48:02 +00:00
Stacey Sheldon
5aa3777078 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	flight/Modules/Telemetry/telemetry.c
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-10-30 00:41:35 -04:00
Stacey Sheldon
2119067722 Merge remote-tracking branch 'op-revo/james/revo' into revo-next 
Conflicts:
	Makefile
	flight/Modules/Attitude/revolution/attitude.c
	flight/Modules/Battery/battery.c
	flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
	flight/Modules/GPS/GPS.c
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Modules/ManualControl/manualcontrol.c
	flight/Modules/OveroSync/overosync.c
	flight/Modules/PathPlanner/inc/pathplanner.h
	flight/Modules/PathPlanner/pathplanner.c
	flight/Modules/Sensors/sensors.c
	flight/Modules/VtolPathFollower/vtolpathfollower.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/Boards/pios_board.h
	flight/PiOS/STM32F4xx/library.mk
	flight/PiOS/inc/pios_hmc5883.h
	flight/PiOS/inc/pios_l3gd20.h
	flight/PiOS/inc/pios_rfm22b_priv.h
	flight/Revolution/Makefile
	flight/Revolution/Makefile.osx
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	package/Makefile
	shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
	shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/pathdesired.xml
	shared/uavobjectdefinition/vtolpathfollowersettings.xml
	shared/uavobjectdefinition/waypoint.xml
 2012-10-30 00:08:43 -04:00
PT_Dreamer
c31f08d350 GCS-PathPlanner 
Fixes and enhancements.
 2012-10-28 16:55:08 +00:00
Oleg Semyonov
245e1e36cb Remove extra "Firmware tag" string from "On Device" uploader panel 2012-10-26 22:58:19 +03:00
PT_Dreamer
994b9d209a Merge branch 'hyper/add-mode3-mode4-to-GCS-tx-input-wizard' of ssh://git.openpilot.org/OpenPilot into next 2012-10-26 19:46:04 +01:00
Oleg Semyonov
a17d0f8084 HotFix: temporary disable AutoTune UI until better tested 2012-10-26 16:14:36 +03:00
Laura Sebesta
b84b8f656c Brought out several air parameter functions from IL2 simulator and added them to the global simulator.cpp file. 2012-10-23 11:59:14 +02:00
Laura Sebesta
5e785d4524 Added body-frame acceleration to ground truth UAVO and to flight simulator output. 
Conflicts:

	shared/uavobjectdefinition/groundtruth.xml
 2012-10-23 11:50:00 +02:00
Laura Sebesta
433d723251 Added groundtruth simulation support. 
This new UAVO serves principally to log data for future comparison with
onboard estimation techniques.

Conflicts:

	ground/openpilotgcs/src/plugins/hitl/il2simulator.cpp
	ground/openpilotgcs/src/plugins/hitl/simulator.h
 2012-10-23 11:47:58 +02:00
Oleg Semyonov
721cb16c2b Adopt to the latest release policy 
See http://wiki.openpilot.org/display/Doc/Release+policy
 2012-10-22 23:44:01 +03:00
Oleg Semyonov
5184dc1087 Revert "Temporary fix for build label (until better system is implemented)" 
This reverts commit 5c141d458d.
 2012-10-22 22:52:13 +03:00
Kenz Dale
1ab1ea5899 Save ~150 bytes by moving GPSDataProtocol to SystemSettings. 
All credit to Anstron.
 2012-10-22 16:47:22 +02:00
Laura Sebesta
617196f106 Deleted last of the old HiTL files that didn't get automatically deleted in the merge. 2012-10-21 10:44:08 +02:00
Stacey Sheldon
127ca1e7e1 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	ground/openpilotgcs/src/plugins/hitl/plugin.pro
	ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/simulator.h
	ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-10-20 13:56:18 -04:00
Richard Flay (Hyper)
7b7bb0ff24 Added support for Mode 3 and Mode 4 to the TX Configuration Wizard. Fixed a number of bugs and issues in the wizard. Made some changes to wizard text and layouts as well. 2012-10-19 20:30:42 +10:30
James Cotton
aba5c65e93 GCS Config Gadget: Fix the file name for the pipx icons in the code and 
name the icons correctly
 2012-10-17 01:06:45 -05:00
James Cotton
298b052c7d GCS Config: Crashing for an unknown board seems a bit harsh. 2012-10-17 00:57:28 -05:00
David Ankers
ec85cd7305 Spelling of Spectrum to Spektrum 2012-10-17 13:28:07 +11:00
James Cotton
c1f9948a81 Merge branch 'master' into next 2012-10-16 14:26:35 -05:00
David Ankers
93c76ec4bf Update credits inside the GCS based on the project and not just code. 2012-10-17 03:27:12 +11:00
Laura Sebesta
350fc8db3b Fixed HiTL bug by which gps velocity was not being updated. 2012-10-16 11:59:58 +02:00
Fredrik Arvidsson
dd7b69dbbc Fixed so that the actuator state error message box does not open behind the wizard. Changed the text to be more informative. 2012-10-16 00:37:15 +02:00
Oleg Semyonov
5c141d458d Temporary fix for build label (until better system is implemented) 2012-10-16 01:14:12 +03:00
PT_Dreamer
b318861619 GCS-Fix eventloop on the connect board while loop 2012-10-15 19:39:20 +01:00
Fredrik Arvidsson
e78cd29c5f Changed port assignments when Spectrum Rx is choosen. 2012-10-15 00:06:13 +02:00
PT_Dreamer
e43d3dd7db GCS-Show first 4 bytes of uavohash instead of last 4. 2012-10-14 19:32:19 +01:00
Fredrik Arvidsson
173cf041cb Fixed texts in Vehicle Setup Wizard. 
Added new icons for PipX.
Enabled hyper link to esc wiki page on wizard output page.
 2012-10-14 16:46:28 +02:00
PT_Dreamer
70d7d16aff GCS-Debug message to understand different uavohash behaviour 2012-10-14 14:52:04 +01:00
PT_Dreamer
30959b460d GCS-Airframe config 
Fixes rounding issues. Needs TESTING.
 2012-10-14 13:15:09 +01:00
sambas
731ac9bc48 Y6 Pitch and Yaw mixer load fix 2012-10-14 12:08:37 +01:00
PT_Dreamer
d25061ac0a GCS-Hides wizard to display dialog 2012-10-14 01:10:30 +01:00
chris pember
4226af60a4 GCS-Fix growing button on the calibration page 2012-10-13 19:26:05 +01:00
PT_Dreamer
2b48cf3d90 GCS-Ensure wizard is top window 2012-10-13 18:57:02 +01:00
James Cotton
28d3cdcd7a SetupWizard: Store a flag if the wizard is running to prevent starting two. 
This is still not as good as getting that dialog modal since the user can get
it lost behind the main window.
 2012-10-13 17:48:57 +01:00
James Cotton
b99b221a6d Setup Wizard: Trigger the wizard with show() instead of exec() as using 
exec blocks the main application event loop.
 2012-10-13 17:46:31 +01:00
PT_Dreamer
ae80370b1d GCS-Fixes custom mixer saving bug 2012-10-13 17:45:41 +01:00
PT_Dreamer
c6936870c1 GCS-Fixes custom mixer saving bug 2012-10-12 18:32:54 +01:00
James Cotton
96afe7cffd Merge remote-tracking branch 'origin/stac/add-debug-consoles' into next 2012-10-12 08:07:44 -05:00
James Cotton
d0ee515daf Merge remote-tracking branch 'origin/kenz/coax_heli' into next 2012-10-12 08:06:13 -05:00
Laura Sebesta
2bad221ec2 Merge branch 'kenz/hitl_merge' into next 2012-10-12 07:41:17 +02:00
PT_Dreamer
d8f99b4096 GCS - Remove test button 2012-10-11 22:33:05 +01:00
PT_Dreamer
c99d048eb9 GCS-Wizard 
Be a bit more verbose on one of the board update messages.
 2012-10-11 14:59:18 +01:00
Fredrik Arvidsson
18f2d8e219 Added new button graphix for upgrade button on autoupdate page. Changed the texts slightly to be less offending. ;) 2012-10-11 13:31:02 +02:00
Stacey Sheldon
f0e0c2e79e console: add debug console via USB CDC/VCP interface 
The USB VCP Port has a new DebugConsole setting that
routes all output destined for PIOS_COM_DEBUG to the
emulated serial port.

To enable this in your build, you'll have to build like:
 - make fw_coptercontrol_clean
 - make fw_coptercontrol ENABLE_DEBUG_CONSOLE=YES

You can then output formatted text to the console
like this:
  #if defined(PIOS_INCLUDE_DEBUG_CONSOLE)
  PIOS_COM_SendFormattedString(PIOS_COM_DEBUG,
                               "foo is %u\r\n",
                               foo);
  #endif	/* PIOS_INCLUDE_DEBUG_CONSOLE */

Please ensure that all of your debug output is
wrapped with these macros so that your debug
code doesn't bloat the firmware image.
 2012-10-11 00:51:09 -04:00
Stacey Sheldon
6088c05946 console: add support for serial debug consoles 
Serial ports now have a new HW setting called DebugConsole
which can be used to dump internal state to a serial port
for debug.

To enable this feature, you need to:
 - make fw_coptercontrol_clean
 - make fw_coptercontrol ENABLE_DEBUG_CONSOLE=YES
 - configure one of the serial ports as DebugConsole in the GCS
 - save settings
 - power-cycle your board

Things to note:
 - The console is at 57600,8N1.
 - This is not currently configurable via the GCS.
 - You can only have a single console enabled at a time.
 2012-10-11 00:22:07 -04:00
PT_Dreamer
ea3eb984f4 Merge branch 'pt/wiz_autoupdate' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate 2012-10-10 18:26:28 +01:00
PT_Dreamer
8863601715 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate 2012-10-10 18:22:53 +01:00
zedamota
27fd597795 GCS-Try to fix blanked out dialog on OSX. 2012-10-10 17:36:58 +01:00
zedamota
47f94143b7 GCS- Detect fw bundle presence in a not so ugly way 2012-10-10 16:38:57 +01:00
zedamota
fb27c5d93c GCS-Fw Auto update - Try to fix win build 2012-10-10 16:36:13 +01:00
James Cotton
0c3084b9b1 OPMap: Line got missed in merge 2012-10-10 09:41:44 -05:00
James Cotton
3110678321 Merge branch 'dynamic_uavo_next' into revo 
Conflicts:
	androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.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/PipXSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/RelayTuning.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
	androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
 2012-10-10 08:27:11 -05:00
Fredrik Arvidsson
befa5da671 Fixed layouts in the setup wizard and made the wizard resizeable. 2012-10-10 00:36:29 +02:00
Laura Sebesta
4b3994a550 Merge branch 'next' into kenz/hitl_merge 
Conflicts:
	ground/openpilotgcs/src/plugins/plugins.pro
 2012-10-09 22:47:20 +02:00
Fredrik Arvidsson
fc69eaa205 Merge branch 'next' into pt/wiz_layouts 2012-10-09 21:56:27 +02:00
Oleg Semyonov
d60be79133 GCS: fix plugin build dependencies 
They should reflect the pro/pri files included and be sufficient to
build. Chained dependencies should be built by the make system.
 2012-10-09 21:57:58 +03:00
PT_Dreamer
d1b78faeb3 Revert "GCS-Config wizard" 
This reverts commit 4b5c88589c.
 2012-10-09 18:59:01 +01:00
Fredrik Arvidsson
d98c2aacf3 Merge branch 'next' into pt/wiz_layouts 2012-10-09 19:56:04 +02:00
PT_Dreamer
4b5c88589c GCS-Config wizard 
Made the wizard set stab1,2,3 as default flight modes for multis
 2012-10-09 00:16:22 +01:00
PT_Dreamer
047201211b GCS-Change config file name 
This is to force a new configuration to be loaded and used.
 2012-10-08 22:36:32 +01:00
Laura Sebesta
c2b49b6ef3 Merge branch 'kenz/cc_hitl_merge' into next 
Conflicts:
	ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
	ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
 2012-10-08 15:30:27 +02:00
Laura Sebesta
db8563f69f Fix aerosimrc hitl merge issues. 2012-10-08 00:41:58 +02:00
PT_Dreamer
64d2922e71 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate 
Conflicts:
	ground/openpilotgcs/share/share.pro
 2012-10-07 21:01:21 +01:00
Fredrik Arvidsson
c03ac35780 Added functionality for skipping autoupdate page if no firmware is available in resource bundle. 2012-10-07 21:49:07 +02:00
chris pember
bb2637054b hopefully fixed any conflicts 2012-10-07 10:57:53 -07:00
chris pember
ee031fe80d Merge branch 'next' into cp/extraGUIchanges 
Conflicts:
	ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowseroptionspage.ui
 2012-10-07 10:32:21 -07:00
chris pember
1d345d6916 Merge branch 'next' into cp/extraGUIchanges 
Conflicts:
	ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetoptionspage.ui
 2012-10-07 10:20:38 -07:00
PT_Dreamer
25bb91682b Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-10-07 13:21:04 +01:00
Laura Sebesta
b0182a47e3 Fixed csv export error, and increased resolution of all variables to 10 significant digits. 
(10 sig. dig. are required for full resolution GPS latitude and longitude output.)
 2012-10-07 09:09:15 +02:00
Laura Sebesta
22d7c8947e Removed extraneous comments. 2012-10-07 08:50:24 +02:00
PT_Dreamer
4ef8b78ff8 GCS-Made autouploader fetch fw from fw bundle 
Fw bundle is built with "make package_resource".
This target is a dependency of the package target but needs testing
on the different systems.
If the bundle is not present the build will not fail and
the wizard will jump the autoupdate page (not working FIXME)
 2012-10-06 23:24:21 +01:00
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
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
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
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
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
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
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
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
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
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
c6c8ff9487 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-09-27 20:41:33 -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
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
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
Dmytro Poplavskiy
6174fa2d7f PFD: display the side-slip indicator 2012-09-20 09:17:10 +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
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
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
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
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
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
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
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