Commit 62b184bb authored by lm's avatar lm

Fixed minor compile errors

parent cd9d96b0
......@@ -62,6 +62,6 @@ void PxQuadMAV::sendProcessCommand(int watchdogId, int processId, unsigned int c
payload.command_id = (uint8_t)command;
mavlink_message_t msg;
mavlink_msg_watchdog_command_encode(sysid, compid, &msg, &payload);
mavlink_msg_watchdog_command_encode(mavlink->getSystemId(), mavlink->getComponentId(), &msg, &payload);
sendMessage(msg);
}
......@@ -4,7 +4,7 @@
#include <QDebug>
WatchdogControl::WatchdogControl(UASInterface* uas, QWidget *parent) :
WatchdogControl::WatchdogControl(QWidget *parent) :
QWidget(parent),
mav(NULL),
ui(new Ui::WatchdogControl)
......@@ -19,7 +19,7 @@ WatchdogControl::~WatchdogControl()
void WatchdogControl::setUAS(UASInterface* uas)
{
PxQuadMAV* qmav = dynamic_cast<PxQuadMAV>(uas);
PxQuadMAV* qmav = dynamic_cast<PxQuadMAV*>(uas);
if (qmav)
{
......
......@@ -94,7 +94,7 @@ public:
QTimer* timeoutTimer_; ///< Internal timer, used to measure the time since the last heartbeat message
};
WatchdogControl(UASInterface* uas, QWidget *parent = 0);
WatchdogControl(QWidget *parent = 0);
~WatchdogControl();
static const uint16_t ALL = (uint16_t)-1; ///< A magic value for a process-ID which addresses "all processes"
......@@ -105,6 +105,7 @@ public slots:
void updateWatchdog(int systemId, int watchdogId, unsigned int processCount);
void addProcess(int systemId, int watchdogId, int processId, QString name, QString arguments, int timeout);
void updateProcess(int systemId, int watchdogId, int processId, int state, bool muted, int crashed, int pid);
void setUAS(UASInterface* uas);
signals:
void sendProcessCommand(int watchdogId, int processId, unsigned int command);
......
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