Stacey Sheldon
5c7295549e
gcs: fix incorrect file case on include path
...
This breaks the Linux build. Introduced in d03282d
.
2012-06-20 22:07:14 -04:00
Brian Webb
7bd32253e5
Removed debug from GCS telemetry.
2012-06-20 18:34:16 -07:00
Brian Webb
3da382e828
Merge remote-tracking branch 'origin/next' into brian/multi-trans-telem
2012-06-20 17:43:17 -07:00
Mike LaBranche
5edd952ed6
VehicleConfig/mixer bugfix: keep the ui in synch when 'Save'ing from uavbrowser;
...
spruce up vehicleconfig with a couple more helpers;
2012-06-20 12:46:07 -07:00
PT_Dreamer
7425547b33
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-06-20 16:16:29 +01:00
James Cotton
621c78e5cb
Merge remote-tracking branch 'origin/MikeL_ConfigVehicle' into next
2012-06-20 09:35:18 +02:00
James Cotton
28c5a038d1
Merge remote-tracking branch 'origin/amorale/fix_osx_multiple_usb_serial' into next
2012-06-20 09:02:33 +02:00
Mike LaBranche
02cdc6feff
MixerCurveWidget: make Node smarter by storing a value whenever pos changes;
...
getCurve now reports back the list of node->getValue()
2012-06-19 16:51:22 -07:00
Mike LaBranche
9da2ffff2f
MixerCurveWidget: incorporate m_thread's delete leak fix, combined node+edge init
2012-06-19 15:22:11 -07:00
Mike LaBranche
04ea5f24fa
MixerCurveWidget: first pass refactoring for performance; bugfix for negative values
2012-06-19 10:28:42 -07:00
Mike LaBranche
fe2aed328e
bugfix: configccpmwidget, updatethrottlecurvevalue using wrong table index
2012-06-19 10:27:08 -07:00
Stacey Sheldon
4c47a36bda
uavobjgenerator: Add generator for wireshark UAVO plugin
...
Using 'make uavobjects_wireshark' now generates a complete
wireshark dissector that can decode all fields of the available
UAVObjects.
2012-06-19 00:21:35 -04:00
Fredrik Arvidsson
c8b4abc71f
Added comments to the code.
2012-06-17 12:46:45 +02:00
Laura Sebesta
87900043a4
Typo fix. Grammarians will be extreamely glad to complement the OP team now that these errors haved disappeared.
2012-06-17 10:21:58 +03:00
Fredrik Arvidsson
0e4ffa7f6d
Merge branch 'next' into thread/uavobrowser_perf
2012-06-17 09:21:22 +02:00
Mike LaBranche
4650d4909d
Add virtual keyword ConfigTaskWidget:: dtor; assures correct child deletion
2012-06-16 13:39:58 -07:00
Mike LaBranche
4807eb730f
Compiler Warning kill: rearrange ctor member init order in ConfigInputWidget
2012-06-16 13:38:05 -07:00
Oleg Semyonov
4120eb300c
HITLv2: fix shared object name captitalization
2012-06-16 20:13:41 +03:00
Fredrik Arvidsson
d03282d9b0
Changed the way change hilight of three cells works to bring down the
...
number of QTimer instances and the number of redraws to hopefully
increase performance.
Changed so that when a child gets hilighted it will hilight its parent.
2012-06-16 17:38:05 +02:00
Laura Sebesta
23651cddd1
Refactored HiTL for a common API from simulators. Also added noise generator. In addition, PFD now displays calibrated airspeed.
...
Also added throttle commands for all four channesl (it is now possible to fly a 747)
2012-06-15 15:22:07 +03:00
Mike LaBranche
c1689b2205
VehicleConfig: add set/getThrottleCurve, enhance configwidgets to consume;
...
add resetMixerVector call in multirotor; ConfigVehicleType now VehicleConfig aware
2012-06-14 15:40:17 -07:00
Mike LaBranche
a7ae258bc8
Bugfix, oops: missed a couple resetMixerVector opportunities.
2012-06-13 15:14:18 -07:00
Mike LaBranche
8de40c7847
BugFix: ConfigFixedWing reset the mixer vectors to zero prior to writing anew.
2012-06-13 15:09:54 -07:00
Mike LaBranche
8283d4280e
UAVTalk, change private member QIODevice* io to smart pointer QPointer<QIODevice>
2012-06-13 14:57:43 -07:00
James Cotton
295fa4a8f3
Fix bug where the aircraft gadget initially shows the quad tab but the selector
...
says plane.
2012-06-12 23:12:53 -05:00
James Cotton
1fad5c9fc2
Fix the stabilization expert UI so the label is in the right place
2012-06-12 01:52:32 -05:00
Brian Webb
9c1549e6a2
Change return type from Telemetry::transactionTimeout back to void.
2012-06-11 21:24:56 -07:00
Brian Webb
952c6d9f32
Added support for multiple transactions to GCS telemetry.
2012-06-11 21:06:50 -07:00
James Cotton
9870abcd2f
Fix some slots in config revo calibration
2012-06-11 14:42:08 -05:00
James Cotton
dba47a7d41
Remove the connection to refreshWidgetValues() in output widget. Mike was
...
right and it's not needed since hte configTaskWidget takes care of this
connection.
2012-06-11 13:22:37 -05:00
James Cotton
93b77becc0
More the system task priority down and increase the timeout for erasing the
...
flash so it says completed. However, it still blocks the system for a long
time. During an erase the heartbeat will flash at 10 Hz to indicate what's
happening.
This still blocks telemetry even after lowering hte system priority (and there
is a vTaskDelay) which makes me think that the SPI bus being locked is blocking
Sensors or somethign else. This should not be permited when the system is
armed.
The reason the system locks up during the erase is that the file system
operations occur within the event dispatcher thread. It is very bad practice
for anything to block this (i.e. callbacks should never take very long). We
should probably move the object persistence handling into the system thread or
something but that can be a separate issue.
2012-06-11 12:03:32 -05:00
James Cotton
6f09b6d087
Fix misnamed slot in the output widget
2012-06-11 11:31:28 -05:00
Sambas
0115c810f3
typo bugfix
2012-06-11 18:48:29 +03:00
Stacey Sheldon
c73cffce59
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
Makefile
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/System/inc/pios_config.h
package/Makefile
Fixed CRLF line end clobbering in:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Common/pios_usb_util.c
flight/PiOS/STM32F4xx/pios_iap.c
flight/PiOS/inc/pios_rfm22b_priv.h
flight/PiOS/inc/pios_usb_util.h
2012-06-10 19:01:11 -04:00
James Cotton
7b8110a457
Merge branch 'MikeL' into next
2012-06-07 11:31:41 -05:00
James Cotton
9b7a8dc15f
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next
2012-06-07 11:27:51 -05:00
Sambas
6330d40215
Separate GPS/UAV trails and context menu settings
2012-06-07 17:46:30 +03:00
Oleg Semyonov
95f66ddd76
AeroSimRC: add default simulatorId to prevent GCS crashes w/o config
...
GCS will crash when HITLv2 plugin is started if there is no
HITLv2 configuration in the OpenPilotGCS.xml. This is a workaround
to prevent this behavior. Better way might be to rework the GCS config
handling, but as a workaround this should work.
2012-06-07 12:52:08 +03:00
James Cotton
aa5832b1e8
Remove some style sheets that got dragged back in from conflict
2012-06-06 13:01:15 -05:00
James Cotton
5e01617cbd
Merge branch 'next' into MikeL
...
Conflicts:
ground/openpilotgcs/src/plugins/config/airframe.ui
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
ground/openpilotgcs/src/plugins/config/configoutputwidget.h
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h
2012-06-06 11:58:06 -05:00
Mike LaBranche
01820904a2
Merge conflict resolution: alter configvehicle,configoutput refreshWidgetsValues
...
signatures to conform to virtual in ConfigTaskWidget;
add multirotor mixer sliders to apply/save dirty monitor, fix slider signals;
2012-06-06 08:58:18 -07:00
Brian Webb
6f9c6ae86d
Only show PipX config gadget when the PipX is connected.
2012-06-05 19:34:42 -07:00
Brian Webb
4e68f6543e
Added tracking of dropped packets to PipX and turned off visible text on signal strength meters.
2012-06-04 21:18:13 -07:00
Brian Webb
7abf32e4c2
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2-gui-upgrades
2012-06-04 18:24:20 -07:00
Mike LaBranche
682ab20f94
add accels.h, gyros.h zapped during conflict resolution
2012-06-04 17:13:55 -07:00
Mike LaBranche
0ba8345c51
Merge branch 'next' into MikeL
...
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
2012-06-04 16:59:31 -07:00
Mike LaBranche
bf591ebe45
Merge branch 'next' into MikeL
...
Conflicts:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/STM32F4xx/pios_iap.c
flight/Revolution/System/inc/pios_config.h
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
2012-06-04 15:38:57 -07:00
James Cotton
ff0a3a156e
Merge remote-tracking branch 'origin/os/AeroSimRC' into next
2012-06-04 12:25:59 -05:00
James Cotton
4d75718347
While change the util manager make a few other methods use static accessors.
2012-06-03 18:16:21 -05:00
James Cotton
2d80d59e93
Make the uavobjectutilmanager handle the error condition on saving and not
...
segfault when a save fails.
2012-06-03 17:41:51 -05:00
a*morale
37e5e0d2a2
Fixes a problem in OSX that prevent to use two serial ports with the same displayed name (for example from USB multiple serial adapter)
...
Now serial ports are internally referred using their physName instead of friendName
2012-06-03 20:31:48 +02:00
Sambas
978aba4e91
Check if Homelocation is set before calibration
2012-06-03 20:25:17 +03:00
Sambas
75bc00c534
Mag calibration, does this make any sense?
2012-06-03 20:25:05 +03:00
Laura Sebesta
054f15c529
Added digital RSSI output to GUI.
2012-06-03 12:06:07 +03:00
Corvus Corax
ab28686976
Merge branch 'corvuscorax/new_navigation' into revo-next
2012-06-02 22:30:44 +02:00
PT_Dreamer
ed92edc421
GCS - Should fix crashes when opening and closing settings page
2012-06-02 01:12:55 +01:00
Corvus Corax
2fcbb4ee8e
Disabled OpenSceneGraph plugin per default. It doesn't compile without loads of extra work.
2012-05-31 16:49:24 +02:00
Corvus Corax
a2d6cb8314
PathAction editor: make easy selection of actions per waypoint
2012-05-31 04:11:13 +02:00
Corvus Corax
df67a3e631
PathActionEditor: added more buttons, always highlight active waypoint and pathaction
2012-05-30 18:23:10 +02:00
PT_Dreamer
ab78e1aca3
GCS - Make the welcome plugin use the workspace names instead
...
of the mode names.
2012-05-30 16:46:45 +01:00
Sambas
ed1a4dada6
Merge remote-tracking branch 'remotes/origin/sambas/osd_test_v1' into revo-next
...
Conflicts:
flight/PiOS/STM32F4xx/pios_adc.c
2012-05-30 16:30:09 +03:00
Corvus Corax
298b6233ed
Merge branch 'revo-next' into corvuscorax/new_navigation
...
Conflicts:
flight/Libraries/paths.c
flight/Modules/ManualControl/manualcontrol.c
flight/Revolution/Makefile
shared/uavobjectdefinition/taskinfo.xml
2012-05-30 00:51:52 +02:00
Corvus Corax
7586a55fd6
Added an editor gadget for pathactions and waypoints - based on James
...
waypointeditor - no storing or loading yet
2012-05-29 22:48:17 +02:00
James Cotton
1a9e0806c1
Merge branch 'next' into revo-next
2012-05-28 22:07:29 -05:00
James Cotton
1e8db9f7e7
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-wheel' into next
2012-05-28 17:51:55 -05:00
James Cotton
1934752d50
Merge branch 'revo-next' into revo
2012-05-28 15:23:14 -05:00
James Cotton
f64adcfa58
Merge branch 'next' into revo-next
2012-05-28 15:17:13 -05:00
James Cotton
a6e9235888
Make the connections in the config gadget unique and add a flag to make sure
...
the refreshWidgetValues is never caleld after disabling updates
2012-05-28 14:11:29 -05:00
James Cotton
52a3d0079e
Clean up the output widget a bit with whole it interfaces to the
...
configTaskWidget. Uses more of the parent functionality.
2012-05-28 14:11:25 -05:00
Oleg Semyonov
5739dfbfc8
Merge remote-tracking branch 'origin/next' into os/aerosimrc
...
Conflicts:
shared/uavobjectdefinition/gcsreceiver.xml
2012-05-28 21:46:43 +03:00
Oleg Semyonov
2ef1943c0c
AeroSimRC: change default ports to the same as in the AeroSimRC config
2012-05-28 19:44:36 +03:00
Oleg Semyonov
d463cd322a
AeroSimRC: fix metadata access functions
2012-05-28 19:44:36 +03:00
Oleg Semyonov
9f0edd803e
AeroSimRC: change HITLv2 code to reflect changed sensor data objects
2012-05-28 19:44:35 +03:00
James Cotton
4360d8adfd
Merge branch 'next' into revo-next
2012-05-28 11:25:40 -05:00
James Cotton
ea03f8f220
Remove the specific function for the setSpinningArmed flag. This is now done
...
differently with the configTaskWidget style.
2012-05-28 11:23:43 -05:00
James Cotton
1689424620
Merge branch 'ui_unbreak' into next
2012-05-28 11:23:35 -05:00
Sambas
147100bc2f
Merge remote-tracking branch 'remotes/origin/revo-next' into osd_test_v1
...
Conflicts:
Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-05-28 19:06:25 +03:00
James Cotton
3fa7b30f22
Merge branch 'ui_unbreak' into revo
2012-05-28 09:42:10 -05:00
James Cotton
33e39713d1
Make GCS aware of revo board number again
2012-05-28 09:34:23 -05:00
James Cotton
8a6073fbaf
Merge remote-tracking branch 'revo/revo-next' into testing
...
Conflicts:
Makefile
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/task.c
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port_posix.c
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/Revolution/Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
shared/uavobjectdefinition/taskinfo.xml
2012-05-28 09:13:26 -05:00
Corvus Corax
978ab5b96c
Merge remote branch 'origin/stac/etasv3' into revo-next
2012-05-28 12:56:27 +02:00
Mike LaBranche
e2d1f67d9e
Add virtual updateObjectsFromWidgets to configccattitude;
...
reset calibration progress bar to 0% upon successful apply/save.
2012-05-27 10:20:31 -07:00
Mike LaBranche
1b2ffde116
Keep up: spelling disableWheelEvents; add pushbutton setAttribute for osx.
2012-05-26 16:49:02 -07:00
Corvus Corax
922b3b7f1e
Merge branch 'basenext' into corvuscorax/new_navigation
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-05-27 01:41:51 +02:00
James Cotton
5fb615c3e5
Remove stylesheet on subpanel of input.ui as it doesn't look consistent across
...
platforms.
2012-05-26 14:09:42 -05:00
Corvus Corax
8c94e931d2
Bugfix: Fixed and reenabled HITL (backport of working code from revo repo)
2012-05-26 17:38:32 +02:00
James Cotton
126671ae4c
Add line from Kenz that fixes button overlap on OSX
2012-05-26 10:33:27 -05:00
James Cotton
f1f01f2b4b
Fix uploader gadget to not throw warnings when uploading to CC3D. Also added a
...
different icon to it. The description is still "CC3D" for "CopterControl".
The whole names/board types/etc really needs centralizing into
devicedescriptorstructure which should become a general class for checking if
firmware is good etc.
2012-05-26 09:46:29 -05:00
Corvus Corax
45258a6561
Ported GCS to reflect recent pathfollower changes
2012-05-26 13:57:46 +02:00
Corvus Corax
c7857926f4
OpenSceneGraph deactivated by default, too tricky to get it compiled for most devs
2012-05-26 13:49:04 +02:00
Laura Sebesta
888b8fb0c9
Disabled wheel scrolling, improved tab order.
2012-05-26 12:00:16 +03:00
James Cotton
dd9e2de4b9
Match small spacing between TxPid and CameraStab
2012-05-26 03:11:39 -05:00
James Cotton
1a4e358f7c
Remove custom style from airframe
2012-05-26 03:11:38 -05:00
James Cotton
8682937f8a
Remove custom style sheets from camerastab. At least that was applied widget
...
wide, but still should be done to look nice cross platform (or from a window
specific runtime command).
2012-05-26 03:11:38 -05:00
James Cotton
60af442f27
Remove the custom stylesheet from the txpid .ui group boxes
2012-05-26 03:11:38 -05:00
James Cotton
a6e1837161
Remove stylesheets for stabilization ui group boxes as they don't work properly
...
on all platforms. Also removed custom fonts as these don't work consistently
across platforms.
Basically don't customize shit in the .ui file. Generate a stylesheet and
let's properly validate them and/or have one per platform. Even things like
changing font sizes behave inconsistently.
Don't specify the size of buttons, at least to any precision. It will not work
across platforms.
2012-05-26 03:11:38 -05:00
Laura Sebesta
0e505a396e
Fixed scrolling issues in plugin by adding all elements to a parent QFrame widget,
...
and then activating scrolling in configpipxtremewidget.cpp constructor.
2012-05-26 03:11:38 -05:00
James Cotton
4683a1dcc3
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-05-26 03:09:16 -05:00
James Cotton
a24375ca71
Fix bug introduced with PiPX merge where the refreshWidgetsValues(UAVObject *)
...
gained the parameter. However, objects that had overriden that method were now
creating a new method and not getting called at the right time. This fixes the
Output and Aircraft type panels
2012-05-26 03:07:36 -05:00
James Cotton
7698913d38
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-scroll' into next
2012-05-25 23:51:30 -05:00