Compare commits

..

2 Commits

Author SHA1 Message Date
Bryant Jones e37d939699 Build: Fix warning on Comet2 missing override keyword 2024-02-14 15:37:09 +00:00
Bryant Jones 2a94b4566b RAD-A2B: Update settings structure 2024-02-14 10:04:14 -05:00
2 changed files with 7 additions and 2 deletions

View File

@ -33,7 +33,8 @@ typedef struct {
struct struct
{ {
uint16_t hwComLatencyTestEn : 1; uint16_t hwComLatencyTestEn : 1;
uint16_t : 15; uint16_t disableUsbCheckOnBoot : 1;
uint16_t : 14;
} flags; } flags;
uint16_t network_enabled_on_boot; uint16_t network_enabled_on_boot;
CAN_SETTINGS can1; CAN_SETTINGS can1;
@ -56,11 +57,15 @@ typedef struct {
uint32_t pwr_man_timeout; uint32_t pwr_man_timeout;
uint16_t pwr_man_enable; uint16_t pwr_man_enable;
ETHERNET_SETTINGS2 ethernet; ETHERNET_SETTINGS2 ethernet;
RAD_GPTP_SETTINGS gPTP;
uint64_t network_enables_5;
} rada2b_settings_t; } rada2b_settings_t;
#pragma pack(pop) #pragma pack(pop)
#ifdef __cplusplus #ifdef __cplusplus
static_assert(sizeof(rada2b_settings_t) == 340, "RAD-A2B settings size mismatch");
#include <iostream> #include <iostream>
class RADA2BSettings : public IDeviceSettings { class RADA2BSettings : public IDeviceSettings {

View File

@ -20,7 +20,7 @@ public:
return "RAD-Comet 2"; return "RAD-Comet 2";
} }
virtual const std::vector<Network>& GetSupportedNetworks() { const std::vector<Network>& GetSupportedNetworks() override {
static std::vector<Network> supportedNetworks = RADCometBase::GetSupportedNetworks(); static std::vector<Network> supportedNetworks = RADCometBase::GetSupportedNetworks();
supportedNetworks.push_back(Network::NetID::OP_Ethernet3); supportedNetworks.push_back(Network::NetID::OP_Ethernet3);
supportedNetworks.push_back(Network::NetID::MDIO4); supportedNetworks.push_back(Network::NetID::MDIO4);