1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-04 12:24:11 +01:00
Commit Graph

1224 Commits

Author SHA1 Message Date
James Cotton
9b7a8dc15f Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next 2012-06-07 11:27:51 -05: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
Laura Sebesta
054f15c529 Added digital RSSI output to GUI. 2012-06-03 12:06:07 +03:00
PT_Dreamer
ed92edc421 GCS - Should fix crashes when opening and closing settings page 2012-06-02 01:12:55 +01: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
James Cotton
1e8db9f7e7 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-wheel' into next 2012-05-28 17:51:55 -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
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
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
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
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
Mike LaBranche
94df1847fc Bugfix: update ccpm swash mix slider visibility via ui instead of stored config;
sliders now appear/disappear as user selects link checkboxes
2012-05-25 19:36:39 -07:00
James Cotton
5a6e02a688 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next 2012-05-25 20:37:23 -05:00
Mike LaBranche
b5ac4306d3 Delete commented code using direct vector object referencing 2012-05-25 11:47:38 -07:00
Mike LaBranche
e9e6aece21 Bugfix: ccpm_ui - change sliders signal sliderMoved to valueChanged;
resolves related spinboxes not always staying in synch
2012-05-25 11:29:38 -07:00
Laura Sebesta
5061f86e00 Fixed scrolling issues in plugin by adding all elements to a parent QFrame widget,
and then activating scrolling in configpipxtremewidget.cpp constructor.
2012-05-25 11:45:28 +03:00
Laura Sebesta
423e287494 Added zoom functionality to scopes. There is a minor bias error when zooming with the legends activated.
This is due principally to the fact that retreiving the Qt coordinate in the frame
references to a slightly different system from Qwt invTranformation when the
legend is active.
2012-05-25 00:48:58 +03:00
Mike LaBranche
7fb96f1acd Bugfixes in configwidgets;
Refactor mixer type and vector set/get, named vector elements;
2012-05-24 09:38:34 -07:00
Laura Sebesta
534559680b Fixed tiny bug in ChronoPlotData. 2012-05-23 01:18:30 +03:00
Mike LaBranche
2db4f6b2b6 Resolves mixer/advanced tab switching issue;
semi-centralized channelNames;
renames ConfigCcpmWidget
2012-05-22 09:55:50 -07:00
Laura Sebesta
5f7944bff1 Fixed display problem for in scope for math function type. Updated
OpenPilotGCS.xml to include default of "None" for scope math type.
2012-05-22 18:14:21 +03:00
Laura Sebesta
6003d2d574 Changed order of scope math functions to be more logical.
Added "Average" as  scope math function.
Changed averaging window size text edit box to be active only when math functions are selected.
Fixed bug introduced immediately prior by removing child redefinition of saveConfig.

