From 24f291dc8372ed7aa0d538422e6faee5b2143f43 Mon Sep 17 00:00:00 2001 From: Bryant Jones Date: Thu, 26 Sep 2024 20:42:41 +0000 Subject: [PATCH] Device: Comet: Update settings --- include/icsneo/device/idevicesettings.h | 10 ++++++++++ include/icsneo/device/tree/radcomet/radcometsettings.h | 5 ++++- .../icsneo/device/tree/radcomet3/radcomet3settings.h | 9 +++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/include/icsneo/device/idevicesettings.h b/include/icsneo/device/idevicesettings.h index d2b7ce3..968f362 100644 --- a/include/icsneo/device/idevicesettings.h +++ b/include/icsneo/device/idevicesettings.h @@ -395,6 +395,16 @@ typedef struct ETHERNET10T1S_SETTINGS_t #define ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA 0x01 #define ETHERNET10T1S_SETTINGS_FLAG_TERMINATION 0x02 +#define ETHERNET10T1S_SETTINGS_FLAG_BUS_DECODING_BEACONS 0x04 +#define ETHERNET10T1S_SETTINGS_FLAG_BUS_DECODING_ALL 0x08 + +typedef struct ETHERNET10T1S_SETTINGS_EXT_t +{ + uint8_t enable_multi_id; // Mask representing whether ID at corresponding bit enabled or not + uint8_t multi_id[7]; + uint8_t rsvd[8]; +} ETHERNET10T1S_SETTINGS_EXT; +#define ETHERNET10T1S_SETTINGS_EXT_SIZE 16 #define ETHERNET_SETTINGS10G_FLAG_FULL_DUPLEX 0x01 #define ETHERNET_SETTINGS10G_FLAG_AUTO_NEG 0x02 diff --git a/include/icsneo/device/tree/radcomet/radcometsettings.h b/include/icsneo/device/tree/radcomet/radcometsettings.h index 5cb44b5..f673603 100644 --- a/include/icsneo/device/tree/radcomet/radcometsettings.h +++ b/include/icsneo/device/tree/radcomet/radcometsettings.h @@ -71,6 +71,9 @@ typedef struct { ETHERNET10T1S_SETTINGS t1s2; uint64_t network_enables_5; LIN_SETTINGS lin1; + // 10T1S Extended settings + ETHERNET10T1S_SETTINGS_EXT t1s1Ext; + ETHERNET10T1S_SETTINGS_EXT t1s2Ext; } radcomet_settings_t; #pragma pack(pop) @@ -80,7 +83,7 @@ typedef struct { #ifdef __cplusplus -static_assert(sizeof(radcomet_settings_t) == 466, "RADComet settings size mismatch"); +static_assert(sizeof(radcomet_settings_t) == 498, "RADComet settings size mismatch"); #include diff --git a/include/icsneo/device/tree/radcomet3/radcomet3settings.h b/include/icsneo/device/tree/radcomet3/radcomet3settings.h index ddc4ec0..3476aac 100644 --- a/include/icsneo/device/tree/radcomet3/radcomet3settings.h +++ b/include/icsneo/device/tree/radcomet3/radcomet3settings.h @@ -68,11 +68,20 @@ typedef struct { ETHERNET_SETTINGS2 ethT1s6; ETHERNET10T1S_SETTINGS t1s6; LIN_SETTINGS lin1; + // 10T1S Extended Settings + ETHERNET10T1S_SETTINGS_EXT t1s1Ext; + ETHERNET10T1S_SETTINGS_EXT t1s2Ext; + ETHERNET10T1S_SETTINGS_EXT t1s3Ext; + ETHERNET10T1S_SETTINGS_EXT t1s4Ext; + ETHERNET10T1S_SETTINGS_EXT t1s5Ext; + ETHERNET10T1S_SETTINGS_EXT t1s6Ext; } radcomet3_settings_t; #pragma pack(pop) #ifdef __cplusplus +static_assert(sizeof(radcomet3_settings_t) == 674, "RADComet3 settings size mismatch"); + #include class RADComet3Settings : public IDeviceSettings {