Commit f909055d authored by Michael Carpenter's avatar Michael Carpenter

Working accelerometer calibation for APM3.0 and greater

parent 223a7484
...@@ -3,9 +3,91 @@ ...@@ -3,9 +3,91 @@
AccelCalibrationConfig::AccelCalibrationConfig(QWidget *parent) : QWidget(parent) AccelCalibrationConfig::AccelCalibrationConfig(QWidget *parent) : QWidget(parent)
{ {
m_uas=0;
ui.setupUi(this); ui.setupUi(this);
connect(ui.calibrateAccelButton,SIGNAL(clicked()),this,SLOT(calibrateButtonClicked()));
connect(UASManager::instance(),SIGNAL(activeUASSet(UASInterface*)),this,SLOT(activeUASSet(UASInterface*)));
activeUASSet(UASManager::instance()->getActiveUAS());
accelAckCount=0;
} }
AccelCalibrationConfig::~AccelCalibrationConfig() AccelCalibrationConfig::~AccelCalibrationConfig()
{ {
} }
void AccelCalibrationConfig::activeUASSet(UASInterface *uas)
{
if (!uas)
{
return;
}
if (m_uas)
{
}
m_uas = uas;
connect(m_uas,SIGNAL(textMessageReceived(int,int,int,QString)),this,SLOT(uasTextMessageReceived(int,int,int,QString)));
}
void AccelCalibrationConfig::calibrateButtonClicked()
{
if (accelAckCount == 0)
{
MAV_CMD command = MAV_CMD_PREFLIGHT_CALIBRATION;
int confirm = 0;
float param1 = 0;
float param2 = 0;
float param3 = 0;
float param4 = 0;
float param5 = 1;
float param6 = 0;
float param7 = 0;
int component = 1;
m_uas->executeCommand(command, confirm, param1, param2, param3, param4, param5, param6, param7, component);
}
else if (accelAckCount <= 5)
{
m_uas->executeCommandAck(accelAckCount++,true);
}
else
{
m_uas->executeCommandAck(accelAckCount++,true);
ui.calibrateAccelButton->setText("Calibrate\nAccelerometer");
//accelAckCount = 0;
}
}
void AccelCalibrationConfig::uasTextMessageReceived(int uasid, int componentid, int severity, QString text)
{
//command received: " Severity 1
//Place APM Level and press any key" severity 5
if (severity == 5)
{
//This is a calibration instruction
if (accelAckCount == 0)
{
//Calibration Sucessful\r"
ui.calibrateAccelButton->setText("Any\nKey");
accelAckCount++;
}
if (accelAckCount == 7)
{
//All finished
//ui.outputLabel->setText(ui.outputLabel->text() + "\n" + text);
ui.outputLabel->setText(text);
accelAckCount++;
}
if (accelAckCount == 8)
{
if (text.contains("Calibration") && text.contains("successful"))
{
accelAckCount = 0;
}
ui.outputLabel->setText(ui.outputLabel->text() + "\n" + text);
}
else
{
ui.outputLabel->setText(text);
}
}
}
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
#include <QWidget> #include <QWidget>
#include "ui_AccelCalibrationConfig.h" #include "ui_AccelCalibrationConfig.h"
#include "UASManager.h"
#include "UASInterface.h"
class AccelCalibrationConfig : public QWidget class AccelCalibrationConfig : public QWidget
{ {
Q_OBJECT Q_OBJECT
...@@ -11,9 +12,14 @@ class AccelCalibrationConfig : public QWidget ...@@ -11,9 +12,14 @@ class AccelCalibrationConfig : public QWidget
public: public:
explicit AccelCalibrationConfig(QWidget *parent = 0); explicit AccelCalibrationConfig(QWidget *parent = 0);
~AccelCalibrationConfig(); ~AccelCalibrationConfig();
private slots:
void activeUASSet(UASInterface *uas);
void calibrateButtonClicked();
void uasTextMessageReceived(int uasid, int componentid, int severity, QString text);
private: private:
int accelAckCount;
Ui::AccelCalibrationConfig ui; Ui::AccelCalibrationConfig ui;
UASInterface *m_uas;
}; };
#endif // ACCELCALIBRATIONCONFIG_H #endif // ACCELCALIBRATIONCONFIG_H
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
<widget class="QPushButton" name="calibrateAccelButton"> <widget class="QPushButton" name="calibrateAccelButton">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>60</x> <x>70</x>
<y>60</y> <y>160</y>
<width>81</width> <width>81</width>
<height>31</height> <height>31</height>
</rect> </rect>
...@@ -43,13 +43,13 @@ ...@@ -43,13 +43,13 @@
Accelerometer</string> Accelerometer</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="outputLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>40</x> <x>20</x>
<y>120</y> <y>50</y>
<width>161</width> <width>211</width>
<height>51</height> <height>91</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment