From f05f96822ef69d8218d94efdc43bba27a0e1dcc0 Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Fri, 9 Nov 2018 16:34:00 -0500 Subject: [PATCH] Fix defines for C applications --- include/icsneo/api/error.h | 6 - include/icsneo/communication/network.h | 224 ++++++++++++------------- include/icsneo/device/devicetype.h | 82 +++++---- 3 files changed, 149 insertions(+), 163 deletions(-) diff --git a/include/icsneo/api/error.h b/include/icsneo/api/error.h index e915a12..1620e9e 100644 --- a/include/icsneo/api/error.h +++ b/include/icsneo/api/error.h @@ -4,12 +4,6 @@ #include #include -#ifdef __cplusplus -#define CONSTEXPR constexpr -#else -#define CONSTEXPR const -#endif - typedef struct { const char* description; time_t timestamp; diff --git a/include/icsneo/communication/network.h b/include/icsneo/communication/network.h index 79bfb3c..f0bb294 100644 --- a/include/icsneo/communication/network.h +++ b/include/icsneo/communication/network.h @@ -1,15 +1,11 @@ #ifndef __NETWORKID_H_ #define __NETWORKID_H_ -#ifndef __cplusplus -#define CONSTEXPR const -#else +#ifdef __cplusplus #include #include -#define CONSTEXPR constexpr - namespace icsneo { class Network { @@ -421,121 +417,121 @@ private: #endif #ifdef __ICSNEOC_H_ -CONSTEXPR uint16_t ICSNEO_NETID_DEVICE = 0; -CONSTEXPR uint16_t ICSNEO_NETID_HSCAN = 1; -CONSTEXPR uint16_t ICSNEO_NETID_MSCAN = 2; -CONSTEXPR uint16_t ICSNEO_NETID_SWCAN = 3; -CONSTEXPR uint16_t ICSNEO_NETID_LSFTCAN = 4; -CONSTEXPR uint16_t ICSNEO_NETID_FORDSCP = 5; -CONSTEXPR uint16_t ICSNEO_NETID_J1708 = 6; -CONSTEXPR uint16_t ICSNEO_NETID_AUX = 7; -CONSTEXPR uint16_t ICSNEO_NETID_J1850VPW = 8; -CONSTEXPR uint16_t ICSNEO_NETID_ISO = 9; -CONSTEXPR uint16_t ICSNEO_NETID_ISOPIC = 10; -CONSTEXPR uint16_t ICSNEO_NETID_MAIN51 = 11; -CONSTEXPR uint16_t ICSNEO_NETID_RED = 12; -CONSTEXPR uint16_t ICSNEO_NETID_SCI = 13; -CONSTEXPR uint16_t ICSNEO_NETID_ISO2 = 14; -CONSTEXPR uint16_t ICSNEO_NETID_ISO14230 = 15; -CONSTEXPR uint16_t ICSNEO_NETID_LIN = 16; -CONSTEXPR uint16_t ICSNEO_NETID_OP_ETHERNET1 = 17; -CONSTEXPR uint16_t ICSNEO_NETID_OP_ETHERNET2 = 18; -CONSTEXPR uint16_t ICSNEO_NETID_OP_ETHERNET3 = 19; +#define ICSNEO_NETID_DEVICE ((uint16_t)0) +#define ICSNEO_NETID_HSCAN ((uint16_t)1) +#define ICSNEO_NETID_MSCAN ((uint16_t)2) +#define ICSNEO_NETID_SWCAN ((uint16_t)3) +#define ICSNEO_NETID_LSFTCAN ((uint16_t)4) +#define ICSNEO_NETID_FORDSCP ((uint16_t)5) +#define ICSNEO_NETID_J1708 ((uint16_t)6) +#define ICSNEO_NETID_AUX ((uint16_t)7) +#define ICSNEO_NETID_J1850VPW ((uint16_t)8) +#define ICSNEO_NETID_ISO ((uint16_t)9) +#define ICSNEO_NETID_ISOPIC ((uint16_t)10) +#define ICSNEO_NETID_MAIN51 ((uint16_t)11) +#define ICSNEO_NETID_RED ((uint16_t)12) +#define ICSNEO_NETID_SCI ((uint16_t)13) +#define ICSNEO_NETID_ISO2 ((uint16_t)14) +#define ICSNEO_NETID_ISO14230 ((uint16_t)15) +#define ICSNEO_NETID_LIN ((uint16_t)16) +#define ICSNEO_NETID_OP_ETHERNET1 ((uint16_t)17) +#define ICSNEO_NETID_OP_ETHERNET2 ((uint16_t)18) +#define ICSNEO_NETID_OP_ETHERNET3 ((uint16_t)19) // START Device Command Returns // When we send a command, the device returns on one of these, depending on command -CONSTEXPR uint16_t ICSNEO_NETID_RED_EXT_MEMORYREAD = 20; -CONSTEXPR uint16_t ICSNEO_NETID_RED_INT_MEMORYREAD = 21; -CONSTEXPR uint16_t ICSNEO_NETID_RED_DFLASH_READ = 22; -CONSTEXPR uint16_t ICSNEO_NETID_RED_SDCARD_READ = 23; -CONSTEXPR uint16_t ICSNEO_NETID_CAN_ERRBITS = 24; -CONSTEXPR uint16_t ICSNEO_NETID_RED_DFLASH_WRITE_DONE = 25; -CONSTEXPR uint16_t ICSNEO_NETID_RED_WAVE_CAN1_LOGICAL = 26; -CONSTEXPR uint16_t ICSNEO_NETID_RED_WAVE_CAN2_LOGICAL = 27; -CONSTEXPR uint16_t ICSNEO_NETID_RED_WAVE_LIN1_LOGICAL = 28; -CONSTEXPR uint16_t ICSNEO_NETID_RED_WAVE_LIN2_LOGICAL = 29; -CONSTEXPR uint16_t ICSNEO_NETID_RED_WAVE_LIN1_ANALOG = 30; -CONSTEXPR uint16_t ICSNEO_NETID_RED_WAVE_LIN2_ANALOG = 31; -CONSTEXPR uint16_t ICSNEO_NETID_RED_WAVE_MISC_ANALOG = 32; -CONSTEXPR uint16_t ICSNEO_NETID_RED_WAVE_MISCDIO2_LOGICAL = 33; -CONSTEXPR uint16_t ICSNEO_NETID_RED_NETWORK_COM_ENABLE_EX = 34; -CONSTEXPR uint16_t ICSNEO_NETID_RED_NEOVI_NETWORK = 35; -CONSTEXPR uint16_t ICSNEO_NETID_RED_READ_BAUD_SETTINGS = 36; -CONSTEXPR uint16_t ICSNEO_NETID_RED_OLDFORMAT = 37; -CONSTEXPR uint16_t ICSNEO_NETID_RED_SCOPE_CAPTURE = 38; -CONSTEXPR uint16_t ICSNEO_NETID_RED_HARDWARE_EXCEP = 39; -CONSTEXPR uint16_t ICSNEO_NETID_RED_GET_RTC = 40; +#define ICSNEO_NETID_RED_EXT_MEMORYREAD ((uint16_t)20) +#define ICSNEO_NETID_RED_INT_MEMORYREAD ((uint16_t)21) +#define ICSNEO_NETID_RED_DFLASH_READ ((uint16_t)22) +#define ICSNEO_NETID_RED_SDCARD_READ ((uint16_t)23) +#define ICSNEO_NETID_CAN_ERRBITS ((uint16_t)24) +#define ICSNEO_NETID_RED_DFLASH_WRITE_DONE ((uint16_t)25) +#define ICSNEO_NETID_RED_WAVE_CAN1_LOGICAL ((uint16_t)26) +#define ICSNEO_NETID_RED_WAVE_CAN2_LOGICAL ((uint16_t)27) +#define ICSNEO_NETID_RED_WAVE_LIN1_LOGICAL ((uint16_t)28) +#define ICSNEO_NETID_RED_WAVE_LIN2_LOGICAL ((uint16_t)29) +#define ICSNEO_NETID_RED_WAVE_LIN1_ANALOG ((uint16_t)30) +#define ICSNEO_NETID_RED_WAVE_LIN2_ANALOG ((uint16_t)31) +#define ICSNEO_NETID_RED_WAVE_MISC_ANALOG ((uint16_t)32) +#define ICSNEO_NETID_RED_WAVE_MISCDIO2_LOGICAL ((uint16_t)33) +#define ICSNEO_NETID_RED_NETWORK_COM_ENABLE_EX ((uint16_t)34) +#define ICSNEO_NETID_RED_NEOVI_NETWORK ((uint16_t)35) +#define ICSNEO_NETID_RED_READ_BAUD_SETTINGS ((uint16_t)36) +#define ICSNEO_NETID_RED_OLDFORMAT ((uint16_t)37) +#define ICSNEO_NETID_RED_SCOPE_CAPTURE ((uint16_t)38) +#define ICSNEO_NETID_RED_HARDWARE_EXCEP ((uint16_t)39) +#define ICSNEO_NETID_RED_GET_RTC ((uint16_t)40) // END Device Command Returns -CONSTEXPR uint16_t ICSNEO_NETID_ISO3 = 41; -CONSTEXPR uint16_t ICSNEO_NETID_HSCAN2 = 42; -CONSTEXPR uint16_t ICSNEO_NETID_HSCAN3 = 44; -CONSTEXPR uint16_t ICSNEO_NETID_OP_ETHERNET4 = 45; -CONSTEXPR uint16_t ICSNEO_NETID_OP_ETHERNET5 = 46; -CONSTEXPR uint16_t ICSNEO_NETID_ISO4 = 47; -CONSTEXPR uint16_t ICSNEO_NETID_LIN2 = 48; -CONSTEXPR uint16_t ICSNEO_NETID_LIN3 = 49; -CONSTEXPR uint16_t ICSNEO_NETID_LIN4 = 50; -//CONSTEXPR uint16_t ICSNEO_NETID_MOST = 51; Old and unused -CONSTEXPR uint16_t ICSNEO_NETID_RED_APP_ERROR = 52; -CONSTEXPR uint16_t ICSNEO_NETID_CGI = 53; -CONSTEXPR uint16_t ICSNEO_NETID_RESET_STATUS = 54; -CONSTEXPR uint16_t ICSNEO_NETID_FB_STATUS = 55; -CONSTEXPR uint16_t ICSNEO_NETID_APP_SIGNAL_STATUS = 56; -CONSTEXPR uint16_t ICSNEO_NETID_READ_DATALINK_CM_TX_MSG = 57; -CONSTEXPR uint16_t ICSNEO_NETID_READ_DATALINK_CM_RX_MSG = 58; -CONSTEXPR uint16_t ICSNEO_NETID_LOGGING_OVERFLOW = 59; -CONSTEXPR uint16_t ICSNEO_NETID_READ_SETTINGS = 60; -CONSTEXPR uint16_t ICSNEO_NETID_HSCAN4 = 61; -CONSTEXPR uint16_t ICSNEO_NETID_HSCAN5 = 62; -CONSTEXPR uint16_t ICSNEO_NETID_RS232 = 63; -CONSTEXPR uint16_t ICSNEO_NETID_UART = 64; -CONSTEXPR uint16_t ICSNEO_NETID_UART2 = 65; -CONSTEXPR uint16_t ICSNEO_NETID_UART3 = 66; -CONSTEXPR uint16_t ICSNEO_NETID_UART4 = 67; -CONSTEXPR uint16_t ICSNEO_NETID_SWCAN2 = 68; -CONSTEXPR uint16_t ICSNEO_NETID_ETHERNET_DAQ = 69; -CONSTEXPR uint16_t ICSNEO_NETID_DATA_TO_HOST = 70; -CONSTEXPR uint16_t ICSNEO_NETID_TEXTAPI_TO_HOST = 71; -CONSTEXPR uint16_t ICSNEO_NETID_OP_ETHERNET6 = 73; -CONSTEXPR uint16_t ICSNEO_NETID_RED_VBAT = 74; -CONSTEXPR uint16_t ICSNEO_NETID_OP_ETHERNET7 = 75; -CONSTEXPR uint16_t ICSNEO_NETID_OP_ETHERNET8 = 76; -CONSTEXPR uint16_t ICSNEO_NETID_OP_ETHERNET9 = 77; -CONSTEXPR uint16_t ICSNEO_NETID_OP_ETHERNET10 = 78; -CONSTEXPR uint16_t ICSNEO_NETID_OP_ETHERNET11 = 79; -CONSTEXPR uint16_t ICSNEO_NETID_FLEXRAY1A = 80; -CONSTEXPR uint16_t ICSNEO_NETID_FLEXRAY1B = 81; -CONSTEXPR uint16_t ICSNEO_NETID_FLEXRAY2A = 82; -CONSTEXPR uint16_t ICSNEO_NETID_FLEXRAY2B = 83; -CONSTEXPR uint16_t ICSNEO_NETID_LIN5 = 84; -CONSTEXPR uint16_t ICSNEO_NETID_FLEXRAY = 85; -CONSTEXPR uint16_t ICSNEO_NETID_FLEXRAY2 = 86; -CONSTEXPR uint16_t ICSNEO_NETID_OP_ETHERNET12 = 87; -CONSTEXPR uint16_t ICSNEO_NETID_MOST25 = 90; -CONSTEXPR uint16_t ICSNEO_NETID_MOST50 = 91; -CONSTEXPR uint16_t ICSNEO_NETID_MOST150 = 92; -CONSTEXPR uint16_t ICSNEO_NETID_ETHERNET = 93; -CONSTEXPR uint16_t ICSNEO_NETID_GMFSA = 94; -CONSTEXPR uint16_t ICSNEO_NETID_TCP = 95; -CONSTEXPR uint16_t ICSNEO_NETID_HSCAN6 = 96; -CONSTEXPR uint16_t ICSNEO_NETID_HSCAN7 = 97; -CONSTEXPR uint16_t ICSNEO_NETID_LIN6 = 98; -CONSTEXPR uint16_t ICSNEO_NETID_LSFTCAN2 = 99; -CONSTEXPR uint16_t ICSNEO_NETID_HW_COM_LATENCY_TEST = 512; -CONSTEXPR uint16_t ICSNEO_NETID_DEVICE_STATUS = 513; -CONSTEXPR uint16_t ICSNEO_NETID_ANY = 0xfffe; // Never actually set as type, but used as flag for filtering -CONSTEXPR uint16_t ICSNEO_NETID_INVALID = 0xffff; +#define ICSNEO_NETID_ISO3 ((uint16_t)41) +#define ICSNEO_NETID_HSCAN2 ((uint16_t)42) +#define ICSNEO_NETID_HSCAN3 ((uint16_t)44) +#define ICSNEO_NETID_OP_ETHERNET4 ((uint16_t)45) +#define ICSNEO_NETID_OP_ETHERNET5 ((uint16_t)46) +#define ICSNEO_NETID_ISO4 ((uint16_t)47) +#define ICSNEO_NETID_LIN2 ((uint16_t)48) +#define ICSNEO_NETID_LIN3 ((uint16_t)49) +#define ICSNEO_NETID_LIN4 ((uint16_t)50) +//#define ICSNEO_NETID_MOST ((uint16_t)51) Old and unused +#define ICSNEO_NETID_RED_APP_ERROR ((uint16_t)52) +#define ICSNEO_NETID_CGI ((uint16_t)53) +#define ICSNEO_NETID_RESET_STATUS ((uint16_t)54) +#define ICSNEO_NETID_FB_STATUS ((uint16_t)55) +#define ICSNEO_NETID_APP_SIGNAL_STATUS ((uint16_t)56) +#define ICSNEO_NETID_READ_DATALINK_CM_TX_MSG ((uint16_t)57) +#define ICSNEO_NETID_READ_DATALINK_CM_RX_MSG ((uint16_t)58) +#define ICSNEO_NETID_LOGGING_OVERFLOW ((uint16_t)59) +#define ICSNEO_NETID_READ_SETTINGS ((uint16_t)60) +#define ICSNEO_NETID_HSCAN4 ((uint16_t)61) +#define ICSNEO_NETID_HSCAN5 ((uint16_t)62) +#define ICSNEO_NETID_RS232 ((uint16_t)63) +#define ICSNEO_NETID_UART ((uint16_t)64) +#define ICSNEO_NETID_UART2 ((uint16_t)65) +#define ICSNEO_NETID_UART3 ((uint16_t)66) +#define ICSNEO_NETID_UART4 ((uint16_t)67) +#define ICSNEO_NETID_SWCAN2 ((uint16_t)68) +#define ICSNEO_NETID_ETHERNET_DAQ ((uint16_t)69) +#define ICSNEO_NETID_DATA_TO_HOST ((uint16_t)70) +#define ICSNEO_NETID_TEXTAPI_TO_HOST ((uint16_t)71) +#define ICSNEO_NETID_OP_ETHERNET6 ((uint16_t)73) +#define ICSNEO_NETID_RED_VBAT ((uint16_t)74) +#define ICSNEO_NETID_OP_ETHERNET7 ((uint16_t)75) +#define ICSNEO_NETID_OP_ETHERNET8 ((uint16_t)76) +#define ICSNEO_NETID_OP_ETHERNET9 ((uint16_t)77) +#define ICSNEO_NETID_OP_ETHERNET10 ((uint16_t)78) +#define ICSNEO_NETID_OP_ETHERNET11 ((uint16_t)79) +#define ICSNEO_NETID_FLEXRAY1A ((uint16_t)80) +#define ICSNEO_NETID_FLEXRAY1B ((uint16_t)81) +#define ICSNEO_NETID_FLEXRAY2A ((uint16_t)82) +#define ICSNEO_NETID_FLEXRAY2B ((uint16_t)83) +#define ICSNEO_NETID_LIN5 ((uint16_t)84) +#define ICSNEO_NETID_FLEXRAY ((uint16_t)85) +#define ICSNEO_NETID_FLEXRAY2 ((uint16_t)86) +#define ICSNEO_NETID_OP_ETHERNET12 ((uint16_t)87) +#define ICSNEO_NETID_MOST25 ((uint16_t)90) +#define ICSNEO_NETID_MOST50 ((uint16_t)91) +#define ICSNEO_NETID_MOST150 ((uint16_t)92) +#define ICSNEO_NETID_ETHERNET ((uint16_t)93) +#define ICSNEO_NETID_GMFSA ((uint16_t)94) +#define ICSNEO_NETID_TCP ((uint16_t)95) +#define ICSNEO_NETID_HSCAN6 ((uint16_t)96) +#define ICSNEO_NETID_HSCAN7 ((uint16_t)97) +#define ICSNEO_NETID_LIN6 ((uint16_t)98) +#define ICSNEO_NETID_LSFTCAN2 ((uint16_t)99) +#define ICSNEO_NETID_HW_COM_LATENCY_TEST ((uint16_t)512) +#define ICSNEO_NETID_DEVICE_STATUS ((uint16_t)513) +#define ICSNEO_NETID_ANY ((uint16_t)0xfffe) // Never actually set as type, but used as flag for filtering +#define ICSNEO_NETID_INVALID ((uint16_t)0xffff) -CONSTEXPR uint8_t ICSNEO_NETWORK_TYPE_INVALID = 0; -CONSTEXPR uint8_t ICSNEO_NETWORK_TYPE_INTERNAL = 1; // Used for statuses that don't actually need to be transferred to the client application -CONSTEXPR uint8_t ICSNEO_NETWORK_TYPE_CAN = 2; -CONSTEXPR uint8_t ICSNEO_NETWORK_TYPE_LIN = 3; -CONSTEXPR uint8_t ICSNEO_NETWORK_TYPE_FLEXRAY = 4; -CONSTEXPR uint8_t ICSNEO_NETWORK_TYPE_MOST = 5; -CONSTEXPR uint8_t ICSNEO_NETWORK_TYPE_ETHERNET = 6; -CONSTEXPR uint8_t ICSNEO_NETWORK_TYPE_ANY = 0xFE; // Never actually set as type, but used as flag for filtering -CONSTEXPR uint8_t ICSNEO_NETWORK_TYPE_OTHER = 0xFF; +#define ICSNEO_NETWORK_TYPE_INVALID ((uint8_t)0) +#define ICSNEO_NETWORK_TYPE_INTERNAL ((uint8_t)1) // Used for statuses that don't actually need to be transferred to the client application +#define ICSNEO_NETWORK_TYPE_CAN ((uint8_t)2) +#define ICSNEO_NETWORK_TYPE_LIN ((uint8_t)3) +#define ICSNEO_NETWORK_TYPE_FLEXRAY ((uint8_t)4) +#define ICSNEO_NETWORK_TYPE_MOST ((uint8_t)5) +#define ICSNEO_NETWORK_TYPE_ETHERNET ((uint8_t)6) +#define ICSNEO_NETWORK_TYPE_ANY ((uint8_t)0xFE) // Never actually set as type, but used as flag for filtering +#define ICSNEO_NETWORK_TYPE_OTHER ((uint8_t)0xFF) #endif #endif \ No newline at end of file diff --git a/include/icsneo/device/devicetype.h b/include/icsneo/device/devicetype.h index eb72501..c44b0e7 100644 --- a/include/icsneo/device/devicetype.h +++ b/include/icsneo/device/devicetype.h @@ -9,15 +9,11 @@ #ifndef __cplusplus #include -#define CONSTEXPR const - typedef uint32_t devicetype_t; #else #include #include -#define CONSTEXPR constexpr - typedef uint32_t devicetype_t; namespace icsneo { @@ -169,45 +165,45 @@ private: #endif // __cplusplus #ifdef __ICSNEOC_H_ // We are using the C API, so we want C-compatible defines -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_UNKNOWN = 0x00000000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_BLUE = 0x00000001; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_ECU_AVB = 0x00000002; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_RADSUPERMOON = 0x00000003; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_DW_VCAN = 0x00000004; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_RADMOON2 = 0x00000005; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_RADGIGALOG = 0x00000006; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_VCAN4_1 = 0x00000007; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_FIRE = 0x00000008; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_RADPLUTO = 0x00000009; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_VCAN4_2EL = 0x0000000a; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_RADIO_CANHUB = 0x0000000b; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_VCAN3 = 0x00000010; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_RED = 0x00000040; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_ECU = 0x00000080; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_IEVB = 0x00000100; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_PENDANT = 0x00000200; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_OBD2_PRO = 0x00000400; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_ECUCHIP_UART = 0x00000800; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_PLASMA = 0x00001000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_DONT_REUSE0 = 0x00002000; // Previously FIRE_VNET -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_NEOANALOG = 0x00004000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_CT_OBD = 0x00008000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_DONT_REUSE1 = 0x00010000; // Previously PLASMA_1_12 -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_DONT_REUSE2 = 0x00020000; // Previously PLASMA_1_13 -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_ION = 0x00040000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_RADSTAR = 0x00080000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_DONT_REUSE3 = 0x00100000; // Previously ION3 -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_VCAN4_4 = 0x00200000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_VCAN4_2 = 0x00400000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_CMPROBE = 0x00800000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_EEVB = 0x01000000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_VCANRF = 0x02000000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_FIRE2 = 0x04000000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_FLEX = 0x08000000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_RADGALAXY = 0x10000000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_RADSTAR2 = 0x20000000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_VIVIDCAN = 0x40000000; -CONSTEXPR devicetype_t ICSNEO_DEVICETYPE_OBD2_SIM = 0x80000000; +#define ICSNEO_DEVICETYPE_UNKNOWN ((devicetype_t)0x00000000) +#define ICSNEO_DEVICETYPE_BLUE ((devicetype_t)0x00000001) +#define ICSNEO_DEVICETYPE_ECU_AVB ((devicetype_t)0x00000002) +#define ICSNEO_DEVICETYPE_RADSUPERMOON ((devicetype_t)0x00000003) +#define ICSNEO_DEVICETYPE_DW_VCAN ((devicetype_t)0x00000004) +#define ICSNEO_DEVICETYPE_RADMOON2 ((devicetype_t)0x00000005) +#define ICSNEO_DEVICETYPE_RADGIGALOG ((devicetype_t)0x00000006) +#define ICSNEO_DEVICETYPE_VCAN4_1 ((devicetype_t)0x00000007) +#define ICSNEO_DEVICETYPE_FIRE ((devicetype_t)0x00000008) +#define ICSNEO_DEVICETYPE_RADPLUTO ((devicetype_t)0x00000009) +#define ICSNEO_DEVICETYPE_VCAN4_2EL ((devicetype_t)0x0000000a) +#define ICSNEO_DEVICETYPE_RADIO_CANHUB ((devicetype_t)0x0000000b) +#define ICSNEO_DEVICETYPE_VCAN3 ((devicetype_t)0x00000010) +#define ICSNEO_DEVICETYPE_RED ((devicetype_t)0x00000040) +#define ICSNEO_DEVICETYPE_ECU ((devicetype_t)0x00000080) +#define ICSNEO_DEVICETYPE_IEVB ((devicetype_t)0x00000100) +#define ICSNEO_DEVICETYPE_PENDANT ((devicetype_t)0x00000200) +#define ICSNEO_DEVICETYPE_OBD2_PRO ((devicetype_t)0x00000400) +#define ICSNEO_DEVICETYPE_ECUCHIP_UART ((devicetype_t)0x00000800) +#define ICSNEO_DEVICETYPE_PLASMA ((devicetype_t)0x00001000) +#define ICSNEO_DEVICETYPE_DONT_REUSE0 ((devicetype_t)0x00002000) // Previously FIRE_VNET +#define ICSNEO_DEVICETYPE_NEOANALOG ((devicetype_t)0x00004000) +#define ICSNEO_DEVICETYPE_CT_OBD ((devicetype_t)0x00008000) +#define ICSNEO_DEVICETYPE_DONT_REUSE1 ((devicetype_t)0x00010000) // Previously PLASMA_1_12 +#define ICSNEO_DEVICETYPE_DONT_REUSE2 ((devicetype_t)0x00020000) // Previously PLASMA_1_13 +#define ICSNEO_DEVICETYPE_ION ((devicetype_t)0x00040000) +#define ICSNEO_DEVICETYPE_RADSTAR ((devicetype_t)0x00080000) +#define ICSNEO_DEVICETYPE_DONT_REUSE3 ((devicetype_t)0x00100000) // Previously ION3 +#define ICSNEO_DEVICETYPE_VCAN4_4 ((devicetype_t)0x00200000) +#define ICSNEO_DEVICETYPE_VCAN4_2 ((devicetype_t)0x00400000) +#define ICSNEO_DEVICETYPE_CMPROBE ((devicetype_t)0x00800000) +#define ICSNEO_DEVICETYPE_EEVB ((devicetype_t)0x01000000) +#define ICSNEO_DEVICETYPE_VCANRF ((devicetype_t)0x02000000) +#define ICSNEO_DEVICETYPE_FIRE2 ((devicetype_t)0x04000000) +#define ICSNEO_DEVICETYPE_FLEX ((devicetype_t)0x08000000) +#define ICSNEO_DEVICETYPE_RADGALAXY ((devicetype_t)0x10000000) +#define ICSNEO_DEVICETYPE_RADSTAR2 ((devicetype_t)0x20000000) +#define ICSNEO_DEVICETYPE_VIVIDCAN ((devicetype_t)0x40000000) +#define ICSNEO_DEVICETYPE_OBD2_SIM ((devicetype_t)0x80000000) #endif #endif \ No newline at end of file