diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 9d78636d..8063e5d5 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.NC/NcToolTableHandler.cs b/Step.NC/NcToolTableHandler.cs
index 26dd5330..fbe6e856 100644
--- a/Step.NC/NcToolTableHandler.cs
+++ b/Step.NC/NcToolTableHandler.cs
@@ -801,5 +801,25 @@ namespace Step.NC
return numericalControl.PLC_WTerminateAssistedToolingProcedure();
}
}
+
+ public CmsError GetSelfAdaptiveStep(out byte step)
+ {
+ step = 0;
+
+ //Get the value
+ return numericalControl.TOOLS_RAdatpivePathStep(ref step);
+ }
+
+ public CmsError SetSelfAdaptiveStep(byte step)
+ {
+ //Limit Value
+ if (step > 100)
+ step = 100;
+ if (step < 0)
+ step = 0;
+
+ //Set the value
+ return numericalControl.TOOLS_WAdatpivePathStep(step);
+ }
}
}
\ No newline at end of file
diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml
index 0306fc67..fd5f44ca 100644
--- a/Step.Utils/languages/IT.xml
+++ b/Step.Utils/languages/IT.xml
@@ -56,8 +56,12 @@
Unità di misura Cn:Versione Server CMS-Active:Versione Core CMS-Active:
- Versione Client CMS-Active:
- Formato delle date CMS-Active:
+ Versione Client CMS-Active:
+ Formato delle date CMS-Active:
+ Versione Server Maestro-Active:
+ Versione Core Maestro-Active:
+ Versione Client Maestro-Active:
+ Formato delle date Maestro-Active:Rpm
diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml
index ea951165..cab6e5c8 100644
--- a/Step.Utils/languages/en.xml
+++ b/Step.Utils/languages/en.xml
@@ -56,8 +56,12 @@
Nc Unit measure:CMS-Active Server Version:CMS-Active Core Version:
- CMS-Active Client Version:
- CMS-Active Data Format:
+ CMS-Active Client Version:
+ CMS-Active Data Format:
+ Maestro-Active Server Version:
+ Maestro-Active Core Version:
+ Maestro-Active Client Version:
+ Maestro-Active Data Format:Rpm
diff --git a/Step/Desktop_Link/CMS Active.lnk b/Step/Desktop_Link/CMS Active.lnk
index df0b5e3a..90c9c16f 100644
Binary files a/Step/Desktop_Link/CMS Active.lnk and b/Step/Desktop_Link/CMS Active.lnk differ
diff --git a/Step/Desktop_Link/CMS.ico b/Step/Desktop_Link/CMS.ico
new file mode 100644
index 00000000..1b62ca77
Binary files /dev/null and b/Step/Desktop_Link/CMS.ico differ
diff --git a/Step/Desktop_Link/Maestro Active.lnk b/Step/Desktop_Link/Maestro Active.lnk
index df3ce9fd..1abce4e8 100644
Binary files a/Step/Desktop_Link/Maestro Active.lnk and b/Step/Desktop_Link/Maestro Active.lnk differ
diff --git a/Step/Desktop_Link/SCM.ico b/Step/Desktop_Link/SCM.ico
new file mode 100644
index 00000000..20341ff6
Binary files /dev/null and b/Step/Desktop_Link/SCM.ico differ
diff --git a/Step/Step.csproj b/Step/Step.csproj
index 9a04db7a..9134c163 100644
--- a/Step/Step.csproj
+++ b/Step/Step.csproj
@@ -239,6 +239,12 @@
App.config
+
+ Always
+
+
+ Always
+ bower.json
@@ -269,6 +275,12 @@
compilerconfig.json
+
+ Always
+
+
+ Always
+
diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/nc-softkeys.vue b/Step/wwwroot/src/app_modules/under-the-hood/components/nc-softkeys.vue
index 56f2a329..8a13acbc 100644
--- a/Step/wwwroot/src/app_modules/under-the-hood/components/nc-softkeys.vue
+++ b/Step/wwwroot/src/app_modules/under-the-hood/components/nc-softkeys.vue
@@ -33,7 +33,7 @@
-
+
diff --git a/Step/wwwroot/src/config.ts b/Step/wwwroot/src/config.ts
index c988f936..96f4b6ad 100644
--- a/Step/wwwroot/src/config.ts
+++ b/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 = true;
\ No newline at end of file
+export const USE_RUNTIME_CONFIGURATION = false;
\ No newline at end of file