diff --git a/include/icsneo/communication/network.h b/include/icsneo/communication/network.h index 086b353..8a59489 100644 --- a/include/icsneo/communication/network.h +++ b/include/icsneo/communication/network.h @@ -443,121 +443,121 @@ private: #endif #ifdef __ICSNEOC_H_ -#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) +#define ICSNEO_NETID_DEVICE 0 +#define ICSNEO_NETID_HSCAN 1 +#define ICSNEO_NETID_MSCAN 2 +#define ICSNEO_NETID_SWCAN 3 +#define ICSNEO_NETID_LSFTCAN 4 +#define ICSNEO_NETID_FORDSCP 5 +#define ICSNEO_NETID_J1708 6 +#define ICSNEO_NETID_AUX 7 +#define ICSNEO_NETID_J1850VPW 8 +#define ICSNEO_NETID_ISO 9 +#define ICSNEO_NETID_ISOPIC 10 +#define ICSNEO_NETID_MAIN51 11 +#define ICSNEO_NETID_RED 12 +#define ICSNEO_NETID_SCI 13 +#define ICSNEO_NETID_ISO2 14 +#define ICSNEO_NETID_ISO14230 15 +#define ICSNEO_NETID_LIN 16 +#define ICSNEO_NETID_OP_ETHERNET1 17 +#define ICSNEO_NETID_OP_ETHERNET2 18 +#define ICSNEO_NETID_OP_ETHERNET3 19 // START Device Command Returns // When we send a command, the device returns on one of these, depending on command -#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) +#define ICSNEO_NETID_RED_EXT_MEMORYREAD 20 +#define ICSNEO_NETID_RED_INT_MEMORYREAD 21 +#define ICSNEO_NETID_RED_DFLASH_READ 22 +#define ICSNEO_NETID_RED_SDCARD_READ 23 +#define ICSNEO_NETID_CAN_ERRBITS 24 +#define ICSNEO_NETID_RED_DFLASH_WRITE_DONE 25 +#define ICSNEO_NETID_RED_WAVE_CAN1_LOGICAL 26 +#define ICSNEO_NETID_RED_WAVE_CAN2_LOGICAL 27 +#define ICSNEO_NETID_RED_WAVE_LIN1_LOGICAL 28 +#define ICSNEO_NETID_RED_WAVE_LIN2_LOGICAL 29 +#define ICSNEO_NETID_RED_WAVE_LIN1_ANALOG 30 +#define ICSNEO_NETID_RED_WAVE_LIN2_ANALOG 31 +#define ICSNEO_NETID_RED_WAVE_MISC_ANALOG 32 +#define ICSNEO_NETID_RED_WAVE_MISCDIO2_LOGICAL 33 +#define ICSNEO_NETID_RED_NETWORK_COM_ENABLE_EX 34 +#define ICSNEO_NETID_RED_NEOVI_NETWORK 35 +#define ICSNEO_NETID_RED_READ_BAUD_SETTINGS 36 +#define ICSNEO_NETID_RED_OLDFORMAT 37 +#define ICSNEO_NETID_RED_SCOPE_CAPTURE 38 +#define ICSNEO_NETID_RED_HARDWARE_EXCEP 39 +#define ICSNEO_NETID_RED_GET_RTC 40 // END Device Command Returns -#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) +#define ICSNEO_NETID_ISO3 41 +#define ICSNEO_NETID_HSCAN2 42 +#define ICSNEO_NETID_HSCAN3 44 +#define ICSNEO_NETID_OP_ETHERNET4 45 +#define ICSNEO_NETID_OP_ETHERNET5 46 +#define ICSNEO_NETID_ISO4 47 +#define ICSNEO_NETID_LIN2 48 +#define ICSNEO_NETID_LIN3 49 +#define ICSNEO_NETID_LIN4 50 +//#define ICSNEO_NETID_MOST 51 Old and unused +#define ICSNEO_NETID_RED_APP_ERROR 52 +#define ICSNEO_NETID_CGI 53 +#define ICSNEO_NETID_RESET_STATUS 54 +#define ICSNEO_NETID_FB_STATUS 55 +#define ICSNEO_NETID_APP_SIGNAL_STATUS 56 +#define ICSNEO_NETID_READ_DATALINK_CM_TX_MSG 57 +#define ICSNEO_NETID_READ_DATALINK_CM_RX_MSG 58 +#define ICSNEO_NETID_LOGGING_OVERFLOW 59 +#define ICSNEO_NETID_READ_SETTINGS 60 +#define ICSNEO_NETID_HSCAN4 61 +#define ICSNEO_NETID_HSCAN5 62 +#define ICSNEO_NETID_RS232 63 +#define ICSNEO_NETID_UART 64 +#define ICSNEO_NETID_UART2 65 +#define ICSNEO_NETID_UART3 66 +#define ICSNEO_NETID_UART4 67 +#define ICSNEO_NETID_SWCAN2 68 +#define ICSNEO_NETID_ETHERNET_DAQ 69 +#define ICSNEO_NETID_DATA_TO_HOST 70 +#define ICSNEO_NETID_TEXTAPI_TO_HOST 71 +#define ICSNEO_NETID_OP_ETHERNET6 73 +#define ICSNEO_NETID_RED_VBAT 74 +#define ICSNEO_NETID_OP_ETHERNET7 75 +#define ICSNEO_NETID_OP_ETHERNET8 76 +#define ICSNEO_NETID_OP_ETHERNET9 77 +#define ICSNEO_NETID_OP_ETHERNET10 78 +#define ICSNEO_NETID_OP_ETHERNET11 79 +#define ICSNEO_NETID_FLEXRAY1A 80 +#define ICSNEO_NETID_FLEXRAY1B 81 +#define ICSNEO_NETID_FLEXRAY2A 82 +#define ICSNEO_NETID_FLEXRAY2B 83 +#define ICSNEO_NETID_LIN5 84 +#define ICSNEO_NETID_FLEXRAY 85 +#define ICSNEO_NETID_FLEXRAY2 86 +#define ICSNEO_NETID_OP_ETHERNET12 87 +#define ICSNEO_NETID_MOST25 90 +#define ICSNEO_NETID_MOST50 91 +#define ICSNEO_NETID_MOST150 92 +#define ICSNEO_NETID_ETHERNET 93 +#define ICSNEO_NETID_GMFSA 94 +#define ICSNEO_NETID_TCP 95 +#define ICSNEO_NETID_HSCAN6 96 +#define ICSNEO_NETID_HSCAN7 97 +#define ICSNEO_NETID_LIN6 98 +#define ICSNEO_NETID_LSFTCAN2 99 +#define ICSNEO_NETID_HW_COM_LATENCY_TEST 512 +#define ICSNEO_NETID_DEVICE_STATUS 513 +#define ICSNEO_NETID_ANY 0xfffe // Never actually set as type, but used as flag for filtering +#define ICSNEO_NETID_INVALID 0xffff -#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) +#define ICSNEO_NETWORK_TYPE_INVALID 0 +#define ICSNEO_NETWORK_TYPE_INTERNAL 1 // Used for statuses that don't actually need to be transferred to the client application +#define ICSNEO_NETWORK_TYPE_CAN 2 +#define ICSNEO_NETWORK_TYPE_LIN 3 +#define ICSNEO_NETWORK_TYPE_FLEXRAY 4 +#define ICSNEO_NETWORK_TYPE_MOST 5 +#define ICSNEO_NETWORK_TYPE_ETHERNET 6 +#define ICSNEO_NETWORK_TYPE_ANY 0xFE // Never actually set as type, but used as flag for filtering +#define ICSNEO_NETWORK_TYPE_OTHER 0xFF #endif #endif \ No newline at end of file