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

Développement CAN Watchdog

Browse Source
This commit is contained in:
jfmartel
2024-03-01 14:43:12 -05:00
parent 0ee7ece650
commit 56b30216c9
16 changed files with 2480 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.cpp
+10
View File
@@ -20,7 +20,17 @@ CLoggingSettingsPage::CLoggingSettingsPage(QWidget *parent) :
ui->mCloudMQTTRefreshRateSpinBx->setEnabled(false);
ui->mCloudMQTTClientID->setEnabled(false);
ui->mDevicePresenceAdd1LineEdit->setInputMask("000.000.000.000");
ui->mDevicePresenceAdd2LineEdit->setInputMask("000.000.000.000");
ui->mDevicePresenceAdd3LineEdit->setInputMask("000.000.000.000");
ui->mDevicePresenceAdd4LineEdit->setInputMask("000.000.000.000");
ui->mDevicePresenceAdd5LineEdit->setInputMask("000.000.000.000");
ui->mDevicePresenceAdd1LineEdit->setText("192.168.10.111");
ui->mDevicePresenceAdd2LineEdit->setText("192.168.10.222");
ui->mDevicePresenceAdd3LineEdit->setText("192.168.10.333");
ui->mDevicePresenceAdd4LineEdit->setText("192.168.10.444");
ui->mDevicePresenceAdd5LineEdit->setText("192.168.10.555");
connect(ui->mCancelBtn,&QPushButton::clicked,this,&CLoggingSettingsPage::CancelBtnPressed);
connect(ui->mChangeParamsBtn,&QPushButton::clicked,this,&CLoggingSettingsPage::ModifyParamsBtnPressed);
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.h
+1
View File
@@ -32,6 +32,7 @@ private:
int UpdateCloudConfig();
int UpdateGeneralParams();
int UpdateCPUWatchdogParams();
int UpdateCANFlagsParams();
Ui::CLoggingSettingsPage *ui;
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.ui
+370 -2
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1196</width>
<height>676</height>
<width>1621</width>
<height>797</height>
</rect>
</property>
<property name="windowTitle">
@@ -485,6 +485,374 @@
</property>
</widget>
</widget>
<widget class="QLabel" name="mCANBusFlagsLbl">
<property name="geometry">
<rect>
<x>1020</x>
<y>30</y>
<width>181</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text">
<string>Flags CANbus</string>
</property>
</widget>
<widget class="QGroupBox" name="mCANFlagsGroupBox">
<property name="geometry">
<rect>
<x>1020</x>
<y>80</y>
<width>411</width>
<height>311</height>
</rect>
</property>
<property name="title">
<string>Assignations des flags à un signal CAN</string>
</property>
<widget class="QLabel" name="mInternetPresenceLbl_3">
<property name="geometry">
<rect>
<x>280</x>
<y>70</y>
<width>41</width>
<height>20</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>BIT</string>
</property>
</widget>
<widget class="QLabel" name="mWatchdogMsgIDLbl">
<property name="geometry">
<rect>
<x>20</x>
<y>30</y>
<width>111</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>CAN Msg ID (HEX):</string>
</property>
</widget>
<widget class="QSpinBox" name="mWatchdogMsgIDSpinBx">
<property name="geometry">
<rect>
<x>150</x>
<y>30</y>
<width>91</width>
<height>20</height>
</rect>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>2048</number>
</property>
<property name="value">
<number>1</number>
</property>
<property name="displayIntegerBase">
<number>16</number>
</property>
</widget>
<widget class="QLabel" name="mInternetPresenceLbl">
<property name="geometry">
<rect>
<x>120</x>
<y>100</y>
<width>131</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Présence Internet</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="mWatchdogMsgIDPrefixLbl">
<property name="geometry">
<rect>
<x>120</x>
<y>30</y>
<width>30</width>
<height>20</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>0x</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QComboBox" name="mInternetPresBitComboBox">
<property name="geometry">
<rect>
<x>260</x>
<y>100</y>
<width>65</width>
<height>22</height>
</rect>
</property>
<property name="maxCount">
<number>63</number>
</property>
</widget>
<widget class="QLabel" name="mMQTTPresenceLbl_4">
<property name="geometry">
<rect>
<x>110</x>
<y>130</y>
<width>141</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Présence Serveur MQTT</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QComboBox" name="mMQTTPresenceBitComboBox">
<property name="geometry">
<rect>
<x>260</x>
<y>130</y>
<width>65</width>
<height>22</height>
</rect>
</property>
<property name="currentText">
<string/>
</property>
<property name="currentIndex">
<number>-1</number>
</property>
<property name="maxCount">
<number>63</number>
</property>
</widget>
<widget class="QCheckBox" name="mDevicePresenceActive1ChkBx">
<property name="geometry">
<rect>
<x>20</x>
<y>160</y>
<width>51</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Actif</string>
</property>
</widget>
<widget class="QLineEdit" name="mDevicePresenceAdd1LineEdit">
<property name="geometry">
<rect>
<x>70</x>
<y>160</y>
<width>171</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QComboBox" name="mDevicePresenceBit1ComboBox">
<property name="geometry">
<rect>
<x>260</x>
<y>160</y>
<width>65</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QCheckBox" name="mDevicePresenceActive2ChkBx">
<property name="geometry">
<rect>
<x>20</x>
<y>190</y>
<width>51</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Actif</string>
</property>
</widget>
<widget class="QLineEdit" name="mDevicePresenceAdd2LineEdit">
<property name="geometry">
<rect>
<x>70</x>
<y>190</y>
<width>171</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QComboBox" name="mDevicePresenceBit2ComboBox">
<property name="geometry">
<rect>
<x>260</x>
<y>190</y>
<width>65</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QLineEdit" name="mDevicePresenceAdd3LineEdit">
<property name="geometry">
<rect>
<x>70</x>
<y>220</y>
<width>171</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QComboBox" name="mDevicePresenceBit3ComboBox">
<property name="geometry">
<rect>
<x>260</x>
<y>220</y>
<width>65</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QCheckBox" name="mDevicePresenceActive3ChkBx">
<property name="geometry">
<rect>
<x>20</x>
<y>220</y>
<width>51</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Actif</string>
</property>
</widget>
<widget class="QCheckBox" name="mDevicePresenceActive4ChkBx">
<property name="geometry">
<rect>
<x>20</x>
<y>250</y>
<width>51</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Actif</string>
</property>
</widget>
<widget class="QComboBox" name="mDevicePresenceBit4ComboBox">
<property name="geometry">
<rect>
<x>260</x>
<y>250</y>
<width>65</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QLineEdit" name="mDevicePresenceAdd4LineEdit">
<property name="geometry">
<rect>
<x>70</x>
<y>250</y>
<width>171</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QCheckBox" name="mDevicePresenceActive5ChkBx">
<property name="geometry">
<rect>
<x>20</x>
<y>280</y>
<width>51</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Actif</string>
</property>
</widget>
<widget class="QLineEdit" name="mDevicePresenceAdd5LineEdit">
<property name="geometry">
<rect>
<x>70</x>
<y>280</y>
<width>171</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QComboBox" name="mDevicePresenceBit5ComboBox">
<property name="geometry">
<rect>
<x>260</x>
<y>280</y>
<width>65</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_4">
<property name="geometry">
<rect>
<x>20</x>
<y>60</y>
<width>241</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Les bits 0 à 30 sont utilisés pour
la date et l'heure</string>
</property>
</widget>
</widget>
</widget>
<resources/>
<connections/>