jfmartel/YULTek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plusieurs changements importants!!!!

Browse Source
This commit is contained in:
jfmartel
2024-07-03 17:17:23 -04:00
parent 1938199b9c
commit 8fb12089f6
22 changed files with 367 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.cpp
+3 -3
View File
@@ -442,9 +442,9 @@ CMQTTMessage CMQTTClientWrapper::GetSystemStatusMessage()
//Millisecs to EPOCH timestamp format
qint64 TimeStamp = QDateTime::currentDateTime().toMSecsSinceEpoch();
MsgPayload.append(QString("\"timestamp\":%1,").arg(TimeStamp));
MsgPayload.append(QString("\"CPU Temperature\":%1").arg(tmp.mSystemTemperature));
MsgPayload.append(QString("\"Board 12V\":%1").arg(tmp.mSystem12V));
MsgPayload.append(QString("\"IO Port\":%1,").arg(tmp.mIOPortState));
MsgPayload.append(QString("\"CPU Temperature\":%1,").arg(tmp.mSystemTemperature));
MsgPayload.append(QString("\"Board 12V\":%1,").arg(tmp.mSystem12V));
MsgPayload.append(QString("\"IO Port\":%1").arg(tmp.mIOPortState));
MsgPayload.append("}");
// qDebug("%s",qPrintable(MsgPayload));
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.ui
+83 -2
View File
@@ -324,7 +324,7 @@
<property name="geometry">
<rect>
<x>590</x>
<y>90</y>
<y>70</y>
<width>351</width>
<height>121</height>
</rect>
@@ -429,7 +429,7 @@
<property name="geometry">
<rect>
<x>590</x>
<y>240</y>
<y>200</y>
<width>351</width>
<height>101</height>
</rect>
@@ -974,6 +974,87 @@ et l'heure</string>
<string>Annuler</string>
</property>
</widget>
<widget class="QGroupBox" name="mSyslogSettingsGroupBox">
<property name="geometry">
<rect>
<x>590</x>
<y>310</y>
<width>351</width>
<height>91</height>
</rect>
</property>
<property name="title">
<string>Serveur Syslog</string>
</property>
<widget class="QLineEdit" name="mSyslogServerAddEdit_2">
<property name="geometry">
<rect>
<x>90</x>
<y>30</y>
<width>241</width>
<height>20</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="mSyslogServerHostNameLbl">
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>71</width>
<height>20</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Addresse</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="mCloudMQTTPortLbl_2">
<property name="geometry">
<rect>
<x>20</x>
<y>55</y>
<width>61</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Port</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QSpinBox" name="mSyslogServerPortSpinBx">
<property name="geometry">
<rect>
<x>90</x>
<y>50</y>
<width>111</width>
<height>22</height>
</rect>
</property>
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>514</number>
</property>
</widget>
</widget>
</widget>
<resources/>
<connections/>