From 76d5a0343e9c7bd304122cef2d09af4030ee72e1 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 9 Mar 2022 20:00:41 +0100
Subject: [PATCH] Update conf

---
 MachineSim/SimStatus.json              | 74 --------------------------
 MachineSim/conf/ConfMode.json          | 58 ++++++++++++++++++++
 MachineSim/conf/ConfStatus.json        | 58 ++++++++++++++++++++
 MachineSim/{ => conf}/SimActLog.json   |  0
 MachineSim/{ => conf}/SimEvHist.json   |  0
 MachineSim/{ => conf}/SimMachStat.json |  0
 MachineSim/{ => conf}/SimMaint.json    |  0
 MachineSim/{ => conf}/SimParams.json   |  0
 MachineSim/{ => conf}/SimProd.json     |  0
 MachineSim/{ => conf}/SimTools.json    |  0
 10 files changed, 116 insertions(+), 74 deletions(-)
 delete mode 100644 MachineSim/SimStatus.json
 create mode 100644 MachineSim/conf/ConfMode.json
 create mode 100644 MachineSim/conf/ConfStatus.json
 rename MachineSim/{ => conf}/SimActLog.json (100%)
 rename MachineSim/{ => conf}/SimEvHist.json (100%)
 rename MachineSim/{ => conf}/SimMachStat.json (100%)
 rename MachineSim/{ => conf}/SimMaint.json (100%)
 rename MachineSim/{ => conf}/SimParams.json (100%)
 rename MachineSim/{ => conf}/SimProd.json (100%)
 rename MachineSim/{ => conf}/SimTools.json (100%)

