sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolve issue #1 undefined symbols when building on POSIX systems

pull/4/head
Paul Hollinsky 2019-01-11 13:01:19 -05:00
parent 122c54b2ff
commit c313801a21
11 changed files with 142 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/icsneo/device/neoobd2pro/neoobd2pro.h
View File

@ -21,10 +21,13 @@ public:
return found; return found;
} }
static constexpr Network::NetID SUPPORTED_NETWORKS[] = { static const std::vector<Network>& GetSupportedNetworks() {
Network::NetID::HSCAN, static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN2 Network::NetID::HSCAN,
}; Network::NetID::HSCAN2
};
return supportedNetworks;
}
private: private:
NeoOBD2PRO(neodevice_t neodevice) : Device(neodevice) { NeoOBD2PRO(neodevice_t neodevice) : Device(neodevice) {
@ -34,7 +37,7 @@ private:
} }
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override { virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : SUPPORTED_NETWORKS) for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid); rxNetworks.emplace_back(netid);
} }

13
include/icsneo/device/neoobd2sim/neoobd2sim.h
View File

@ -21,10 +21,13 @@ public:
return found; return found;
} }
static constexpr Network::NetID SUPPORTED_NETWORKS[] = { static const std::vector<Network>& GetSupportedNetworks() {
Network::NetID::HSCAN, static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN2 Network::NetID::HSCAN,
}; Network::NetID::HSCAN2
};
return supportedNetworks;
}
private: private:
NeoOBD2SIM(neodevice_t neodevice) : Device(neodevice) { NeoOBD2SIM(neodevice_t neodevice) : Device(neodevice) {
@ -34,7 +37,7 @@ private:
} }
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override { virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : SUPPORTED_NETWORKS) for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid); rxNetworks.emplace_back(netid);
} }

37
include/icsneo/device/neovifire/neovifire.h
View File

@ -21,25 +21,28 @@ public:
return found; return found;
} }
static constexpr Network::NetID SUPPORTED_NETWORKS[] = { static const std::vector<Network>& GetSupportedNetworks() {
Network::NetID::HSCAN, static std::vector<Network> supportedNetworks = {
Network::NetID::MSCAN, Network::NetID::HSCAN,
Network::NetID::HSCAN2, Network::NetID::MSCAN,
Network::NetID::HSCAN3, Network::NetID::HSCAN2,
Network::NetID::HSCAN4, Network::NetID::HSCAN3,
Network::NetID::HSCAN5, Network::NetID::HSCAN4,
Network::NetID::HSCAN5,
Network::NetID::LSFTCAN, Network::NetID::LSFTCAN,
Network::NetID::LSFTCAN2, Network::NetID::LSFTCAN2,
Network::NetID::SWCAN, Network::NetID::SWCAN,
Network::NetID::SWCAN2, Network::NetID::SWCAN2,
Network::NetID::LIN, Network::NetID::LIN,
Network::NetID::LIN2, Network::NetID::LIN2,
Network::NetID::LIN3, Network::NetID::LIN3,
Network::NetID::LIN4 Network::NetID::LIN4
}; };
return supportedNetworks;
}
enum class Mode : char { enum class Mode : char {
Application = 'A', Application = 'A',
@ -79,7 +82,7 @@ private:
} }
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override { virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : SUPPORTED_NETWORKS) for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid); rxNetworks.emplace_back(netid);
} }

43
include/icsneo/device/neovifire2/neovifire2.h
View File

@ -12,29 +12,32 @@ public:
static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::FIRE2; static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::FIRE2;
static constexpr const char* SERIAL_START = "CY"; static constexpr const char* SERIAL_START = "CY";
static constexpr Network::NetID SUPPORTED_NETWORKS[] = { static const std::vector<Network>& GetSupportedNetworks() {
Network::NetID::HSCAN, static std::vector<Network> supportedNetworks = {
Network::NetID::MSCAN, Network::NetID::HSCAN,
Network::NetID::HSCAN2, Network::NetID::MSCAN,
Network::NetID::HSCAN3, Network::NetID::HSCAN2,
Network::NetID::HSCAN4, Network::NetID::HSCAN3,
Network::NetID::HSCAN5, Network::NetID::HSCAN4,
Network::NetID::HSCAN6, Network::NetID::HSCAN5,
Network::NetID::HSCAN7, Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
Network::NetID::LSFTCAN, Network::NetID::LSFTCAN,
Network::NetID::LSFTCAN2, Network::NetID::LSFTCAN2,
Network::NetID::SWCAN, Network::NetID::SWCAN,
Network::NetID::SWCAN2, Network::NetID::SWCAN2,
Network::NetID::Ethernet, Network::NetID::Ethernet,
Network::NetID::LIN, Network::NetID::LIN,
Network::NetID::LIN2, Network::NetID::LIN2,
Network::NetID::LIN3, Network::NetID::LIN3,
Network::NetID::LIN4 Network::NetID::LIN4
}; };
return supportedNetworks;
}
protected: protected:
NeoVIFIRE2(neodevice_t neodevice) : Device(neodevice) { NeoVIFIRE2(neodevice_t neodevice) : Device(neodevice) {
@ -47,7 +50,7 @@ protected:
} }
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override { virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : SUPPORTED_NETWORKS) for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid); rxNetworks.emplace_back(netid);
} }

57
include/icsneo/device/radgalaxy/radgalaxy.h
View File

@ -47,34 +47,37 @@ public:
return found; return found;
} }
static constexpr Network::NetID SUPPORTED_NETWORKS[] = { static const std::vector<Network>& GetSupportedNetworks() {
Network::NetID::HSCAN, static std::vector<Network> supportedNetworks = {
Network::NetID::MSCAN, Network::NetID::HSCAN,
Network::NetID::HSCAN2, Network::NetID::MSCAN,
Network::NetID::HSCAN3, Network::NetID::HSCAN2,
Network::NetID::HSCAN4, Network::NetID::HSCAN3,
Network::NetID::HSCAN5, Network::NetID::HSCAN4,
Network::NetID::HSCAN6, Network::NetID::HSCAN5,
Network::NetID::HSCAN7, Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
Network::NetID::SWCAN, Network::NetID::SWCAN,
Network::NetID::SWCAN2, Network::NetID::SWCAN2,
Network::NetID::LIN, Network::NetID::LIN,
Network::NetID::OP_Ethernet1, Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2, Network::NetID::OP_Ethernet2,
Network::NetID::OP_Ethernet3, Network::NetID::OP_Ethernet3,
Network::NetID::OP_Ethernet4, Network::NetID::OP_Ethernet4,
Network::NetID::OP_Ethernet5, Network::NetID::OP_Ethernet5,
Network::NetID::OP_Ethernet6, Network::NetID::OP_Ethernet6,
Network::NetID::OP_Ethernet7, Network::NetID::OP_Ethernet7,
Network::NetID::OP_Ethernet8, Network::NetID::OP_Ethernet8,
Network::NetID::OP_Ethernet9, Network::NetID::OP_Ethernet9,
Network::NetID::OP_Ethernet10, Network::NetID::OP_Ethernet10,
Network::NetID::OP_Ethernet11, Network::NetID::OP_Ethernet11,
Network::NetID::OP_Ethernet12 Network::NetID::OP_Ethernet12
}; };
return supportedNetworks;
}
RADGalaxy(neodevice_t neodevice) : Device(neodevice) { RADGalaxy(neodevice_t neodevice) : Device(neodevice) {
initialize<PCAP>(); initialize<PCAP>();
@ -100,7 +103,7 @@ protected:
} }
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override { virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : SUPPORTED_NETWORKS) for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid); rxNetworks.emplace_back(netid);
} }

19
include/icsneo/device/radstar2/radstar2.h
View File

@ -14,15 +14,18 @@ public:
static constexpr const uint16_t PRODUCT_ID = 0x0005; static constexpr const uint16_t PRODUCT_ID = 0x0005;
static constexpr const char* SERIAL_START = "RS"; static constexpr const char* SERIAL_START = "RS";
static constexpr Network::NetID SUPPORTED_NETWORKS[] = { static const std::vector<Network>& GetSupportedNetworks() {
Network::NetID::HSCAN, static std::vector<Network> supportedNetworks = {
Network::NetID::MSCAN, Network::NetID::HSCAN,
Network::NetID::MSCAN,
Network::NetID::LIN, Network::NetID::LIN,
Network::NetID::OP_Ethernet1, Network::NetID::OP_Ethernet1,
Network::NetID::OP_Ethernet2 Network::NetID::OP_Ethernet2
}; };
return supportedNetworks;
}
protected: protected:
virtual void setupPacketizer(Packetizer& packetizer) override { virtual void setupPacketizer(Packetizer& packetizer) override {
@ -42,7 +45,7 @@ protected:
} }
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override { virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : SUPPORTED_NETWORKS) for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid); rxNetworks.emplace_back(netid);
} }

13
include/icsneo/device/valuecan3/valuecan3.h
View File

@ -21,10 +21,13 @@ public:
return found; return found;
} }
static constexpr Network::NetID SUPPORTED_NETWORKS[] = { static const std::vector<Network>& GetSupportedNetworks() {
Network::NetID::HSCAN, static std::vector<Network> supportedNetworks = {
Network::NetID::MSCAN Network::NetID::HSCAN,
}; Network::NetID::MSCAN
};
return supportedNetworks;
}
private: private:
ValueCAN3(neodevice_t neodevice) : Device(neodevice) { ValueCAN3(neodevice_t neodevice) : Device(neodevice) {
@ -34,7 +37,7 @@ private:
} }
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override { virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : SUPPORTED_NETWORKS) for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid); rxNetworks.emplace_back(netid);
} }

11
include/icsneo/device/valuecan4/valuecan4-1.h
View File

@ -22,9 +22,12 @@ public:
return found; return found;
} }
static constexpr Network::NetID SUPPORTED_NETWORKS[] = { static const std::vector<Network>& GetSupportedNetworks() {
Network::NetID::HSCAN static std::vector<Network> supportedNetworks = {
}; Network::NetID::HSCAN
};
return supportedNetworks;
}
protected: protected:
void setupEncoder(Encoder& encoder) override { void setupEncoder(Encoder& encoder) override {
@ -33,7 +36,7 @@ protected:
} }
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override { virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : SUPPORTED_NETWORKS) for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid); rxNetworks.emplace_back(netid);
} }

13
include/icsneo/device/valuecan4/valuecan4-2.h
View File

@ -22,14 +22,17 @@ public:
return found; return found;
} }
static constexpr Network::NetID SUPPORTED_NETWORKS[] = { static const std::vector<Network>& GetSupportedNetworks() {
Network::NetID::HSCAN, static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN2 Network::NetID::HSCAN,
}; Network::NetID::HSCAN2
};
return supportedNetworks;
}
protected: protected:
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override { virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : SUPPORTED_NETWORKS) for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid); rxNetworks.emplace_back(netid);
} }

15
include/icsneo/device/valuecan4/valuecan4-2el.h
View File

@ -22,16 +22,19 @@ public:
return found; return found;
} }
static constexpr Network::NetID SUPPORTED_NETWORKS[] = { static const std::vector<Network>& GetSupportedNetworks() {
Network::NetID::HSCAN, static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN2, Network::NetID::HSCAN,
Network::NetID::HSCAN2,
Network::NetID::Ethernet Network::NetID::Ethernet
}; };
return supportedNetworks;
}
protected: protected:
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override { virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : SUPPORTED_NETWORKS) for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid); rxNetworks.emplace_back(netid);
} }

17
include/icsneo/device/valuecan4/valuecan4-4.h
View File

@ -22,16 +22,19 @@ public:
return found; return found;
} }
static constexpr Network::NetID SUPPORTED_NETWORKS[] = { static const std::vector<Network>& GetSupportedNetworks() {
Network::NetID::HSCAN, static std::vector<Network> supportedNetworks = {
Network::NetID::HSCAN2, Network::NetID::HSCAN,
Network::NetID::HSCAN3, Network::NetID::HSCAN2,
Network::NetID::HSCAN4 Network::NetID::HSCAN3,
}; Network::NetID::HSCAN4
};
return supportedNetworks;
}
protected: protected:
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override { virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
for(auto& netid : SUPPORTED_NETWORKS) for(auto& netid : GetSupportedNetworks())
rxNetworks.emplace_back(netid); rxNetworks.emplace_back(netid);
} }