From 1a6fcaee1bf5da88dfb803ae78fbb775394c4d74 Mon Sep 17 00:00:00 2001
From: "MJ.Jun" <mjun@intrepidcs.com>
Date: Thu, 3 Apr 2025 14:12:20 -0400
Subject: [PATCH 1/4] For Vspy3 921_depricate branch

---
 doc/source/index.rst              | 30 +++++++++++++++---------------
 include/ics/icsnVC40.h            | 30 +++++++++++++++---------------
 src/methods.cpp                   | 30 +++++++++++++++---------------
 src/setup_module_auto_defines.cpp | 30 +++++++++++++++---------------
 4 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/doc/source/index.rst b/doc/source/index.rst
index 69b8e701d..734a0c920 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1695,7 +1695,7 @@ Module Variables
     .. py:data:: NEODEVICE_BLUE
             :annotation: = 1
 
-    .. py:data:: NEODEVICE_CMPROBE
+    .. py:data:: NEODEVICE_CMPROBE_DEPRECATED
             :annotation: = 8388608
 
     .. py:data:: NEODEVICE_CT_OBD
@@ -1719,19 +1719,19 @@ Module Variables
     .. py:data:: NEODEVICE_ECU
             :annotation: = 128
 
-    .. py:data:: NEODEVICE_ECU22
+    .. py:data:: NEODEVICE_ECU22_DEPRECATED
             :annotation: = 27
 
     .. py:data:: NEODEVICE_ECUCHIP_UART
             :annotation: = 2048
 
-    .. py:data:: NEODEVICE_ECU_AVB
+    .. py:data:: NEODEVICE_ECU_AVB_DEPRECATED
             :annotation: = 2
 
-    .. py:data:: NEODEVICE_EEVB
+    .. py:data:: NEODEVICE_EEVB_DEPRECATED
             :annotation: = 16777216
 
-    .. py:data:: NEODEVICE_ETHER_BADGE
+    .. py:data:: NEODEVICE_ETHER_BADGE_DEPRECATED
             :annotation: = 22
 
     .. py:data:: NEODEVICE_FIRE
@@ -1740,7 +1740,7 @@ Module Variables
     .. py:data:: NEODEVICE_FIRE2
             :annotation: = 67108864
 
-    .. py:data:: NEODEVICE_FIRE2_REDLINE
+    .. py:data:: NEODEVICE_FIRE2_REDLINE_DEPRECATED
             :annotation: = 21
 
     .. py:data:: NEODEVICE_FIRE3
@@ -1779,19 +1779,19 @@ Module Variables
     .. py:data:: NEODEVICE_NEW_DEVICE_59
             :annotation: = 33
 
-    .. py:data:: NEODEVICE_OBD2_DEV
+    .. py:data:: NEODEVICE_OBD2_DEV_DEPRECATED
             :annotation: = 26
 
     .. py:data:: NEODEVICE_OBD2_LC
             :annotation: = 13
 
-    .. py:data:: NEODEVICE_OBD2_PRO
+    .. py:data:: NEODEVICE_OBD2_PRO_DEPRECATED
             :annotation: = 1024
 
-    .. py:data:: NEODEVICE_OBD2_SIM
+    .. py:data:: NEODEVICE_OBD2_SIM_DEPRECATED
             :annotation: = 2147483648
 
-    .. py:data:: NEODEVICE_OBD2_SIM_DOIP
+    .. py:data:: NEODEVICE_OBD2_SIM_DOIP_DEPRECATED
             :annotation: = 25
 
     .. py:data:: NEODEVICE_PENDANT
@@ -1815,7 +1815,7 @@ Module Variables
     .. py:data:: NEODEVICE_RADGALAXY
             :annotation: = 268435456
 
-    .. py:data:: NEODEVICE_RADGIGALOG
+    .. py:data:: NEODEVICE_RADGIGALOG_DEPRECATED
             :annotation: = 6
 
     .. py:data:: NEODEVICE_RADIO_CANHUB
@@ -1830,19 +1830,19 @@ Module Variables
     .. py:data:: NEODEVICE_RADMOON3
             :annotation: = 35
 
-    .. py:data:: NEODEVICE_RADPLUTO
+    .. py:data:: NEODEVICE_RADPLUTO_DEPRECATED
             :annotation: = 9
 
     .. py:data:: NEODEVICE_RADPROXIMA
             :annotation: = 30
 
-    .. py:data:: NEODEVICE_RADSTAR
+    .. py:data:: NEODEVICE_RADSTAR_DEPRECATED
             :annotation: = 524288
 
     .. py:data:: NEODEVICE_RADSTAR2
             :annotation: = 536870912
 
-    .. py:data:: NEODEVICE_RADSUPERMOON
+    .. py:data:: NEODEVICE_RADSUPERMOON_DEPRECATED
             :annotation: = 3
 
     .. py:data:: NEODEVICE_RAD_A2B
@@ -1851,7 +1851,7 @@ Module Variables
     .. py:data:: NEODEVICE_RAD_BMS
             :annotation: = 34
 
-    .. py:data:: NEODEVICE_RAD_MOON_DUO
+    .. py:data:: NEODEVICE_RAD_MOON_DUO_DEPRECATED
             :annotation: = 14
 
     .. py:data:: NEODEVICE_RED
