diff --git a/das-dn/zjd3100proc/zjd3100pro.cpp b/das-dn/zjd3100proc/zjd3100pro.cpp index d3e8bdba..cc439f33 100644 --- a/das-dn/zjd3100proc/zjd3100pro.cpp +++ b/das-dn/zjd3100proc/zjd3100pro.cpp @@ -689,17 +689,7 @@ BOOLEAN CZJD3100Process::OnSyntanProcessInfo(char *pData, int ord) CZJD3100ProcessItem* pItem = (CZJD3100ProcessItem *)GetItem(ord); if (pItem == NULL) return FALSE; if (pData == NULL) return FALSE; -/* - pCmd = strchr(pData, ' '); - if (NULL == pCmd) return FALSE; - *pCmd = '\0'; - pCmd++; - pid = atoi(pData); - if (pid < 0 || pid >= PROCESSES_NUM) - { - pid = 0; - } -*/ + if (strcmp(pData, "get") == 0) { pItem->WriteData((BYTE *)"ZJD3100# \r\n", strlen("ZJD3100# \r\n"), ord); @@ -719,13 +709,13 @@ BOOLEAN CZJD3100Process::OnSyntanProcessInfo(char *pData, int ord) snprintf(buffer, sizeof(buffer), ",%s", "unknow protocol"); pItem->WriteData((BYTE *)buffer, strlen(buffer), ord); } - snprintf(buffer, sizeof(buffer), ", link units: "); + snprintf(buffer, sizeof(buffer), ", softdog is: %d, link units: ", config.processes[pid].softdog); pItem->WriteData((BYTE *)buffer, strlen(buffer), 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", config.processes[pid].units[i]); - else snprintf(buffer, sizeof(buffer), ", %d", config.processes[pid].units[i]); + if (i == 0) snprintf(buffer, sizeof(buffer), "%d-%d", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].softdog); + else snprintf(buffer, sizeof(buffer), ", %d-%d", config.processes[pid].units[i], config.units[config.processes[pid].units[i]].softdog); pItem->WriteData((BYTE *)buffer, strlen(buffer), ord); } pItem->WriteData((BYTE *)"\r\n", strlen("\r\n"), ord);