wxchen/newspark110
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(*):03LaserCut_V00.00.01,Spark100项目发货前功能提取

Browse Source
This commit is contained in:
adminwu
2024-03-14 14:21:18 +08:00
parent 1dda4f24ad
commit d045ed5fd8
46 changed files with 3457 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

227
device/SerialPort/IPG_laser.cpp
View File

@@ -1,7 +1,7 @@
#include "IPG_laser.h"
#include "deviceinfo.h"
#include "deviceproxy.h"
#include "rs_settings.h"
IPGLaser* IPGLaser::uniqueInstance = nullptr;
IPGLaser* IPGLaser::instance()
@@ -333,6 +333,103 @@ int IPGLaser::GetLaserSts()
::LeaveCriticalSection(&mCsRead);
return ret;
}
int IPGLaser::UpdateIPGPara()
{
RS_SETTINGS->beginGroup("device/LaserCmb");
PP_Enable = RS_SETTINGS->readEntry("/PPEnable");
Power1 = RS_SETTINGS->readEntry("/PP1");
Prepump1 = RS_SETTINGS->readEntry("/PG1");
PulseRepetition1 = RS_SETTINGS->readEntry("/AM1");
PulseDuration1 = RS_SETTINGS->readEntry("/MODE1");
Power2 = RS_SETTINGS->readEntry("/PP2");
Prepump2 = RS_SETTINGS->readEntry("/PG2");
PulseRepetition2 = RS_SETTINGS->readEntry("/AM2");
PulseDuration2 = RS_SETTINGS->readEntry("/MODE2");
Power3 = RS_SETTINGS->readEntry("/PP3");
Prepump3 = RS_SETTINGS->readEntry("/PG3");
PulseRepetition3 = RS_SETTINGS->readEntry("/AM3");
PulseDuration3 = RS_SETTINGS->readEntry("/MODE3");
Power4 = RS_SETTINGS->readEntry("/PP4");
Prepump4 = RS_SETTINGS->readEntry("/PG4");
PulseRepetition4 = RS_SETTINGS->readEntry("/AM4");
PulseDuration4 = RS_SETTINGS->readEntry("/MODE4");
Power5 = RS_SETTINGS->readEntry("/PP5");
Prepump5 = RS_SETTINGS->readEntry("/PG5");
PulseRepetition5 = RS_SETTINGS->readEntry("/AM5");
PulseDuration5 = RS_SETTINGS->readEntry("/MODE5");
Power6 = RS_SETTINGS->readEntry("/PP6");
Prepump6 = RS_SETTINGS->readEntry("/PG6");
PulseRepetition6 = RS_SETTINGS->readEntry("/AM6");
PulseDuration6 = RS_SETTINGS->readEntry("/MODE6");
Power7 = RS_SETTINGS->readEntry("/PP7");
Prepump7 = RS_SETTINGS->readEntry("/PG7");
PulseRepetition7 = RS_SETTINGS->readEntry("/AM7");
PulseDuration7 = RS_SETTINGS->readEntry("/MODE7");
Power8 = RS_SETTINGS->readEntry("/PP8");
Prepump8 = RS_SETTINGS->readEntry("/PG8");
PulseRepetition8 = RS_SETTINGS->readEntry("/AM8");
PulseDuration8 = RS_SETTINGS->readEntry("/MODE8");
RS_SETTINGS->endGroup();
Power1_set= Power1;
int tmp;
tmp = PulseDuration1.toInt() -1;
PulseDuration1 = QString::number(tmp);
QString str;
str = getValueFromList(DEV->deCodeString,"PW1");
dstPower1 = str.toDouble();
Power2_set= Power2;
tmp = PulseDuration2.toInt() -1;
PulseDuration2 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW2");
dstPower2 = str.toDouble();
tmp = PulseDuration3.toInt() -1;
PulseDuration3 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW3");
dstPower3 = str.toDouble();
tmp = PulseDuration4.toInt() -1;
PulseDuration4 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW4");
dstPower4 = str.toDouble();
tmp = PulseDuration5.toInt() -1;
PulseDuration5 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW5");
dstPower5 = str.toDouble();
tmp = PulseDuration6.toInt() -1;
PulseDuration6 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW6");
dstPower6 = str.toDouble();
tmp = PulseDuration7.toInt() -1;
PulseDuration7 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW7");
dstPower7 = str.toDouble();
tmp = PulseDuration8.toInt() -1;
PulseDuration8 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW8");
dstPower8 = str.toDouble();
return 0;
}
int IPGLaser::getIPGLaerPara(QString DevName)
{
QSettings *settings;//申明一个QSetting类函数
@@ -362,91 +459,147 @@ int IPGLaser::getIPGLaerPara(QString DevName)
nStopBits = 0; //停止位1
//int ret = DEV->deCode_file(".\\Data\\laser_para1.txt");
int ret = DEV->deCode_file(".\\Data\\data.txt");
if (ret != 0)
return -1;
// int ret = DEV->deCode_file(".\\Data\\data.txt");
// if (ret != 0)
// return -1;
// Mode 1
// AM 50
// PP 10
// PG 6500
//QStringList list = DEV->deCodeString.split("\n"); // 按","为分隔符分割字符串，list的值为["apple", "banana", "pear"]
Power1 = getValueFromList(DEV->deCodeString,"PP1");
RS_SETTINGS->beginGroup("device/LaserCmb");
PP_Enable = RS_SETTINGS->readEntry("/PPEnable");
Power1 = RS_SETTINGS->readEntry("/PP1");
Prepump1 = RS_SETTINGS->readEntry("/PG1");
PulseRepetition1 = RS_SETTINGS->readEntry("/AM1");
PulseDuration1 = RS_SETTINGS->readEntry("/MODE1");
Power2 = RS_SETTINGS->readEntry("/PP2");
Prepump2 = RS_SETTINGS->readEntry("/PG2");
PulseRepetition2 = RS_SETTINGS->readEntry("/AM2");
PulseDuration2 = RS_SETTINGS->readEntry("/MODE2");
Power3 = RS_SETTINGS->readEntry("/PP3");
Prepump3 = RS_SETTINGS->readEntry("/PG3");
PulseRepetition3 = RS_SETTINGS->readEntry("/AM3");
PulseDuration3 = RS_SETTINGS->readEntry("/MODE3");
Power4 = RS_SETTINGS->readEntry("/PP4");
Prepump4 = RS_SETTINGS->readEntry("/PG4");
PulseRepetition4 = RS_SETTINGS->readEntry("/AM4");
PulseDuration4 = RS_SETTINGS->readEntry("/MODE4");
Power5 = RS_SETTINGS->readEntry("/PP5");
Prepump5 = RS_SETTINGS->readEntry("/PG5");
PulseRepetition5 = RS_SETTINGS->readEntry("/AM5");
PulseDuration5 = RS_SETTINGS->readEntry("/MODE5");
Power6 = RS_SETTINGS->readEntry("/PP6");
Prepump6 = RS_SETTINGS->readEntry("/PG6");
PulseRepetition6 = RS_SETTINGS->readEntry("/AM6");
PulseDuration6 = RS_SETTINGS->readEntry("/MODE6");
Power7 = RS_SETTINGS->readEntry("/PP7");
Prepump7 = RS_SETTINGS->readEntry("/PG7");
PulseRepetition7 = RS_SETTINGS->readEntry("/AM7");
PulseDuration7 = RS_SETTINGS->readEntry("/MODE7");
Power8 = RS_SETTINGS->readEntry("/PP8");
Prepump8 = RS_SETTINGS->readEntry("/PG8");
PulseRepetition8 = RS_SETTINGS->readEntry("/AM8");
PulseDuration8 = RS_SETTINGS->readEntry("/MODE8");
RS_SETTINGS->endGroup();
///Power1 = getValueFromList(DEV->deCodeString,"PP1");//
Power1_set= Power1;
Prepump1 = getValueFromList(DEV->deCodeString,"PG1");
PulseDuration1 = getValueFromList(DEV->deCodeString,"Mode1");
///Prepump1 = getValueFromList(DEV->deCodeString,"PG1");//
///PulseDuration1 = getValueFromList(DEV->deCodeString,"Mode1");//
int tmp;
tmp = PulseDuration1.toInt() -1;
PulseDuration1 = QString::number(tmp);
PulseRepetition1 = getValueFromList(DEV->deCodeString,"AM1");
///PulseRepetition1 = getValueFromList(DEV->deCodeString,"AM1");//
QString str;
str = getValueFromList(DEV->deCodeString,"PW1");
dstPower1 = str.toDouble();
PP_Enable = getValueFromList(DEV->deCodeString,"PP_Enable");
//PP_Enable = getValueFromList(DEV->deCodeString,"PP_Enable");
// ret = DEV->deCode_file(".\\Data\\laser_para2.txt");
// if (ret != 0)
// return -1;
Power2 = getValueFromList(DEV->deCodeString,"PP2");
//Power2 = getValueFromList(DEV->deCodeString,"PP2");
Power2_set= Power2;
Prepump2 = getValueFromList(DEV->deCodeString,"PG2");
PulseDuration2 = getValueFromList(DEV->deCodeString,"Mode2");
PulseRepetition2 = getValueFromList(DEV->deCodeString,"AM2");
//Prepump2 = getValueFromList(DEV->deCodeString,"PG2");
//PulseDuration2 = getValueFromList(DEV->deCodeString,"Mode2");
//PulseRepetition2 = getValueFromList(DEV->deCodeString,"AM2");
tmp = PulseDuration2.toInt() -1;
PulseDuration2 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW2");
dstPower2 = str.toDouble();
DEVICE_INFO->printDeviceSystemInfo("MODE1:"+PulseDuration1+1);
DEVICE_INFO->printDeviceSystemInfo("PP1:"+Power1);
DEVICE_INFO->printDeviceSystemInfo("PG1:"+Prepump1);
DEVICE_INFO->printDeviceSystemInfo("AM1:"+PulseRepetition1);
Power3 = getValueFromList(DEV->deCodeString,"PP3");
Prepump3 = getValueFromList(DEV->deCodeString,"PG3");
PulseDuration3 = getValueFromList(DEV->deCodeString,"Mode3");
PulseRepetition3 = getValueFromList(DEV->deCodeString,"AM3");
DEVICE_INFO->printDeviceSystemInfo("MODE2:"+PulseDuration2+1);
DEVICE_INFO->printDeviceSystemInfo("PP2:"+Power2);
DEVICE_INFO->printDeviceSystemInfo("PG2:"+Prepump2);
DEVICE_INFO->printDeviceSystemInfo("AM2:"+PulseRepetition2);
//Power3 = getValueFromList(DEV->deCodeString,"PP3");
//Prepump3 = getValueFromList(DEV->deCodeString,"PG3");
//PulseDuration3 = getValueFromList(DEV->deCodeString,"Mode3");
//PulseRepetition3 = getValueFromList(DEV->deCodeString,"AM3");
tmp = PulseDuration3.toInt() -1;
PulseDuration3 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW3");
dstPower3 = str.toDouble();
Power4 = getValueFromList(DEV->deCodeString,"PP4");
Prepump4 = getValueFromList(DEV->deCodeString,"PG4");
PulseDuration4 = getValueFromList(DEV->deCodeString,"Mode4");
PulseRepetition4 = getValueFromList(DEV->deCodeString,"AM4");
//Power4 = getValueFromList(DEV->deCodeString,"PP4");
//Prepump4 = getValueFromList(DEV->deCodeString,"PG4");
//PulseDuration4 = getValueFromList(DEV->deCodeString,"Mode4");
//PulseRepetition4 = getValueFromList(DEV->deCodeString,"AM4");
tmp = PulseDuration4.toInt() -1;
PulseDuration4 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW4");
dstPower4 = str.toDouble();
Power5 = getValueFromList(DEV->deCodeString,"PP5");
Prepump5 = getValueFromList(DEV->deCodeString,"PG5");
PulseDuration5 = getValueFromList(DEV->deCodeString,"Mode5");
PulseRepetition5 = getValueFromList(DEV->deCodeString,"AM5");
// Power5 = getValueFromList(DEV->deCodeString,"PP5");
// Prepump5 = getValueFromList(DEV->deCodeString,"PG5");
// PulseDuration5 = getValueFromList(DEV->deCodeString,"Mode5");
// PulseRepetition5 = getValueFromList(DEV->deCodeString,"AM5");
tmp = PulseDuration5.toInt() -1;
PulseDuration5 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW5");
dstPower5 = str.toDouble();
Power6 = getValueFromList(DEV->deCodeString,"PP6");
Prepump6 = getValueFromList(DEV->deCodeString,"PG6");
PulseDuration6 = getValueFromList(DEV->deCodeString,"Mode6");
PulseRepetition6 = getValueFromList(DEV->deCodeString,"AM6");
// Power6 = getValueFromList(DEV->deCodeString,"PP6");
// Prepump6 = getValueFromList(DEV->deCodeString,"PG6");
// PulseDuration6 = getValueFromList(DEV->deCodeString,"Mode6");
// PulseRepetition6 = getValueFromList(DEV->deCodeString,"AM6");
tmp = PulseDuration6.toInt() -1;
PulseDuration6 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW6");
dstPower6 = str.toDouble();
Power7 = getValueFromList(DEV->deCodeString,"PP7");
Prepump7 = getValueFromList(DEV->deCodeString,"PG7");
PulseDuration7 = getValueFromList(DEV->deCodeString,"Mode7");
PulseRepetition7 = getValueFromList(DEV->deCodeString,"AM7");
// Power7 = getValueFromList(DEV->deCodeString,"PP7");
// Prepump7 = getValueFromList(DEV->deCodeString,"PG7");
// PulseDuration7 = getValueFromList(DEV->deCodeString,"Mode7");
// PulseRepetition7 = getValueFromList(DEV->deCodeString,"AM7");
tmp = PulseDuration7.toInt() -1;
PulseDuration7 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW7");
dstPower7 = str.toDouble();
Power8 = getValueFromList(DEV->deCodeString,"PP8");
Prepump8 = getValueFromList(DEV->deCodeString,"PG8");
PulseDuration8 = getValueFromList(DEV->deCodeString,"Mode8");
PulseRepetition8 = getValueFromList(DEV->deCodeString,"AM8");
// Power8 = getValueFromList(DEV->deCodeString,"PP8");
// Prepump8 = getValueFromList(DEV->deCodeString,"PG8");
// PulseDuration8 = getValueFromList(DEV->deCodeString,"Mode8");
// PulseRepetition8 = getValueFromList(DEV->deCodeString,"AM8");
tmp = PulseDuration8.toInt() -1;
PulseDuration8 = QString::number(tmp);
str = getValueFromList(DEV->deCodeString,"PW8");

11
device/SerialPort/IPG_laser.h
View File

@@ -11,11 +11,13 @@ private:
int revDataLen;
static IPGLaser* uniqueInstance;
public:
int UpdateIPGPara();
QString PP_Enable;
QString Power1;
QString Prepump1;
QString PulseDuration1;
@@ -36,26 +38,31 @@ public:
QString PulseDuration3;
QString PulseRepetition3;
double dstPower3;
QString Power4;
QString Prepump4;
QString PulseDuration4;
QString PulseRepetition4;
double dstPower4;
QString Power5;
QString Prepump5;
QString PulseDuration5;
QString PulseRepetition5;
double dstPower5;
QString Power6;
QString Prepump6;
QString PulseDuration6;
QString PulseRepetition6;
double dstPower6;
QString Power7;
QString Prepump7;
QString PulseDuration7;
QString PulseRepetition7;
double dstPower7;
QString Power8;
QString Prepump8;
QString PulseDuration8;