diff --git a/MachineSim/SimStatus.json b/MachineSim/SimStatus.json
deleted file mode 100644
index d5d495e..0000000
--- a/MachineSim/SimStatus.json
+++ /dev/null
@@ -1,74 +0,0 @@
-[
-  {
-    "Order": 0,
-    "Type": "SPEED-5000-10000",
-    "Title": "SPEED",
-    "Value": "6000",
-    "ValueNum": 6000,
-    "MinVal": 1000,
-    "MaxVal": 10000,
-    "SimMean": 100,
-    "SimStd": 50,
-    "DisplFormat": "N0"
-  },
-  {
-    "Order": 0,
-    "Type": "FEED-3000-5000",
-    "Title": "FEED",
-    "Value": "3500",
-    "ValueNum": 3500,
-    "MinVal": 1000,
-    "MaxVal": 5000,
-    "SimMean": 50,
-    "SimStd": 5,
-    "DisplFormat": "N0"
-  },
-  {
-    "Order": 0,
-    "Type": "LOAD",
-    "Title": "SPINDLE LOAD",
-    "Value": "30",
-    "ValueNum": 30,
-    "MinVal": 0,
-    "MaxVal": 100,
-    "SimMean": 5,
-    "SimStd": 1,
-    "DisplFormat": "N1"
-  },
-  {
-    "Order": 0,
-    "Type": "POS",
-    "Title": "X POS",
-    "Value": "500",
-    "ValueNum": 500,
-    "MinVal": 0,
-    "MaxVal": 5000,
-    "SimMean": 100,
-    "SimStd": 20,
-    "DisplFormat": "N2"
-  },
-  {
-    "Order": 0,
-    "Type": "POS",
-    "Title": "Y POS",
-    "Value": "3000",
-    "ValueNum": 3000,
-    "MinVal": 0,
-    "MaxVal": 10000,
-    "SimMean": 100,
-    "SimStd": 10,
-    "DisplFormat": "N2"
-  },
-  {
-    "Order": 0,
-    "Type": "POS",
-    "Title": "Z POS",
-    "Value": "-500",
-    "ValueNum": -500,
-    "MinVal": -3000,
-    "MaxVal": 0,
-    "SimMean": 50,
-    "SimStd": 5,
-    "DisplFormat": "N2"
-  }
-]
\ No newline at end of file
diff --git a/MachineSim/conf/ConfMode.json b/MachineSim/conf/ConfMode.json
new file mode 100644
index 0000000..4fd7c5f
--- /dev/null
+++ b/MachineSim/conf/ConfMode.json
@@ -0,0 +1,58 @@
+[
+  {
+    "MStatusID": 0,
+    "Description": "UNDEFINED",
+    "Css": "bg bg-dark text-light",
+    "Priority": 1,
+    "Group": "POWEROFF"
+  },
+  {
+    "MStatusID": 1,
+    "Description": "EXE",
+    "Css": "bg bg-success text-light",
+    "Priority": 2,
+    "Group": "RUN"
+  },
+  {
+    "MStatusID": 2,
+    "Description": "READY",
+    "Css": "bg bg-primary text-light",
+    "Priority": 3,
+    "Group": "MANUAL"
+  },
+  {
+    "MStatusID": 3,
+    "Description": "HOLD",
+    "Css": "bg bg-warning text-light",
+    "Priority": 3,
+    "Group": "MANUAL"
+  },
+  {
+    "MStatusID": 4,
+    "Description": "FEED_HOLD",
+    "Css": "bg bg-warning text-light",
+    "Priority": 3,
+    "Group": "MANUAL"
+  },
+  {
+    "MStatusID": 5,
+    "Description": "OPTIONAL_STOP",
+    "Css": "bg bg-danger text-warning",
+    "Priority": 3,
+    "Group": "ERROR"
+  },
+  {
+    "MStatusID": 6,
+    "Description": "PROGRAM_STOPPED",
+    "Css": "bg bg-warning text-light",
+    "Priority": 3,
+    "Group": "MANUAL"
+  },
+  {
+    "MStatusID": 7,
+    "Description": "DONE",
+    "Css": "bg bg-primary text-light",
+    "Priority": 3,
+    "Group": "MANUAL"
+  }
+]
\ No newline at end of file
diff --git a/MachineSim/conf/ConfStatus.json b/MachineSim/conf/ConfStatus.json
new file mode 100644
index 0000000..8a5233b
--- /dev/null
+++ b/MachineSim/conf/ConfStatus.json
@@ -0,0 +1,58 @@
+[
+  {
+    "MStatusID": 0,
+    "Description": "UNDEFINED",
+    "Css": "bg bg-dark text-light",
+    "Priority": 1,
+    "Group": "POWEROFF"
+  },
+  {
+    "MStatusID": 1,
+    "Description": "POWEROFF",
+    "Css": "bg bg-secondary text-light",
+    "Priority": 1,
+    "Group": "POWEROFF"
+  },
+  {
+    "MStatusID": 2,
+    "Description": "AUTOMATIC",
+    "Css": "bg bg-success text-light",
+    "Priority": 2,
+    "Group": "RUN"
+  },
+  {
+    "MStatusID": 3,
+    "Description": "EDIT",
+    "Css": "bg bg-warning text-light",
+    "Priority": 3,
+    "Group": "MANUAL"
+  },
+  {
+    "MStatusID": 4,
+    "Description": "SEMIAUTOMATIC",
+    "Css": "bg bg-warning text-light",
+    "Priority": 3,
+    "Group": "MANUAL"
+  },
+  {
+    "MStatusID": 5,
+    "Description": "MANUAL_JOG",
+    "Css": "bg bg-warning text-light",
+    "Priority": 3,
+    "Group": "MANUAL"
+  },
+  {
+    "MStatusID": 6,
+    "Description": "ALARM",
+    "Css": "bg bg-danger text-warning",
+    "Priority": 3,
+    "Group": "ERROR"
+  },
+  {
+    "MStatusID": 7,
+    "Description": "ESTOP",
+    "Css": "bg bg-danger text-light",
+    "Priority": 3,
+    "Group": "ERROR"
+  }
+]
\ No newline at end of file
diff --git a/MachineSim/SimActLog.json b/MachineSim/conf/SimActLog.json
similarity index 100%
rename from MachineSim/SimActLog.json
rename to MachineSim/conf/SimActLog.json
diff --git a/MachineSim/SimEvHist.json b/MachineSim/conf/SimEvHist.json
similarity index 100%
rename from MachineSim/SimEvHist.json
rename to MachineSim/conf/SimEvHist.json
diff --git a/MachineSim/SimMachStat.json b/MachineSim/conf/SimMachStat.json
similarity index 100%
rename from MachineSim/SimMachStat.json
rename to MachineSim/conf/SimMachStat.json
diff --git a/MachineSim/SimMaint.json b/MachineSim/conf/SimMaint.json
similarity index 100%
rename from MachineSim/SimMaint.json
rename to MachineSim/conf/SimMaint.json
diff --git a/MachineSim/SimParams.json b/MachineSim/conf/SimParams.json
similarity index 100%
rename from MachineSim/SimParams.json
rename to MachineSim/conf/SimParams.json
diff --git a/MachineSim/SimProd.json b/MachineSim/conf/SimProd.json
similarity index 100%
rename from MachineSim/SimProd.json
rename to MachineSim/conf/SimProd.json
diff --git a/MachineSim/SimTools.json b/MachineSim/conf/SimTools.json
similarity index 100%
rename from MachineSim/SimTools.json
rename to MachineSim/conf/SimTools.json