Commit bb5418a1 authored by pixhawk's avatar pixhawk

Fixed compile errors and warnings

parent 165ef149
...@@ -104,10 +104,6 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message) ...@@ -104,10 +104,6 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
emit valueChanged(uasId, "vis. x", pos.x, time); emit valueChanged(uasId, "vis. x", pos.x, time);
emit valueChanged(uasId, "vis. y", pos.y, time); emit valueChanged(uasId, "vis. y", pos.y, time);
emit valueChanged(uasId, "vis. z", pos.z, time); emit valueChanged(uasId, "vis. z", pos.z, time);
emit valueChanged(uasId, "vis. vx", pos.vx, time);
emit valueChanged(uasId, "vis. vy", pos.vy, time);
emit valueChanged(uasId, "vis. vz", pos.vz, time);
emit valueChanged(uasId, "vis. vyaw", pos.vyaw, time);
} }
break; break;
case MAVLINK_MSG_ID_AUX_STATUS: case MAVLINK_MSG_ID_AUX_STATUS:
......
...@@ -119,7 +119,7 @@ void HSIDisplay::paintDisplay() ...@@ -119,7 +119,7 @@ void HSIDisplay::paintDisplay()
float bottomMargin = 3.0f; float bottomMargin = 3.0f;
// Size of the ring instrument // Size of the ring instrument
const float margin = 0.1f; // 10% margin of total width on each side //const float margin = 0.1f; // 10% margin of total width on each side
float baseRadius = (vheight - topMargin - bottomMargin) / 2.0f - bottomMargin / 2.0f; float baseRadius = (vheight - topMargin - bottomMargin) / 2.0f - bottomMargin / 2.0f;
// Draw instruments // Draw instruments
...@@ -294,6 +294,7 @@ void HSIDisplay::drawPositionLock(float x, float y, QString label, int status, Q ...@@ -294,6 +294,7 @@ void HSIDisplay::drawPositionLock(float x, float y, QString label, int status, Q
void HSIDisplay::updatePositionLock(UASInterface* uas, bool lock) void HSIDisplay::updatePositionLock(UASInterface* uas, bool lock)
{ {
Q_UNUSED(uas);
positionLock = lock; positionLock = lock;
} }
...@@ -876,12 +877,17 @@ void visionLocalizationChanged(UASInterface* uas, int fix); ...@@ -876,12 +877,17 @@ void visionLocalizationChanged(UASInterface* uas, int fix);
void HSIDisplay::updateJoystick(double roll, double pitch, double yaw, double thrust, int xHat, int yHat) void HSIDisplay::updateJoystick(double roll, double pitch, double yaw, double thrust, int xHat, int yHat)
{ {
Q_UNUSED(roll);
Q_UNUSED(pitch);
Q_UNUSED(yaw);
Q_UNUSED(thrust);
Q_UNUSED(xHat);
Q_UNUSED(yHat);
} }
void HSIDisplay::pressKey(int key) void HSIDisplay::pressKey(int key)
{ {
Q_UNUSED(key);
} }
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
WatchdogProcessView::WatchdogProcessView(int processid, QWidget *parent) : WatchdogProcessView::WatchdogProcessView(int processid, QWidget *parent) :
QWidget(parent), QWidget(parent),
processid(processid),
m_ui(new Ui::WatchdogProcessView) m_ui(new Ui::WatchdogProcessView)
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
......
...@@ -16,6 +16,7 @@ public: ...@@ -16,6 +16,7 @@ public:
protected: protected:
void changeEvent(QEvent *e); void changeEvent(QEvent *e);
int processid;
private: private:
Ui::WatchdogProcessView *m_ui; Ui::WatchdogProcessView *m_ui;
......
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