OP-1150 UI for thermal calibration: move into calibration/thermal

ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibration.cpp

@@ -25,8 +25,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#include "thermalcalibration.h"
 #include "QDebug"
+#include "thermalcalibration.h"
 using namespace OpenPilot;
 bool ThermalCalibration::BarometerCalibration(Eigen::VectorXf pressure, Eigen::VectorXf temperature, float *result)
 {

ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibration.h

@@ -27,7 +27,7 @@
  */
 #ifndef THERMALCALIBRATION_H
 #define THERMALCALIBRATION_H
-#include "calibrationutils.h"
+#include "../calibrationutils.h"
 
 namespace OpenPilot {
 class ThermalCalibration {

ground/openpilotgcs/src/plugins/config/config.pro

@@ -26,7 +26,6 @@ HEADERS += configplugin.h \
     configpipxtremewidget.h \
     configstabilizationwidget.h \
     assertions.h \
-#    calibration.h \
     defaultattitudewidget.h \
     defaulthwsettingswidget.h \
     inputchannelform.h \
@@ -45,9 +44,9 @@ HEADERS += configplugin.h \
     dblspindelegate.h \
     configrevohwwidget.h \
     calibration/calibrationutils.h \
-    calibration/thermalcalibration.h \
     calibration/wizardstate.h \
-    calibration/wizardmodel.h
+    calibration/wizardmodel.h \
+    calibration/thermal/thermalcalibration.h \
 
 SOURCES += configplugin.cpp \
     configgadgetwidget.cpp \
@@ -61,10 +60,6 @@ SOURCES += configplugin.cpp \
     configccattitudewidget.cpp \
     configstabilizationwidget.cpp \
     configpipxtremewidget.cpp \
-#    twostep.cpp \
-#    legacy-calibration.cpp \
-#    gyro-calibration.cpp \
-#    alignment-calibration.cpp \
     defaultattitudewidget.cpp \
     defaulthwsettingswidget.cpp \
     inputchannelform.cpp \
@@ -82,9 +77,9 @@ SOURCES += configplugin.cpp \
     dblspindelegate.cpp \
     configrevohwwidget.cpp \
     calibration/calibrationutils.cpp \
-    calibration/thermalcalibration.cpp \
     calibration/wizardstate.cpp \
-    calibration/wizardmodel.cpp
+    calibration/wizardmodel.cpp \
+    calibration/thermal/thermalcalibration.cpp \
 
 FORMS += airframe.ui \
     airframe_ccpm.ui \