Tried installing scroll wheel event filter for scope config plugin, but is not currently working.
2012-05-22 12:34:01 +03:00
Laura Sebesta
a210b790b4 Added combo boxes to the mouse wheel filter. 2012-05-22 12:19:20 +03:00
Brian Webb
6e359c5933 Added PipX to Windows .inf file and updated ppm port definitions. 2012-05-21 19:22:46 -07:00
Laura Sebesta
aeca5c6741 Added Math Functions to the scope. Currently only support standard deviation. 2012-05-22 05:21:11 +03:00
Laura Sebesta
ce139a12cc Missed a final typo. 2012-05-22 01:22:47 +03:00
Laura Sebesta
f4376b3445 Corrected small typo: disbleMouseWheelEvents vs. disableMouseWheelEvents 2012-05-22 01:20:23 +03:00
Laura Sebesta
3a1b15a65b Reworked scale plot entry to have a more descriptive name and function. 2012-05-22 00:40:01 +03:00
Laura Sebesta
cae53915d3 Fixed small typo: "sequencial" vs. "sequential" 2012-05-22 00:34:29 +03:00
Mike LaBranche
64688be0a1 Refactor configwidgets for multirotor,fixedwing,heli,ground;
VehicleConfig subclasses ConfigTaskWidget and adds guiconfigdata bit storage;
Align channelbox items so 'None' is first;
2012-05-21 11:28:29 -07:00
Brian Webb
bc9dcd415f Reverted unnecessary changes to configtaskwidget.cpp 2012-05-19 15:05:17 -07:00
Brian Webb
723f68f763 Reverted unnecessary changes to configtaskwidget.cpp 2012-05-19 14:18:29 -07:00
Brian Webb
c25884bcaf Cleanup on the PipX branch. 2012-05-18 17:42:25 -07:00
Brian Webb
68d66d4181 Fixed firmware description in PipX status. 2012-05-17 20:35:17 -07:00
Brian Webb
44a1663eb9 Fixed transparent comm on PipX. 2012-05-16 19:02:53 -07:00
Corvus Corax
80f53b185c GCS: BITFIELD: Set lists of options hardcoded in uavobjectfield.cpp (can only be "0" or "1" ) 2012-05-15 19:40:58 +02:00
Corvus Corax
aa7788d04c UAVObjects: Bugfixes to BITFIELD type 2012-05-15 19:01:32 +02:00
Corvus Corax
8fc471463d UAVOBJECTS: On GCS side, handle Mode Bitfield in UAVOBJECT Metadata as a type BITFIELD. This has no effect on flight side, since the serialized form is identical to an UINT8 that's interpreted as a bitfield which is used there, so that can change later if necessary 2012-05-15 18:23:25 +02:00
Corvus Corax
31fd30b108 UABOBJECTS: Made GCS aware of new BITFIELD type in UAVObjects - so far not used by UAVObjectgenerator, but can be used (hardcoded) in metadata objects 2012-05-15 18:22:36 +02:00
Corvus Corax
badf509d1d UAVObjects: switched around order of update modes to give each bit semantic meaning - important to allow usage of a bitfield type later 2012-05-15 18:21:27 +02:00
Mike LaBranche
ed54716436 add gui config data bit storage to fixedwing,multirotor,ground vehicles 2012-05-14 10:05:40 -07:00
Brian Webb
a3269aaf2f Reverted some file permission changes. 2012-05-13 14:24:57 -07:00
Brian Webb
68d12b1b2f Fixed some bugs with setting PairIDs in GCS. 2012-05-13 14:24:00 -07:00
Brian Webb
ec67742ff6 Added configuration of COM ports on PipX. 2012-05-12 13:16:36 -07:00
Mike LaBranche
5e07e742ef revised to use GUIConfigManager.GetChannelDescriptions 2012-05-11 21:53:02 -07:00
Mike LaBranche
3a3dc4b888 extend GUIConfigData to support all vehicle types; add GUIConfigDataManager class to get/set 2012-05-11 21:48:46 -07:00
Brian Webb
dd02873908 Reverted changed mode. 2012-05-11 17:53:53 -07:00
Brian Webb
1f5dbcf57c Mostly complete PipX configuration GUI. 2012-05-11 17:51:18 -07:00
Brian Webb
513c014f5a Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-05-11 17:44:23 -07:00
PT_Dreamer
f716f16b60 Fixes compile issues on Ubuntu with qt 4.8.0 2012-05-10 14:47:30 +01:00
Mike LaBranche
c066fdc5e6 add support for output channel assignment descriptions for helicp 2012-05-09 15:24:15 -07:00
zedamota
75b3547e89 Merge branch 'ui_fixes' into next 2012-05-07 15:14:55 +01:00
zedamota
f753105c0f GCS - disable the boot and safeboot buttons during flash 2012-05-07 15:11:51 +01:00
Oleg Semyonov
a3906aa7ea Merge remote-tracking branch 'origin/hhrhhr/AeroSimRC_plugin' into os/aerosimrc 2012-05-07 16:09:35 +03:00
zedamota
9481be90af GCS - Changes reload button behavior, now loads data from persistence memory. 2012-05-07 14:02:58 +01:00
Brian Webb
454144f46c Pairing and saving settings working. 2012-05-06 20:47:21 -07:00
Laura Sebesta
bcc1885785 Added tooltips to beginners stab. tab. 2012-05-06 17:53:43 -04:00
Brian Webb
ef4828032b Fixed failed merge with next. 2012-05-06 12:38:13 -07:00
Kenn Sebesta
40e215ae27 Fixed bug in configvehicletypewidget.cpp that prevented Octo Coax X from being selected.
Fixed labelnames in airframes.ui that were causing compile warnings.
2012-05-06 12:22:43 -04:00
Brian Webb
480371a43e Resolving merge with origin/next 2012-05-05 09:53:54 -07:00
Brian Webb
e83fec0463 Merged latest origin/next. 2012-05-05 09:40:44 -07:00
zedamota
3e32b8db70 GCS - Fixes wrong mixer value being displayed. 2012-05-05 12:30:37 +01:00
James Cotton
474c5c96d3 Change field name back to ILimit to correctly reflect how it works in the code 2012-05-04 15:26:58 -05:00
James Cotton
3ef01569b8 Merge remote-tracking branch 'origin/kenz/PT_UI_fixes' into next
Conflicts:
	flight/OpenPilot/System/openpilot.c
	shared/uavobjectdefinition/positionactual.xml
	shared/uavobjectdefinition/positiondesired.xml
	shared/uavobjectdefinition/velocityactual.xml
	shared/uavobjectdefinition/velocitydesired.xml
