Merge remote-tracking branch 'origin/develop' into new/ThermoCamManager

Client2020/Client2020.csproj

@@ -180,7 +180,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+      <ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\cef.redist.x64.84.4.1\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.84.4.1\build\cef.redist.x64.props'))" />
     <Error Condition="!Exists('..\packages\cef.redist.x86.84.4.1\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.84.4.1\build\cef.redist.x86.props'))" />

Thermo.Active.Config/Config/serverConfig.xml

@@ -4,6 +4,7 @@
         <ncVendor>S7NET</ncVendor>
         <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI/S7NET -->
         <showNcHMI>false</showNcHMI>
+        <!--<ncIpAddress>192.168.139.1</ncIpAddress>-->
         <ncIpAddress>192.168.0.102</ncIpAddress>
         <ncPort>102</ncPort>
         <machineModel>Thermo 2020</machineModel>
@@ -140,7 +141,7 @@
         <thread name="expMan" value="30000" />
         <thread name="functionEnab" value="300" />
         <thread name="gauges" value="500" />
-        <thread name="m154" value="500" />
+        <thread name="m154" value="1000" />
         <thread name="mCommands" value="250" />
         <thread name="powerOn" value="500" />
         <thread name="prodCycle" value="1000" />

Thermo.Active.Core/app.config

@@ -38,10 +38,6 @@
         <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="S7.Net" publicKeyToken="d5812d469e84c693" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.8.1.0" newVersion="0.8.1.0" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

Thermo.Active.Database/App.config

@@ -57,10 +57,6 @@
                 <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="S7.Net" publicKeyToken="d5812d469e84c693" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-0.8.1.0" newVersion="0.8.1.0" />
-            </dependentAssembly>
         </assemblyBinding>
     </runtime>
 </configuration>

Thermo.Active.Database/Controllers/RedisController.cs

@@ -37,8 +37,10 @@ namespace Thermo.Active.Database.Controllers
         private const string machineMessagePath = "Events:Messages";
 
 
-        private const string thermoSemRecipe = "Thermo:Semaphore:Recipe";
-        private const string thermoSemWarmers = "Thermo:Semaphore:Warmers";
+        private const string thermoSemRecipe = "Thermo:Semaphore:All";
+        private const string thermoSemWarmers = "Thermo:Semaphore:All";
+        //private const string thermoSemRecipe = "Thermo:Semaphore:Recipe";
+        //private const string thermoSemWarmers = "Thermo:Semaphore:Warmers";
 
         public static void WriteProductionNotification(uint ProductionProcess, string Notification)
         {

Thermo.Active.NC/NcAdapter.cs

@@ -475,10 +475,16 @@ namespace Thermo.Active.NC
             // solo x S7...
             if (NcConfig.NcVendor == NC_VENDOR.S7NET)
             {
+                // registro in redis blocco x lettura ricetta...
+                RedisController.setRecipeReadSem(true);
+
                 // call NC for update
                 CmsError libraryError = numericalControl.PLC_WRecipeEdit(confirmUpdate);
                 if (libraryError.IsError())
                     return libraryError;
+
+                // tolgo blocco x lettura ricetta...
+                RedisController.setRecipeReadSem(false);
             }
             else
             {
@@ -1764,10 +1770,16 @@ namespace Thermo.Active.NC
                 {
                     if (NcFileAdapter.RecipeLiveData.ChannelSetpoints != null)
                     {
+                        // registro in redis blocco x lettura ricetta...
+                        RedisController.setRecipeReadSem(true);
+
                         // se si in questo caso scrivo configurazione...
                         WriteRecipeWarmConfig();
                         // Ack !
                         libraryError = numericalControl.PLC_WAckConfRiskRequest();
+
+                        // tolgo in redis blocco x lettura ricetta...
+                        RedisController.setRecipeReadSem(false);
                     }
                 }
                 if (ThermoReqConfRecipeStr)
@@ -1795,8 +1807,12 @@ namespace Thermo.Active.NC
                                 return NOT_FOUND_ERROR;
                             }
                         }
+                        // registro in redis blocco x lettura ricetta...
+                        RedisController.setRecipeReadSem(true);
                         // se si in questo caso scrivo configurazione attuale...
                         WriteRecipeParams(updtRecipe, nMaxParamWrite, delayParamWrite);
+                        // tolgo in redis blocco x lettura ricetta...
+                        RedisController.setRecipeReadSem(false);
 
                         using (UserSoftkeysController controller = new UserSoftkeysController())
                         {
@@ -1813,6 +1829,9 @@ namespace Thermo.Active.NC
                             newRisk.Add(item.Key, item.Value);
                         }
 
+                        // registro in redis blocco x lettura ricetta...
+                        RedisController.setRecipeReadSem(true);
+
                         // write to PLC SetPointHMI (%)
                         libraryError = WriteRecipeWarmChSetpHMI(newRisk);
                         if (libraryError.IsError())
@@ -1827,6 +1846,9 @@ namespace Thermo.Active.NC
                         libraryError = ConfirmRecipeData(true);
                         if (libraryError.IsError())
                             return libraryError;
+
+                        // tolgo in redis blocco x lettura ricetta...
+                        RedisController.setRecipeReadSem(true);
                     }
                 }
             }
@@ -3421,8 +3443,14 @@ namespace Thermo.Active.NC
         /// <returns></returns>
         public CmsError SetTCamActiv(bool enableTCam)
         {
+            // registro in redis blocco x lettura ricetta...
+            RedisController.setWarmersReadSem(true);
+
             CmsError libraryError = numericalControl.PLC_WTCamActiv(enableTCam);
 
+            // tolgo in redis blocco x lettura ricetta...
+            RedisController.setWarmersReadSem(false);
+
             return libraryError;
         }
 
@@ -3433,8 +3461,14 @@ namespace Thermo.Active.NC
         /// <returns></returns>
         public CmsError SetTCamMode(bool enableTCam)
         {
+            // registro in redis blocco x lettura ricetta...
+            RedisController.setWarmersReadSem(true);
+
             CmsError libraryError = numericalControl.PLC_WTCamMode(enableTCam);
 
+            // tolgo in redis blocco x lettura ricetta...
+            RedisController.setWarmersReadSem(false);
+
             return libraryError;
         }
 

Thermo.Active.NC/app.config

@@ -38,10 +38,6 @@
         <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="S7.Net" publicKeyToken="d5812d469e84c693" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.8.1.0" newVersion="0.8.1.0" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

Thermo.Active.UI/app.config

@@ -38,10 +38,6 @@
         <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="S7.Net" publicKeyToken="d5812d469e84c693" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.8.1.0" newVersion="0.8.1.0" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

Thermo.Active/App.config

@@ -115,10 +115,6 @@
                 <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="S7.Net" publicKeyToken="d5812d469e84c693" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-0.8.1.0" newVersion="0.8.1.0" />
-            </dependentAssembly>
         </assemblyBinding>
     </runtime>
     <connectionStrings>

Thermo.Active/Listeners/SignalR/SignalRListener.cs

@@ -326,6 +326,10 @@ namespace Thermo.Active.Listeners.SignalR
                 lastSetpointHmiInvalid = currMessage;
                 var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
                 context.Clients.Group("ncData").setpointHmiInvalid(currMessage);
+
+                context.Clients.Group("ncData").recipeFullDataInvalidSetpoint(LastRecipeFullData);
+                context.Clients.Group("ncData").warmersData(LastWarmersData);
+
             }
         }
 
@@ -686,7 +690,7 @@ namespace Thermo.Active.Listeners.SignalR
             // Send THERMO Recipe data
             group.recipeFullData(LastRecipeFullData);
             group.recipeOverData(LastRecipeOverData);
-            group.setpointHmiInvalid();
+
             // Send THERMO Modules data
             group.modulesData(LastModulesData);
             // Send THERMO Warmers data
@@ -696,6 +700,8 @@ namespace Thermo.Active.Listeners.SignalR
             group.gaugeData(LastLiveProdData);
             // THERMO prod info data
             group.prodInfoData(LastProdInfoData);
+
+            group.prodPanelData(LastProdPanelData);
             // THERMO prod cycle data
             group.prodCycleData(LastProdCycleData);
 

Thermo.Active/Properties/AssemblyInfo.cs

@@ -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.187")]
+[assembly: AssemblyVersion("1.1.191")]

Thermo.Active/wwwroot/src/app.business-logic.ts

@@ -12,6 +12,7 @@ import { loginService, machineService, localizationService } from "./services";
 import { prodService } from "./services/prodService";
 import * as iziToast from "izitoast";
 import { underTheHoodService } from "./services/underTheHoodService";
