diff --git a/Step.Config/Config/ncSoftKeyConfig.xml b/Step.Config/Config/ncSoftKeyConfig.xml
index 050f9417..7942bc27 100644
--- a/Step.Config/Config/ncSoftKeyConfig.xml
+++ b/Step.Config/Config/ncSoftKeyConfig.xml
@@ -3,114 +3,141 @@
true
Auto
+ false
true
Edit
+ false
true
Mdi
+ false
true
Dnc
+ false
[
true
Ref
+ false
]
true
Jog
+ false
true
Jog Inc
+ false
true
Restart
+ false
true
Teach
+ false
true
Restract
+ false
true
Wcs Mcs
+ false
true
Handle
+ true
true
Reset
+ false
true
Blk/Blk
+ false
true
Blk Del
+ false
true
OpStop
+ false
true
DryRun
+ false
true
PrgTest
+ false
true
Manual Handle Interrupt
+ false
true
Teach In
+ false
true
- Inc Plane
+ Inc Planefalse
true
+
+ false
true
-
+ false
true
Rapid
+ false
true
x1
+ false
true
x10
+ false
true
x10
+ false
true
x10
+ false
\ No newline at end of file
diff --git a/Step.Config/Config/ncSoftKeyConfigValidator.xsd b/Step.Config/Config/ncSoftKeyConfigValidator.xsd
index 3217250c..7384a502 100644
--- a/Step.Config/Config/ncSoftKeyConfigValidator.xsd
+++ b/Step.Config/Config/ncSoftKeyConfigValidator.xsd
@@ -8,7 +8,8 @@
-
+
+
diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs
index aea019a2..53386dc0 100644
--- a/Step.Config/ServerConfigController.cs
+++ b/Step.Config/ServerConfigController.cs
@@ -221,7 +221,8 @@ namespace Step.Config
Id = GetPlcIdFromNcSoftKey(x.Name.ToString()),
Name = x.Name.ToString(),
VisualizedName = x.Element("visualizedName").Value,
- IsActive = Convert.ToBoolean(x.Element("active").Value)
+ IsActive = Convert.ToBoolean(x.Element("active").Value),
+ IsReadOnly = Convert.ToBoolean(x.Element("readOnly").Value)
})
.ToList();
}
diff --git a/Step.Model/ConfigModels/NcSoftKeysModel.cs b/Step.Model/ConfigModels/NcSoftKeysModel.cs
index b9c19c02..d6b4065c 100644
--- a/Step.Model/ConfigModels/NcSoftKeysModel.cs
+++ b/Step.Model/ConfigModels/NcSoftKeysModel.cs
@@ -4,6 +4,7 @@
{
public int Id;
public bool IsActive;
+ public bool IsReadOnly;
public string Name;
public string VisualizedName;
}
diff --git a/Step/Controllers/WebApi/ConfigurationController.cs b/Step/Controllers/WebApi/ConfigurationController.cs
index 33d49873..03bdaec9 100644
--- a/Step/Controllers/WebApi/ConfigurationController.cs
+++ b/Step/Controllers/WebApi/ConfigurationController.cs
@@ -51,7 +51,7 @@ namespace Step.Controllers.WebApi
}
[Route("softKeys"), HttpGet]
- public IHttpActionResult GetSoftKeysConfig()
+ public IHttpActionResult GetUserSoftKeysConfig()
{
Dictionary> output = new Dictionary>();
foreach (var softKey in SoftKeysConfig)