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

Changement de l'identification des pucks CAN par device ID plutôt que par Handle

Browse Source
This commit is contained in:
jfmartel
2023-06-02 14:09:37 -04:00
parent 34cf515944
commit 163d050fe5
24 changed files with 1152 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/ui_CANbusSettingsPage.h
+15 -9
View File
@@ -33,7 +33,6 @@ public:
QLabel *label_2;
QGroupBox *mDeviceParamsGroupBox;
QLabel *mCANIDLbl;
QComboBox *mCANIDComboBx;
QLabel *mCANBaudrateLbl;
QComboBox *mCANBaudrateComboBx;
QPushButton *mModifyDevParamsBtn;
@@ -45,6 +44,7 @@ public:
QSpinBox *mDevicePollPeriodSpinBx;
QPushButton *mCancelModifyParamsBtn;
QPlainTextEdit *mDeviceNameEditBx;
QSpinBox *mCANDeviceIDSpinBx;
QGroupBox *mDatabaseGroupBox;
QLabel *mDBMessageNameLbl;
QLabel *mDBMessageIDLbl;
@@ -55,6 +55,7 @@ public:
QTableWidget *mDBSignalDetailsTable;
QPushButton *mAddDeviceBtn;
QPushButton *mDeleteDeviceBtn;
QComboBox *mCANIDComboBx;
void setupUi(QWidget *CCANbusSettingsPage)
{
@@ -63,7 +64,7 @@ public:
CCANbusSettingsPage->resize(1475, 693);
label = new QLabel(CCANbusSettingsPage);
label->setObjectName(QString::fromUtf8("label"));
label->setGeometry(QRect(370, 20, 231, 21));
label->setGeometry(QRect(370, 20, 321, 21));
QFont font;
font.setPointSize(12);
label->setFont(font);
@@ -78,14 +79,10 @@ public:
mDeviceParamsGroupBox->setGeometry(QRect(270, 100, 321, 371));
mCANIDLbl = new QLabel(mDeviceParamsGroupBox);
mCANIDLbl->setObjectName(QString::fromUtf8("mCANIDLbl"));
mCANIDLbl->setGeometry(QRect(10, 60, 91, 16));
mCANIDLbl->setGeometry(QRect(10, 66, 91, 10));
QFont font1;
font1.setPointSize(10);
mCANIDLbl->setFont(font1);
mCANIDComboBx = new QComboBox(mDeviceParamsGroupBox);
mCANIDComboBx->setObjectName(QString::fromUtf8("mCANIDComboBx"));
mCANIDComboBx->setEnabled(true);
mCANIDComboBx->setGeometry(QRect(100, 59, 131, 20));
mCANBaudrateLbl = new QLabel(mDeviceParamsGroupBox);
mCANBaudrateLbl->setObjectName(QString::fromUtf8("mCANBaudrateLbl"));
mCANBaudrateLbl->setGeometry(QRect(10, 90, 91, 16));
@@ -128,6 +125,11 @@ public:
mDeviceNameEditBx->setObjectName(QString::fromUtf8("mDeviceNameEditBx"));
mDeviceNameEditBx->setGeometry(QRect(13, 23, 281, 31));
mDeviceNameEditBx->setFont(font1);
mCANDeviceIDSpinBx = new QSpinBox(mDeviceParamsGroupBox);
mCANDeviceIDSpinBx->setObjectName(QString::fromUtf8("mCANDeviceIDSpinBx"));
mCANDeviceIDSpinBx->setGeometry(QRect(110, 60, 71, 22));
mCANDeviceIDSpinBx->setMinimum(1);
mCANDeviceIDSpinBx->setMaximum(255);
mDatabaseGroupBox = new QGroupBox(CCANbusSettingsPage);
mDatabaseGroupBox->setObjectName(QString::fromUtf8("mDatabaseGroupBox"));
mDatabaseGroupBox->setGeometry(QRect(620, 100, 711, 491));
@@ -165,6 +167,10 @@ public:
mDeleteDeviceBtn = new QPushButton(CCANbusSettingsPage);
mDeleteDeviceBtn->setObjectName(QString::fromUtf8("mDeleteDeviceBtn"));
mDeleteDeviceBtn->setGeometry(QRect(50, 420, 61, 22));
mCANIDComboBx = new QComboBox(CCANbusSettingsPage);
mCANIDComboBx->setObjectName(QString::fromUtf8("mCANIDComboBx"));
mCANIDComboBx->setEnabled(true);
mCANIDComboBx->setGeometry(QRect(790, 20, 131, 20));
retranslateUi(CCANbusSettingsPage);
@@ -174,10 +180,10 @@ public:
void retranslateUi(QWidget *CCANbusSettingsPage)
{
CCANbusSettingsPage->setWindowTitle(QCoreApplication::translate("CCANbusSettingsPage", "Form", nullptr));
label->setText(QCoreApplication::translate("CCANbusSettingsPage", "Param\303\250tres de la station Otarcik", nullptr));
label->setText(QCoreApplication::translate("CCANbusSettingsPage", "Param\303\250tres CAN de la station Otarcik", nullptr));
label_2->setText(QCoreApplication::translate("CCANbusSettingsPage", "Dispositifs CAN", nullptr));
mDeviceParamsGroupBox->setTitle(QCoreApplication::translate("CCANbusSettingsPage", "Param\303\250tres", nullptr));
mCANIDLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "Driver CAN ID:", nullptr));
mCANIDLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "CAN Device ID:", nullptr));
mCANBaudrateLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "CAN Baudrate:", nullptr));
mModifyDevParamsBtn->setText(QCoreApplication::translate("CCANbusSettingsPage", "Modifier", nullptr));
mRefreshRateLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "P\303\251riode rafra\303\256chissement (ms):", nullptr));