lnk/microser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ledger update

Browse Source
This commit is contained in:
lnk
2025-03-13 16:35:19 +08:00
parent f2bec8c94e
commit 97e4da3df7
3 changed files with 104 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cfg_parse/cfg_parser.cpp
View File

@@ -3935,6 +3935,7 @@ int parse_rpt_log_ini()
LD_info = &(ied_usr->LD_info[cpuno]);
char str[256]; //256<35><36>С
char* tmp = Get_IED(ied_usr->dev_type);
if(tmp == NULL){std::cerr << "front read ied config error!" << std::endl;continue;}
qDebug() << tmp << endl;
apr_snprintf(str, sizeof(str), tmp, cpuno + 1);
@@ -3966,6 +3967,7 @@ int parse_rpt_log_ini()
for (int i = 0; i < log_cfg_strlists[type]->size(); ++i) {
apr_snprintf(buf, sizeof(buf), "%s", log_cfg_strlists[type]->at(i).toAscii().constData());
char* tmp = Get_LDevice(ied_usr->dev_type);
if(tmp == NULL){std::cerr << "front read monitor config error!" << std::endl;continue;}
fill_logctrl_by_cfg(LD_info, i, buf, tmp);
delete[] tmp;
}
@@ -11758,13 +11760,29 @@ void printLedgerinshell(const ied_usr_t& ied_usr, QIODevice* outputDevice) {
//recall
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- autorecallflag: " + QByteArray::number(ied_usr.LD_info[i].autorecallflag) + "\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- autorecallcount: " + QByteArray::number(ied_usr.LD_info[i].autorecallcount) + "\n");
for (int j = 0; j < ied_usr.LD_info[i].autorecallcount && ied_usr.LD_info->autorecall[j] != NULL; j++){
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- autorecall_t[" + QByteArray::number(j) + "]:\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- start_time: " + QByteArray::number(ied_usr.LD_info->autorecall[j]->start) + "\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- end_time: " + QByteArray::number(ied_usr.LD_info->autorecall[j]->end) + "\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- need_steady: " + QByteArray::number(ied_usr.LD_info->autorecall[j]->need_steady) + "\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- need_voltage: " + QByteArray::number(ied_usr.LD_info->autorecall[j]->need_voltage) + "\n");
}
for (int j = 0;
j < ied_usr.LD_info[i].autorecallcount &&
ied_usr.LD_info[i].autorecall != NULL && // <20><><EFBFBD><EFBFBD> LD_info->autorecall <20><><EFBFBD><EFBFBD>
ied_usr.LD_info[i].autorecall[j] != NULL;
j++)
{
outputDevice->write("\r\x1B[K");
outputDevice->write(" |-- autorecall_t[" + QByteArray::number(j) + "]:\n");
if (ied_usr.LD_info[i].autorecall[j] == NULL) {
outputDevice->write(" |-- [Error] autorecall[j] is NULL\n");
continue; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NULL ָ<><D6B8>
}
outputDevice->write("\r\x1B[K");
outputDevice->write(" |-- start_time: " + QByteArray::number(ied_usr.LD_info[i].autorecall[j]->start) + "\n");
outputDevice->write("\r\x1B[K");
outputDevice->write(" |-- end_time: " + QByteArray::number(ied_usr.LD_info[i].autorecall[j]->end) + "\n");
outputDevice->write("\r\x1B[K");
outputDevice->write(" |-- need_steady: " + QByteArray::number(ied_usr.LD_info[i].autorecall[j]->need_steady) + "\n");
outputDevice->write("\r\x1B[K");
outputDevice->write(" |-- need_voltage: " + QByteArray::number(ied_usr.LD_info[i].autorecall[j]->need_voltage) + "\n");
}
// rpt
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- rptRecvFlag: " + QByteArray::number(ied_usr.LD_info[i].rptRecvFlag) + "\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- rptRecvCheckFlag: " + QByteArray::number(ied_usr.LD_info[i].rptRecvCheckFlag) + "\n");
@@ -14746,6 +14764,7 @@ int parse_rpt_log_ini_one(ied_t* ied)
//<2F><>Щ<EFBFBD><D0A9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD><D0B5>ڴ棬<DAB4><E6A3AC><EFBFBD><EFBFBD><EFBFBD>жϲ<D0B6><CFB2>ܴ<EFBFBD>g_init_pool<6F>з<EFBFBD><D0B7><EFBFBD><EFBFBD>ڴ棬lnk20250122
char str[256];
char* tmp = Get_IED(ied_usr->dev_type);
if(tmp == NULL){std::cerr << "front read ied config error!" << std::endl;continue;}
qDebug() << tmp << endl;
apr_snprintf(str, sizeof(str), tmp, cpuno + 1);
//ied_usr->LD_info[cpuno].LD_name = apr_pstrdup(g_init_pool, str);//lnk20250122
@@ -14801,6 +14820,7 @@ int parse_rpt_log_ini_one(ied_t* ied)
for (int i = 0; i < log_cfg_strlists[type]->size(); ++i) {
apr_snprintf(buf, sizeof(buf), "%s", log_cfg_strlists[type]->at(i).toAscii().constData());
char* tmp = Get_LDevice(ied_usr->dev_type);
if(tmp == NULL){std::cerr << "front read monitor config error!" << std::endl;continue;}
fill_logctrl_by_cfg(LD_info, i, buf, tmp);
delete[] tmp;
}