sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhouhuang 2025-01-16 13:36:54 +08:00
parent 1e464a4945
commit 1aa915d305
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
das-dn/cmg/ry.cpp
View File

@ -2845,7 +2845,7 @@ void CRYDevice::heart_beat(int status)
#if 1
jsonValue["real"] = (config.processes[i].real_softdog >= PROCESS_WATCHDOG_TIME) ? false : true;
if ((config.processes[i].state & 0x20) == 0x20) {
jsonValue["ftp"] = (config.processes[i].real_softdog >= PROCESS_WATCHDOG_TIME) ? false : true;
jsonValue["ftp"] = (config.processes[i].ftp_softdog >= PROCESS_WATCHDOG_TIME) ? false : true;
}
#endif
jsonLink.append(jsonValue);
@ -2871,7 +2871,7 @@ void CRYDevice::heart_beat(int status)
#if 1
jsonValue["real"] = (config.units[i].real_softdog >= UNIT_WATCHDOG_TIME) ? false : true;
if ((config.units[i].state & 0x20) == 0x20) {
jsonValue["ftp"] = (config.units[i].real_softdog >= UNIT_WATCHDOG_TIME) ? false : true;
jsonValue["ftp"] = (config.units[i].ftp_softdog >= UNIT_WATCHDOG_TIME) ? false : true;
}
#endif
jsonDevice.append(jsonValue);

12
das-dn/zjd3100proc/zjd3100pro.cpp
View File

@ -714,8 +714,16 @@ BOOLEAN CZJD3100Process::OnSyntanProcessInfo(char *pData, int ord)
for (int i = 0; i < PROCESS_UNIT_NUM; i++)
{
if (config.processes[pid].units[i] < 0) continue;
if (i == 0) snprintf(buffer, sizeof(buffer), "%d-%d", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].real_softdog);
else snprintf(buffer, sizeof(buffer), ", %d-%d", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].real_softdog);
if ((config.units[config.processes[pid].units[i]].state & 0x20) == 0x20)
{
if (i == 0) snprintf(buffer, sizeof(buffer), "%d-<%d,%d>", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].real_softdog, config.units[config.processes[pid].units[i]].ftp_softdog);
else snprintf(buffer, sizeof(buffer), ", %d-<%d,%d>", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].real_softdog, config.units[config.processes[pid].units[i]].ftp_softdog);
}
else
{
if (i == 0) snprintf(buffer, sizeof(buffer), "%d-<%d>", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].real_softdog);
else snprintf(buffer, sizeof(buffer), ", %d-<%d>", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].real_softdog);
}
pItem->WriteData((BYTE *)buffer, strlen(buffer), ord);
}
pItem->WriteData((BYTE *)"\r\n", strlen("\r\n"), ord);