1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-08 19:46:06 +01:00
Commit Graph

168 Commits

Author SHA1 Message Date
Fredrik Arvidsson
3fa2d504bb Merge branch 'next' into thread/OP-39 2012-09-30 13:37:24 +02:00
PT_Dreamer
4edf78d1cd GCS-No more hidden settings. 2012-09-29 22:44:52 +01:00
Fredrik Arvidsson
f42085f6ac Merge branch 'next' into thread/OP-39 2012-09-26 00:44:34 +02: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
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
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
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
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
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
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
abbf858123 Fixes special settings not being saved. 2012-09-12 21:57:49 +01:00
PT_Dreamer
c11958c9b6 GCS-Review comments changes
Added font mixer curve font size to linux default and wide stylesheets
Change Node class name to MixerNode to ease stylesheet access
Changed language selection to top of the list
2012-09-12 11:09:30 +01:00
James Cotton
2488b48f50 Merge branch 'usb_fixes' into next 2012-09-11 10:18:45 -05:00
PT_Dreamer
09f950ff76 GCS Fixes -clean-config command line argument segfault 2012-09-10 19:46:13 +01:00
James Cotton
26ff40b5f3 GCS OSX: Work on how the receive threads are stopped properly 2012-09-09 23:43:38 -05:00
Fredrik Arvidsson
b889035a24 Merge branch 'next' into thread/OP-39 2012-09-09 23:46:39 +02: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
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
82f752685a GCS ConnectionManager: When polling is disabled don't automatically connect to boards either. 2012-09-08 19:06:03 -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
Kenz Dale
9ebc32da3d Eliminated several (dozen) compiler warnings.
Conflicts:

	ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2012-08-23 18:03:17 +02: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
Mike LaBranche
13e631a2e4 ConnectionManager: add connect/reconnect timer management into telemetryconnect/disconnect slots 2012-08-16 21:13:07 -07:00
PT_Dreamer
525dec1748 GCS-Added gradient to edit gadgets bar 2012-08-16 23:30:31 +01: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
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
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
Fredrik Arvidsson
25d13e4c35 Merge branch 'next' into thread/OP-39 2012-08-13 19:54:26 +02:00
James Cotton
63e490a922 Update the config file so the mag scopes selection works 2012-08-12 16:12:21 -05:00
Mike LaBranche
c414f80fd7 Merge branch 'pt/CC3D_Release' of ssh://gitolite@git.openpilot.org/OpenPilot.git into CC3D_Release 2012-08-12 08:40:43 -07:00
PT_Dreamer
9379eb73d7 GCS-Fix stylesheet not being saved. 2012-08-10 03:03:52 +01:00
PT_Dreamer
3df35b933c Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-09 22:42:35 +01:00
PT_Dreamer
b0e6566114 GCS- Handle loading of the configuration file. Stylesheets files
are now loaded from mainwindow instead of main.
2012-08-09 22:33:13 +01:00
PT_Dreamer
dae15702ed GCS-Delete previously used stylesheet and configuration files 2012-08-09 22:31:51 +01:00
PT_Dreamer
e2d7e824ed GCS-Created new wide and default stylesheets and configurations just as an example.
Currently they are the same.
2012-08-09 22:30:31 +01:00
PT_Dreamer
e033004656 GCS-Added new dialog to let the user choose from a list of available
configurations uppon startup when no valid configuration is found
2012-08-09 22:22:09 +01:00
David Ankers
5bf98a03c7 Align the new telem to the center, it's bugging me. 2012-08-09 18:12:56 +10:00
David Ankers
92a9a57bf7 Make options Window a better size, fixes a load of the cramped layout. 2012-08-09 15:42:00 +10:00
David Ankers
40e25ff8e2 Turn on sounds by default 2012-08-09 14:58:07 +10:00
Mike LaBranche
0f35e5f776 Merge branch 'pt/CC3D_Release' of ssh://gitolite@git.openpilot.org/OpenPilot.git into CC3D_Release 2012-08-08 15:05:57 -07:00
Mike LaBranche
0643f59b85 Merge branch 'pt/CC3d_Release' of ssh://gitolite@git.openpilot.org/OpenPilot.git into CC3D_Release
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/popupwidget.cpp
2012-08-03 14:36:16 -07:00