m_thread 7bcdff9f2f Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard ...

Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h

2014-09-23 22:30:49 +02:00

..

abstractwizardpage.cpp

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

abstractwizardpage.h

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

airframeinitialtuningpage.cpp

Initial tuning page

2014-09-05 17:14:27 +10:00

airframeinitialtuningpage.h

Initial tuning page

2014-09-05 17:14:27 +10:00

airframeinitialtuningpage.ui

Initial tuning page

2014-09-05 17:14:27 +10:00

airspeedpage.cpp

OP-1222 Uncrustify

2014-09-16 19:27:18 +02:00

airspeedpage.h

OP-1222 Uncrustify

2014-09-16 19:27:18 +02:00

autoupdatepage.cpp

OP-1174 uncrustified

2014-05-05 00:05:51 +02:00

autoupdatepage.h

OP-1122 OP-1125 cleaned up GCS side uavtalk includes

2013-12-11 22:22:28 +01:00

autoupdatepage.ui

Minor formatting, add wizard image

2014-08-17 01:41:14 +10:00

biascalibrationpage.cpp

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

biascalibrationpage.h

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

biascalibrationpage.ui

Minor formatting of all Wiz pages for consitency

2014-08-17 04:15:11 +10:00

controllerpage.cpp

OP-1493 Make Vehicle and TX Wizards work with the discoveryf4bare target

2014-09-15 23:43:58 +02:00

controllerpage.h

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

controllerpage.ui

Minor formatting of all Wiz pages for consitency

2014-08-17 04:15:11 +10:00

escpage.cpp

Summary to not show unknown ESC type fpr FWs, remane legacy ESC to

2014-08-23 02:00:11 +10:00

escpage.h

OP-1222 Renamed some pages. Added support for both esc and servo types.

2014-08-22 01:40:05 +02:00

escpage.ui

OP-1222 Renamed some pages. Added support for both esc and servo types.

2014-08-22 01:40:05 +02:00

fixedwingpage.cpp

OP-1222 Added code to handle port conflicts in configuration.

2014-09-05 17:31:41 +02:00

fixedwingpage.h

OP-1222 Added code to handle port conflicts in configuration.

2014-09-05 17:31:41 +02:00

gpspage.cpp

OP-1222 Fixed handling of conflicting configurations. Config is now invalidated if use goes back and make changes introducing conflicts.

2014-09-07 13:52:28 +02:00

gpspage.h

OP-1222 Added code to handle port conflicts in configuration.

2014-09-05 17:31:41 +02:00

helipage.cpp

OP-39 Added some pages and some functionality to the OP SetupWizard.

2012-07-17 01:24:22 +02:00

helipage.h

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

helipage.ui

copy/content revisions and corrections.

2012-09-20 21:34:14 -04:00

inputpage.cpp

OP-1493 Make Vehicle and TX Wizards work with the discoveryf4bare target

2014-09-15 23:43:58 +02:00

inputpage.h

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

inputpage.ui

Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard

2014-09-22 23:05:21 +02:00

multipage.cpp

OP-1222 Uncrustify

2014-09-16 19:27:18 +02:00

multipage.h

OP-1222 Added code to handle port conflicts in configuration.

2014-09-05 17:31:41 +02:00

notyetimplementedpage.cpp

OP-39 Added some pages and some functionality to the OP SetupWizard.

2012-07-17 01:24:22 +02:00

notyetimplementedpage.h

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

notyetimplementedpage.ui

Fixed layouts in the setup wizard and made the wizard resizeable.

2012-10-10 00:36:29 +02:00

opendpage.cpp

[OP-835] Qt 5.1.0 - migrated GCS plugins

2013-09-15 23:37:20 +02:00

opendpage.h

[OP-835] Qt 5.1.0 - migrated GCS plugins

2013-09-15 23:37:20 +02:00

opendpage.ui

[OP-835] Qt 5.1.0 - migrated GCS plugins

2013-09-15 23:37:20 +02:00

opstartpage.cpp

[OP-835] Qt 5.1.0 - migrated GCS plugins

2013-09-15 23:37:20 +02:00

opstartpage.h

[OP-835] Qt 5.1.0 - migrated GCS plugins

2013-09-15 23:37:20 +02:00

opstartpage.ui

Add image

2014-08-17 01:57:15 +10:00

outputcalibrationpage.cpp

OP-1222 FW_Wizard Fix : QuadH and HexaH do not load Svg file

2014-09-16 20:41:45 +02:00

outputcalibrationpage.h

OP-1222 Changed servo calibarion to contain min, max and center on the same page.

2014-08-25 23:45:46 +02:00

outputcalibrationpage.ui

Change motor for engine

2014-09-02 14:29:49 +10:00

rebootpage.cpp

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

rebootpage.h

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

rebootpage.ui

Fixed texts in Vehicle Setup Wizard.

2012-10-14 16:46:28 +02:00

revocalibrationpage.cpp

OP-816 Added page for Revolution calibration referring to the configuration plug-in until we get 'our ducks in a row' regarding the Revolution calibration procedure.

2013-04-16 20:40:25 +02:00

revocalibrationpage.h

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

revocalibrationpage.ui

Minor formatting of all Wiz pages for consitency

2014-08-17 04:15:11 +10:00

savepage.cpp

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

savepage.h

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

savepage.ui

Fixed layouts in the setup wizard and made the wizard resizeable.

2012-10-10 00:36:29 +02:00

selectionpage.cpp

OP-1222 Fixed handling of conflicting configurations. Config is now invalidated if use goes back and make changes introducing conflicts.

2014-09-07 13:52:28 +02:00

selectionpage.h

OP-1222 Uncrustify

2014-09-16 19:27:18 +02:00

selectionpage.ui

OP-1222 Finished re-factoring vehicle selection pages,

2014-09-02 11:03:52 +02:00

servopage.cpp

OP-1222 Renamed some pages. Added support for both esc and servo types.

2014-08-22 01:40:05 +02:00

servopage.h

OP-1222 Renamed some pages. Added support for both esc and servo types.

2014-08-22 01:40:05 +02:00

servopage.ui

OP-1222 Renamed some pages. Added support for both esc and servo types.

2014-08-22 01:40:05 +02:00

summarypage.cpp

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

summarypage.h

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

summarypage.ui

OP-1222 Added code to handle port conflicts in configuration.

2014-09-05 17:31:41 +02:00

surfacepage.cpp

OP-39 Added some pages and some functionality to the OP SetupWizard.

2012-07-17 01:24:22 +02:00

surfacepage.h

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

surfacepage.ui

copy/content revisions and corrections.

2012-09-20 21:34:14 -04:00

vehiclepage.cpp

OP-1222 Uncrustify

2014-08-26 22:34:58 +02:00

vehiclepage.h

OP-1222 Renamed some files.

2014-08-18 01:20:31 +02:00

vehiclepage.ui

Change button order in wizard to match the order of the config plugin,

2014-09-02 13:30:22 +10:00