YShuvakin/VkuMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added various improvements

Browse Source
This commit is contained in:
Yury Shuvakin
2024-07-10 17:32:51 +09:00
parent d708fc3499
commit a6a0513186
5 changed files with 134 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cpp/CanController.h
View File

@@ -3,6 +3,7 @@
#include <QObject>
#include <QVariant>
#include <QDateTime>
class QQmlEngine;
class QJSEngine;
@@ -17,7 +18,7 @@ class CanController : public QObject
Q_PROPERTY(QString radiatorTemperature MEMBER radiatorTemperature_ NOTIFY radiatorTemperatureChanged)
Q_PROPERTY(QString outputVoltage MEMBER outputVoltage_ NOTIFY outputVoltageChanged)
Q_PROPERTY(QString emergencyCounter MEMBER emergencyCounter_ NOTIFY emergencyCounterChanged)
Q_PROPERTY(QString outputCurrent MEMBER outputCurrent_ NOTIFY outputCurrentChanged)
Q_PROPERTY(QString inputCurrent MEMBER inputCurrent_ NOTIFY inputCurrentChanged)
Q_PROPERTY(QString maximumCurrent MEMBER maximumCurrent_ NOTIFY maximumCurrentChanged)
Q_PROPERTY(QString emergencyDelay MEMBER emergencyDelay_ NOTIFY emergencyDelayChanged)
@@ -38,18 +39,19 @@ public slots:
void connectCan();
void disconnectCan();
void vkuClosure();
void switchVkuClosure();
void emergencyReset();
private slots:
void sendParameters();
void sendVkuClosure();
signals:
void inputVoltageChanged();
void radiatorTemperatureChanged();
void outputVoltageChanged();
void emergencyCounterChanged();
void outputCurrentChanged();
void inputCurrentChanged();
void maximumCurrentChanged();
void emergencyDelayChanged();
@@ -65,16 +67,23 @@ private slots:
void handleCurrentState(const CanMessage* message);
void handleStatus(const CanMessage* message);
void showStatus(quint32 status);
void updateCanStatus();
private:
void setupDrivers();
void setupDefaultParameters();
private:
bool isConnected_ = false;
bool isFirstCheck_ = true;
QDateTime lastPackageDateTime_;
QString inputVoltage_;
QString radiatorTemperature_;
QString outputVoltage_;
QString emergencyCounter_;
QString outputCurrent_;
QString inputCurrent_;
QString maximumCurrent_;
QString emergencyDelay_;
@@ -82,8 +91,9 @@ private:
QString retriesAfterEmergencyBreak_;
QString breakingCurrent_;
QVariantList statuses_;
bool isVkuClosed_ = false;
QVariantList statuses_;
};
#endif // CANCONTROLLER_H