Compare commits
No commits in common. "ea5f11268c2a111dc5ff0b01d19280eebdcc2142" and "771d82826f3ddd58e8cbc1fbf62dc329e502d860" have entirely different histories.
ea5f11268c
...
771d82826f
|
|
@ -848,13 +848,6 @@ protected:
|
||||||
|
|
||||||
neodevice_t& getWritableNeoDevice() { return data; }
|
neodevice_t& getWritableNeoDevice() { return data; }
|
||||||
|
|
||||||
enum class LEDState : uint8_t {
|
|
||||||
Offline = 0x04,
|
|
||||||
CoreMiniRunning = 0x08, // This should override "offline" if the CoreMini is running
|
|
||||||
Online = 0x10
|
|
||||||
};
|
|
||||||
LEDState ledState;
|
|
||||||
void updateLEDState();
|
|
||||||
private:
|
private:
|
||||||
neodevice_t data;
|
neodevice_t data;
|
||||||
std::shared_ptr<ResetStatusMessage> latestResetStatus;
|
std::shared_ptr<ResetStatusMessage> latestResetStatus;
|
||||||
|
|
@ -883,6 +876,14 @@ private:
|
||||||
|
|
||||||
APIEvent::Type getCommunicationNotEstablishedError();
|
APIEvent::Type getCommunicationNotEstablishedError();
|
||||||
|
|
||||||
|
enum class LEDState : uint8_t {
|
||||||
|
Offline = 0x04,
|
||||||
|
CoreMiniRunning = 0x08, // This should override "offline" if the CoreMini is running
|
||||||
|
Online = 0x10
|
||||||
|
};
|
||||||
|
LEDState ledState;
|
||||||
|
void updateLEDState();
|
||||||
|
|
||||||
size_t pollingMessageLimit = 20000;
|
size_t pollingMessageLimit = 20000;
|
||||||
moodycamel::BlockingConcurrentQueue<std::shared_ptr<Message>> pollingContainer;
|
moodycamel::BlockingConcurrentQueue<std::shared_ptr<Message>> pollingContainer;
|
||||||
void enforcePollingMessageLimit();
|
void enforcePollingMessageLimit();
|
||||||
|
|
|
||||||
|
|
@ -48,19 +48,24 @@ public:
|
||||||
return Device::getProductName();
|
return Device::getProductName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RADMoon 2 does not go online, you can only set settings and
|
||||||
|
// view PHY information (when supported)
|
||||||
bool goOnline() override {
|
bool goOnline() override {
|
||||||
if(!com->sendCommand(Command::EnableNetworkCommunication, true))
|
report(APIEvent::Type::OnlineNotSupported, APIEvent::Severity::Error);
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
updateLEDState();
|
|
||||||
online = true;
|
bool goOffline() override {
|
||||||
return true;
|
report(APIEvent::Type::OnlineNotSupported, APIEvent::Severity::Error);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool getEthPhyRegControlSupported() const override { return true; }
|
bool getEthPhyRegControlSupported() const override { return true; }
|
||||||
|
|
||||||
virtual uint8_t getPhyAddrOrPort() const = 0;
|
virtual uint8_t getPhyAddrOrPort() const = 0;
|
||||||
|
|
||||||
|
bool isOnlineSupported() const override { return false; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
using Device::Device;
|
using Device::Device;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,10 +27,6 @@ typedef struct {
|
||||||
uint16_t pc_com_mode;
|
uint16_t pc_com_mode;
|
||||||
TIMESYNC_ICSHARDWARE_SETTINGS timeSyncSettings;
|
TIMESYNC_ICSHARDWARE_SETTINGS timeSyncSettings;
|
||||||
uint16_t hwComLatencyTestEn;
|
uint16_t hwComLatencyTestEn;
|
||||||
|
|
||||||
RAD_GPTP_SETTINGS gPTP;
|
|
||||||
uint64_t network_enables_5;
|
|
||||||
|
|
||||||
} radmoon2_settings_t;
|
} radmoon2_settings_t;
|
||||||
#pragma pack(pop)
|
#pragma pack(pop)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,6 @@ public:
|
||||||
static std::vector<Network> supportedNetworks = {
|
static std::vector<Network> supportedNetworks = {
|
||||||
Network::NetID::Ethernet,
|
Network::NetID::Ethernet,
|
||||||
Network::NetID::OP_Ethernet1,
|
Network::NetID::OP_Ethernet1,
|
||||||
Network::NetID::MDIO1
|
|
||||||
};
|
};
|
||||||
return supportedNetworks;
|
return supportedNetworks;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@ typedef struct {
|
||||||
uint16_t enableLatencyTest : 1;
|
uint16_t enableLatencyTest : 1;
|
||||||
uint16_t reserved : 15;
|
uint16_t reserved : 15;
|
||||||
} flags; // 2
|
} flags; // 2
|
||||||
uint64_t network_enables_5;
|
|
||||||
} radmoon3_settings_t;
|
} radmoon3_settings_t;
|
||||||
#pragma pack(pop)
|
#pragma pack(pop)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue