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
db15b01e35
Reenabled double-clicking on Home to set lat/lon/altitude.
...
Also reduced the size of the double-click sensitive area.
2012-10-22 10:54:13 +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
David Ankers
2db1bcdaf8
Wide Screen config, added UAVOB and some resizes. Synced normal and
...
widescreen so they are basically the same except for ID and splitters.
2012-10-16 09:08:47 +11: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
36087b1339
Changed new config files to include new HiTL settings.
2012-10-12 08:53:13 +02: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
993cd0f8f6
Added conversion from rotation matrix to quaternions.
2012-10-08 15:17:47 +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
d664ec9705
GCS-Try to fix linux file copy without braking Win
2012-10-07 16:50:04 +01: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
5c879d5238
GCS-Fix file copying on linux
...
It got reverted on a merge
2012-10-06 23:41:14 +01: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
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