From 125cce1983ce747a9e300e663ee844e6daafbb6d Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 10 Jun 2025 18:29:01 +0200 Subject: [PATCH] Include : - aggiunte costanti per utensile di tipo Probe - aggiunte costanti per operazione/lavorazione Probing. --- EMkMachiningConst.h | 3 ++- EMkOperationConst.h | 11 +++++++---- EMkToolConst.h | 12 ++++++++---- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h index 87a1069..57dafb4 100644 --- a/EMkMachiningConst.h +++ b/EMkMachiningConst.h @@ -68,7 +68,8 @@ enum MachiningType { MT_SURFROUGHING = OPER_SURFROUGHING, MT_SURFFINISHING = OPER_SURFFINISHING, MT_WATERJETTING = OPER_WATERJETTING, - MT_FIVEAXISMILLING = OPER_FIVEAXISMILLING + MT_FIVEAXISMILLING = OPER_FIVEAXISMILLING, + MT_PROBING = OPER_PROBING } ; //---------------------------------------------------------------------------- diff --git a/EMkOperationConst.h b/EMkOperationConst.h index 9ad0636..a8de54c 100644 --- a/EMkOperationConst.h +++ b/EMkOperationConst.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2015-2024 +// EgalTech 2015-2025 //---------------------------------------------------------------------------- -// File : EmkOperationConst.h Data : 22.05.24 Versione : 2.6e5 +// File : EmkOperationConst.h Data : 09.06.25 Versione : 2.7f2 // Contenuto : Costanti delle operazioni. // // @@ -13,6 +13,7 @@ // 25.05.19 DS Agg. SurfRoughing e SurfFinishing. // 08.07.19 DS Agg. WaterJetting. // 06.09.23 DS Agg. 5AxMachining. +// 09.06.25 DS Agg. Probing. // //---------------------------------------------------------------------------- @@ -33,7 +34,8 @@ enum OperType { OPER_NULL = 0, // nulla OPER_SURFROUGHING = 0x040000, // sgrossatura superficie OPER_SURFFINISHING = 0x080000, // finitura superficie OPER_WATERJETTING = 0x100000, // taglio water jet - OPER_FIVEAXISMILLING = 0x200000} ; // lavorazione 5 assi + OPER_FIVEAXISMILLING = 0x200000, // lavorazione 5 assi + OPER_PROBING = 0x400000} ; // tastatura // Controllo tipo valido bool inline IsValidDispositionType( int nType) { @@ -53,5 +55,6 @@ bool inline IsValidMachiningType( int nType) nType == OPER_SURFROUGHING || nType == OPER_SURFFINISHING || nType == OPER_WATERJETTING || - nType == OPER_FIVEAXISMILLING) ; + nType == OPER_FIVEAXISMILLING || + nType == OPER_PROBING) ; } diff --git a/EMkToolConst.h b/EMkToolConst.h index 9eda38c..972d35a 100644 --- a/EMkToolConst.h +++ b/EMkToolConst.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2015-2021 +// EgalTech 2015-2025 //---------------------------------------------------------------------------- -// File : EmkToolConst.h Data : 16.09.21 Versione : 2.3i6 +// File : EmkToolConst.h Data : 09.06.25 Versione : 2.7f2 // Contenuto : Costanti degli utensili. // // @@ -11,6 +11,7 @@ // 20.09.18 DS Agg. costanti per ToolHolder // 05.04.21 DS Agg. TPA_DIST e TPA_STEMDIAM. // 16.09.21 DS Agg. TPA_CORE. +// 09.06.25 DS Agg. probe. // //---------------------------------------------------------------------------- @@ -27,6 +28,7 @@ const int TF_MORTISE = 0x0800 ; // 2048 const int TF_CHISEL = 0x1000 ; // 4096 const int TF_WATERJET = 0x2000 ; // 8192 const int TF_COMPO = 0x4000 ; // 16384 +const int TF_PROBE = 0x8000 ; // 32768 // Costante per tutte le famiglie const int TF_ALL = 0xFF00 ; // Tipologie di utensili @@ -42,7 +44,8 @@ enum ToolType { TT_MORTISE_STD = TF_MORTISE + 0, // 2048 TT_CHISEL_STD = TF_CHISEL + 0, // 4096 TT_WATERJET = TF_WATERJET + 0, // 8192 - TT_COMPO = TF_COMPO + 0 // 16384 + TT_COMPO = TF_COMPO + 0, // 16384 + TT_PROBE = TF_PROBE + 0 // 32768 } ; // Controllo tipo valido bool inline IsValidToolType( int nType) @@ -53,7 +56,8 @@ bool inline IsValidToolType( int nType) nType == TT_MORTISE_STD || nType == TT_CHISEL_STD || nType == TT_WATERJET || - nType == TT_COMPO) ; + nType == TT_COMPO || + nType == TT_PROBE) ; } //----------------------------------------------------------------------------