7 Commits

Author SHA1 Message Date
S.E.Locatelli c691a677d2 centerfrigo:
- update conf e scrittura real
- è LowHigh (NON HighLow)
- da aggiornare SDK
2022-07-13 18:10:05 +02:00
S.E.Locatelli b55cb314f2 Merge remote-tracking branch 'origin/HEAD' into Feature/Giacovelli 2022-07-13 17:49:30 +02:00
Samuele Locatelli 3a2749d947 Merge branch 'release/FixDisplayCOntapezziFanuc' 2022-07-12 11:43:04 +02:00
Samuele Locatelli 8b34765ad5 Update display contapezzi x FANUC (dopo lettura valori da MACRO) 2022-07-12 11:42:43 +02:00
Samuele Locatelli ebc7afc455 Merge tag 'UpdateAuxMacro' into develop
Update x gestione nuova delle p-code
2022-07-12 11:07:06 +02:00
Samuele Locatelli 3bd9da0949 Merge branch 'release/UpdateAuxMacro' 2022-07-12 11:06:50 +02:00
Samuele Locatelli 11fd84276c Update con nuova libreria FANUC 2022-07-12 11:06:18 +02:00
6 changed files with 77 additions and 15 deletions
+64 -8
View File
@@ -1,17 +1,73 @@
{
"mMapWrite": {
"TestWrite": {
"name": "TestWrite",
"description": "Test Scrittura",
"memAddr": "41621",
"tipoMem": "Real",
"index": 1621,
"TestWrite01": {
"name": "TestWrite01",
"description": "Test Scrittura 01",
"memAddr": "44010",
"tipoMem": "FloatBADC",
"index": 4010,
"size": 2,
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": -100,
"maxVal": 100,
"minVal": 0,
"maxVal": 15,
"unit": "°C"
},
"TestWrite02": {
"name": "TestWrite02",
"description": "Test Scrittura 02",
"memAddr": "44012",
"tipoMem": "FloatBADC",
"index": 4012,
"size": 2,
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": 0,
"maxVal": 15,
"unit": "°C"
},
"TestWrite03": {
"name": "TestWrite03",
"description": "Test Scrittura 03",
"memAddr": "44014",
"tipoMem": "FloatBADC",
"index": 4014,
"size": 2,
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": 0,
"maxVal": 15,
"unit": "°C"
},
"TestWrite04": {
"name": "TestWrite04",
"description": "Test Scrittura 04",
"memAddr": "44016",
"tipoMem": "FloatBADC",
"index": 4016,
"size": 2,
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": 0,
"maxVal": 15,
"unit": "°C"
},
"TestWrite05": {
"name": "TestWrite05",
"description": "Test Scrittura 05",
"memAddr": "44018",
"tipoMem": "FloatBADC",
"index": 4018,
"size": 2,
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": 0,
"maxVal": 15,
"unit": "°C"
},
"SetPoint_Tunnel": {
+1 -1
View File
@@ -38,6 +38,6 @@ CLI_INST=SteamWareSim
;STARTLIST=GIACO_ICOEL_002
;STARTLIST=GIACO_CENTERFRIGO
;STARTLIST=GIACO_NWSE
STARTLIST=SIMUL_01
STARTLIST=GIACO_CENTERFRIGO
MAXCNC=10
+1 -1
View File
@@ -94,7 +94,7 @@
<HintPath>..\packages\EgwProxy.Icoel.3.6.2206.2811\lib\EgwProxy.Icoel.DataLayer.dll</HintPath>
</Reference>
<Reference Include="EgwProxy.MultiCncLib, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EgwProxy.MultiCncLib.3.6.2207.1116\lib\EgwProxy.MultiCncLib.dll</HintPath>
<HintPath>..\packages\EgwProxy.MultiCncLib.3.6.2207.1211\lib\EgwProxy.MultiCncLib.dll</HintPath>
</Reference>
<Reference Include="EgwProxy.OsaiCncLib, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EgwProxy.OsaiCncLib.3.6.2205.2015\lib\EgwProxy.OsaiCncLib.dll</HintPath>
+4 -4
View File
@@ -1112,10 +1112,10 @@ namespace IOB_WIN_NEXT
int newVal = -1;
Int32.TryParse(outputVal.ToString(), out newVal);
contapezziPLC = newVal > -1 ? newVal : contapezziPLC;
if (isVerboseLog)
{
lgInfo("[3] contapezziPLC contapezzi: {0}", contapezziPLC);
}
//if (isVerboseLog)
//{
lgInfo("[3] contapezziPLC contapezzi: {0}", contapezziPLC);
//}
}
stopwatch.Stop();
}
+6
View File
@@ -822,6 +822,12 @@ namespace IOB_WIN_NEXT
fatto = writeInputReg(currMem.index, CurrVal);
break;
case plcDataType.FloatBADC:
valDouble = getScaledDouble(currMem);
CurrVal = ModbusClient.ConvertFloatToRegisters((float)valDouble, ModbusClient.RegisterOrder.LowHigh);
fatto = writeInputReg(currMem.index, CurrVal);
break;
//case plcDataType.String:
// // se ho writePre --> "allungo" di 2 la dimensione della stringa x MemBlock...
// if (writePre)
+1 -1
View File
@@ -3,7 +3,7 @@
<package id="Autoupdater.NET.Official" version="1.7.0" targetFramework="net462" />
<package id="EasyModbusTCP" version="5.6.0" targetFramework="net462" />
<package id="EgwProxy.Icoel" version="3.6.2206.2811" targetFramework="net462" />
<package id="EgwProxy.MultiCncLib" version="3.6.2207.1116" targetFramework="net462" />
<package id="EgwProxy.MultiCncLib" version="3.6.2207.1211" targetFramework="net462" />
<package id="EgwProxy.OsaiCncLib" version="3.6.2205.2015" targetFramework="net462" />
<package id="EntityFramework" version="6.4.4" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2206.2718" targetFramework="net462" />