2012-05-04 13:21:23 -05:00
James Cotton
65829a6513 Update the revo configuration to be consistent with the new meta data format. 2012-05-03 21:09:25 -05:00
Brian Webb
44d95003f3 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-05-03 17:56:08 -07:00
James Cotton
3155324384 Merge branch 'next' into cc3d
Conflicts:
	Makefile
	ground/openpilotgcs/src/plugins/config/configahrswidget.cpp
	shared/uavobjectdefinition/ahrscalibration.xml
	shared/uavobjectdefinition/ahrssettings.xml
	shared/uavobjectdefinition/attituderaw.xml
2012-05-03 16:31:49 -05:00
zedamota
c8655acd2d Merge remote-tracking branch 'remotes/origin/kenzPT' into PT_ui_fixes 2012-04-27 18:49:17 +01:00
Kenn Sebesta
38f9c99596 Changed Basic stabilization UI to remove scaling from full stick movement, etc...
in order that the Basic and Advanced tabs correspond.
2012-04-27 09:30:30 -04:00
jb
8fc3958f80 Made the scroll event filter a member of the parent class. 2012-04-26 12:29:00 +01:00
Laura Sebesta
4fedbd7df4 Changed the number of significant digits in many fields. 2012-04-25 06:31:21 -04:00
Brian Webb
663b151f4a A few more bug fixes on metadata mods. 2012-04-22 20:49:37 -07:00
Brian Webb
aab47d6ed4 Final updates to throttled mode and further memeory reduction in the object manager and event dispatcher to reflect smaller data sizes in metadata. 2012-04-22 14:56:26 -07:00
Brian Webb
a1168b6658 Added additional status reporting to PipX config GUI. 2012-04-21 20:47:50 -07:00
Laura Sebesta
d9510a94eb Fixed firmware file chooser to be a little more intelligent. Especially important for windows users.
However, for Mac and Linux, this currently points to a directory relative to the build directory, which is helpful for devs, but not for users.
2012-04-21 22:03:43 -04:00
Brian Webb
eb6f175af4 Fixed metadata settings in object browswer, and removed update mode never from all uavobjects that used it (changed to manual). 2012-04-21 11:59:14 -07:00
Laura Sebesta
79940287dc Import UAV objects config gadget UI upgrades. Fixed table selectability, and progress bar. 2012-04-20 08:56:51 -04:00
Laura Sebesta
48d018f9bb Fixed [cm] vs. [m] unit discrepencies in PFD and xml files, as per revo update to [m-kg-s] units. 2012-04-20 06:11:44 -04:00
Laura Sebesta
73cafd742c Changed Help in help menu from displaying plugins to sending user to Wiki. 2012-04-19 19:10:42 -04:00
Laura Sebesta
0b7b86cd24 Turned off wheel scrolling! Also changed all wheel focus to strong focus. 2012-04-19 13:00:20 -04:00
Laura Sebesta
ac76628c84 Moved "Help" and "Export UAV Data..." to HELP menu. 2012-04-19 11:54:43 -04:00
Laura Sebesta
ddf45b79cd Fixed smartsave button instatiation race condition 2012-04-19 09:42:35 -04:00
Brian Webb
19166cc830 Added UPDATEMODE_THROTTLED to UAVObjects update modes. 2012-04-18 18:47:13 -07:00
Brian Webb
f4164d97bd Merge remote-tracking branch 'origin/next' into Brian-Metadata-Mods 2012-04-17 19:34:44 -07:00
Brian Webb
a65b073c58 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-04-17 17:43:17 -07:00
Brian Webb
16da443405 Added PipX config widget (not complete). 2012-04-17 17:40:24 -07:00
Laura Sebesta
dddbd77a89 Changed all to StrongFocus.
Added limits to Ki*ILimit
2012-04-17 18:48:47 -04:00
Laura Sebesta
e143f98793 Fixed steps in spin boxes. 2012-04-17 17:35:48 -04:00
Laura Sebesta
46584209fb Fixed foxus problems in basic tab. 2012-04-17 17:14:03 -04:00
Laura Sebesta
c6c5e18992 Fixed outputchannelform.ui tab order and tab focus. 2012-04-17 16:32:07 -04:00
zedamota
45e34cbae0 Force CC attitude config page refresh on board connection. 2012-04-17 15:19:41 +01:00
zedamota
411c38aebf Fixes the incompatible message when the GIT tag has a leading zero. 2012-04-17 13:54:41 +01:00
Brian Webb
4936cd8fd2 Added PipXStatus and PipXSettings UAVObjects and added support the sending/receiving UAVTalk objects on the PipX. 2012-04-10 20:22:53 -07:00
Brian Webb
5542d7c995 Updated configvehicletypewidget.cpp with metadata mods. 2012-04-05 18:50:47 -07:00
Dmitry Zaitsev
34b8564864 add emulated sonar output
40 degree beam, hardcoded.
2012-04-04 01:22:34 +04:00
Brian Webb
df0a1c2ac1 Upgraded Brian-Metadata-Mods to current next. 2012-04-01 12:25:13 -07:00
Brian Webb
496a323b7f Fixed indentaion. 2012-03-31 07:59:44 -07:00
Laura Sebesta
6461b91f18 Removed commented code, as per reviewer comments. Made other small reviewer requested changes. Fixed bug with capitalization. 2012-03-29 00:54:11 -04:00
Kenn Sebesta
90e4686d70 Typo correction in airframe UI. Minor GUI upgrades to Input. 2012-03-26 11:49:10 -04:00
Laura Sebesta
ad499c8946 Removed extraneous configccpmwidget.h and configccpmwidget.cpp. 2012-03-25 18:42:32 -04:00
Laura Sebesta
88a46f9062 Merge GroundVehicle into latest next 2012-03-25 12:21:58 -04:00
James Cotton
f3de06bd0f For some reason leaving this tab on the second tab by default (while not
correct) causes crashes which is bad.
2012-03-23 00:56:46 -05:00
James Cotton
56233e262b Remove unnecessary decimals for roll/pitch/yaw rates. 2012-03-22 11:35:29 -05:00
James Cotton
c7ff2a46c7 Merge remote-tracking branch 'origin/laurent/modelview' into revolution
Conflicts:
	flight/CopterControl/Makefile
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
2012-03-22 02:58:24 -05:00
James Cotton
6cb3abec80 Allow firmware compiled for 0x902 to be downloaded to 0x901 2012-03-22 00:42:23 -05:00
James Cotton
1eaf6f66fb Rename one of the boxes in the runnindevicewidget.ui to avoid warnings. 2012-03-22 00:42:22 -05:00
James Cotton
6350ec575e Merge remote-tracking branch 'origin/os/features/stick-deadband-next' into next
Conflicts:
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
2012-03-21 16:03:40 -05:00
zedamota
4e6114d095 Merge remote-tracking branch 'remotes/origin/laurent/modelview' into next 2012-03-20 23:20:20 +00:00
Laurent Ribon
299f9fd5d3 Comment the line "VERSION = 2.2.0" 2012-03-20 00:10:31 +01:00
Laurent Ribon
b36be73ffb Add the possibility to set VBO usage when running.(No restart required)
Change Zoomm sensibility (made it more sensitive)
Remobe unecessary state variable :
 - load Error
 - init failed (An OpenGL init failed cause a Crash)
2012-03-19 20:41:28 +01:00
Laurent Ribon
081769fb7b Make method setVboEnable not inline.
There is more stuf to do.
2012-03-19 20:38:21 +01:00
Brian Webb
aba3789d87 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into Brian-Metadata-Mods 2012-03-18 13:28:11 -07:00
Laurent Ribon
75d1f74090 Modify the modelview gadget widget in order to make it work with the
latest vesrion of GLC_lib and Qt4.8
2012-03-14 20:03:39 +01:00
Laurent Ribon
a636abef43 Activate Modelview plugin with QT4.8 2012-03-14 19:57:50 +01:00
Laurent Ribon
5eeafa227c Replace GLC_lib OpenPilot version to the latest GLC_lib version. 2012-03-14 19:57:11 +01:00
banigreyling
761924e855 Made the config look-and-feel more consistent according to the stabilization panel 2012-03-11 18:56:43 +02:00
banigreyling
02b0da9b33 Made the config look-and-feel more consistent according to the stabilization panel 2012-03-11 17:21:12 +02:00
Stacey Sheldon
5060ad311b gcs: remove reference to obsolete ui_ahrs.h file 2012-03-10 14:52:32 -05:00
banigreyling
909083c124 Input panel changes 2012-03-10 20:50:14 +02:00
Dmitry Zaitsev
933dfa8609 GCSReciver: fix UI and increase number of channels 2012-03-10 06:00:00 +04:00
Dmitry Zaitsev
3a5b0c2329 plugins: add hitlv2 in build tree 2012-03-10 05:56:56 +04:00
Dmitry Zaitsev
c68af6de78 HITL: initial commit
plugin for simulator: https://github.com/hhrhhr/Aerosim-plugin-for-CopterControl
2012-03-10 05:56:07 +04:00
James Cotton
11e7f58b63 Merge remote-tracking branch 'origin/os/features/pid-tuning-from-transmitter-next' into next 2012-03-05 00:18:17 -06:00
James Cotton
f20e5da9ed Merge branch 'next' into revolution
Conflicts:
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configrevowidget.h
	ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2012-03-03 11:41:41 -06:00