diff --git a/include/ics/icsnVC40.h b/include/ics/icsnVC40.h
index 611b0afc9..beb432ea3 100644
--- a/include/ics/icsnVC40.h
+++ b/include/ics/icsnVC40.h
@@ -206,32 +206,32 @@ typedef unsigned __int64 uint64_t;
 //clang-format off
 #define NEODEVICE_UNKNOWN (0x00000000)
 #define NEODEVICE_BLUE (0x00000001)
-#define NEODEVICE_ECU_AVB (0x00000002)
-#define NEODEVICE_RADSUPERMOON (0x00000003)
+#define NEODEVICE_ECU_AVB_DEPRECATED (0x00000002)
+#define NEODEVICE_RADSUPERMOON_DEPRECATED (0x00000003)
 #define NEODEVICE_DW_VCAN (0x00000004)
 #define NEODEVICE_RADMOON2 (0x00000005)
-#define NEODEVICE_RADGIGALOG (0x00000006) /* AKA RADMARS */
+#define NEODEVICE_RADGIGALOG_DEPRECATED (0x00000006) /* AKA RADMARS */
 #define NEODEVICE_VCAN41 (0x00000007)
 #define NEODEVICE_FIRE (0x00000008)
-#define NEODEVICE_RADPLUTO (0x00000009)
+#define NEODEVICE_RADPLUTO_DEPRECATED (0x00000009)
 #define NEODEVICE_VCAN42_EL (0x0000000a)
 #define NEODEVICE_RADIO_CANHUB (0x0000000b)
 #define NEODEVICE_NEOECU12 (0x0000000c)
 #define NEODEVICE_OBD2_LC (0x0000000d)
-#define NEODEVICE_RAD_MOON_DUO (0x0000000e)
+#define NEODEVICE_RAD_MOON_DUO_DEPRECATED (0x0000000e)
 #define NEODEVICE_FIRE3 (0x0000000f)
 #define NEODEVICE_VCAN3 (0x00000010)
 #define NEODEVICE_RADJUPITER (0x00000011)
 #define NEODEVICE_VCAN4_IND (0x00000012)
 #define NEODEVICE_GIGASTAR (0x00000013)
 #define NEODEVICE_RED2 (0x00000014)
-#define NEODEVICE_FIRE2_REDLINE (0x00000015)
-#define NEODEVICE_ETHER_BADGE (0x00000016)
+#define NEODEVICE_FIRE2_REDLINE_DEPRECATED (0x00000015)
+#define NEODEVICE_ETHER_BADGE_DEPRECATED (0x00000016)
 #define NEODEVICE_RAD_A2B (0x00000017)
 #define NEODEVICE_RADEPSILON (0x00000018)
-#define NEODEVICE_OBD2_SIM_DOIP (0x00000019)
-#define NEODEVICE_OBD2_DEV (0x0000001a)
-#define NEODEVICE_ECU22 (0x0000001b)
+#define NEODEVICE_OBD2_SIM_DOIP_DEPRECATED (0x00000019)
+#define NEODEVICE_OBD2_DEV_DEPRECATED (0x0000001a)
+#define NEODEVICE_ECU22_DEPRECATED (0x0000001b)
 #define NEODEVICE_RADEPSILON_T (0x0000001c)
 #define NEODEVICE_RADEPSILON_EXPRESS (0x0000001d)
 #define NEODEVICE_RADPROXIMA (0x0000001e)
@@ -251,7 +251,7 @@ typedef unsigned __int64 uint64_t;
 #define NEODEVICE_ECU (0x00000080)
 #define NEODEVICE_IEVB (0x00000100)
 #define NEODEVICE_PENDANT (0x00000200)
-#define NEODEVICE_OBD2_PRO (0x00000400)
+#define NEODEVICE_OBD2_PRO_DEPRECATED (0x00000400)
 #define NEODEVICE_ECUCHIP_UART (0x00000800)
 #define NEODEVICE_PLASMA (0x00001000)
 #define NEODEVICE_DONT_REUSE0 (0x00002000) //NEODEVICE_FIRE_VNET
@@ -260,19 +260,19 @@ typedef unsigned __int64 uint64_t;
 #define NEODEVICE_DONT_REUSE1 (0x00010000) //NEODEVICE_PLASMA_1_12
 #define NEODEVICE_DONT_REUSE2 (0x00020000) //NEODEVICE_PLASMA_1_13
 #define NEODEVICE_ION (0x00040000)
-#define NEODEVICE_RADSTAR (0x00080000)
+#define NEODEVICE_RADSTAR_DEPRECATED (0x00080000)
 #define NEODEVICE_DONT_REUSE3 (0x00100000) //NEODEVICE_ION3
 #define NEODEVICE_VCAN44 (0x00200000)
 #define NEODEVICE_VCAN42 (0x00400000)
-#define NEODEVICE_CMPROBE (0x00800000)
-#define NEODEVICE_EEVB (0x01000000)
+#define NEODEVICE_CMPROBE_DEPRECATED (0x00800000)
+#define NEODEVICE_EEVB_DEPRECATED (0x01000000)
 #define NEODEVICE_DONT_REUSE4 (0x02000000)
 #define NEODEVICE_FIRE2 (0x04000000)
 #define NEODEVICE_FLEX (0x08000000)
 #define NEODEVICE_RADGALAXY (0x10000000)
 #define NEODEVICE_RADSTAR2 (0x20000000)
 #define NEODEVICE_VIVIDCAN (0x40000000)
-#define NEODEVICE_OBD2_SIM (0x80000000)
+#define NEODEVICE_OBD2_SIM_DEPRECATED (0x80000000)
 #define NEODEVICE_ANY_PLASMA (NEODEVICE_PLASMA)
 #define NEODEVICE_ANY_ION (NEODEVICE_ION)
 #define NEODEVICE_NEOECUCHIP NEODEVICE_IEVB
