Fanuc overrides

CMS_CORE_Library/Fanuc/Nc_Fanuc.cs

@@ -1438,8 +1438,6 @@ namespace CMS_CORE_Library.Fanuc
             processData.Reps = BitConverter.ToUInt16(bytes, 2);
 
             return NO_ERROR;
-
-            return NO_ERROR;
         }
 
         // Get the process Alarms
@@ -1739,18 +1737,37 @@ namespace CMS_CORE_Library.Fanuc
             
             OffsetModel offsetData = new OffsetModel();
             if(offsetId != 0)
-            // Read offset data
-            cmsError = TOOLS_ROffset(offsetId, ref offsetData);
+                // Read offset data
+                cmsError = TOOLS_ROffset(offsetId, ref offsetData);
+                if (cmsError.IsError())
+                    return cmsError;
+
+            byte rapid= 0, work = 0;
+            bool jogIsActive = false;
+            // read if jog is active
+            cmsError = MEM_RWBoolean(R, 0, MEMORY_TYPE.Fanuc_F, 3, 2, ref jogIsActive);
             if (cmsError.IsError())
                 return cmsError;
 
+            // Choose & read work override
+            int mem = jogIsActive ? (processId - 1) * 1000 + 10 : (processId - 1) * 1000 + 12;
+            cmsError = MEM_RWByte(R, 0, MEMORY_TYPE.Fanuc_G, mem, 0, ref work);
+            if (cmsError.IsError())
+                return cmsError;
+
+            // Read rapid
+            cmsError = MEM_RWByte(R, 0, MEMORY_TYPE.Fanuc_G, 96, 0, ref rapid);
+            if (cmsError.IsError())
+                return cmsError;
 
             processData = new SelectedProcessData()
             {
                 ActiveOffsetId = offsetId,
                 Origin = origin,
                 ProcessMessage = msg,
-                OffsetData = offsetData
+                OffsetData = offsetData,
+                RapidOverride = rapid,
+                WorkOverride = work
             };
 
             return NO_ERROR;

CMS_CORE_Library/Models/DataStructures.cs

@@ -413,9 +413,9 @@ namespace CMS_CORE_Library.Models
 
             public string ProcessMessage { get; set; }
 
-            public double RapidOverride { get; set; }
+            public byte RapidOverride { get; set; }
 
-            public ushort WorkOverride { get; set; }
+            public byte WorkOverride { get; set; }
 
             public OffsetModel OffsetData { get; set; }
         }

CMS_CORE_Library/Nc.cs

@@ -1805,12 +1805,12 @@ namespace CMS_CORE_Library
             ///////////////////////////////////////////////////////////////////
             //Siemens Memory Type,
             /** <summary>Siemens DB</summary> */
-            Siemens_DB = 0,
+            Siemens_DB = 1000,
 
             ///////////////////////////////////////////////////////////////////
             // Demo memory type
             /**<summary>Demo default memory</summary> **/
-            Demo = 0
+            Demo = 1000
         };
 
         // NC Memory Type Name

CMS_CORE_Library/Osai/Nc_Osai.cs

@@ -1353,7 +1353,6 @@ namespace CMS_CORE_Library.Osai
             return cmsError;
         }
 
-
         public override CmsError PLC_WExpiredCandy(bool value)
         {
             bool newVal = false;
@@ -1747,8 +1746,8 @@ namespace CMS_CORE_Library.Osai
                     ActiveOffsetId = (short)info.actualtooloff,
                     Origin = axOr,
                     ProcessMessage = message ?? "",
-                    RapidOverride = info.rapfeedov,
-                    WorkOverride = info.manfeedov,
+                    RapidOverride = Convert.ToByte(info.rapfeedov / 100),
+                    WorkOverride = Convert.ToByte(info.manfeedov / 100),
                     OffsetData = offsetData
                 };
 

CMS_CORE_Library/ToolConfigurations.cs

@@ -53,29 +53,29 @@ namespace CMS_CORE_Library
             {0, "generic"},
             {10, "angularTransmission"},
 
-            // Ultra sound rotation
-            {70, "ultrasoundRot10"},
-            {71, "ultrasoundRot20"},
-            {72, "ultrasoundRot30"},
-            {73, "ultrasoundRot40"},
-            {74, "ultrasoundRot50"},
-            {75, "ultrasoundRot60"},
-            {76, "ultrasoundRot70"},
-            {77, "ultrasoundRot80"},
-            {78, "ultrasoundRot90"},
-            {79, "ultrasoundRot100"},
+            // Disk ultra sound
+            {70, "diskUltrasound10"},
+            {71, "diskUltrasound20"},
+            {72, "diskUltrasound30"},
+            {73, "diskUltrasound40"},
+            {74, "diskUltrasound50"},
+            {75, "diskUltrasound60"},
+            {76, "diskUltrasound70"},
+            {77, "diskUltrasound80"},
+            {78, "diskUltrasound90"},
+            {79, "diskUltrasound100"},
 
-            // Ultra sound NO rotation
-            {80, "ultrasoundNoRot10"},
-            {81, "ultrasoundNoRot20"},
-            {82, "ultrasoundNoRot30"},
-            {83, "ultrasoundNoRot40"},
-            {84, "ultrasoundNoRot50"},
-            {85, "ultrasoundNoRot60"},
-            {86, "ultrasoundNoRot70"},
-            {87, "ultrasoundNoRot80"},
-            {88, "ultrasoundNoRot90"},
-            {89, "ultrasoundNoRot100"},
+            // Blade ultra sound
+            {80, "bladeUltrasound10"},
+            {81, "bladeUltrasound20"},
+            {82, "bladeUltrasound30"},
+            {83, "bladeUltrasound40"},
+            {84, "bladeUltrasound50"},
+            {85, "bladeUltrasound60"},
+            {86, "bladeUltrasound70"},
+            {87, "bladeUltrasound80"},
+            {88, "bladeUltrasound90"},
+            {89, "bladeUltrasound100"},
 
             {90, "blade1"},
             {91, "blade2"},