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

Développement program settings

Browse Source
This commit is contained in:
jfmartel
2023-01-24 19:51:06 -05:00
parent 145d07754d
commit d183780f1b
19 changed files with 1368 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/OtarcikCan.cpp
+16 -14
View File
@@ -19,7 +19,7 @@
COtarcikCan::COtarcikCan(QObject *parent) : QObject(parent)
{
mMainWindow.mProgramSettingsPage->mProgramPtr = this;
}
COtarcikCan::~COtarcikCan()
@@ -30,7 +30,7 @@ COtarcikCan::~COtarcikCan()
delete mCANDevicesList.takeFirst();
}
mCANDevicesList.clear();
mMainWindow.mProgramSettingsPage->mProgramPtr = this;
}
@@ -56,11 +56,15 @@ int COtarcikCan::Start()
mMainWindow.mProgramSettingsPage->SetDevicesList(&mCANDevicesList);
}
// CCANDevice *NewCANDevice = new CCANDevice();
// mCANDevicesList.append(NewCANDevice);
// NewCANDevice->mProgramPtr = this;
// NewCANDevice->Init("IVT-S_all-variations_12082020.dbc",PCAN_USBBUS1,PCAN_BAUD_500K,"Puck CAN USB branchée sur le module Parker qui contrôle la patente", "Module Parker",1000);
// SaveSystemConfigRequest();
// mMainWindow.mProgramSettingsPage->SetDevicesList(&mCANDevicesList);
// NewCANDevice = new CCANDevice();
// mCANDevicesList.append(NewCANDevice);
@@ -69,7 +73,7 @@ int COtarcikCan::Start()
// NewCANDevice->Init("mazda_3_2019.dbc",PCAN_USBBUS3,PCAN_BAUD_800K,"Puck CAN USB branchée sur une autre patente", "Module Cossin",200);
}
@@ -87,24 +91,22 @@ int COtarcikCan::InitCANViewer(QList<CCANMessage *> *MsgList)
}
int COtarcikCan::SaveSystemConfigRequest(QList<CCANDevice *> *DevicesList)
//The device configuration has been modified directly in the master list
//Just save it and refresh display.
int COtarcikCan::SaveSystemConfigRequest()
{
if(DevicesList == 0)
{
qDebug("COtarcikCan::Trying to save a config with an invalid devices list");
return RET_GENERAL_ERROR;
}
if(mSystemConfig.SaveConfig(DevicesList) == RET_OK)
if(mSystemConfig.SaveConfig(&mCANDevicesList) == RET_OK)
{
// mMainWindow.mProgramSettingsPage->UpdatePage();
//Config saving is successful. To apply changes we need to reload the devices.
//The easiest way is to delete everything and reload.
while(mCANDevicesList.size() != 0)
{
delete mCANDevicesList.takeFirst();
}
while(DevicesList->size() != 0)
{
delete DevicesList->takeFirst();
}
if(mSystemConfig.LoadConfig(&mCANDevicesList) == RET_OK)
{
for(int i = 0; i < mCANDevicesList.size(); i++)