+import { warmersService } from "./services/warmersService";
 
 // import { UsersService } from "./services/usersService";
 
@@ -60,19 +61,16 @@ async function loadMachineConfig() {
 
   await loginService.getUserInfo();
 
-
   try {
     let machine = new machineService();
     let result = await machine.getAreasConfiguration();
     machineStatusActions.setAreasConfg(store, result);
 
     let mcresult = await machine.getMachineConfiguration();
+    await underTheHoodService.getChannelsConfig();
+    await warmersService.GetResistances();
     machineStatusActions.setWarmersParameters(store, mcresult.additionalParameters);
 
-    await prodService.GetProdPanel();
-
-    await underTheHoodService.getChannels();
-    await underTheHoodService.getChannelsConfig();
 
     // load default language
     if (!(store.state as AppModel).localization.currentLanguage) {

Thermo.Active/wwwroot/src/app_modules_thermo/dashboard/dashboard.ts

@@ -130,8 +130,6 @@ export default class Dashboard extends Vue {
   }
 
   async mounted() {
-    prodService.GetProdPanel();
-
     let $this = this;
     setInterval(() => {
       $this.now = moment();

Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts

@@ -239,7 +239,10 @@ export default class Thermocamera extends Vue {
   }
 
   async openImageModal() {
-    ModalHelper.modalImage.title = moment(this.TCamData.lastTakenImage).format("L") + " - " + moment(this.TCamData.lastTakenImage).format("LTS");
+
+    if(this.TCamData){
+      ModalHelper.modalImage.title = moment(this.TCamData.lastTakenImage).format("L") + " - " + moment(this.TCamData.lastTakenImage).format("LTS");
+    }
     ModalHelper.modalImage.content = this.thermocameraOriginalUrl;
     ModalHelper.ShowModal(ModalImage, "modal2");
   }

Thermo.Active/wwwroot/src/main.ts

@@ -24,12 +24,6 @@ import "./app.business-logic";
 import "./app.modules";
 import { messageService } from "src/_base";
 
-import { warmersService } from "./services/warmersService";
-warmersService.GetChannels();
-warmersService.GetResistances();
-import { prodService } from "./services/prodService";
-prodService.GetProd();
-
 const App = () =>
   import("./App.vue");
 

Thermo.Active/wwwroot/src/services/hub.ts

@@ -113,6 +113,7 @@ export class Hub {
 
     //  qui i NUOVI metodi NUOVI dal server (Recipe, gauges) da completare lato HUB
     this._hub.client.recipeFullData = Hub.recipeFullData;
+    this._hub.client.recipeFullDataInvalidSetpoint = Hub.recipeFullDataInvalidSetpoint;    
     this._hub.client.warmersData = Hub.warmersData;
     this._hub.client.setpointHmiInvalid = Hub.setpointHmiInvalid;
     this._hub.client.recipeOverData = Hub.recipeOverData;
@@ -201,14 +202,17 @@ export class Hub {
     recipeActions.setCurrent(store, data, true);
   }
 
+  
+  public static recipeFullDataInvalidSetpoint(data) {
+    recipeActions.setCurrent(store, data, false);
+  }
+
   public static warmersData(data) {
     warmersActions.setChannels(store, data as { [id: number]: Warmers.IChannel });
   }
 
   public static async setpointHmiInvalid(data) {
     if (data) {
-      await recipeService.GetCurrent();
-      await warmersService.GetChannels();
       await warmersService.GetThermocameraStatus();
       // await recipeService.GetOverview();
     }
@@ -231,11 +235,14 @@ export class Hub {
     prodActions.setProd(store, data);
   }
 
+
+  
   public updateAuthToken() {
     // Set or update authorization token
     let authData = JSON.parse(window.localStorage.getItem("authorizationData") || window.sessionStorage.getItem("authorizationData")) as AuthToken;
 
     $.connection.hub.qs = {};
+    console.log(authData);
     if (authData)
       $.connection.hub.qs.Authorization = authData.access_token;
 
@@ -243,6 +250,7 @@ export class Hub {
       $.connection.hub.qs.CmsClientId = cmsClient.getClientID;
   }
 
+
   private logout(e) {
     if (e)
       appModelActions.CheckLogoff(store, e.id);