From b97f358a0f9c6509b8e813c8a8163badd54106ad Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Mon, 10 May 2021 21:17:31 -0400 Subject: [PATCH] Settings: Extra Ethernet settings on ValueCAN 4 and RAD-Pluto --- include/icsneo/device/tree/radpluto/radplutosettings.h | 4 ++++ .../device/tree/valuecan4/settings/valuecan4settings.h | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/icsneo/device/tree/radpluto/radplutosettings.h b/include/icsneo/device/tree/radpluto/radplutosettings.h index 037fe83..0cf2e7b 100644 --- a/include/icsneo/device/tree/radpluto/radplutosettings.h +++ b/include/icsneo/device/tree/radpluto/radplutosettings.h @@ -61,11 +61,15 @@ typedef struct { uint8_t usbSelect; uint8_t pad; } custom; + + ETHERNET_SETTINGS2 ethernet2; } radpluto_settings_t; #pragma pack(pop) #ifdef __cplusplus +static_assert(sizeof(radpluto_settings_t) == 322, "RAD-Pluto Settings are not packed correctly!"); + #include class RADPlutoSettings : public IDeviceSettings { diff --git a/include/icsneo/device/tree/valuecan4/settings/valuecan4settings.h b/include/icsneo/device/tree/valuecan4/settings/valuecan4settings.h index 6689285..0ac5be4 100644 --- a/include/icsneo/device/tree/valuecan4/settings/valuecan4settings.h +++ b/include/icsneo/device/tree/valuecan4/settings/valuecan4settings.h @@ -79,6 +79,7 @@ typedef struct { } flags; uint16_t pwr_man_enable; uint16_t pwr_man_timeout; + ETHERNET_SETTINGS2 ethernet2; } valuecan4_4_2el_settings_t, valuecan4_4_settings_t, valuecan4_2el_settings_t; typedef struct { @@ -121,6 +122,7 @@ typedef struct { uint32_t enablePcEthernetComm : 1; uint32_t reserved : 28; } flags; + ETHERNET_SETTINGS2 ethernet2; } valuecan4_industrial_settings_t; #pragma pack(pop) #ifdef _MSC_VER @@ -130,8 +132,8 @@ typedef struct { #ifdef __cplusplus static_assert(sizeof(valuecan4_1_2_settings_t) == 148, "ValueCAN 4-1 / 4-2 Settings are not packed correctly!"); -static_assert(sizeof(valuecan4_4_2el_settings_t) == 326, "ValueCAN 4-4 / 4-2EL Settings are not packed correctly!"); -static_assert(sizeof(valuecan4_industrial_settings_t) == 212, "ValueCAN 4 Industrial Settings are not packed correctly!"); +static_assert(sizeof(valuecan4_4_2el_settings_t) == 342, "ValueCAN 4-4 / 4-2EL Settings are not packed correctly!"); +static_assert(sizeof(valuecan4_industrial_settings_t) == 228, "ValueCAN 4 Industrial Settings are not packed correctly!"); } // End of namespace