diff --git a/src/methods.cpp b/src/methods.cpp
index cad3db826..991230b65 100644
--- a/src/methods.cpp
+++ b/src/methods.cpp
@@ -631,21 +631,21 @@ auto device_name_from_nde(NeoDeviceEx* nde) -> std::string
                 return "Unknown";
             case NEODEVICE_BLUE:
                 return "neoVI BLUE";
-            case NEODEVICE_ECU_AVB:
+            case NEODEVICE_ECU_AVB_DEPRECATED:
                 return "neoECU AVB/TSN";
-            case NEODEVICE_RADSUPERMOON:
+            case NEODEVICE_RADSUPERMOON_DEPRECATED:
                 return "RAD-Supermoon";
             case NEODEVICE_DW_VCAN:
                 return "ValueCAN DW";
             case NEODEVICE_RADMOON2:
                 return "RAD-Moon 2";
-            case NEODEVICE_RADGIGALOG:
+            case NEODEVICE_RADGIGALOG_DEPRECATED:
                 return "RAD-Gigalog";
             case NEODEVICE_VCAN41:
                 return "ValueCAN 4-1";
             case NEODEVICE_FIRE:
                 return "neoVI FIRE";
-            case NEODEVICE_RADPLUTO:
+            case NEODEVICE_RADPLUTO_DEPRECATED:
                 return "RAD-Pluto";
             case NEODEVICE_VCAN42_EL:
                 return "ValueCAN 4-2EL";
@@ -655,7 +655,7 @@ auto device_name_from_nde(NeoDeviceEx* nde) -> std::string
                 return "neoECU12";
             case NEODEVICE_OBD2_LC:
                 return "neoOBD2-LC";
-            case NEODEVICE_RAD_MOON_DUO:
+            case NEODEVICE_RAD_MOON_DUO_DEPRECATED:
                 return "RAD-Moon Duo";
             case NEODEVICE_VCAN3:
                 return "ValueCAN 3";
@@ -669,20 +669,20 @@ auto device_name_from_nde(NeoDeviceEx* nde) -> std::string
                 return "RAD-Gigastar";
             case NEODEVICE_RED2:
                 return "neoVI RED 2";
-            case NEODEVICE_FIRE2_REDLINE:
+            case NEODEVICE_FIRE2_REDLINE_DEPRECATED:
                 return "neoVI FIRE 2 Redline";
-            case NEODEVICE_ETHER_BADGE:
+            case NEODEVICE_ETHER_BADGE_DEPRECATED:
                 return "EtherBADGE";
             case NEODEVICE_RAD_A2B:
                 return "RAD-A2B";
             case NEODEVICE_RADEPSILON:
                 return "RAD-Epsilon";
-            case NEODEVICE_OBD2_SIM_DOIP:
-            case NEODEVICE_OBD2_SIM:
+            case NEODEVICE_OBD2_SIM_DOIP_DEPRECATED:
+            case NEODEVICE_OBD2_SIM_DEPRECATED:
                 return "neoOBD2-SIM";
-            case NEODEVICE_OBD2_DEV:
+            case NEODEVICE_OBD2_DEV_DEPRECATED:
                 return "neoOBD2-DEV";
-            case NEODEVICE_ECU22:
+            case NEODEVICE_ECU22_DEPRECATED:
                 return "neoECU22";
             case NEODEVICE_RADEPSILON_T:
                 return "RAD-EpsilonT";
@@ -714,7 +714,7 @@ auto device_name_from_nde(NeoDeviceEx* nde) -> std::string
                 return "IEVB";
             case NEODEVICE_PENDANT:
                 return "Pendant";
-            case NEODEVICE_OBD2_PRO:
+            case NEODEVICE_OBD2_PRO_DEPRECATED:
                 return "neoOBD2 PRO";
             case NEODEVICE_ECUCHIP_UART:
                 return "ECUCHIP";
@@ -726,15 +726,15 @@ auto device_name_from_nde(NeoDeviceEx* nde) -> std::string
                 return "neoOBD CT";
             case NEODEVICE_ION: // also NEODEVICE_ANY_ION
                 return "neoVI ION";
-            case NEODEVICE_RADSTAR:
+            case NEODEVICE_RADSTAR_DEPRECATED:
                 return "RAD-Star";
             case NEODEVICE_VCAN44:
                 return "ValueCAN 4-4";
             case NEODEVICE_VCAN42:
                 return "ValueCAN 4-2";
-            case NEODEVICE_CMPROBE:
+            case NEODEVICE_CMPROBE_DEPRECATED:
                 return "CM Probe";
-            case NEODEVICE_EEVB:
+            case NEODEVICE_EEVB_DEPRECATED:
                 return "EEVB";
             case NEODEVICE_FIRE2:
                 return "neoVI FIRE 2";
diff --git a/src/setup_module_auto_defines.cpp b/src/setup_module_auto_defines.cpp
index 5ca55390f..cd3e3320a 100644
--- a/src/setup_module_auto_defines.cpp
+++ b/src/setup_module_auto_defines.cpp
@@ -153,32 +153,32 @@ int setup_module_auto_defines(PyObject * module)
 	result += PyModule_AddIntMacro(module, NETID_INVALID);
 	result += PyModule_AddIntMacro(module, NEODEVICE_UNKNOWN);
 	result += PyModule_AddIntMacro(module, NEODEVICE_BLUE);