James Cotton
3c92e1cbcf Set the grahpicssystem to "raster" in the code after the reported performance
benefits.  This can be overriden on the commandline with -graphicssystem
2012-03-02 18:14:23 -06:00
zedamota
6d004f06f5 Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next 2012-03-02 18:48:11 +00:00
zedamota
05ef028f9d GCS - Make the save/apply operation result icons disappear when the form contents changes. 2012-03-02 18:47:24 +00:00
James Cotton
21699a3fce Set the grahpicssystem to "raster" in the code after the reported performance
benefits.  This can be overriden on the commandline with -graphicssystem
2012-02-29 22:22:43 -06:00
zedamota
37975dc00a GCS-Fixes new stabilization controls decimal places 2012-02-29 18:28:26 +00:00
David Ankers
d38a173bed Bug: Spinbox for PitchRateKp was linked to the wrong UAVObject 2012-02-26 16:40:08 +11:00
Dmytro Poplavskiy
3d05256a36 Welcome page UI tweaks
To make it closer to proposed design.

* Aligned the background OP logo to the bottom-right corner
* Don't upscale the OP logo
* Fixed width of community panel
* Changed the vertical layout of icons and community panel
* Fixed color of community panel titles
* Use styled text for next containing &,
   this fixes rendering but "..." are not displayed
