Plusieurs développements, dont l'implémentation du endian Intel
This commit is contained in:
@@ -1,11 +1,13 @@
|
||||
#include "CCANWatchdogSettingsPage.h"
|
||||
#include "ui_CCANWatchdogSettingsPage.h"
|
||||
#include "CANDevice.h"
|
||||
#include "OtarcikCan.h"
|
||||
|
||||
CCANWatchdogSettingsPage::CCANWatchdogSettingsPage(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::CCANWatchdogSettingsPage)
|
||||
{
|
||||
mProgramHandle = 0;
|
||||
ui->setupUi(this);
|
||||
|
||||
connect(ui->mCANWatchdogChangBtn,&QPushButton::pressed,this,&CCANWatchdogSettingsPage::ChangeSettingsButtonPressed);
|
||||
@@ -67,6 +69,7 @@ void CCANWatchdogSettingsPage::ChangeSettingsButtonPressed()
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
mIsSettingsChangeMode = false;
|
||||
|
||||
ui->mCANWatchdogCancelBtn->setVisible(false);
|
||||
@@ -74,5 +77,28 @@ void CCANWatchdogSettingsPage::ChangeSettingsButtonPressed()
|
||||
ui->mCANWatchdogDeviceIDSpinBx->setEnabled(false);
|
||||
ui->mCANWatchdogTimeoutSpinBx->setEnabled(false);
|
||||
ui->mCANWatchdogChangBtn->setText("Modifier");
|
||||
|
||||
//Save data...
|
||||
mCANWatchdogConfig.mCANDeviceID = ui->mCANWatchdogDeviceIDSpinBx->value();
|
||||
mCANWatchdogConfig.mWatchdogTimeout = ui->mCANWatchdogTimeoutSpinBx->value();
|
||||
mCANWatchdogConfig.mCANDeviceBaudrate = ui->mCANWatchdogBaudrateComboBx->currentData().toInt();
|
||||
|
||||
mProgramHandle->SaveCANWatchdogSettingsRequest(&mCANWatchdogConfig);
|
||||
}
|
||||
}
|
||||
|
||||
int CCANWatchdogSettingsPage::SetCANWatchdogConfig(CCANWatchdogConfig *Config)
|
||||
{
|
||||
if(Config == 0)
|
||||
{
|
||||
return RET_GENERAL_ERROR;
|
||||
}
|
||||
|
||||
mCANWatchdogConfig = *Config;
|
||||
|
||||
ui->mCANWatchdogDeviceIDSpinBx->setValue(mCANWatchdogConfig.mCANDeviceID);
|
||||
ui->mCANWatchdogTimeoutSpinBx->setValue(mCANWatchdogConfig.mWatchdogTimeout);
|
||||
ui->mCANWatchdogBaudrateComboBx->setCurrentIndex(ui->mCANWatchdogBaudrateComboBx->findData(mCANWatchdogConfig.mCANDeviceBaudrate));
|
||||
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user