-	result += PyModule_AddIntMacro(module, NEODEVICE_ECU_AVB);
-	result += PyModule_AddIntMacro(module, NEODEVICE_RADSUPERMOON);
+	result += PyModule_AddIntMacro(module, NEODEVICE_ECU_AVB_DEPRECATED);
+	result += PyModule_AddIntMacro(module, NEODEVICE_RADSUPERMOON_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_DW_VCAN);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADMOON2);
-	result += PyModule_AddIntMacro(module, NEODEVICE_RADGIGALOG);
+	result += PyModule_AddIntMacro(module, NEODEVICE_RADGIGALOG_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN41);
 	result += PyModule_AddIntMacro(module, NEODEVICE_FIRE);
-	result += PyModule_AddIntMacro(module, NEODEVICE_RADPLUTO);
+	result += PyModule_AddIntMacro(module, NEODEVICE_RADPLUTO_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN42_EL);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADIO_CANHUB);
 	result += PyModule_AddIntMacro(module, NEODEVICE_NEOECU12);
 	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_LC);
-	result += PyModule_AddIntMacro(module, NEODEVICE_RAD_MOON_DUO);
+	result += PyModule_AddIntMacro(module, NEODEVICE_RAD_MOON_DUO_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_FIRE3);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN3);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADJUPITER);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN4_IND);
 	result += PyModule_AddIntMacro(module, NEODEVICE_GIGASTAR);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RED2);
-	result += PyModule_AddIntMacro(module, NEODEVICE_FIRE2_REDLINE);
-	result += PyModule_AddIntMacro(module, NEODEVICE_ETHER_BADGE);
+	result += PyModule_AddIntMacro(module, NEODEVICE_FIRE2_REDLINE_DEPRECATED);
+	result += PyModule_AddIntMacro(module, NEODEVICE_ETHER_BADGE_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RAD_A2B);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADEPSILON);
-	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_SIM_DOIP);
-	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_DEV);
-	result += PyModule_AddIntMacro(module, NEODEVICE_ECU22);
+	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_SIM_DOIP_DEPRECATED);
+	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_DEV_DEPRECATED);
+	result += PyModule_AddIntMacro(module, NEODEVICE_ECU22_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADEPSILON_T);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADEPSILON_EXPRESS);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADPROXIMA);
@@ -195,7 +195,7 @@ int setup_module_auto_defines(PyObject * module)
 	result += PyModule_AddIntMacro(module, NEODEVICE_ECU);
 	result += PyModule_AddIntMacro(module, NEODEVICE_IEVB);
 	result += PyModule_AddIntMacro(module, NEODEVICE_PENDANT);
-	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_PRO);
+	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_PRO_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_ECUCHIP_UART);
 	result += PyModule_AddIntMacro(module, NEODEVICE_PLASMA);
 	result += PyModule_AddIntMacro(module, NEODEVICE_DONT_REUSE0);
@@ -204,19 +204,19 @@ int setup_module_auto_defines(PyObject * module)
 	result += PyModule_AddIntMacro(module, NEODEVICE_DONT_REUSE1);
 	result += PyModule_AddIntMacro(module, NEODEVICE_DONT_REUSE2);
 	result += PyModule_AddIntMacro(module, NEODEVICE_ION);
-	result += PyModule_AddIntMacro(module, NEODEVICE_RADSTAR);
+	result += PyModule_AddIntMacro(module, NEODEVICE_RADSTAR_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_DONT_REUSE3);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN44);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN42);
-	result += PyModule_AddIntMacro(module, NEODEVICE_CMPROBE);
-	result += PyModule_AddIntMacro(module, NEODEVICE_EEVB);
+	result += PyModule_AddIntMacro(module, NEODEVICE_CMPROBE_DEPRECATED);
+	result += PyModule_AddIntMacro(module, NEODEVICE_EEVB_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_DONT_REUSE4);
 	result += PyModule_AddIntMacro(module, NEODEVICE_FIRE2);
 	result += PyModule_AddIntMacro(module, NEODEVICE_FLEX);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADGALAXY);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADSTAR2);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VIVIDCAN);
-	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_SIM);
+	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_SIM_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_ANY_PLASMA);
 	result += PyModule_AddIntMacro(module, NEODEVICE_ANY_ION);
 	result += PyModule_AddIntMacro(module, NEODEVICE_NEOECUCHIP);

From c4b501effd8f350f140ef821f8cf87695f89ebf8 Mon Sep 17 00:00:00 2001
From: "MJ.Jun" <mjun@intrepidcs.com>
Date: Tue, 8 Apr 2025 12:21:26 -0400
Subject: [PATCH 2/4] IEVB Deprecated & Delete code of Deprecated feature

---
 doc/source/index.rst              |  2 +-
 include/ics/icsnVC40.h            |  4 ++--
 src/methods.cpp                   | 31 -------------------------------
 src/setup_module_auto_defines.cpp | 16 ----------------
 4 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/doc/source/index.rst b/doc/source/index.rst
index 734a0c920..864e02106 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1755,7 +1755,7 @@ Module Variables
     .. py:data:: NEODEVICE_GIGASTAR
             :annotation: = 19
 
-    .. py:data:: NEODEVICE_IEVB
+    .. py:data:: NEODEVICE_IEVB_DEPRECATED
             :annotation: = 256
 
     .. py:data:: NEODEVICE_ION
