From 8574eb6c2f6154c6bef1eff36eca62ca7d550c7c Mon Sep 17 00:00:00 2001
From: zhouhuang <assouan@sohu.com>
Date: Wed, 11 Dec 2024 10:41:45 +0800
Subject: [PATCH] update

---
 das-dn/cmg/main.cpp |  1 -
 das-dn/cmg/ry.cpp   | 21 +++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/das-dn/cmg/main.cpp b/das-dn/cmg/main.cpp
index b93320dc..ae326bfe 100644
--- a/das-dn/cmg/main.cpp
+++ b/das-dn/cmg/main.cpp
@@ -250,7 +250,6 @@ int main(int argc, char** argv)
         config.processes[i].option.network.target_addr = INADDR_ANY;
 
         config.units[uid].state = TRUE;
-
 #endif
         unsigned int    m_runCount = 0;
         unsigned int    count = 0;
diff --git a/das-dn/cmg/ry.cpp b/das-dn/cmg/ry.cpp
index f0dc3cfb..ea52deac 100644
--- a/das-dn/cmg/ry.cpp
+++ b/das-dn/cmg/ry.cpp
@@ -3241,7 +3241,7 @@ bool CRYDevice::ry_run(void)
     }
     publishdeviceEventData();
     int i = 0;
-#if 0
+#if 1
     for (int i = 0; i < UNIT_NUM; i++)
     {
 #else
@@ -3249,18 +3249,15 @@ bool CRYDevice::ry_run(void)
         m_nCurUnit++;
         if (m_nCurUnit >= UNIT_NUM) m_nCurUnit = 0;
 #endif
-        do {
-            if ((config.units[i].state & 0x01) != TRUE) break;
-            if (config.units[i].type != MASTER_UNIT) break;
-            MakeYKFrame(i);
-            MakeYTFrame(i);
-            if (sec_changed) {
-                publishAnalogData(i);
-                publishStateData(i);
-            }
+        if ((config.units[i].state & 0x01) != TRUE) break;
+        if (config.units[i].type != MASTER_UNIT) break;
+        MakeYKFrame(i);
+        MakeYTFrame(i);
+        if (sec_changed) {
+            publishAnalogData(i);
+            publishStateData(i);
         }
-        while (0);
-#if 0
+#if 1
     }
 #endif
     return m_dataAcquisitionReload;