From b61dedf3fa7a110b9247f20190146900d348bb7a Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Sat, 11 Jul 2020 09:57:48 +0200
Subject: [PATCH] FIX configurazioni

---
 .../Config/setup-Steamware.DB999.json         |  68 +++++++++
 IOB.WIN.FileExp/Config/setup-Steamware.json   | 106 +++++--------
 IOB.WIN.FileExp/Config/setup.json             | 140 +++++++++---------
 3 files changed, 179 insertions(+), 135 deletions(-)
 create mode 100644 IOB.WIN.FileExp/Config/setup-Steamware.DB999.json

diff --git a/IOB.WIN.FileExp/Config/setup-Steamware.DB999.json b/IOB.WIN.FileExp/Config/setup-Steamware.DB999.json
new file mode 100644
index 0000000..2e6b762
--- /dev/null
+++ b/IOB.WIN.FileExp/Config/setup-Steamware.DB999.json
@@ -0,0 +1,68 @@
+{
+  "confPLC": {
+    "ipAdrr": "192.168.0.102",
+    "tipoCpu": "S71500",
+    "rack": 0,
+    "slot": 1
+  },
+  "triggerList": {
+    "DB999.DBB0": {
+      "Column": "Trigger",
+      "MemConf": "DB999.DBB0",
+      "DataType": "Bit",
+      "memByteSize": 1,
+      "TriggerVal": "True",
+      "bitAdr": 0
+    }
+  },
+  "parametersList": {
+    "DB999.DBB8": {
+      "Column": "Valore 1",
+      "MemConf": "DB999.DBB8",
+      "DataType": "Word",
+      "memByteSize": 2
+    },
+    "DB999.DBB10": {
+      "Column": "Valore 2",
+      "MemConf": "DB999.DBB10",
+      "DataType": "Word",
+      "memByteSize": 2
+    },
+    "DB999.DBB16": {
+      "Column": "Valore 3",
+      "MemConf": "DB999.DBB16",
+      "DataType": "DWord",
+      "memByteSize": 4
+    },
+    "DB999.DBB20": {
+      "Column": "Valore 4",
+      "MemConf": "DB999.DBB20",
+      "DataType": "DWord",
+      "memByteSize": 4
+    },
+    "DB999.DBB32": {
+      "Column": "Valore 5",
+      "MemConf": "DB999.DBB32",
+      "DataType": "Real",
+      "memByteSize": 4
+    },
+    "DB999.DBB36": {
+      "Column": "Valore 6",
+      "MemConf": "DB999.DBB36",
+      "DataType": "Real",
+      "memByteSize": 4
+    },
+    "DB999.DBB40": {
+      "Column": "Valore 7",
+      "MemConf": "DB999.DBB306",
+      "DataType": "Word",
+      "memByteSize": 2
+    },
+    "DB999.DBB48": {
+      "Column": "Valore 8",
+      "MemConf": "DB999.DBB48",
+      "DataType": "String",
+      "memByteSize": 20
+    }
+  }
+}
\ No newline at end of file
diff --git a/IOB.WIN.FileExp/Config/setup-Steamware.json b/IOB.WIN.FileExp/Config/setup-Steamware.json
index 2e6b762..b277bdf 100644
--- a/IOB.WIN.FileExp/Config/setup-Steamware.json
+++ b/IOB.WIN.FileExp/Config/setup-Steamware.json
@@ -1,68 +1,44 @@
 {
-  "confPLC": {
-    "ipAdrr": "192.168.0.102",
-    "tipoCpu": "S71500",
-    "rack": 0,
-    "slot": 1
-  },
-  "triggerList": {
-    "DB999.DBB0": {
-      "Column": "Trigger",
-      "MemConf": "DB999.DBB0",
-      "DataType": "Bit",
-      "memByteSize": 1,
-      "TriggerVal": "True",
-      "bitAdr": 0
+    "confPLC": {
+        "ipAdrr": "192.168.0.102",
+        "tipoCpu": "S71500",
+        "rack": 0,
+        "slot": 1
+    },
+    "triggerList": {
+        "DB604.DBX3.7": {
+            "Column": "Trigger",
+            "MemConf": "DB604.DBX3.7",
+            "DataType": "Bit",
+            "memByteSize": 1,
+            "TriggerVal": "True",
+            "bitAdr": 7
+        }
+    },
+    "parametersList": {
+        "DB606.DBB0": {
+            "Column": "Lotto",
+            "MemConf": "DB606.DBB0",
+            "DataType": "Word",
+            "memByteSize": 2
+        },
+        "DB606.DBB2": {
+            "Column": "Pezzi Fatti",
+            "MemConf": "DB606.DBB2",
+            "DataType": "Word",
+            "memByteSize": 2
+        },
+        "DB604.DBB18": {
+            "Column": "TC Lordo",
+            "MemConf": "DB604.DBB18",
+            "DataType": "DWord",
+            "memByteSize": 4
+        },
+        "DB604.DBB22": {
+            "Column": "TC Netto",
+            "MemConf": "DB604.DBB22",
+            "DataType": "DWord",
+            "memByteSize": 4
+        }
     }
-  },
-  "parametersList": {
-    "DB999.DBB8": {
-      "Column": "Valore 1",
-      "MemConf": "DB999.DBB8",
-      "DataType": "Word",
-      "memByteSize": 2
-    },
-    "DB999.DBB10": {
-      "Column": "Valore 2",
-      "MemConf": "DB999.DBB10",
-      "DataType": "Word",
-      "memByteSize": 2
-    },
-    "DB999.DBB16": {
-      "Column": "Valore 3",
-      "MemConf": "DB999.DBB16",
-      "DataType": "DWord",
-      "memByteSize": 4
-    },
-    "DB999.DBB20": {
-      "Column": "Valore 4",
-      "MemConf": "DB999.DBB20",
-      "DataType": "DWord",
-      "memByteSize": 4
-    },
-    "DB999.DBB32": {
-      "Column": "Valore 5",
-      "MemConf": "DB999.DBB32",
-      "DataType": "Real",
-      "memByteSize": 4
-    },
-    "DB999.DBB36": {
-      "Column": "Valore 6",
-      "MemConf": "DB999.DBB36",
-      "DataType": "Real",
-      "memByteSize": 4
-    },
-    "DB999.DBB40": {
-      "Column": "Valore 7",
-      "MemConf": "DB999.DBB306",
-      "DataType": "Word",
-      "memByteSize": 2
-    },
-    "DB999.DBB48": {
-      "Column": "Valore 8",
-      "MemConf": "DB999.DBB48",
-      "DataType": "String",
-      "memByteSize": 20
-    }
-  }
 }
\ No newline at end of file
diff --git a/IOB.WIN.FileExp/Config/setup.json b/IOB.WIN.FileExp/Config/setup.json
index 4f8b5e2..0c7f620 100644
--- a/IOB.WIN.FileExp/Config/setup.json
+++ b/IOB.WIN.FileExp/Config/setup.json
@@ -1,73 +1,73 @@
 {
-  "confPLC": {
-    "ipAdrr": "192.168.0.51",
-    "tipoCpu": "S7300",
-    "rack": 0,
-    "slot": 2
-  },
-  "triggerList": {
-    "DB700.DBX0.0": {
-      "Column": "Trigger",
-      "MemConf": "DB700.DBX0.0",
-      "DataType": "Bit",
-      "memByteSize": 1,
-      "TriggerVal": "True",
-      "bitAdr": 0
+    "confPLC": {
+        "ipAdrr": "192.168.0.51",
+        "tipoCpu": "S7300",
+        "rack": 0,
+        "slot": 2
+    },
+    "triggerList": {
+        "DB700.DBX0.0": {
+            "Column": "Trigger",
+            "MemConf": "DB700.DBX0.0",
+            "DataType": "Bit",
+            "memByteSize": 1,
+            "TriggerVal": "True",
+            "bitAdr": 0
+        }
+    },
+    "parametersList": {
+        "DB700.DBX0.2": {
+            "Column": "Macchina in Modo Automatico",
+            "MemConf": "DB700.DBX0.2",
+            "DataType": "Bit",
+            "memByteSize": 1,
+            "bitAdr": 2
+        },
+        "DB700.DBX0.3": {
+            "Column": "Presenza Allarmi in Macchina da PLC",
+            "MemConf": "DB700.DBX0.3",
+            "DataType": "Bit",
+            "memByteSize": 1,
+            "bitAdr": 3
+        },
+        "DB700.DBX0.5": {
+            "Column": "Presenza Allarmi da Programma Cicli",
+            "MemConf": "DB700.DBX0.5",
+            "DataType": "Bit",
+            "memByteSize": 1,
+            "bitAdr": 5
+        },
+        "DB700.DBD4": {
+            "Column": "Giri Mola Giri/Min",
+            "MemConf": "DB700.DBD4",
+            "DataType": "DWord",
+            "memByteSize": 4
+        },
+        "DB700.DBX20.0": {
+            "Column": "Inzio Ciclo di Rettifica",
+            "MemConf": "DB700.DBX20.0",
+            "DataType": "Bit",
+            "memByteSize": 1,
+            "bitAdr": 0
+        },
+        "DB700.DBX20.1": {
+            "Column": "Fine Ciclo di Rettifica",
+            "MemConf": "DB700.DBX20.1",
+            "DataType": "Bit",
+            "memByteSize": 1,
+            "bitAdr": 1
+        },
+        "DB800.DBB0": {
+            "Column": "Numero / Nome Commessa",
+            "MemConf": "DB800.DBB0",
+            "DataType": "String",
+            "memByteSize": 20
+        },
+        "DB800.DBB44": {
+            "Column": "Codice disegno Pezzo",
+            "MemConf": "DB800.DBB44",
+            "DataType": "String",
+            "memByteSize": 20
+        }
     }
-  },
-  "parametersList": {
-    "DB700.DBX0.2": {
-      "Column": "Macchina in Modo Automatico",
-      "MemConf": "DB700.DBX0.2",
-      "DataType": "Bit",
-      "memByteSize": 1,
-      "bitAdr": 2
-    },
-    "DB700.DBX0.3": {
-      "Column": "Presenza Allarmi in Macchina da PLC",
-      "MemConf": "DB700.DBX0.3",
-      "DataType": "Bit",
-      "memByteSize": 1,
-      "bitAdr": 3
-    },
-    "DB700.DBX0.5": {
-      "Column": "Presenza Allarmi da Programma Cicli",
-      "MemConf": "DB700.DBX0.5",
-      "DataType": "Bit",
-      "memByteSize": 1,
-      "bitAdr": 5
-    },
-    "DB700.DBD4": {
-      "Column": "Giri Mola Giri/Min",
-      "MemConf": "DB700.DBD4",
-      "DataType": "DWord",
-      "memByteSize": 4
-    },
-    "DB700.DBX20.0": {
-      "Column": "Inzio Ciclo di Rettifica",
-      "MemConf": "DB700.DBX20.0",
-      "DataType": "Bit",
-      "memByteSize": 1,
-      "bitAdr": 0
-    },
-    "DB700.DBX20.1": {
-      "Column": "Fine Ciclo di Rettifica",
-      "MemConf": "DB700.DBX20.1",
-      "DataType": "Bit",
-      "memByteSize": 1,
-      "bitAdr": 1
-    },
-    "DB800.DBB0": {
-      "Column": "Numero / Nome Commessa",
-      "MemConf": "DB800.DBB0",
-      "DataType": "String",
-      "memByteSize": 20
-    },
-    "DB800.DBB44": {
-      "Column": "Codice disegno Pezzo",
-      "MemConf": "DB800.DBB44",
-      "DataType": "String",
-      "memByteSize": 20
-    }
-  }
 }
\ No newline at end of file