Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/UpdateImaxAeromacDecoding'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-11-10 15:48:02 +01:00
parent 137456b70f 7066f25073
commit e1c8b84ff2
4 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/DATA/CONF/3026.json
+28
View File
@@ -3,6 +3,34 @@
},
"mMapRead": {
"StatusWord": {
"name": "StatusWord",
"description": "Word di Status",
"memAddr": "40002",
"tipoMem": "Int",
"index": 2,
"size": 1,
"func": "POINT",
"period": 90,
"factor": 1,
"minVal": 0,
"maxVal": 65536,
"unit": "BMap"
},
"StatusDetWord": {
"name": "StatusDetWord",
"description": "Word di Status",
"memAddr": "40005",
"tipoMem": "Int",
"index": 5,
"size": 1,
"func": "POINT",
"period": 90,
"factor": 1,
"minVal": 0,
"maxVal": 65536,
"unit": "BMap"
},
"FreqInverter": {
"name": "FreqInverter",
"description": "Frequenza Inverter",
IOB-WIN-NEXT/DATA/CONF/VL22.json
+16 -16
View File
@@ -37,7 +37,7 @@
"RamPosition": {
"name": "RamPosition",
"description": "Ram Position",
"memAddr": "DB1002.DBB18",
"memAddr": "DB1001.DBB18",
"tipoMem": "Int",
"index": 18,
"size": 2,
@@ -48,7 +48,7 @@
"LowerEjectorPosition": {
"name": "LowerEjectorPosition",
"description": "Lower Ejector Position",
"memAddr": "DB1002.DBB20",
"memAddr": "DB1001.DBB20",
"tipoMem": "Int",
"index": 20,
"size": 2,
@@ -59,7 +59,7 @@
"UpperTool": {
"name": "UpperTool",
"description": "Upper Tool",
"memAddr": "DB1002.DBB22",
"memAddr": "DB1001.DBB22",
"tipoMem": "Int",
"index": 22,
"size": 2,
@@ -70,7 +70,7 @@
"TempMainMotorU": {
"name": "TempMainMotorU",
"description": "Temp MainMotor U",
"memAddr": "DB1002.DBB24",
"memAddr": "DB1001.DBB24",
"tipoMem": "Int",
"index": 24,
"size": 2,
@@ -81,7 +81,7 @@
"TempMainMotorV": {
"name": "TempMainMotorV",
"description": "Temp MainMotor V",
"memAddr": "DB1002.DBB26",
"memAddr": "DB1001.DBB26",
"tipoMem": "Int",
"index": 26,
"size": 2,
@@ -92,7 +92,7 @@
"TempMainMotorW": {
"name": "TempMainMotorW",
"description": "Temp MainMotor W",
"memAddr": "DB1002.DBB28",
"memAddr": "DB1001.DBB28",
"tipoMem": "Int",
"index": 28,
"size": 2,
@@ -103,7 +103,7 @@
"TempSpindleNut": {
"name": "TempSpindleNut",
"description": "Temp Spindle Nut",
"memAddr": "DB1002.DBB30",
"memAddr": "DB1001.DBB30",
"tipoMem": "Int",
"index": 30,
"size": 2,
@@ -114,7 +114,7 @@
"TempMotoModule": {
"name": "TempMotoModule",
"description": "Temp Moto Module",
"memAddr": "DB1002.DBB32",
"memAddr": "DB1001.DBB32",
"tipoMem": "Int",
"index": 32,
"size": 2,
@@ -125,7 +125,7 @@
"TempOilCirculation": {
"name": "TempOilCirculation",
"description": "Temp Oil Circulation",
"memAddr": "DB1002.DBB34",
"memAddr": "DB1001.DBB34",
"tipoMem": "Int",
"index": 34,
"size": 2,
@@ -136,7 +136,7 @@
"TempHydraulicUnit": {
"name": "TempHydraulicUnit",
"description": "Temp Hydraulic Unit",
"memAddr": "DB1002.DBB36",
"memAddr": "DB1001.DBB36",
"tipoMem": "Int",
"index": 36,
"size": 2,
@@ -147,7 +147,7 @@
"PressHydraulicPump": {
"name": "PressHydraulicPump",
"description": "Press Hydraulic Pump",
"memAddr": "DB1002.DBB38",
"memAddr": "DB1001.DBB38",
"tipoMem": "Int",
"index": 38,
"size": 2,
@@ -158,7 +158,7 @@
"PressHydraulicAccumulator": {
"name": "PressHydraulicAccumulator",
"description": "Press Hydraulic Accumulator",
"memAddr": "DB1002.DBB40",
"memAddr": "DB1001.DBB40",
"tipoMem": "Int",
"index": 40,
"size": 2,
@@ -169,7 +169,7 @@
"PressCounterforceOil": {
"name": "PressCounterforceOil",
"description": "Press Counterforce Oil",
"memAddr": "DB1002.DBB42",
"memAddr": "DB1001.DBB42",
"tipoMem": "Int",
"index": 42,
"size": 2,
@@ -180,7 +180,7 @@
"PressCounterforceGas": {
"name": "PressCounterforceGas",
"description": "Press Counterforce Gas",
"memAddr": "DB1002.DBB44",
"memAddr": "DB1001.DBB44",
"tipoMem": "Int",
"index": 44,
"size": 2,
@@ -191,7 +191,7 @@
"ForcePressureActual": {
"name": "ForcePressureActual",
"description": "Force Pressure Actual",
"memAddr": "DB1002.DBB46",
"memAddr": "DB1001.DBB46",
"tipoMem": "DInt",
"index": 46,
"size": 4,
@@ -202,7 +202,7 @@
"ForceOnBushing": {
"name": "ForceOnBushing",
"description": "Force On Bushing",
"memAddr": "DB1002.DBB50",
"memAddr": "DB1001.DBB50",
"tipoMem": "Int",
"index": 50,
"size": 2,
IOB-WIN-NEXT/IobModbusTCPImaxAeromec.cs
+6 -6
View File
@@ -46,7 +46,7 @@ namespace IOB_WIN_NEXT
#region Protected Methods
/// <summary>
/// Restituisce status di emergenza, hard coded dall'area di allarmi
/// Restituisce status di emergenza
/// </summary>
protected bool EStop
{
@@ -55,15 +55,15 @@ namespace IOB_WIN_NEXT
bool answ = false;
int currStatus = 0;
// hard coded
int statusReg = 40003;
int statusReg = 40002;
// deve avere allarmi (è un allarme EStop)
if (hasAlarms())
{
int[] listInt = new int[2];
listInt = HoldingRegisterLUT[statusReg];
currStatus = ModbusClient.ConvertRegistersToInt(listInt);
// hard coded il 5° bit
answ = ((currStatus & (1 << 9)) > 0);
// hard coded il 9° bit a zero
answ = ((currStatus & (1 << 9)) == 0);
}
return answ;
}
@@ -79,7 +79,7 @@ namespace IOB_WIN_NEXT
bool answ = false;
int currStatus = 0;
// hard coded
int statusReg = 40003;
int statusReg = 40002;
int[] listInt = new int[2];
listInt = HoldingRegisterLUT[statusReg];
currStatus = ModbusClient.ConvertRegistersToInt(listInt);
@@ -98,7 +98,7 @@ namespace IOB_WIN_NEXT
bool answ = false;
int currStatus = 0;
// hard coded
int statusReg = 40003;
int statusReg = 40002;
int[] listInt = new int[2];
listInt = HoldingRegisterLUT[statusReg];
currStatus = ModbusClient.ConvertRegistersToInt(listInt);
IOB-WIN-NEXT/IobSiemensLasco.cs
+3
View File
@@ -203,7 +203,10 @@ namespace IOB_WIN_NEXT
// verifica SE aggiungere il veto reset contapezzi
if (forcePzReset)
{
// reset shift counter
valore += 2;
// reset type counter
valore += 4;
// controlla se resettare il pz reset...
forcePzReset = forcePzResetUntil >= DateTime.Now;
}