diff --git a/das-dn/cmg/ry.cpp b/das-dn/cmg/ry.cpp index 8b8a9782..b2b52f45 100644 --- a/das-dn/cmg/ry.cpp +++ b/das-dn/cmg/ry.cpp @@ -2804,7 +2804,7 @@ void CRYDevice::heart_beat(int status) Json::Value jsonDevice; Json::Value jsonValue; for (int i = 0; i < PROCESSES_NUM; i++) { - if (config.processes[i].state == TRUE) { + if ((config.processes[i].state & 0x01) == TRUE) { char linkId[32]; if (config.processes[i].irn == 0) continue; #ifdef NOPOLL_64BIT_PLATFORM @@ -2814,7 +2814,7 @@ void CRYDevice::heart_beat(int status) #endif jsonValue["linkId"] = linkId; 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); } } @@ -2823,7 +2823,8 @@ void CRYDevice::heart_beat(int status) payload["links"] = jsonLink; } 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]; if (config.units[i].irn == 0) continue; #ifdef NOPOLL_64BIT_PLATFORM @@ -2833,7 +2834,7 @@ void CRYDevice::heart_beat(int status) #endif jsonValue["deviceId"] = deviceId; 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); } }