diff --git a/include/ics/icsnVC40.h b/include/ics/icsnVC40.h
index beb432ea3..7f0ea4f7a 100644
--- a/include/ics/icsnVC40.h
+++ b/include/ics/icsnVC40.h
@@ -249,7 +249,7 @@ typedef unsigned __int64 uint64_t;
 
 #define NEODEVICE_RED (0x00000040)
 #define NEODEVICE_ECU (0x00000080)
-#define NEODEVICE_IEVB (0x00000100)
+#define NEODEVICE_IEVB_DEPRECATED (0x00000100)
 #define NEODEVICE_PENDANT (0x00000200)
 #define NEODEVICE_OBD2_PRO_DEPRECATED (0x00000400)
 #define NEODEVICE_ECUCHIP_UART (0x00000800)
@@ -275,7 +275,7 @@ typedef unsigned __int64 uint64_t;
 #define NEODEVICE_OBD2_SIM_DEPRECATED (0x80000000)
 #define NEODEVICE_ANY_PLASMA (NEODEVICE_PLASMA)
 #define NEODEVICE_ANY_ION (NEODEVICE_ION)
-#define NEODEVICE_NEOECUCHIP NEODEVICE_IEVB
+#define NEODEVICE_NEOECUCHIP NEODEVICE_IEVB_DEPRECATED
 //clang-format on
 
 #define DEVICECOUNT_FOR_EXPLORER (48) //this value will be checked by the NeoViExplorer after #6453!
diff --git a/src/methods.cpp b/src/methods.cpp
index 991230b65..bfd7e66a6 100644
--- a/src/methods.cpp
+++ b/src/methods.cpp
@@ -631,22 +631,14 @@ auto device_name_from_nde(NeoDeviceEx* nde) -> std::string
                 return "Unknown";
             case NEODEVICE_BLUE:
                 return "neoVI BLUE";
-            case NEODEVICE_ECU_AVB_DEPRECATED:
-                return "neoECU AVB/TSN";
-            case NEODEVICE_RADSUPERMOON_DEPRECATED:
-                return "RAD-Supermoon";
             case NEODEVICE_DW_VCAN:
                 return "ValueCAN DW";
             case NEODEVICE_RADMOON2:
                 return "RAD-Moon 2";
-            case NEODEVICE_RADGIGALOG_DEPRECATED:
-                return "RAD-Gigalog";
             case NEODEVICE_VCAN41:
                 return "ValueCAN 4-1";
             case NEODEVICE_FIRE:
                 return "neoVI FIRE";
-            case NEODEVICE_RADPLUTO_DEPRECATED:
-                return "RAD-Pluto";
             case NEODEVICE_VCAN42_EL:
                 return "ValueCAN 4-2EL";
             case NEODEVICE_RADIO_CANHUB:
@@ -655,8 +647,6 @@ auto device_name_from_nde(NeoDeviceEx* nde) -> std::string
                 return "neoECU12";
             case NEODEVICE_OBD2_LC:
                 return "neoOBD2-LC";
-            case NEODEVICE_RAD_MOON_DUO_DEPRECATED:
-                return "RAD-Moon Duo";
             case NEODEVICE_VCAN3:
                 return "ValueCAN 3";
             case NEODEVICE_FIRE3:
@@ -669,21 +659,10 @@ auto device_name_from_nde(NeoDeviceEx* nde) -> std::string
                 return "RAD-Gigastar";
             case NEODEVICE_RED2:
                 return "neoVI RED 2";
-            case NEODEVICE_FIRE2_REDLINE_DEPRECATED:
-                return "neoVI FIRE 2 Redline";
-            case NEODEVICE_ETHER_BADGE_DEPRECATED:
-                return "EtherBADGE";
             case NEODEVICE_RAD_A2B:
                 return "RAD-A2B";
             case NEODEVICE_RADEPSILON:
                 return "RAD-Epsilon";
-            case NEODEVICE_OBD2_SIM_DOIP_DEPRECATED:
-            case NEODEVICE_OBD2_SIM_DEPRECATED:
-                return "neoOBD2-SIM";
-            case NEODEVICE_OBD2_DEV_DEPRECATED:
-                return "neoOBD2-DEV";
-            case NEODEVICE_ECU22_DEPRECATED:
-                return "neoECU22";
             case NEODEVICE_RADEPSILON_T:
                 return "RAD-EpsilonT";
             case NEODEVICE_RADEPSILON_EXPRESS:
@@ -710,12 +689,8 @@ auto device_name_from_nde(NeoDeviceEx* nde) -> std::string
                 return "neoVI RED";
             case NEODEVICE_ECU:
                 return "neoECU";
-            case NEODEVICE_IEVB: // also NEODEVICE_NEOECUCHIP
-                return "IEVB";
             case NEODEVICE_PENDANT:
                 return "Pendant";
-            case NEODEVICE_OBD2_PRO_DEPRECATED:
-                return "neoOBD2 PRO";
             case NEODEVICE_ECUCHIP_UART:
                 return "ECUCHIP";
             case NEODEVICE_PLASMA: // also NEODEVICE_ANY_PLASMA
@@ -726,16 +701,10 @@ auto device_name_from_nde(NeoDeviceEx* nde) -> std::string
                 return "neoOBD CT";
             case NEODEVICE_ION: // also NEODEVICE_ANY_ION
                 return "neoVI ION";
-            case NEODEVICE_RADSTAR_DEPRECATED:
-                return "RAD-Star";
             case NEODEVICE_VCAN44:
                 return "ValueCAN 4-4";
             case NEODEVICE_VCAN42:
                 return "ValueCAN 4-2";
-            case NEODEVICE_CMPROBE_DEPRECATED:
-                return "CM Probe";
-            case NEODEVICE_EEVB_DEPRECATED:
-                return "EEVB";
             case NEODEVICE_FIRE2:
                 return "neoVI FIRE 2";
             case NEODEVICE_FLEX:
diff --git a/src/setup_module_auto_defines.cpp b/src/setup_module_auto_defines.cpp
index cd3e3320a..3e5cfc4d0 100644
--- a/src/setup_module_auto_defines.cpp
+++ b/src/setup_module_auto_defines.cpp
@@ -153,32 +153,22 @@ int setup_module_auto_defines(PyObject * module)
 	result += PyModule_AddIntMacro(module, NETID_INVALID);
 	result += PyModule_AddIntMacro(module, NEODEVICE_UNKNOWN);
 	result += PyModule_AddIntMacro(module, NEODEVICE_BLUE);
-	result += PyModule_AddIntMacro(module, NEODEVICE_ECU_AVB_DEPRECATED);
-	result += PyModule_AddIntMacro(module, NEODEVICE_RADSUPERMOON_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_DW_VCAN);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADMOON2);
-	result += PyModule_AddIntMacro(module, NEODEVICE_RADGIGALOG_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN41);
 	result += PyModule_AddIntMacro(module, NEODEVICE_FIRE);
-	result += PyModule_AddIntMacro(module, NEODEVICE_RADPLUTO_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN42_EL);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADIO_CANHUB);
 	result += PyModule_AddIntMacro(module, NEODEVICE_NEOECU12);
 	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_LC);
-	result += PyModule_AddIntMacro(module, NEODEVICE_RAD_MOON_DUO_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_FIRE3);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN3);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADJUPITER);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN4_IND);
 	result += PyModule_AddIntMacro(module, NEODEVICE_GIGASTAR);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RED2);
-	result += PyModule_AddIntMacro(module, NEODEVICE_FIRE2_REDLINE_DEPRECATED);
-	result += PyModule_AddIntMacro(module, NEODEVICE_ETHER_BADGE_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RAD_A2B);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADEPSILON);
-	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_SIM_DOIP_DEPRECATED);
-	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_DEV_DEPRECATED);
-	result += PyModule_AddIntMacro(module, NEODEVICE_ECU22_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADEPSILON_T);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADEPSILON_EXPRESS);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADPROXIMA);
@@ -193,9 +183,7 @@ int setup_module_auto_defines(PyObject * module)
 	result += PyModule_AddIntMacro(module, NEODEVICE_GIGASTAR2);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_ECU);
-	result += PyModule_AddIntMacro(module, NEODEVICE_IEVB);
 	result += PyModule_AddIntMacro(module, NEODEVICE_PENDANT);
-	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_PRO_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_ECUCHIP_UART);
 	result += PyModule_AddIntMacro(module, NEODEVICE_PLASMA);
 	result += PyModule_AddIntMacro(module, NEODEVICE_DONT_REUSE0);
@@ -204,19 +192,15 @@ int setup_module_auto_defines(PyObject * module)
 	result += PyModule_AddIntMacro(module, NEODEVICE_DONT_REUSE1);
 	result += PyModule_AddIntMacro(module, NEODEVICE_DONT_REUSE2);
 	result += PyModule_AddIntMacro(module, NEODEVICE_ION);
-	result += PyModule_AddIntMacro(module, NEODEVICE_RADSTAR_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_DONT_REUSE3);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN44);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN42);
-	result += PyModule_AddIntMacro(module, NEODEVICE_CMPROBE_DEPRECATED);
-	result += PyModule_AddIntMacro(module, NEODEVICE_EEVB_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_DONT_REUSE4);
 	result += PyModule_AddIntMacro(module, NEODEVICE_FIRE2);
 	result += PyModule_AddIntMacro(module, NEODEVICE_FLEX);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADGALAXY);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADSTAR2);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VIVIDCAN);
-	result += PyModule_AddIntMacro(module, NEODEVICE_OBD2_SIM_DEPRECATED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_ANY_PLASMA);
 	result += PyModule_AddIntMacro(module, NEODEVICE_ANY_ION);
 	result += PyModule_AddIntMacro(module, NEODEVICE_NEOECUCHIP);

From 200aef7e28918ad991748ff67032dccc2ef842e8 Mon Sep 17 00:00:00 2001
From: "MJ.Jun" <mjun@intrepidcs.com>
Date: Tue, 8 Apr 2025 14:27:50 -0400
Subject: [PATCH 3/4] IEVB, ECUCHIP_UART deprecated

---
 doc/source/index.rst              |  2 +-
 examples/lin_settings_example.py  |  1 -
 include/ics/icsnVC40.h            | 60 +------------------------------
 src/methods.cpp                   |  2 --
 src/setup_module_auto_defines.cpp |  2 --
 5 files changed, 2 insertions(+), 65 deletions(-)

diff --git a/doc/source/index.rst b/doc/source/index.rst
index 864e02106..3735cc008 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1722,7 +1722,7 @@ Module Variables
     .. py:data:: NEODEVICE_ECU22_DEPRECATED
             :annotation: = 27
 
-    .. py:data:: NEODEVICE_ECUCHIP_UART
+    .. py:data:: NEODEVICE_ECUCHIP_UART_DEPRECATED
             :annotation: = 2048
 
     .. py:data:: NEODEVICE_ECU_AVB_DEPRECATED
diff --git a/examples/lin_settings_example.py b/examples/lin_settings_example.py
index 1e0df8154..ea70f03ba 100644
--- a/examples/lin_settings_example.py
+++ b/examples/lin_settings_example.py
@@ -17,7 +17,6 @@ def get_device_specific_settings(s: s_device_settings) -> object:
     setting_map[e_device_settings_type.DeviceFireSettingsType] = "fire"
     setting_map[e_device_settings_type.DeviceFireVnetSettingsType] = "firevnet"
     setting_map[e_device_settings_type.DeviceFlexVnetzSettingsType] = "flexvnetz"
-    setting_map[e_device_settings_type.DeviceIEVBSettingsType] = "ievb"
     setting_map[e_device_settings_type.DeviceNeoECU12SettingsType] = "neoecu12"
     setting_map[e_device_settings_type.DeviceOBD2ProSettingsType] = "obd2pro"
     setting_map[e_device_settings_type.DeviceRADGalaxySettingsType] = "radgalaxy"
diff --git a/include/ics/icsnVC40.h b/include/ics/icsnVC40.h
index 7f0ea4f7a..d9fdd3b1b 100644
--- a/include/ics/icsnVC40.h
+++ b/include/ics/icsnVC40.h
@@ -252,7 +252,7 @@ typedef unsigned __int64 uint64_t;
 #define NEODEVICE_IEVB_DEPRECATED (0x00000100)
 #define NEODEVICE_PENDANT (0x00000200)
 #define NEODEVICE_OBD2_PRO_DEPRECATED (0x00000400)
-#define NEODEVICE_ECUCHIP_UART (0x00000800)
+#define NEODEVICE_ECUCHIP_UART_DEPRECATED (0x00000800)
 #define NEODEVICE_PLASMA (0x00001000)
 #define NEODEVICE_DONT_REUSE0 (0x00002000) //NEODEVICE_FIRE_VNET
 #define NEODEVICE_NEOANALOG (0x00004000)
@@ -2812,61 +2812,6 @@ typedef struct _SPendantSettings
 } SPendantSettings;
 #define SPendantSettings_SIZE 470
 
