Egalware/CMS-MTConn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix svuotamento area REDIS + fix ricodifica assi in nuovo formato

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-11-15 14:26:30 +01:00
parent 4bf6bb39dc
commit b3632f923b
2 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs
+5 -6
View File
@@ -444,12 +444,11 @@ namespace OPC_UA_REDIS
var listCNC_en = new List<KeyValuePair<string, string>>();
var listPLC_en = new List<KeyValuePair<string, string>>();
var listHMI_en = new List<KeyValuePair<string, string>>();
// 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<string, string>("000000000000|000", "NONE"));
listCNC_en.Add(new KeyValuePair<string, string>("000000000000|000", "NONE"));
MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map
+48 -48
View File
@@ -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