diff --git a/Step.Config/Config/headsConfig.xml b/Step.Config/Config/headsConfig.xml
index 40ab86d4..00b69d69 100644
--- a/Step.Config/Config/headsConfig.xml
+++ b/Step.Config/Config/headsConfig.xml
@@ -9,8 +9,8 @@
Testa 2
AWJ
- 55
- 80
+ 2.56
+ 5.00
Testa 3
diff --git a/Step.Config/Config/headsConfigValidator.xsd b/Step.Config/Config/headsConfigValidator.xsd
index 0eeb57c2..eaa44369 100644
--- a/Step.Config/Config/headsConfigValidator.xsd
+++ b/Step.Config/Config/headsConfigValidator.xsd
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs
index e90e8edb..f7c8c2c7 100644
--- a/Step.Config/ServerConfigController.cs
+++ b/Step.Config/ServerConfigController.cs
@@ -289,8 +289,8 @@ namespace Step.Config
Id = i++, // Autoincrement Id
Name = x.Element("name").Value,
Type = GetHeadType(x.Element("type").Value),
- WarningLimit = Convert.ToInt16(x.Element("warningLimit").Value),
- AlarmLimit = Convert.ToInt16(x.Element("alarmLimit").Value),
+ WarningLimit = Convert.ToDouble(x.Element("warningLimit").Value, CultureInfo.GetCultureInfo("en")),
+ AlarmLimit = Convert.ToDouble(x.Element("alarmLimit").Value, CultureInfo.GetCultureInfo("en")),
})
.ToList();
}
diff --git a/Step.Model/ConfigModels/HeadsConfigModel.cs b/Step.Model/ConfigModels/HeadsConfigModel.cs
index c8fad081..21b6acee 100644
--- a/Step.Model/ConfigModels/HeadsConfigModel.cs
+++ b/Step.Model/ConfigModels/HeadsConfigModel.cs
@@ -7,7 +7,7 @@ namespace Step.Model.ConfigModels
public int Id;
public string Name;
public HEAD_TYPE Type;
- public short WarningLimit;
- public short AlarmLimit;
+ public double WarningLimit;
+ public double AlarmLimit;
}
}
diff --git a/Step.Model/DTOModels/DTOHeadModel.cs b/Step.Model/DTOModels/DTOHeadModel.cs
index 0957ee60..3b7b6df5 100644
--- a/Step.Model/DTOModels/DTOHeadModel.cs
+++ b/Step.Model/DTOModels/DTOHeadModel.cs
@@ -75,7 +75,7 @@
{
public int ActualPressure;
public ushort Abrasive;
- public float Vacum;
+ public double Vacum;
public override bool Equals(object obj)
{
diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index 8b912272..7dac6554 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -569,18 +569,19 @@ namespace Step.NC
case HEAD_TYPE.AWJ:
{
- float vacumValue = (float)head.MountedTool_Vacum / 100;
+ double vacuumValue = (double)head.MountedTool_Vacum / 100;
+
heads.Add(new DTOAbrasiveWaterJet()
{
Id = head.Id,
Process = head.Process,
Type = configuredHead.Type.ToString(),
- inWarning = vacumValue >= configuredHead.WarningLimit,
- inAlarm = vacumValue >= configuredHead.AlarmLimit,
+ inWarning = Math.Abs(vacuumValue) >= Math.Abs(configuredHead.WarningLimit),
+ inAlarm = Math.Abs(vacuumValue) >= Math.Abs(configuredHead.AlarmLimit),
OverrideEditable = head.OverrideEditable,
ActualPressure = head.ActualSpeed_Pressure,
Abrasive = head.Load_Abrasive,
- Vacum = vacumValue,
+ Vacum = vacuumValue,
Override = head.Override,
IsActive = head.IsActive,
IsSelected = head.IsSelected