-typedef struct _SIEVBSettings
-{
-	/* see SECUSettings */
-	uint32_t ecu_id;
-
-	uint16_t selected_network; /* not supported yet - default to HSCAN */
-
-	CAN_SETTINGS can1;
-	LIN_SETTINGS lin1;
-
-	uint16_t network_enables;
-	uint16_t network_enables_2;
-	uint16_t network_enabled_on_boot;
-
-	uint16_t misc_io_initial_ddr;
-	uint16_t misc_io_initial_latch;
-	uint16_t misc_io_analog_enable;
-	uint16_t misc_io_report_period;
-	uint16_t misc_io_on_report_events;
-	uint16_t ain_sample_period;
-	uint16_t ain_threshold;
-
-	uint16_t iso15765_separation_time_offset;
-
-	CAN_SETTINGS can2;
-	LIN_SETTINGS lin2;
-
-	UART_SETTINGS uart;
-	UART_SETTINGS uart2;
-
-	STextAPISettings text_api;
-
-	uint32_t reserved_1;
-	uint32_t reserved_2;
-
-	uint32_t pwr_man_timeout;
-	uint16_t pwr_man_enable;
-
-	uint16_t idle_wakeup_network_enables_1;
-	uint16_t idle_wakeup_network_enables_2;
-
-	uint16_t misc_io_analog_enable_2;
-
-	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings;
-	uint16_t iso_parity;
-	uint16_t iso_msg_termination;
-	uint16_t iso_tester_pullup_enable;
-
-	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_2;
-	uint16_t iso_parity_2;
-	uint16_t iso_msg_termination_2;
-
-} SIEVBSettings;
-#define SIEVBSettings_SIZE 434
-
 typedef struct _SEEVBSettings
 {
 	uint32_t ecu_id;
@@ -5326,7 +5271,6 @@ typedef struct _GLOBAL_SETTINGS
 		SVCAN3Settings vcan3;
 		SVCAN4Settings vcan4;
 		SECUSettings ecu;
-		SIEVBSettings ievb;
 		SPendantSettings pendant;
 		SRADGalaxySettings radgalaxy;
 		SRADStar2Settings radstar2;
@@ -5435,7 +5379,6 @@ typedef struct _SDeviceSettings
 		SVCAN3Settings vcan3;
 		SVCAN4Settings vcan4;
 		SECUSettings ecu;
-		SIEVBSettings ievb;
 		SPendantSettings pendant;
 		SRADGalaxySettings radgalaxy;
 		SRADStar2Settings radstar2;
@@ -6318,7 +6261,6 @@ CHECK_STRUCT_SIZE(SVCAN3Settings);
 CHECK_STRUCT_SIZE(SVCAN4Settings);
 CHECK_STRUCT_SIZE(SECUSettings);
 CHECK_STRUCT_SIZE(SPendantSettings);
-CHECK_STRUCT_SIZE(SIEVBSettings);
 CHECK_STRUCT_SIZE(SEEVBSettings);
 CHECK_STRUCT_SIZE(SRADGalaxySettings);
 CHECK_STRUCT_SIZE(SRADStar2Settings);
diff --git a/src/methods.cpp b/src/methods.cpp
index bfd7e66a6..980308d3b 100644
--- a/src/methods.cpp
+++ b/src/methods.cpp
@@ -691,8 +691,6 @@ auto device_name_from_nde(NeoDeviceEx* nde) -> std::string
                 return "neoECU";
             case NEODEVICE_PENDANT:
                 return "Pendant";
-            case NEODEVICE_ECUCHIP_UART:
-                return "ECUCHIP";
             case NEODEVICE_PLASMA: // also NEODEVICE_ANY_PLASMA
                 return "neoVI PLASMA";
             case NEODEVICE_NEOANALOG:
diff --git a/src/setup_module_auto_defines.cpp b/src/setup_module_auto_defines.cpp
index 3e5cfc4d0..c40a4fbf4 100644
--- a/src/setup_module_auto_defines.cpp
+++ b/src/setup_module_auto_defines.cpp
@@ -184,7 +184,6 @@ int setup_module_auto_defines(PyObject * module)
 	result += PyModule_AddIntMacro(module, NEODEVICE_RED);
 	result += PyModule_AddIntMacro(module, NEODEVICE_ECU);
 	result += PyModule_AddIntMacro(module, NEODEVICE_PENDANT);
-	result += PyModule_AddIntMacro(module, NEODEVICE_ECUCHIP_UART);
 	result += PyModule_AddIntMacro(module, NEODEVICE_PLASMA);
 	result += PyModule_AddIntMacro(module, NEODEVICE_DONT_REUSE0);
 	result += PyModule_AddIntMacro(module, NEODEVICE_NEOANALOG);
@@ -889,7 +888,6 @@ int setup_module_auto_defines(PyObject * module)
 	result += PyModule_AddIntMacro(module, SVCAN4Settings_SIZE);
 	result += PyModule_AddIntMacro(module, SECUSettings_SIZE);
 	result += PyModule_AddIntMacro(module, SPendantSettings_SIZE);
-	result += PyModule_AddIntMacro(module, SIEVBSettings_SIZE);
 	result += PyModule_AddIntMacro(module, SEEVBSettings_SIZE);
 	// enum
 	result += PyModule_AddIntMacro(module, ePortDisabled);

From 853db4dd2110a769941aace77e33975a50b5b01c Mon Sep 17 00:00:00 2001
From: "MJ.Jun" <mjun@intrepidcs.com>
Date: Thu, 10 Apr 2025 15:10:49 -0400
Subject: [PATCH 4/4] Device FLEX is deprecated

---
 doc/source/index.rst              | 2 +-
 include/ics/icsnVC40.h            | 2 +-
 src/methods.cpp                   | 2 --
 src/setup_module_auto_defines.cpp | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/doc/source/index.rst b/doc/source/index.rst
index 3735cc008..267ddfd0a 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1749,7 +1749,7 @@ Module Variables
     .. py:data:: NEODEVICE_FIRE3_FLEXRAY
             :annotation: = 37
 
-    .. py:data:: NEODEVICE_FLEX
+    .. py:data:: NEODEVICE_FLEX_DEPRECATED
             :annotation: = 134217728
 
     .. py:data:: NEODEVICE_GIGASTAR
diff --git a/include/ics/icsnVC40.h b/include/ics/icsnVC40.h
index d9fdd3b1b..505b4a7a2 100644
--- a/include/ics/icsnVC40.h
+++ b/include/ics/icsnVC40.h
@@ -268,7 +268,7 @@ typedef unsigned __int64 uint64_t;
 #define NEODEVICE_EEVB_DEPRECATED (0x01000000)
 #define NEODEVICE_DONT_REUSE4 (0x02000000)
 #define NEODEVICE_FIRE2 (0x04000000)
-#define NEODEVICE_FLEX (0x08000000)
+#define NEODEVICE_FLEX_DEPRECATED (0x08000000)
 #define NEODEVICE_RADGALAXY (0x10000000)
 #define NEODEVICE_RADSTAR2 (0x20000000)
 #define NEODEVICE_VIVIDCAN (0x40000000)
diff --git a/src/methods.cpp b/src/methods.cpp
index 980308d3b..4f99f5233 100644
--- a/src/methods.cpp
+++ b/src/methods.cpp
@@ -705,8 +705,6 @@ auto device_name_from_nde(NeoDeviceEx* nde) -> std::string
                 return "ValueCAN 4-2";
             case NEODEVICE_FIRE2:
                 return "neoVI FIRE 2";
-            case NEODEVICE_FLEX:
-                return "neoVI FLEX";
             case NEODEVICE_RADGALAXY:
                 return "RAD-Galaxy";
             case NEODEVICE_RADSTAR2:
diff --git a/src/setup_module_auto_defines.cpp b/src/setup_module_auto_defines.cpp
index c40a4fbf4..a6034d7b1 100644
--- a/src/setup_module_auto_defines.cpp
+++ b/src/setup_module_auto_defines.cpp
@@ -196,7 +196,6 @@ int setup_module_auto_defines(PyObject * module)
 	result += PyModule_AddIntMacro(module, NEODEVICE_VCAN42);
 	result += PyModule_AddIntMacro(module, NEODEVICE_DONT_REUSE4);
 	result += PyModule_AddIntMacro(module, NEODEVICE_FIRE2);
-	result += PyModule_AddIntMacro(module, NEODEVICE_FLEX);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADGALAXY);
 	result += PyModule_AddIntMacro(module, NEODEVICE_RADSTAR2);
 	result += PyModule_AddIntMacro(module, NEODEVICE_VIVIDCAN);