From 90b7450b05c3a26767727b12fc08f9667ebb1868 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 26 一月 2024 14:57:40 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview2.java |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview2.java
index 9b41787..d09e767 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview2.java
@@ -52,42 +52,45 @@
 
 
             // 璋冪敤initword鏂规硶
-          PlcParameterObject plcParameterObject = initUtil.initword(jsonFilePath);
+            PlcParameterObject plcParameterObject = initUtil.initword(jsonFilePath);
             PlcParameterObject plcStateObject = initUtil.initword(jsonFilePath4);
-
-            // 璋冪敤initbit鏂规硶
             PlcBitObject plcBitObject = initUtil.initbit(jsonFilePath2);
             readAndUpdateBitValues(plcBitObject);
-          readAndUpdateWordValues(plcParameterObject);
+            readAndUpdateWordValues(plcParameterObject);
             readAndUpdateWordValues(plcStateObject);
+//            List<Boolean> getplcvlues = S7control.getinstance().ReadBits(plcBitObject.getPlcAddressBegin(), plcBitObject.getPlcAddressLength());
+//            plcBitObject.setPlcBitList(getplcvlues);
+
            // int index = plcParameterObject.getPlcParameter("A01A02conveyorVelocity(Max)").getAddressIndex();
          //   System.out.println(index);
            // plcParameterObject.getPlcParameter("A01A02conveyorVelocity(Max)").getAddress(index);
             // System.out.println(plcParameterObject.getPlcParameter("A01A02conveyorVelocity(Max)").getAddress(index));
             // S7control.getinstance().WriteWord(plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getAddress(index), (short) 100);
-     List<String> addresses = new ArrayList<>();
-      addresses.add("conveyorVelocity(AutoFAST)");
-      addresses.add("A02ID");
-System.out.println(plcParameterObject.getPlcParameterValues(addresses));
+//     List<String> addresses = new ArrayList<>();
+//      addresses.add("conveyorVelocity(AutoFAST)");
+//      addresses.add("A02ID");
+//System.out.println(plcParameterObject.getPlcParameterValues(addresses));
             List<String> addresses2 = new ArrayList<>();
-            addresses2.add("conveyorVelocity(AutoSLOW)");
             addresses2.add("D01.SRdec");
+            addresses2.add("D01.SRinpos");
+            addresses2.add("D05.SRinpos");
+
 
 
 
             System.out.println(plcBitObject.getPlcBitValues(addresses2));
 
-            int index2 = plcBitObject.getPlcBit("DO1id").getAddressIndex();
+           int index2 = plcBitObject.getPlcBit("D05.SRinpos").getAddressIndex();
             System.out.println(index2);
 
-            plcBitObject.getPlcBit("DO1id").getAddress(index2);
-            System.out.println(plcBitObject.getPlcBit("DO1id").getAddress(index2));
-
-
-            List<String> addresses3 = new ArrayList<>();
-            addresses3.add("A02ID1");
-            addresses3.add("A01CurrentGrid");
-            System.out.println(plcStateObject.getPlcParameterValues(addresses3));
+           plcBitObject.getPlcBit("D05.SRinpos").getAddress(index2);
+           System.out.println(plcBitObject.getPlcBit("D05.SRinpos").getAddress(index2));
+//
+//
+//            List<String> addresses3 = new ArrayList<>();
+//            addresses3.add("A02ID1");
+//            addresses3.add("A01CurrentGrid");
+//            System.out.println(plcStateObject.getPlcParameterValues(addresses3));
         }
     }
 }

--
Gitblit v1.8.0