James Cotton
|
af189cc0ab
|
Merge remote-tracking branch 'origin/remote/origin/banig/ScopeChanges' into next
|
2012-02-14 13:24:49 -06:00 |
|
James Cotton
|
bb89b82865
|
Merge branch 'next' into GCS_QML_Dmytro
|
2012-02-14 12:35:14 -06:00 |
|
James Cotton
|
c111e26958
|
Patch from Kenz to suppress warnings about unknown object IDs until end of
parsing
|
2012-02-13 14:55:44 -06:00 |
|
James Cotton
|
90945ec9b0
|
Merge remote-tracking branch 'origin/Brian-GCSReceiver-Failsafe' into next
|
2012-02-13 11:32:05 -06:00 |
|
Oleg Semyonov
|
a01e38c277
|
Merge remote branch 'origin/master' into os/features/pid-tuning-from-transmitter
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadget.qrc
|
2012-02-13 11:51:00 +02:00 |
|
zedamota
|
855cc0f663
|
Fixes the BT telemetry not working on non windows OSs.
|
2012-02-12 17:27:26 +00:00 |
|
zedamota
|
74108e200b
|
Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into pt/gcs_uavobj_widget_framework
Conflicts:
ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp
ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h
ground/openpilotgcs/src/plugins/config/stabilization.ui
|
2012-02-11 22:29:03 +00:00 |
|
zedamota
|
aea1e45de7
|
Added some documentation to the new framework
|
2012-02-11 21:38:27 +00:00 |
|
zedamota
|
1da2cf5166
|
Added support for multiple instances objects.
|
2012-02-11 18:35:36 +00:00 |
|
banig
|
2aead6a7c6
|
Made method name more descriptive
|
2012-02-11 16:17:20 +02:00 |
|
banig
|
8e1a7ae709
|
Add warning to let user know if Scope refresh interval is quicker than the telemetry data
|
2012-02-11 15:59:34 +02:00 |
|
Dmytro Poplavskiy
|
e6df2ca6d3
|
Replaced the welcome page with a QML based one.
It's still necessary to replace the mode images with the correct ones.
|
2012-02-11 10:14:13 +10:00 |
|
zedamota
|
c2d9af1e89
|
Finished framework and stab config showcase
|
2012-02-10 16:34:07 +00:00 |
|
sambas
|
81f01a0b96
|
Merge remote-tracking branch 'remotes/origin/next' into qwt_6.0.1_upgrade
Conflicts:
ground/openpilotgcs/src/libs/qwt/src/qwt_global.h
ground/openpilotgcs/src/libs/qwt/src/src.pro
|
2012-02-10 17:27:23 +02:00 |
|
zedamota
|
4cdf223bff
|
Added support for multiple apply/save buttons.
Added a few useful signals.
|
2012-02-08 20:15:14 +00:00 |
|
zedamota
|
5cfd763f2a
|
Bug fixes and showcase UI setup (partial).
|
2012-02-07 20:29:32 +00:00 |
|
zedamota
|
e2c6a9d58a
|
Added Dado's UI.
Several scale bug fixes.
Added lots of debug info, will clean later.
|
2012-02-06 17:33:54 +00:00 |
|
Corvus Corax
|
b4a8eda8db
|
Merge branch 'corvuscorax/Smoothed_Scope' into next
Conflicts:
ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
|
2012-02-06 16:35:13 +01:00 |
|
zedamota
|
35c5391d53
|
Corrected file headers
|
2012-02-05 20:07:19 +00:00 |
|
sambas
|
a263ee7885
|
unix:!mac should solve all problems
|
2012-02-05 21:45:47 +02:00 |
|
zedamota
|
6d6111b9ac
|
Moved framework to its own plugin
|
2012-02-05 18:16:38 +00:00 |
|
zedamota
|
32ebdb63a3
|
Preparatory commit before moving framework to a better location.
|
2012-02-05 14:41:23 +00:00 |
|
Dmytro Poplavskiy
|
861b21a18d
|
Added a QML viewer plugin.
UAV objects used in PFD are available in the QMl context.
|
2012-02-05 22:33:14 +10:00 |
|
Dmytro Poplavskiy
|
aead288304
|
Generate properties for UAVDataObject fields.
Also changed UAVObject::requestUpdate() and UAVObject::update() to be slots.
This makes possible to use objects directly from QML.
|
2012-02-05 13:58:17 +10:00 |
|
Brian Webb
|
3f66afd74a
|
Removed emacs mode header from pios_gcsrcvr.c
|
2012-02-04 08:42:16 -07:00 |
|
Brian Webb
|
1b55f9fd51
|
Merge remote-tracking branch 'origin/next' into Brian-GCSReceiver-Failsafe
|
2012-02-04 08:36:55 -07:00 |
|
zedamota
|
427acee559
|
Added support for objects value limits on the GCS to the GCS and generator.
|
2012-02-03 20:29:28 +00:00 |
|
Brian Webb
|
a314604f9b
|
Added failsafe to GCS Receiver device.
|
2012-02-02 19:59:42 -07:00 |
|
zedamota
|
4c1e33b0b3
|
WIP configtaskwidget enhancements.
|
2012-02-02 16:22:40 +00:00 |
|
sambas
|
fedc62b6c3
|
OPReview-159: Linux posix timer thing fix
|
2012-02-02 16:34:46 +02:00 |
|
David Ankers
|
213a915f67
|
Remove flightplanner screen
|
2012-02-01 20:09:43 +11:00 |
|
James Cotton
|
bd77b7e5a2
|
Fix stupid commit on my part. Thanks for heads up brian.
|
2012-01-31 19:26:48 -06:00 |
|
James Cotton
|
eaf9a4bded
|
Merge branch 'master' into next
Conflicts:
ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
|
2012-01-31 17:30:05 -06:00 |
|
James Cotton
|
c69717edd8
|
DOS2UNIX cc_hw_settings.ui to make merge work
|
2012-01-31 17:29:29 -06:00 |
|
James Cotton
|
7990d209a8
|
Fix package deployment script for OSX to make sure the SVG pixmap shows up
|
2012-01-31 14:48:24 -06:00 |
|
James Cotton
|
a2979125b7
|
Remove the hardcoded .svg from the QLabel and load it dynamically. This will
be useful for CC3D.
|
2012-01-31 14:47:56 -06:00 |
|
James Cotton
|
318354a115
|
Fix resizing issue with input wizard
|
2012-01-31 13:31:14 -06:00 |
|
James Cotton
|
d07b386beb
|
Revert "made the input wizard background transparent"
This reverts commit c5a2afcc2c .
|
2012-01-31 13:09:01 -06:00 |
|
James Cotton
|
3a66f70eae
|
Input config: Increase the delay after detecting a channel to ask for next one
|
2012-01-31 11:25:18 -06:00 |
|
James Cotton
|
e3f89eb958
|
Input config: Increase the delay after detecting a channel to ask for next one
|
2012-01-31 11:24:19 -06:00 |
|
David Ankers
|
a5ffdb7306
|
Merge branch 'master' into next
|
2012-01-31 05:32:49 +11:00 |
|
Oleg Semyonov
|
369629ad34
|
Add "Reset To Defaults" button to Stabilization configuration tab
Also add tootips to Reset/Apply/Save buttons.
|
2012-01-31 04:44:54 +11:00 |
|
Oleg Semyonov
|
911f8fde03
|
Add "Reset To Defaults" button to Stabilization configuration tab
Also add tootips to Reset/Apply/Save buttons.
|
2012-01-31 04:27:59 +11:00 |
|
zedamota
|
01c910cd2b
|
OP-616 Fixes wrong HW version being displayed.
|
2012-01-29 21:49:11 +00:00 |
|
David Ankers
|
6c030482a5
|
Fix 64 bit compile
|
2012-01-30 04:51:11 +11:00 |
|
zedamota
|
c5a2afcc2c
|
made the input wizard background transparent
|
2012-01-29 10:28:24 +11:00 |
|
zedamota
|
3d896ffaf5
|
Fixes scopegadget loading issues with Qt versions > 4.7.4
|
2012-01-29 10:25:07 +11:00 |
|
naiiawah
|
fdcea01100
|
numberOfDevices could be left unitialized if sendData or receiveData
fail in findDevices or if no one ever calls findDevices. Added init of
var.
|
2012-01-28 15:12:27 -07:00 |
|
zedamota
|
f6d747d5f0
|
Fixes scopegadget failure to load with Qt versions > 4.7.4
|
2012-01-28 22:07:45 +00:00 |
|
zedamota
|
e1d471dc63
|
Fixes scopegadget loading issues with Qt versions > 4.7.4
|
2012-01-28 21:25:38 +00:00 |
|