From b3632f923bc97495bbc1bddea6cdb247dc8d2b9b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 15 Nov 2018 14:26:30 +0100 Subject: [PATCH] Fix svuotamento area REDIS + fix ricodifica assi in nuovo formato --- MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs | 11 +-- .../SCMA/DATA/CONF/NameRepRolesList.map | 96 +++++++++---------- 2 files changed, 53 insertions(+), 54 deletions(-) diff --git a/MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs b/MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs index 16a2c99..d3f2f65 100644 --- a/MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs +++ b/MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs @@ -444,12 +444,11 @@ namespace OPC_UA_REDIS var listCNC_en = new List>(); var listPLC_en = new List>(); var listHMI_en = new List>(); - // resetto TUTTE le aree di competenza - hashKey = confHash(""); - redUtil.man.redFlushKey(redUtil.man.redHash("Adp")); - redUtil.man.redFlushKey(redUtil.man.redHash("AdpConf")); - redUtil.man.redFlushKey(redUtil.man.redHash("AdpVeto")); - redUtil.man.redFlushKey(redUtil.man.redHash("Machine")); + // resetto TUTTE le aree di competenza + redUtil.man.redFlushKey(redUtil.man.redHash("AdpVeto*")); + redUtil.man.redFlushKey(redUtil.man.redHash("AdpConf*")); + redUtil.man.redFlushKey(redUtil.man.redHash("Adp*")); + redUtil.man.redFlushKey(redUtil.man.redHash("Machine*")); // imposto valori "empty" di default.... listCNC_curr.Add(new KeyValuePair("000000000000|000", "NONE")); listCNC_en.Add(new KeyValuePair("000000000000|000", "NONE")); diff --git a/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map b/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map index 8193e71..6345b9c 100644 --- a/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map +++ b/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map @@ -25,54 +25,54 @@ A|I|CodG_ACT|CodGAct A|I|USER_ACTION|UserAction # variabili 1:1 per mapping "forzato" CMS 9110 -A|I|Axis_01_FeedAct|Axes:AxisX:FeedRate -A|I|Axis_02_FeedAct|Axes:AxisY:FeedRate -A|I|Axis_03_FeedAct|Axes:AxisZ:FeedRate -A|I|Axis_04_FeedAct|Axes:AxisB:FeedRate -A|I|Axis_05_FeedAct|Axes:AxisC:FeedRate -A|I|Axis_06_FeedAct|Axes:AxisV:FeedRate - -A|I|Axis_01_FeedOver|Axes:AxisX:Override -A|I|Axis_02_FeedOver|Axes:AxisY:Override -A|I|Axis_03_FeedOver|Axes:AxisZ:Override -A|I|Axis_04_FeedOver|Axes:AxisB:Override -A|I|Axis_05_FeedOver|Axes:AxisC:Override -A|I|Axis_06_FeedOver|Axes:AxisV:Override - -A|I|Axis_01_InvDDone|Axes:AxisX:Inversions -A|I|Axis_02_InvDDone|Axes:AxisY:Inversions -A|I|Axis_03_InvDDone|Axes:AxisZ:Inversions -A|I|Axis_04_InvDDone|Axes:AxisB:Inversions -A|I|Axis_05_InvDDone|Axes:AxisC:Inversions -A|I|Axis_06_InvDDone|Axes:AxisV:Inversions - -A|I|AV_Axis_01_Load|Axes:AxisX:Load -A|I|AV_Axis_02_Load|Axes:AxisY:Load -A|I|AV_Axis_03_Load|Axes:AxisZ:Load -A|I|AV_Axis_04_Load|Axes:AxisB:Load -A|I|AV_Axis_05_Load|Axes:AxisC:Load -A|I|AV_Axis_06_Load|Axes:AxisV:Load - -A|I|Axis_01_PosAct|Axes:AxisX:CurrentPos -A|I|Axis_02_PosAct|Axes:AxisY:CurrentPos -A|I|Axis_03_PosAct|Axes:AxisZ:CurrentPos -A|I|Axis_04_PosAct|Axes:AxisB:CurrentAng -A|I|Axis_05_PosAct|Axes:AxisC:CurrentAng -A|I|Axis_06_PosAct|Axes:AxisV:CurrentAng - -A|I|Axis_01_FeedOver|Axes:AxisX:Override -A|I|Axis_02_FeedOver|Axes:AxisY:Override -A|I|Axis_03_FeedOver|Axes:AxisZ:Override -A|I|Axis_04_FeedOver|Axes:AxisB:Override -A|I|Axis_05_FeedOver|Axes:AxisC:Override -A|I|Axis_06_FeedOver|Axes:AxisV:Override - -A|I|Axis_01_DistDone|Axes:AxisX:Distance -A|I|Axis_02_DistDone|Axes:AxisY:Distance -A|I|Axis_03_DistDone|Axes:AxisZ:Distance -A|I|Axis_04_DistDone|Axes:AxisB:Distance -A|I|Axis_05_DistDone|Axes:AxisC:Distance -A|I|Axis_06_DistDone|Axes:AxisV:Distance +#A|I|Axis_01_FeedAct|Axes:AxisX:FeedRate +#A|I|Axis_02_FeedAct|Axes:AxisY:FeedRate +#A|I|Axis_03_FeedAct|Axes:AxisZ:FeedRate +#A|I|Axis_04_FeedAct|Axes:AxisB:FeedRate +#A|I|Axis_05_FeedAct|Axes:AxisC:FeedRate +#A|I|Axis_06_FeedAct|Axes:AxisV:FeedRate +# +#A|I|Axis_01_FeedOver|Axes:AxisX:Override +#A|I|Axis_02_FeedOver|Axes:AxisY:Override +#A|I|Axis_03_FeedOver|Axes:AxisZ:Override +#A|I|Axis_04_FeedOver|Axes:AxisB:Override +#A|I|Axis_05_FeedOver|Axes:AxisC:Override +#A|I|Axis_06_FeedOver|Axes:AxisV:Override +# +#A|I|Axis_01_InvDDone|Axes:AxisX:Inversions +#A|I|Axis_02_InvDDone|Axes:AxisY:Inversions +#A|I|Axis_03_InvDDone|Axes:AxisZ:Inversions +#A|I|Axis_04_InvDDone|Axes:AxisB:Inversions +#A|I|Axis_05_InvDDone|Axes:AxisC:Inversions +#A|I|Axis_06_InvDDone|Axes:AxisV:Inversions +# +#A|I|AV_Axis_01_Load|Axes:AxisX:Load +#A|I|AV_Axis_02_Load|Axes:AxisY:Load +#A|I|AV_Axis_03_Load|Axes:AxisZ:Load +#A|I|AV_Axis_04_Load|Axes:AxisB:Load +#A|I|AV_Axis_05_Load|Axes:AxisC:Load +#A|I|AV_Axis_06_Load|Axes:AxisV:Load +# +#A|I|Axis_01_PosAct|Axes:AxisX:CurrentPos +#A|I|Axis_02_PosAct|Axes:AxisY:CurrentPos +#A|I|Axis_03_PosAct|Axes:AxisZ:CurrentPos +#A|I|Axis_04_PosAct|Axes:AxisB:CurrentAng +#A|I|Axis_05_PosAct|Axes:AxisC:CurrentAng +#A|I|Axis_06_PosAct|Axes:AxisV:CurrentAng +# +#A|I|Axis_01_FeedOver|Axes:AxisX:Override +#A|I|Axis_02_FeedOver|Axes:AxisY:Override +#A|I|Axis_03_FeedOver|Axes:AxisZ:Override +#A|I|Axis_04_FeedOver|Axes:AxisB:Override +#A|I|Axis_05_FeedOver|Axes:AxisC:Override +#A|I|Axis_06_FeedOver|Axes:AxisV:Override +# +#A|I|Axis_01_DistDone|Axes:AxisX:Distance +#A|I|Axis_02_DistDone|Axes:AxisY:Distance +#A|I|Axis_03_DistDone|Axes:AxisZ:Distance +#A|I|Axis_04_DistDone|Axes:AxisB:Distance +#A|I|Axis_05_DistDone|Axes:AxisC:Distance +#A|I|Axis_06_DistDone|Axes:AxisV:Distance #A|I|Path_01_FeedOverr|Axes:Override #A|I|Path_01_FeedRate|Axes:FeedRate