Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new/ThermoCamManager' into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-03-18 09:49:59 +01:00
parent 83d6f40491 86fd710aaa
commit c31edb94d5
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active.Config/Config/serverConfig.xml
+3 -3
View File
@@ -133,7 +133,7 @@
<thread name="axis" value="200" />
<thread name="channelsIoFast" value="300" />
<thread name="channelsIoSlow" value="5000" />
<thread name="area" value="500" />
<thread name="area" value="2500" />
<thread name="confReq" value="2000" />
<thread name="expMan" value="30000" />
<thread name="functionEnab" value="300" />
@@ -145,12 +145,12 @@
<thread name="prodInfo" value="1000" />
<thread name="prodPanel" value="500" />
<thread name="modules" value="200" />
<thread name="recipe" value="4000" />
<thread name="recipe" value="1000" />
<thread name="scada" value="1000" />
<thread name="statusCommand" value="250" />
<thread name="FlirCamera" value="500" />
<thread name="userSK" value="250" />
<thread name="warmers" value="500" />
<thread name="warmers" value="2000" />
<thread name="watchdog" value="250" />
<thread name="stats" value="2000" />
</sampling>
Thermo.Active.NC/NcAdapter.cs
+4 -2
View File
@@ -1414,7 +1414,9 @@ namespace Thermo.Active.NC
// leggo la ricetta dal PLC!
var currRecipe = new Dictionary<string, DTORecipeParam>();
libraryError = ReadFullRecipe(out currRecipe);
//libraryError = ReadFullRecipe(out currRecipe);
libraryError = ReadRecipeData(true, true, out currRecipe);
if (libraryError.IsError())
return libraryError;
@@ -1685,7 +1687,7 @@ namespace Thermo.Active.NC
var currRecipe = new Dictionary<string, DTORecipeParam>();
// read recipe
libraryError = ReadRecipeData(false, true, out currRecipe);
libraryError = ReadRecipeData(true, true, out currRecipe);
if (libraryError.IsError())
return libraryError;
Thermo.Active/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.1.181")]
[assembly: AssemblyVersion("1.1.182")]