Settings: Resolve MSVC structure warnings
parent
9ba7320fd3
commit
07afbebc6d
|
|
@ -22,6 +22,7 @@ typedef struct {
|
||||||
uint8_t linkMode1;
|
uint8_t linkMode1;
|
||||||
// USB/CM or RJ45 selection (RadMoonDuoConverterMode)
|
// USB/CM or RJ45 selection (RadMoonDuoConverterMode)
|
||||||
uint8_t converter1Mode;
|
uint8_t converter1Mode;
|
||||||
|
uint8_t reserved;
|
||||||
// IP Settings if converter is hooked up to Coremini
|
// IP Settings if converter is hooked up to Coremini
|
||||||
// Currently unused
|
// Currently unused
|
||||||
uint32_t ipAddress;
|
uint32_t ipAddress;
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,11 @@ namespace icsneo {
|
||||||
// This is where the actual settings structures for all the ValueCAN 4 line live
|
// This is where the actual settings structures for all the ValueCAN 4 line live
|
||||||
// ValueCAN 4-1 and 4-2 share a structure, and 4-4 shares with 4-2EL, Industrial has its own
|
// ValueCAN 4-1 and 4-2 share a structure, and 4-4 shares with 4-2EL, Industrial has its own
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable : 4201) // nameless struct/union
|
||||||
|
#endif
|
||||||
|
|
||||||
#pragma pack(push, 2)
|
#pragma pack(push, 2)
|
||||||
typedef struct {
|
typedef struct {
|
||||||
/* Performance Test */
|
/* Performance Test */
|
||||||
|
|
@ -76,8 +81,7 @@ typedef struct {
|
||||||
uint16_t pwr_man_timeout;
|
uint16_t pwr_man_timeout;
|
||||||
} valuecan4_4_2el_settings_t, valuecan4_4_settings_t, valuecan4_2el_settings_t;
|
} valuecan4_4_2el_settings_t, valuecan4_4_settings_t, valuecan4_2el_settings_t;
|
||||||
|
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
uint8_t ethernetActivationLineEnabled;
|
uint8_t ethernetActivationLineEnabled;
|
||||||
uint8_t unused;
|
uint8_t unused;
|
||||||
} valuecan4_4_2el_status_t, valuecan4_4_status_t, valuecan4_2el_status_t;
|
} valuecan4_4_2el_status_t, valuecan4_4_status_t, valuecan4_2el_status_t;
|
||||||
|
|
@ -119,6 +123,9 @@ typedef struct {
|
||||||
} flags;
|
} flags;
|
||||||
} valuecan4_industrial_settings_t;
|
} valuecan4_industrial_settings_t;
|
||||||
#pragma pack(pop)
|
#pragma pack(pop)
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue