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

Merge branch 'master' into v0.3.0-dev

Browse Source
This commit is contained in:
Paul Hollinsky
2021-06-17 21:07:50 -04:00
parent e5bf87ba7d 02c14aeb35
commit bb65e37841
9 changed files with 128 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/device/tree/valuecan4/settings/valuecan4industrialsettings.h
+2 -2
View File
@@ -12,7 +12,7 @@ class ValueCAN4IndustrialSettings : public IDeviceSettings {
public:
ValueCAN4IndustrialSettings(std::shared_ptr<Communication> com) : IDeviceSettings(com, sizeof(valuecan4_industrial_settings_t)) {}
const CAN_SETTINGS* getCANSettingsFor(Network net) const override {
auto cfg = getStructurePointer<valuecan4_1_2_settings_t>();
auto cfg = getStructurePointer<valuecan4_industrial_settings_t>();
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {
@@ -25,7 +25,7 @@ public:
}
}
const CANFD_SETTINGS* getCANFDSettingsFor(Network net) const override {
auto cfg = getStructurePointer<valuecan4_1_2_settings_t>();
auto cfg = getStructurePointer<valuecan4_industrial_settings_t>();
if(cfg == nullptr)
return nullptr;
switch(net.getNetID()) {