Compare commits
No commits in common. "e37d9396990c7e00974424a28138fb649fef11f2" and "4782e26bedf2e97817333334ec7876c3c272f7bc" have entirely different histories.
e37d939699
...
4782e26bed
|
|
@ -33,8 +33,7 @@ typedef struct {
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
uint16_t hwComLatencyTestEn : 1;
|
uint16_t hwComLatencyTestEn : 1;
|
||||||
uint16_t disableUsbCheckOnBoot : 1;
|
uint16_t : 15;
|
||||||
uint16_t : 14;
|
|
||||||
} flags;
|
} flags;
|
||||||
uint16_t network_enabled_on_boot;
|
uint16_t network_enabled_on_boot;
|
||||||
CAN_SETTINGS can1;
|
CAN_SETTINGS can1;
|
||||||
|
|
@ -57,15 +56,11 @@ 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 {
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ public:
|
||||||
return "RAD-Comet 2";
|
return "RAD-Comet 2";
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::vector<Network>& GetSupportedNetworks() override {
|
virtual const std::vector<Network>& GetSupportedNetworks() {
|
||||||
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);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue