Commit 1e90dab4 authored by pixhawk's avatar pixhawk

Working on watchdog control

parent a705367c
...@@ -58,7 +58,7 @@ void WatchdogControl::updateWatchdog(int systemId, int watchdogId, unsigned int ...@@ -58,7 +58,7 @@ void WatchdogControl::updateWatchdog(int systemId, int watchdogId, unsigned int
// start the timeout timer // start the timeout timer
//watchdog.timeoutTimer_.reset(); //watchdog.timeoutTimer_.reset();
//qDebug() << "WATCHDOG RECEIVED"; qDebug() << "WATCHDOG RECEIVED";
//qDebug() << "<-- received mavlink_watchdog_heartbeat_t " << msg->sysid << " / " << payload.watchdog_id << " / " << payload.process_count << std::endl; //qDebug() << "<-- received mavlink_watchdog_heartbeat_t " << msg->sysid << " / " << payload.watchdog_id << " / " << payload.process_count << std::endl;
} }
...@@ -73,6 +73,7 @@ void WatchdogControl::addProcess(int systemId, int watchdogId, int processId, QS ...@@ -73,6 +73,7 @@ void WatchdogControl::addProcess(int systemId, int watchdogId, int processId, QS
process.arguments_ = arguments.toStdString(); process.arguments_ = arguments.toStdString();
process.timeout_ = timeout; process.timeout_ = timeout;
qDebug() << "PROCESS RECEIVED"; qDebug() << "PROCESS RECEIVED";
qDebug() << "SYS" << systemId << "WD" << watchdogId << "PROCESS" << processId << name << "ARG" << arguments << "TO" << timeout;
//qDebug() << "<-- received mavlink_watchdog_process_info_t " << msg->sysid << " / " << (const char*)payload.name << " / " << (const char*)payload.arguments << " / " << payload.timeout << std::endl; //qDebug() << "<-- received mavlink_watchdog_process_info_t " << msg->sysid << " / " << (const char*)payload.name << " / " << (const char*)payload.arguments << " / " << payload.timeout << std::endl;
} }
...@@ -90,6 +91,8 @@ void WatchdogControl::updateProcess(int systemId, int watchdogId, int processId, ...@@ -90,6 +91,8 @@ void WatchdogControl::updateProcess(int systemId, int watchdogId, int processId,
process.pid_ = pid; process.pid_ = pid;
qDebug() << "PROCESS UPDATED"; qDebug() << "PROCESS UPDATED";
qDebug() << "SYS" << systemId << "WD" << watchdogId << "PROCESS" << processId << "STATE" << state << "CRASH" << crashes << "PID" << pid;
//process.updateTimer_.reset(); //process.updateTimer_.reset();
//qDebug() << "<-- received mavlink_watchdog_process_status_t " << msg->sysid << " / " << payload.state << " / " << payload.muted << " / " << payload.crashes << " / " << payload.pid << std::endl; //qDebug() << "<-- received mavlink_watchdog_process_status_t " << msg->sysid << " / " << payload.state << " / " << payload.muted << " / " << payload.crashes << " / " << payload.pid << std::endl;
} }
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define WATCHDOGPROCESSVIEW_H #define WATCHDOGPROCESSVIEW_H
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QMap>
namespace Ui { namespace Ui {
class WatchdogProcessView; class WatchdogProcessView;
...@@ -10,7 +11,7 @@ namespace Ui { ...@@ -10,7 +11,7 @@ namespace Ui {
class WatchdogProcessView : public QWidget { class WatchdogProcessView : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
WatchdogProcessView(QWidget *parent = 0); WatchdogProcessView(int processid, QWidget *parent = 0);
~WatchdogProcessView(); ~WatchdogProcessView();
protected: protected:
......
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