WIP Scada

Fanuc fix

Step.Model/DatabaseModels/NcMagazinePositionModel.cs

@@ -26,7 +26,7 @@ namespace Step.Model.DatabaseModels
             {
                 MagazineId = obj.MagazineId,
                 PositionId = (ushort)obj.PositionId,
-                Disabled = obj.Disabled ? (byte)1 : (byte)0,
+                // Disabled = obj.Disabled ? (byte)1 : (byte)0,
                 Type = obj.Type
             };
         }

Step.NC/NcHandler.cs

@@ -1562,7 +1562,7 @@ namespace Step.NC
             magazineStatus = new DTOMagazineActionModel();
             MagazineActionModel libModel = new MagazineActionModel();
             // Read status from NC
-            CmsError cmsError = numericalControl.TOOLS_GetMagazinesStatus(ref libModel);
+            CmsError cmsError = numericalControl.TOOLS_RMagazineAction(ref libModel);
             if (cmsError.IsError())
                 return cmsError;
 
@@ -2464,7 +2464,7 @@ namespace Step.NC
                                 Value = new DTOScadaValueModel()
                                 {
                                     IsVisible = Convert.ToBoolean(val),
-                                    Value = Convert.ToBoolean(val)
+                                    Value = val2
                                 }
                             });
                         }
@@ -2479,6 +2479,7 @@ namespace Step.NC
 
         private SCADA_MEM_TYPE GetMemTypeFromString(string memType)
         {
+            memType = memType.ToUpper();
             switch (memType)
             {
                 case "BOOL":

Step/Controllers/WebApi/ScadaController.cs

@@ -17,7 +17,7 @@ namespace Step.Controllers.WebApi
         [Route("list")]
         public IHttpActionResult GetScadaList()
         {
-            using (NcHandler ncHandler = new NcHandler())
+            using (NcHandler ncHandler = new NcHandler()) 
             {
                 ncHandler.Connect();
                 CmsError cmsError = ncHandler.ReadScadaData(out List<DTOScadaModel> values);
@@ -35,7 +35,6 @@ namespace Step.Controllers.WebApi
             }
         }
 
-
         [Route("production/list")]
         public IHttpActionResult GetProductionPageList()
         {

Step/wwwroot/src/config.ts

@@ -5,8 +5,8 @@ export const CONFIGURATION_DEMO = "";
 
 
 //  stabilise quale configurazione deve leggere il client per andare in DEBUG
-export const DEBUG_CONFIGURATION = CONFIGURATION_SIEMENS;
+export const DEBUG_CONFIGURATION = CONFIGURATION_OSAI;
 
 // stabilisce se leggere la configurazione dal server o 
 // se utilizzare la configurazione locale 
-export const USE_RUNTIME_CONFIGURATION = false;
+export const USE_RUNTIME_CONFIGURATION = true;