sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 09:28:40 +02:00
Code Issues Projects Releases Wiki Activity

Support software controllable termination

Browse Source
This commit is contained in:
Paul Hollinsky
2021-04-11 22:13:51 -04:00
parent c8bf1f26da
commit e82b5d15e0
16 changed files with 588 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/device/tree/neovifire2/neovifire2settings.h
+25
View File
@@ -191,6 +191,31 @@ public:
return nullptr;
}
}
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
return {
{
Network(Network::NetID::HSCAN),
Network(Network::NetID::HSCAN3),
Network(Network::NetID::HSCAN5),
Network(Network::NetID::HSCAN7)
},
{
Network(Network::NetID::MSCAN),
Network(Network::NetID::HSCAN2),
Network(Network::NetID::HSCAN4),
Network(Network::NetID::HSCAN6)
}
};
}
protected:
const uint64_t* getTerminationEnables() const override {
auto cfg = getStructurePointer<neovifire2_settings_t>();
if(cfg == nullptr)
return nullptr;
return &cfg->termination_enables;
}
};
}
include/icsneo/device/tree/radgigalog/radgigalogsettings.h
+25
View File
@@ -152,6 +152,31 @@ public:
return nullptr;
}
}
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
return {
{
Network(Network::NetID::HSCAN),
Network(Network::NetID::HSCAN3),
Network(Network::NetID::HSCAN5),
Network(Network::NetID::HSCAN7)
},
{
Network(Network::NetID::MSCAN),
Network(Network::NetID::HSCAN2),
Network(Network::NetID::HSCAN4),
Network(Network::NetID::HSCAN6)
}
};
}
protected:
const uint64_t* getTerminationEnables() const override {
auto cfg = getStructurePointer<radgigalog_settings_t>();
if(cfg == nullptr)
return nullptr;
return &cfg->termination_enables;
}
};
}
include/icsneo/device/tree/radgigastar/radgigastarsettings.h
+23
View File
@@ -133,6 +133,29 @@ public:
return nullptr;
}
}
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
return {
{
Network(Network::NetID::HSCAN),
Network(Network::NetID::HSCAN2),
Network(Network::NetID::HSCAN3),
Network(Network::NetID::HSCAN4)
},
{
Network(Network::NetID::MSCAN),
Network(Network::NetID::HSCAN5)
}
};
}
protected:
const uint64_t* getTerminationEnables() const override {
auto cfg = getStructurePointer<radgigastar_settings_t>();
if(cfg == nullptr)
return nullptr;
return &cfg->termination_enables;
}
};
typedef struct {
include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h
+15
View File
@@ -37,6 +37,21 @@ public:
return nullptr;
}
}
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
return {
{ Network(Network::NetID::HSCAN) },
{ Network(Network::NetID::HSCAN2) }
};
}
protected:
const uint64_t* getTerminationEnables() const override {
auto cfg = getStructurePointer<valuecan4_4_2el_settings_t>();
if(cfg == nullptr)
return nullptr;
return &cfg->termination_enables;
}
};
}
include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h
+15
View File
@@ -36,6 +36,21 @@ public:
return nullptr;
}
}
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
return {
{ Network(Network::NetID::HSCAN) },
{ Network(Network::NetID::HSCAN2) }
};
}
protected:
const uint64_t* getTerminationEnables() const override {
auto cfg = getStructurePointer<valuecan4_1_2_settings_t>();
if(cfg == nullptr)
return nullptr;
return &cfg->termination_enables;
}
};
}
include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h
+21
View File
@@ -45,6 +45,27 @@ public:
return nullptr;
}
}
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
return {
{
Network(Network::NetID::HSCAN),
Network(Network::NetID::HSCAN3)
},
{
Network(Network::NetID::HSCAN2),
Network(Network::NetID::HSCAN4)
}
};
}
protected:
const uint64_t* getTerminationEnables() const override {
auto cfg = getStructurePointer<valuecan4_4_2el_settings_t>();
if(cfg == nullptr)
return nullptr;
return &cfg->termination_enables;
}
};
}
include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h
+15
View File
@@ -37,6 +37,21 @@ public:
return nullptr;
}
}
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
return {
{ Network(Network::NetID::HSCAN) },
{ Network(Network::NetID::HSCAN2) }
};
}
protected:
const uint64_t* getTerminationEnables() const override {
auto cfg = getStructurePointer<valuecan4_industrial_settings_t>();
if(cfg == nullptr)
return nullptr;
return &cfg->termination_enables;
}
};
}
include/icsneo/device/tree/vividcan/vividcansettings.h
+49
View File
@@ -82,6 +82,55 @@ public:
return nullptr;
}
}
virtual std::vector<TerminationGroup> getTerminationGroups() const override {
return {
{ Network(Network::NetID::HSCAN) }
};
}
bool refresh(bool ignoreChecksum = false) override {
// Because VividCAN uses a nonstandard 16-bit termination_enables
// we need to keep the standard 64-bit values in memory and update
// the structure when applying
if(!IDeviceSettings::refresh(ignoreChecksum))
return false;
auto cfg = getStructurePointer<vividcan_settings_t>();
if(cfg == nullptr)
return false;
activeTerminationEnables = queuedTerminationEnables = cfg->termination_enables;
return true;
}
bool apply(bool permanent = true) override {
auto cfg = getMutableStructurePointer<vividcan_settings_t>();
if(cfg)
cfg->termination_enables = uint16_t(queuedTerminationEnables & 0xFFFF);
const bool success = IDeviceSettings::apply(permanent);
if(success)
activeTerminationEnables = cfg->termination_enables;
return success;
}
protected:
const uint64_t* getTerminationEnables() const override {
// Check the structure pointer even though we're not using it so
// all of the other checks that go along with it are performed
if(getStructurePointer<vividcan_settings_t>() == nullptr)
return nullptr;
return &activeTerminationEnables;
}
uint64_t* getMutableTerminationEnables() override {
if(getMutableStructurePointer<vividcan_settings_t>() == nullptr)
return nullptr;
return &queuedTerminationEnables;
}
private:
uint64_t queuedTerminationEnables = 0;
uint64_t activeTerminationEnables = 0;
};
}