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-11 10:41:45 +08:00
parent 28b1bf7ede
commit 8574eb6c2f
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
das-dn/cmg/main.cpp
View File

@ -250,7 +250,6 @@ int main(int argc, char** argv)
config.processes[i].option.network.target_addr = INADDR_ANY; config.processes[i].option.network.target_addr = INADDR_ANY;
config.units[uid].state = TRUE; config.units[uid].state = TRUE;
#endif #endif
unsigned int m_runCount = 0; unsigned int m_runCount = 0;
unsigned int count = 0; unsigned int count = 0;

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

@ -3241,7 +3241,7 @@ bool CRYDevice::ry_run(void)
} }
publishdeviceEventData(); publishdeviceEventData();
int i = 0; int i = 0;
#if 0 #if 1
for (int i = 0; i < UNIT_NUM; i++) for (int i = 0; i < UNIT_NUM; i++)
{ {
#else #else
@ -3249,18 +3249,15 @@ bool CRYDevice::ry_run(void)
m_nCurUnit++; m_nCurUnit++;
if (m_nCurUnit >= UNIT_NUM) m_nCurUnit = 0; if (m_nCurUnit >= UNIT_NUM) m_nCurUnit = 0;
#endif #endif
do { if ((config.units[i].state & 0x01) != TRUE) break;
if ((config.units[i].state & 0x01) != TRUE) break; if (config.units[i].type != MASTER_UNIT) break;
if (config.units[i].type != MASTER_UNIT) break; MakeYKFrame(i);
MakeYKFrame(i); MakeYTFrame(i);
MakeYTFrame(i); if (sec_changed) {
if (sec_changed) { publishAnalogData(i);
publishAnalogData(i); publishStateData(i);
publishStateData(i);
}
} }
while (0); #if 1
#if 0
} }
#endif #endif
return m_dataAcquisitionReload; return m_dataAcquisitionReload;