Skip to content

921 depricate #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wskellenger-intrepid wants to merge 4 commits into from
Closed

921 depricate #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a6fcae
For Vspy3 921_depricate branch
MJun77 Apr 3, 2025
c4b501e
IEVB Deprecated & Delete code of Deprecated feature
MJun77 Apr 8, 2025
200aef7
IEVB, ECUCHIP_UART deprecated
MJun77 Apr 8, 2025
853db4d
Device FLEX is deprecated
MJun77 Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions doc/source/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
.. py:data:: NEODEVICE_ECUCHIP_UART_DEPRECATED
: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
Expand All @@ -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
Expand All @@ -1749,13 +1749,13 @@ Module Variables
.. py:data:: NEODEVICE_FIRE3_FLEXRAY
:annotation: = 37

.. py:data:: NEODEVICE_FLEX
.. py:data:: NEODEVICE_FLEX_DEPRECATED
:annotation: = 134217728

.. py:data:: NEODEVICE_GIGASTAR
:annotation: = 19

.. py:data:: NEODEVICE_IEVB
.. py:data:: NEODEVICE_IEVB_DEPRECATED
:annotation: = 256

.. py:data:: NEODEVICE_ION
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion examples/lin_settings_example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
96 changes: 19 additions & 77 deletions include/ics/icsnVC40.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -249,33 +249,33 @@ 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 (0x00000400)
#define NEODEVICE_ECUCHIP_UART (0x00000800)
#define NEODEVICE_OBD2_PRO_DEPRECATED (0x00000400)
#define NEODEVICE_ECUCHIP_UART_DEPRECATED (0x00000800)
#define NEODEVICE_PLASMA (0x00001000)
#define NEODEVICE_DONT_REUSE0 (0x00002000) //NEODEVICE_FIRE_VNET
#define NEODEVICE_NEOANALOG (0x00004000)
#define NEODEVICE_CT_OBD (0x00008000)
#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_FLEX_DEPRECATED (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
#define NEODEVICE_NEOECUCHIP NEODEVICE_IEVB_DEPRECATED
//clang-format on

#define DEVICECOUNT_FOR_EXPLORER (48) //this value will be checked by the NeoViExplorer after #6453!
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -5326,7 +5271,6 @@ typedef struct _GLOBAL_SETTINGS
SVCAN3Settings vcan3;
SVCAN4Settings vcan4;
SECUSettings ecu;
SIEVBSettings ievb;
SPendantSettings pendant;
SRADGalaxySettings radgalaxy;
SRADStar2Settings radstar2;
Expand Down Expand Up @@ -5435,7 +5379,6 @@ typedef struct _SDeviceSettings
SVCAN3Settings vcan3;
SVCAN4Settings vcan4;
SECUSettings ecu;
SIEVBSettings ievb;
SPendantSettings pendant;
SRADGalaxySettings radgalaxy;
SRADStar2Settings radstar2;
Expand Down Expand Up @@ -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);
Expand Down
35 changes: 0 additions & 35 deletions src/methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
return "neoECU AVB/TSN";
case NEODEVICE_RADSUPERMOON:
return "RAD-Supermoon";
case NEODEVICE_DW_VCAN:
return "ValueCAN DW";
case NEODEVICE_RADMOON2:
return "RAD-Moon 2";
case NEODEVICE_RADGIGALOG:
return "RAD-Gigalog";
case NEODEVICE_VCAN41:
return "ValueCAN 4-1";
case NEODEVICE_FIRE:
return "neoVI FIRE";
case NEODEVICE_RADPLUTO:
return "RAD-Pluto";
case NEODEVICE_VCAN42_EL:
return "ValueCAN 4-2EL";
case NEODEVICE_RADIO_CANHUB:
Expand All @@ -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:
return "RAD-Moon Duo";
case NEODEVICE_VCAN3:
return "ValueCAN 3";
case NEODEVICE_FIRE3:
Expand All @@ -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:
return "neoVI FIRE 2 Redline";
case NEODEVICE_ETHER_BADGE:
return "EtherBADGE";
case NEODEVICE_RAD_A2B:
return "RAD-A2B";
case NEODEVICE_RADEPSILON:
return "RAD-Epsilon";
case NEODEVICE_OBD2_SIM_DOIP:
case NEODEVICE_OBD2_SIM:
return "neoOBD2-SIM";
case NEODEVICE_OBD2_DEV:
return "neoOBD2-DEV";
case NEODEVICE_ECU22:
return "neoECU22";
case NEODEVICE_RADEPSILON_T:
return "RAD-EpsilonT";
case NEODEVICE_RADEPSILON_EXPRESS:
Expand All @@ -710,14 +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:
return "neoOBD2 PRO";
case NEODEVICE_ECUCHIP_UART:
return "ECUCHIP";
case NEODEVICE_PLASMA: // also NEODEVICE_ANY_PLASMA
return "neoVI PLASMA";
case NEODEVICE_NEOANALOG:
Expand All @@ -726,20 +699,12 @@ 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:
return "RAD-Star";
case NEODEVICE_VCAN44:
return "ValueCAN 4-4";
case NEODEVICE_VCAN42:
return "ValueCAN 4-2";
case NEODEVICE_CMPROBE:
return "CM Probe";
case NEODEVICE_EEVB:
return "EEVB";
case NEODEVICE_FIRE2:
return "neoVI FIRE 2";
case NEODEVICE_FLEX:
return "neoVI FLEX";
case NEODEVICE_RADGALAXY:
return "RAD-Galaxy";
case NEODEVICE_RADSTAR2:
Expand Down
Loading
Loading