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 2024-12-13 19:31:32 +08:00
parent 865291842f
commit 23d24127c1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2804,7 +2804,7 @@ void CRYDevice::heart_beat(int status)
Json::Value jsonDevice; Json::Value jsonDevice;
Json::Value jsonValue; Json::Value jsonValue;
for (int i = 0; i < PROCESSES_NUM; i++) { for (int i = 0; i < PROCESSES_NUM; i++) {
if (config.processes[i].state == TRUE) { if ((config.processes[i].state & 0x01) == TRUE) {
char linkId[32]; char linkId[32];
if (config.processes[i].irn == 0) continue; if (config.processes[i].irn == 0) continue;
#ifdef NOPOLL_64BIT_PLATFORM #ifdef NOPOLL_64BIT_PLATFORM
@ -2814,7 +2814,7 @@ void CRYDevice::heart_beat(int status)
#endif #endif
jsonValue["linkId"] = linkId; jsonValue["linkId"] = linkId;
jsonValue["online"] = (config.processes[i].softdog >= PROCESS_WATCHDOG_TIME) ? false : true; jsonValue["online"] = (config.processes[i].softdog >= PROCESS_WATCHDOG_TIME) ? false : true;
vLog(LOG_DEBUG, "link %s, %d\n", linkId, (config.processes[i].softdog >= PROCESS_WATCHDOG_TIME) ? 0 : 1); //vLog(LOG_DEBUG, "link %s, %d\n", linkId, (config.processes[i].softdog >= PROCESS_WATCHDOG_TIME) ? 0 : 1);
jsonLink.append(jsonValue); jsonLink.append(jsonValue);
} }
} }
@ -2823,7 +2823,8 @@ void CRYDevice::heart_beat(int status)
payload["links"] = jsonLink; payload["links"] = jsonLink;
} }
for (int i = 0; i < UNIT_NUM; i++) { for (int i = 0; i < UNIT_NUM; i++) {
if (config.units[i].state == TRUE) { //vLog(LOG_DEBUG, "unit (%d), state is: %d\n", i, config.units[i].state);
if ((config.units[i].state & 0x01) == TRUE) {
char deviceId[32]; char deviceId[32];
if (config.units[i].irn == 0) continue; if (config.units[i].irn == 0) continue;
#ifdef NOPOLL_64BIT_PLATFORM #ifdef NOPOLL_64BIT_PLATFORM
@ -2833,7 +2834,7 @@ void CRYDevice::heart_beat(int status)
#endif #endif
jsonValue["deviceId"] = deviceId; jsonValue["deviceId"] = deviceId;
jsonValue["online"] = (config.units[i].softdog >= PROCESS_WATCHDOG_TIME) ? false : true; jsonValue["online"] = (config.units[i].softdog >= PROCESS_WATCHDOG_TIME) ? false : true;
vLog(LOG_DEBUG, "unit %s, %d\n", deviceId, (config.units[i].softdog >= PROCESS_WATCHDOG_TIME) ? 0 : 1); //vLog(LOG_DEBUG, "unit %s, %d\n", deviceId, (config.units[i].softdog >= PROCESS_WATCHDOG_TIME) ? 0 : 1);
jsonDevice.append(jsonValue); jsonDevice.append(jsonValue);
} }
} }