Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Adaptive Step Controller

Browse Source
This commit is contained in:
Nicola Carminati
2019-04-05 17:21:33 +02:00
parent 11944294e9
commit f475cff913
11 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/CMS_CORE_Library.dll
BIN
View File
Binary file not shown.
Step.NC/NcToolTableHandler.cs
+20
View File
@@ -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);
}
}
}
Step.Utils/languages/IT.xml
+6 -2
View File
@@ -56,8 +56,12 @@
<machineinfo_umeas>Unità di misura Cn:</machineinfo_umeas>
<machineinfo_server_cms_version>Versione Server CMS-Active:</machineinfo_server_cms_version>
<machineinfo_core_cms_version>Versione Core CMS-Active:</machineinfo_core_cms_version>
<machineinfo_client_version>Versione Client CMS-Active:</machineinfo_client_version>
<machineinfo_dateformat>Formato delle date CMS-Active:</machineinfo_dateformat>
<machineinfo_cms_client_version>Versione Client CMS-Active:</machineinfo_cms_client_version>
<machineinfo_cms_dateformat>Formato delle date CMS-Active:</machineinfo_cms_dateformat>
<machineinfo_server_scm_version>Versione Server Maestro-Active:</machineinfo_server_scm_version>
<machineinfo_core_scm_version>Versione Core Maestro-Active:</machineinfo_core_scm_version>
<machineinfo_scm_client_version>Versione Client Maestro-Active:</machineinfo_scm_client_version>
<machineinfo_scm_dateformat>Formato delle date Maestro-Active:</machineinfo_scm_dateformat>
<!-- Head Info -->
<head_label_rpm>Rpm</head_label_rpm>
Step.Utils/languages/en.xml
+6 -2
View File
@@ -56,8 +56,12 @@
<machineinfo_umeas>Nc Unit measure:</machineinfo_umeas>
<machineinfo_server_cms_version>CMS-Active Server Version:</machineinfo_server_cms_version>
<machineinfo_core_cms_version>CMS-Active Core Version:</machineinfo_core_cms_version>
<machineinfo_client_version>CMS-Active Client Version:</machineinfo_client_version>
<machineinfo_dateformat>CMS-Active Data Format:</machineinfo_dateformat>
<machineinfo_cms_client_version>CMS-Active Client Version:</machineinfo_cms_client_version>
<machineinfo_cms_dateformat>CMS-Active Data Format:</machineinfo_cms_dateformat>
<machineinfo_server_scm_version>Maestro-Active Server Version:</machineinfo_server_scm_version>
<machineinfo_core_scm_version>Maestro-Active Core Version:</machineinfo_core_scm_version>
<machineinfo_scm_client_version>Maestro-Active Client Version:</machineinfo_scm_client_version>
<machineinfo_scm_dateformat>Maestro-Active Data Format:</machineinfo_scm_dateformat>
<!-- Head Info -->
<head_label_rpm>Rpm</head_label_rpm>
Step/Desktop_Link/CMS Active.lnk
BIN
View File
Binary file not shown.
Step/Desktop_Link/CMS.ico
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 104 KiB

Step/Desktop_Link/Maestro Active.lnk
BIN
View File
Binary file not shown.
Step/Desktop_Link/SCM.ico
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 101 KiB

Step/Step.csproj
+12
View File
@@ -239,6 +239,12 @@
<DependentUpon>App.config</DependentUpon>
</Content>
<Content Include="CMS_Icon.ico" />
<None Include="Desktop_Link\CMS.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Desktop_Link\SCM.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<Content Include="wwwroot\.bowerrc">
<DependentUpon>bower.json</DependentUpon>
</Content>
@@ -269,6 +275,12 @@
<None Include="compilerconfig.json.defaults">
<DependentUpon>compilerconfig.json</DependentUpon>
</None>
<None Include="Desktop_Link\CMS Active.lnk">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Desktop_Link\Maestro Active.lnk">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="wwwroot\Scripts\jquery-3.2.1.intellisense.js" />
<Content Include="wwwroot\Scripts\jquery-3.2.1.js" />
<Content Include="wwwroot\Scripts\jquery-3.2.1.min.js" />
Step/wwwroot/src/app_modules/under-the-hood/components/nc-softkeys.vue
+1 -1
View File
@@ -33,7 +33,7 @@
<div class="empty-space" v-if="!isVisible(10)"></div>
<button @click="ncClick(12)" v-if="isVisible(12)" :disabled="!isKeyActive(12)" :class="{active:isKeySelected(12) , readonly:isReadOnly(12)}" class="soft icon"><img src="assets/icons/under-hood-png/handle2.png">{{name(12)}}</button>
<div class="empty-space" v-if="!isVisible(11)"></div>
<div class="empty-space" v-if="!isVisible(12)"></div>
</div>
<div v-if="isSiemens() ">
<button @click="ncClick(1)" v-if="isVisible(1)" :disabled="!isKeyActive(1)" :class="{active:isKeySelected(1) , readonly:isReadOnly(1)}" class="soft icon"><img src="assets/icons/under-hood-png/automatic-blue@2x.png">{{name(1)}}</button>
Step/wwwroot/src/config.ts
+2 -2
View File
@@ -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;
export const USE_RUNTIME_CONFIGURATION = false;