2012-02-25 20:17:55 +11:00
Corvus Corax
a16c392bc6 Change to GLC Lib to make it compile on Linux with QT 4.8.0. 2012-02-24 14:28:48 +01:00
Oleg Semyonov
2271b95816 Merge remote branch 'origin/next' into os/features/stick-deadband-next
Conflicts:
	ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp
	ground/openpilotgcs/src/plugins/config/configtaskwidget.h
2012-02-23 08:32:27 +02:00
Oleg Semyonov
e62cc8914c Merge remote branch 'origin/next' into os/features/pid-tuning-from-transmitter-next
Conflicts:
	flight/CopterControl/Makefile
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/hwsettings.xml
2012-02-22 23:03:17 +02:00
Brian Webb
aea5374be9 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into Metadata-Mods 2012-02-20 19:11:23 -07:00
Brian Webb
43f6458f86 Reduced the sizeof the UAVObject metadata by:
1) Combining all binary or mode values into a single byte
  2) Adding accessor functions to read/write the flag bits
  3) Reduced the size of the time values from 32 bits to 16 bits
2012-02-20 18:45:18 -07:00
David Ankers
709c985b17 Update to Dado's work on the Stab UI 2012-02-21 03:53:00 +11:00
David Ankers
4a0d101f12 Start adding Dado's artwork and GUI changes 2012-02-19 18:05:33 +11:00
David Ankers
f6303b80a5 Constructor was called directly, GCC 4.6.1 on X64 Linux was not a fan
This fixes the build
2012-02-19 14:44:49 +11:00
David Ankers
d79eea0468 Use new icons for welcome plugin 2012-02-19 14:18:32 +11:00
David Ankers
0a352e179a Add Steve's new icons 2012-02-19 13:12:27 +11:00
zedamota
6fdec3364a Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next 2012-02-18 20:38:22 +00:00
zedamota
91e3ee13fd Fix input and output configuration layout issues. 2012-02-18 20:37:30 +00:00
zedamota
949785d212 Fixes shadow widgets values not being refreshed if master widget default value is equal the the UAVObj field value. 2012-02-18 16:58:10 +00:00
David Ankers
80715fbec3 Update Plist info for Mac 2012-02-18 08:38:01 +11:00
James Cotton
fbb0b1173a More work from Kenz to improve the matlab parser 2012-02-16 04:24:10 -06:00
Oleg Semyonov
b02b64ece9 Change to GLC_lib to make it compile on Windows with Qt 4.8.0 2012-02-16 01:17:56 +02:00
James Cotton
32b156b686 Update dependencies on the Util gadget relating to the Settings gadget. Fixes
clean build.
2012-02-14 18:16:00 -06:00
James Cotton
68836b4a48 Disable ModelView with linux-g++-64 since it causes segfaults 2012-02-14 16:25:35 -06:00
David Ankers
688f3d9c84 Merge branch 'welcome' into next 2012-02-15 07:59:20 +11:00
James Cotton
7c65bcc5ac Merge remote-tracking branch 'origin/pt/gcs_uavobj_widget_framework' into next 2012-02-14 14:24:23 -06:00
James Cotton
03d12915af Merge remote-tracking branch 'origin/os/features/better-version-info-and-uav-export' into next 2012-02-14 13:39:00 -06:00
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
fea4accb07 Patch from Kenz to suppress warnings about unknown object IDs until end of
parsing
2012-02-13 16:36:05 -06:00
James Cotton
81ceb9c17a Precompute CRC table in a global constant. Also if datasize for unknown object
is > 256 ignore it since corrupt data.
2012-02-13 16:27:44 -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
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
James Cotton
34ca5777dd Kalman filter for altitude 2012-02-11 21:08:19 -06: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