Begin work on FlexRay support

include/icsneo/device/tree/neoobd2pro/neoobd2pro.h

@@ -0,0 +1,50 @@
+#ifndef __NEOOBD2PRO_H_
+#define __NEOOBD2PRO_H_
+
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/stm32.h"
+
+namespace icsneo {
+
+class NeoOBD2PRO : public Device {
+public:
+	// Serial numbers are NP****
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::OBD2_PRO;
+	static constexpr const uint16_t PRODUCT_ID = 0x1103;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : STM32::FindByProduct(PRODUCT_ID))
+			found.emplace_back(new NeoOBD2PRO(neodevice));
+
+		return found;
+	}
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN,
+			Network::NetID::HSCAN2
+		};
+		return supportedNetworks;
+	}
+
+private:
+	NeoOBD2PRO(neodevice_t neodevice) : Device(neodevice) {
+		initialize<STM32>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+		productId = PRODUCT_ID;
+	}
+
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	// The supported TX networks are the same as the supported RX networks for this device
+	virtual void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+};
+
+}
+
+#endif

include/icsneo/device/tree/neoobd2sim/neoobd2sim.h

@@ -0,0 +1,50 @@
+#ifndef __NEOOBD2SIM_H_
+#define __NEOOBD2SIM_H_
+
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/stm32.h"
+
+namespace icsneo {
+
+class NeoOBD2SIM : public Device {
+public:
+	// Serial numbers are OS****
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::OBD2_SIM;
+	static constexpr const uint16_t PRODUCT_ID = 0x1100;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : STM32::FindByProduct(PRODUCT_ID))
+			found.emplace_back(new NeoOBD2SIM(neodevice));
+
+		return found;
+	}
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN,
+			Network::NetID::HSCAN2
+		};
+		return supportedNetworks;
+	}
+
+private:
+	NeoOBD2SIM(neodevice_t neodevice) : Device(neodevice) {
+		initialize<STM32>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+		productId = PRODUCT_ID;
+	}
+
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	// The supported TX networks are the same as the supported RX networks for this device
+	virtual void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+};
+
+}
+
+#endif

include/icsneo/device/tree/neovifire/neovifire.h

@@ -0,0 +1,91 @@
+#ifndef __NEOVIFIRE_H_
+#define __NEOVIFIRE_H_
+
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
+#include "icsneo/device/tree/neovifire/neovifiresettings.h"
+
+namespace icsneo {
+
+class NeoVIFIRE : public Device {
+public:
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::FIRE;
+	static constexpr const uint16_t PRODUCT_ID = 0x0701;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID))
+			found.emplace_back(new NeoVIFIRE(neodevice)); // Creation of the shared_ptr
+
+		return found;
+	}
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN,
+			Network::NetID::MSCAN,
+			Network::NetID::HSCAN2,
+			Network::NetID::HSCAN3,
+
+			Network::NetID::LSFTCAN,
+
+			Network::NetID::SWCAN,
+
+			Network::NetID::LIN,
+			Network::NetID::LIN2,
+			Network::NetID::LIN3,
+			Network::NetID::LIN4
+		};
+		return supportedNetworks;
+	}
+
+	enum class Mode : char {
+		Application = 'A',
+		Bootloader = 'B'
+	};
+
+	bool open() override {
+		if(!com)
+			return false;
+
+		if(!com->open())
+			return false;
+
+		// Enter mode is only needed on very old FIRE devices (white board), will be ignored by newer devices
+		if(!enterMode(Mode::Application))
+			return false;
+
+		return Device::open();
+	}
+
+	bool enterMode(Mode mode) {
+		// Included for compatibility with bootloaders on very old FIRE devices (white board)
+		// Mode will be a uppercase char like 'A'
+		if(!com->rawWrite({ (uint8_t)mode }))
+			return false;
+
+		// We then expect to see that same mode back in lowercase
+		// This won't happen in the case of new devices, though, so we assume it worked
+		return true;
+	}
+
+private:
+	NeoVIFIRE(neodevice_t neodevice) : Device(neodevice) {
+		initialize<FTDI, NeoVIFIRESettings>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+		productId = PRODUCT_ID;
+	}
+
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	// The supported TX networks are the same as the supported RX networks for this device
+	virtual void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+};
+
+}
+
+#endif

include/icsneo/device/tree/neovifire/neovifiresettings.h

@@ -0,0 +1,140 @@
+#ifndef __NEOVIFIRESETTINGS_H_
+#define __NEOVIFIRESETTINGS_H_
+
+#include <stdint.h>
+#include "icsneo/device/idevicesettings.h"
+
+#ifdef __cplusplus
+
+namespace icsneo {
+
+#endif
+
+#pragma pack(push, 2)
+typedef struct {
+	uint16_t netId;
+	uint8_t zero0;
+	uint8_t Config;
+} SNeoMostGatewaySettings;
+
+typedef struct {
+	CAN_SETTINGS can1;
+	CAN_SETTINGS can2;
+	CAN_SETTINGS can3;
+	CAN_SETTINGS can4;
+
+	SWCAN_SETTINGS swcan;
+	CAN_SETTINGS lsftcan;
+
+	LIN_SETTINGS lin1;
+	LIN_SETTINGS lin2;
+	LIN_SETTINGS lin3;
+	LIN_SETTINGS lin4;
+
+	uint16_t cgi_enable_reserved;
+	uint16_t cgi_baud;
+	uint16_t cgi_tx_ifs_bit_times;
+	uint16_t cgi_rx_ifs_bit_times;
+	uint16_t cgi_chksum_enable;
+
+	uint16_t network_enables;
+	uint16_t network_enabled_on_boot;
+
+	uint32_t pwm_man_timeout;
+	uint16_t pwr_man_enable;
+
+	uint16_t misc_io_initial_ddr;
+	uint16_t misc_io_initial_latch;
+
+	uint16_t misc_io_analog_enable;
+	uint16_t misc_io_report_period;
+	uint16_t misc_io_on_report_events;
+	uint16_t ain_sample_period;
+	uint16_t ain_threshold;
+
+	uint16_t iso15765_separation_time_offset;
+
+	uint16_t iso9141_kwp_enable_reserved;
+	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings;
+
+	uint16_t perf_en;
+
+	/* ISO9141: iso_parity 0 - no parity, 1 - event, 2 - odd; iso_msg_termination 0 - use inner frame time, 1 - GME CIM-SCL */
+
+	uint16_t iso_parity;
+	uint16_t iso_msg_termination;
+	uint16_t iso_tester_pullup_enable;
+
+	uint16_t network_enables_2;
+
+	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_2;
+	uint16_t iso_parity_2;
+	uint16_t iso_msg_termination_2;
+
+	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_3;
+	uint16_t iso_parity_3;
+	uint16_t iso_msg_termination_3;
+
+	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_4;
+	uint16_t iso_parity_4;
+	uint16_t iso_msg_termination_4;
+
+	uint16_t fast_init_network_enables_1;
+	uint16_t fast_init_network_enables_2;
+
+	UART_SETTINGS uart;
+	UART_SETTINGS uart2;
+
+	STextAPISettings text_api;
+
+	SNeoMostGatewaySettings neoMostGateway;
+
+	uint16_t vnetBits;
+} neovifire_settings_t;
+#pragma pack(pop)
+
+#ifdef __cplusplus
+
+#include <iostream>
+
+class NeoVIFIRESettings : public IDeviceSettings {
+public:
+	NeoVIFIRESettings(std::shared_ptr<Communication> com) : IDeviceSettings(com, sizeof(neovifire_settings_t)) {}
+	const CAN_SETTINGS* getCANSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<neovifire_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->can1);
+			case Network::NetID::MSCAN:
+				return &(cfg->can2);
+			case Network::NetID::HSCAN2:
+				return &(cfg->can3);
+			case Network::NetID::HSCAN3:
+				return &(cfg->can4);
+			case Network::NetID::LSFTCAN:
+				return &(cfg->lsftcan);
+			default:
+				return nullptr;
+		}
+	}
+	const CAN_SETTINGS* getLSFTCANSettingsFor(Network net) const override { return getCANSettingsFor(net); }
+	const SWCAN_SETTINGS* getSWCANSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<neovifire_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::SWCAN:
+				return &(cfg->swcan);
+			default:
+				return nullptr;
+		}
+	}
+};
+
+}
+
+#endif // __cplusplus
+
+#endif

include/icsneo/device/tree/neovifire2/neovifire2.h

@@ -0,0 +1,63 @@
+#ifndef __NEOVIFIRE2_H_
+#define __NEOVIFIRE2_H_
+
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
+
+namespace icsneo {
+
+class NeoVIFIRE2 : public Device {
+public:
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::FIRE2;
+	static constexpr const char* SERIAL_START = "CY";
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN,
+			Network::NetID::MSCAN,
+			Network::NetID::HSCAN2,
+			Network::NetID::HSCAN3,
+			Network::NetID::HSCAN4,
+			Network::NetID::HSCAN5,
+			Network::NetID::HSCAN6,
+			Network::NetID::HSCAN7,
+
+			Network::NetID::LSFTCAN,
+			Network::NetID::LSFTCAN2,
+
+			Network::NetID::SWCAN,
+			Network::NetID::SWCAN2,
+
+			Network::NetID::Ethernet,
+
+			Network::NetID::LIN,
+			Network::NetID::LIN2,
+			Network::NetID::LIN3,
+			Network::NetID::LIN4
+		};
+		return supportedNetworks;
+	}
+
+protected:
+	NeoVIFIRE2(neodevice_t neodevice) : Device(neodevice) {
+		getWritableNeoDevice().type = DEVICE_TYPE;
+	}
+
+	virtual void setupEncoder(Encoder& encoder) override {
+		Device::setupEncoder(encoder);
+		encoder.supportCANFD = true;
+	}
+
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	// The supported TX networks are the same as the supported RX networks for this device
+	virtual void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+};
+
+}
+
+#endif

include/icsneo/device/tree/neovifire2/neovifire2eth.h

@@ -0,0 +1,60 @@
+#ifndef __NEOVIFIRE2ETH_H_
+#define __NEOVIFIRE2ETH_H_
+
+#include "icsneo/device/tree/neovifire2/neovifire2.h"
+#include "icsneo/platform/pcap.h"
+#include "icsneo/device/tree/neovifire2/neovifire2settings.h"
+#include <memory>
+
+namespace icsneo {
+
+class NeoVIFIRE2ETH : public NeoVIFIRE2 {
+public:
+	static constexpr const uint16_t PRODUCT_ID = 0x0004;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+		
+		for(auto& foundDev : PCAP::FindAll()) {
+			auto fakedev = std::shared_ptr<NeoVIFIRE2ETH>(new NeoVIFIRE2ETH({}));
+			for (auto& payload : foundDev.discoveryPackets)
+				fakedev->com->packetizer->input(payload);
+			for (auto& packet : fakedev->com->packetizer->output()) {
+				std::shared_ptr<Message> msg;
+				if (!fakedev->com->decoder->decode(msg, packet))
+					continue; // We failed to decode this packet
+
+				if(!msg || msg->network.getNetID() != Network::NetID::Main51)
+					continue; // Not a message we care about
+				auto sn = std::dynamic_pointer_cast<SerialNumberMessage>(msg);
+				if(!sn)
+					continue; // Not a serial number message
+				
+				if(sn->deviceSerial.length() < 2)
+					continue;
+				if(sn->deviceSerial.substr(0, 2) != SERIAL_START)
+					continue; // Not a FIRE 2
+				
+				foundDev.device.serial[sn->deviceSerial.copy(foundDev.device.serial, sizeof(foundDev.device.serial))] = '\0';
+				found.push_back(std::make_shared<NeoVIFIRE2ETH>(foundDev.device));
+				break;
+			}
+		}
+
+		return found;
+	}
+
+	NeoVIFIRE2ETH(neodevice_t neodevice) : NeoVIFIRE2(neodevice) {
+		initialize<PCAP, NeoVIFIRE2Settings>();
+		productId = PRODUCT_ID;
+	}
+
+protected:
+	virtual void setupSettings(IDeviceSettings* ssettings) {
+		// TODO Check firmware version, old firmwares will reset Ethernet settings on settings send
+		ssettings->readonly = true;
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/neovifire2/neovifire2settings.h

@@ -0,0 +1,191 @@
+#ifndef __NEOVIFIRE2SETTINGS_H_
+#define __NEOVIFIRE2SETTINGS_H_
+
+#include <stdint.h>
+#include "icsneo/device/idevicesettings.h"
+
+#ifdef __cplusplus
+
+namespace icsneo {
+
+#endif
+
+#pragma pack(push, 2)
+typedef struct {
+	uint16_t perf_en;
+
+	CAN_SETTINGS can1;
+	CANFD_SETTINGS canfd1;
+	CAN_SETTINGS can2;
+	CANFD_SETTINGS canfd2;
+	CAN_SETTINGS can3;
+	CANFD_SETTINGS canfd3;
+	CAN_SETTINGS can4;
+	CANFD_SETTINGS canfd4;
+	CAN_SETTINGS can5;
+	CANFD_SETTINGS canfd5;
+	CAN_SETTINGS can6;
+	CANFD_SETTINGS canfd6;
+	CAN_SETTINGS can7;
+	CANFD_SETTINGS canfd7;
+	CAN_SETTINGS can8;
+	CANFD_SETTINGS canfd8;
+
+	/* Native CAN are either LS1/LS2 or SW1/SW2 */
+	SWCAN_SETTINGS swcan1;
+	uint16_t network_enables;
+	SWCAN_SETTINGS swcan2;
+	uint16_t network_enables_2;
+
+	CAN_SETTINGS lsftcan1;
+	CAN_SETTINGS lsftcan2;
+
+	LIN_SETTINGS lin1;
+	uint16_t misc_io_initial_ddr;
+	LIN_SETTINGS lin2;
+	uint16_t misc_io_initial_latch;
+	LIN_SETTINGS lin3;
+	uint16_t misc_io_report_period;
+	LIN_SETTINGS lin4;
+	uint16_t misc_io_on_report_events;
+	LIN_SETTINGS lin5;
+	uint16_t misc_io_analog_enable;
+	uint16_t ain_sample_period;
+	uint16_t ain_threshold;
+
+	uint32_t pwr_man_timeout;
+	uint16_t pwr_man_enable;
+
+	uint16_t network_enabled_on_boot;
+
+	uint16_t iso15765_separation_time_offset;
+
+	uint16_t iso_9141_kwp_enable_reserved;
+	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_1;
+	uint16_t iso_parity_1;
+
+	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_2;
+	uint16_t iso_parity_2;
+
+	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_3;
+	uint16_t iso_parity_3;
+
+	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_4;
+	uint16_t iso_parity_4;
+
+	uint16_t iso_msg_termination_1;
+	uint16_t iso_msg_termination_2;
+	uint16_t iso_msg_termination_3;
+	uint16_t iso_msg_termination_4;
+
+	uint16_t idle_wakeup_network_enables_1;
+	uint16_t idle_wakeup_network_enables_2;
+
+	/* reserved for HSCAN6/7, LSFT2, etc.. */
+	uint16_t network_enables_3;
+	uint16_t idle_wakeup_network_enables_3;
+
+	uint16_t can_switch_mode;
+	STextAPISettings text_api;
+	uint64_t termination_enables;
+	LIN_SETTINGS lin6;
+	ETHERNET_SETTINGS ethernet;
+	uint16_t slaveVnetA;
+	uint16_t slaveVnetB;
+	struct {
+		uint32_t disableUsbCheckOnBoot : 1;
+		uint32_t enableLatencyTest : 1;
+		uint32_t busMessagesToAndroid : 1;
+		uint32_t enablePcEthernetComm : 1;
+		uint32_t enableDefaultLogger : 1;
+		uint32_t enableDefaultUpload : 1;
+		uint32_t reserved : 26;
+	} flags;
+	uint16_t digitalIoThresholdTicks;
+	uint16_t digitalIoThresholdEnable;
+	TIMESYNC_ICSHARDWARE_SETTINGS timeSync;
+} neovifire2_settings_t;
+#pragma pack(pop)
+
+#ifdef __cplusplus
+
+#include <iostream>
+
+class NeoVIFIRE2Settings : public IDeviceSettings {
+public:
+	NeoVIFIRE2Settings(std::shared_ptr<Communication> com) : IDeviceSettings(com, sizeof(neovifire2_settings_t)) {}
+	const CAN_SETTINGS* getCANSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<neovifire2_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->can1);
+			case Network::NetID::MSCAN:
+				return &(cfg->can2);
+			case Network::NetID::HSCAN2:
+				return &(cfg->can3);
+			case Network::NetID::HSCAN3:
+				return &(cfg->can4);
+			case Network::NetID::HSCAN4:
+				return &(cfg->can5);
+			case Network::NetID::HSCAN5:
+				return &(cfg->can6);
+			case Network::NetID::HSCAN6:
+				return &(cfg->can7);
+			case Network::NetID::HSCAN7:
+				return &(cfg->can8);
+			case Network::NetID::LSFTCAN:
+				return &(cfg->lsftcan1);
+			case Network::NetID::LSFTCAN2:
+				return &(cfg->lsftcan2);
+			default:
+				return nullptr;
+		}
+	}
+	const CANFD_SETTINGS* getCANFDSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<neovifire2_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->canfd1);
+			case Network::NetID::MSCAN:
+				return &(cfg->canfd2);
+			case Network::NetID::HSCAN2:
+				return &(cfg->canfd3);
+			case Network::NetID::HSCAN3:
+				return &(cfg->canfd4);
+			case Network::NetID::HSCAN4:
+				return &(cfg->canfd5);
+			case Network::NetID::HSCAN5:
+				return &(cfg->canfd6);
+			case Network::NetID::HSCAN6:
+				return &(cfg->canfd7);
+			case Network::NetID::HSCAN7:
+				return &(cfg->canfd8);
+			default:
+				return nullptr;
+		}
+	}
+	const CAN_SETTINGS* getLSFTCANSettingsFor(Network net) const override { return getCANSettingsFor(net); }
+	const SWCAN_SETTINGS* getSWCANSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<neovifire2_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::SWCAN:
+				return &(cfg->swcan1);
+			case Network::NetID::SWCAN2:
+				return &(cfg->swcan2);
+			default:
+				return nullptr;
+		}
+	}
+};
+
+}
+
+#endif // __cplusplus
+
+#endif

include/icsneo/device/tree/neovifire2/neovifire2usb.h

@@ -0,0 +1,31 @@
+#ifndef __NEOVIFIRE2USB_H_
+#define __NEOVIFIRE2USB_H_
+
+#include "icsneo/device/tree/neovifire2/neovifire2.h"
+#include "icsneo/platform/ftdi.h"
+#include "icsneo/device/tree/neovifire2/neovifire2settings.h"
+
+namespace icsneo {
+
+class NeoVIFIRE2USB : public NeoVIFIRE2 {
+public:
+	static constexpr const uint16_t PRODUCT_ID = 0x1000;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID))
+			found.emplace_back(new NeoVIFIRE2USB(neodevice)); // Creation of the shared_ptr
+
+		return found;
+	}
+
+private:
+	NeoVIFIRE2USB(neodevice_t neodevice) : NeoVIFIRE2(neodevice) {
+		initialize<FTDI, NeoVIFIRE2Settings>();
+		productId = PRODUCT_ID;
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/plasion/neoviion.h

@@ -0,0 +1,33 @@
+#ifndef __NEOVIION_H_
+#define __NEOVIION_H_
+
+#include "icsneo/device/tree/plasion/plasion.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
+
+namespace icsneo {
+
+class NeoVIION : public Plasion {
+public:
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::ION;
+	static constexpr const uint16_t PRODUCT_ID = 0x0901;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID))
+			found.emplace_back(new NeoVIION(neodevice));
+
+		return found;
+	}
+
+private:
+	NeoVIION(neodevice_t neodevice) : Plasion(neodevice) {
+		initialize<FTDI>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+		productId = PRODUCT_ID;
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/plasion/neoviplasma.h

@@ -0,0 +1,33 @@
+#ifndef __NEOVIPLASMA_H_
+#define __NEOVIPLASMA_H_
+
+#include "icsneo/device/tree/plasion/plasion.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
+
+namespace icsneo {
+
+class NeoVIPLASMA : public Plasion {
+public:
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::PLASMA;
+	static constexpr const uint16_t PRODUCT_ID = 0x0801;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID))
+			found.emplace_back(new NeoVIPLASMA(neodevice));
+
+		return found;
+	}
+
+private:
+	NeoVIPLASMA(neodevice_t neodevice) : Plasion(neodevice) {
+		initialize<FTDI>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+		productId = PRODUCT_ID;
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/plasion/plasion.h

@@ -0,0 +1,91 @@
+#ifndef __PLASION_H_
+#define __PLASION_H_
+
+#include "icsneo/device/device.h"
+#include "icsneo/communication/multichannelcommunication.h"
+#include "icsneo/platform/ftdi.h"
+#include "icsneo/device/extensions/flexray/extension.h"
+
+namespace icsneo {
+
+class Plasion : public Device {
+protected:
+	virtual std::shared_ptr<Communication> makeCommunication(
+		std::unique_ptr<ICommunication> transport,
+		std::shared_ptr<Packetizer> packetizer,
+		std::unique_ptr<Encoder> encoder,
+		std::unique_ptr<Decoder> decoder
+	) override { return std::make_shared<MultiChannelCommunication>(report, std::move(transport), packetizer, std::move(encoder), std::move(decoder)); }
+
+	// TODO: This is done so that Plasion can still transmit it's basic networks, awaiting VLAN support
+	virtual bool isSupportedRXNetwork(const Network&) const override { return true; }
+	virtual bool isSupportedTXNetwork(const Network&) const override { return true; }
+	virtual void setupExtensions() override {
+		addExtension(std::make_shared<FlexRay::Extension>(*this, 2));
+	}
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN,
+			Network::NetID::MSCAN,
+			Network::NetID::HSCAN2,
+			Network::NetID::HSCAN3,
+			Network::NetID::HSCAN4,
+			Network::NetID::HSCAN5,
+			Network::NetID::HSCAN6,
+			Network::NetID::HSCAN7,
+
+			Network::NetID::LSFTCAN,
+			Network::NetID::LSFTCAN2,
+
+			Network::NetID::SWCAN,
+			Network::NetID::SWCAN2,
+
+			Network::NetID::Ethernet,
+
+			Network::NetID::LIN,
+			Network::NetID::LIN2,
+			Network::NetID::LIN3,
+			Network::NetID::LIN4,
+
+			Network::NetID::FlexRay,
+			Network::NetID::FlexRay2
+		};
+		return supportedNetworks;
+	}
+
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	virtual std::shared_ptr<FlexRay::Controller> getFlexRayControllerByNetwork(const Network& net) const override {
+		uint8_t idx = 0xff;
+		switch(net.getNetID()) {
+			case Network::NetID::FlexRay:
+				idx = 0;
+				break;
+			case Network::NetID::FlexRay2:
+				idx = 1;
+				break;
+			default:
+				return Device::getFlexRayControllerByNetwork(net);
+		}
+		
+		auto extension = getExtension<FlexRay::Extension>();
+		if(!extension)
+			return Device::getFlexRayControllerByNetwork(net);
+		
+		auto res = extension->getController(idx);
+		if(!res)
+			return Device::getFlexRayControllerByNetwork(net);
+		return res;
+	}
+
+public:
+	Plasion(neodevice_t neodevice) : Device(neodevice) {}
+};
+
+}
+
+#endif

include/icsneo/device/tree/radgalaxy/radgalaxy.h

@@ -0,0 +1,116 @@
+#ifndef __RADGALAXY_H_
+#define __RADGALAXY_H_
+
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/pcap.h"
+#include "icsneo/communication/packetizer.h"
+#include "icsneo/communication/decoder.h"
+
+namespace icsneo {
+
+class RADGalaxy : public Device {
+public:
+	// Serial numbers start with RG
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::RADGalaxy;
+	static constexpr const uint16_t PRODUCT_ID = 0x0003;
+	static constexpr const char* SERIAL_START = "RG";
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+		
+		for(auto& foundDev : PCAP::FindAll()) {
+			auto fakedev = std::shared_ptr<RADGalaxy>(new RADGalaxy({}));
+			for(auto& payload : foundDev.discoveryPackets)
+				fakedev->com->packetizer->input(payload);
+			for(auto& packet : fakedev->com->packetizer->output()) {
+				std::shared_ptr<Message> msg;
+				if(!fakedev->com->decoder->decode(msg, packet))
+					continue; // We failed to decode this packet
+
+				if(!msg || msg->network.getNetID() != Network::NetID::Main51)
+					continue; // Not a message we care about
+				auto sn = std::dynamic_pointer_cast<SerialNumberMessage>(msg);
+				if(!sn)
+					continue; // Not a serial number message
+				
+				if(sn->deviceSerial.length() < 2)
+					continue;
+				if(sn->deviceSerial.substr(0, 2) != SERIAL_START)
+					continue; // Not a RADGalaxy
+				
+				foundDev.device.serial[sn->deviceSerial.copy(foundDev.device.serial, sizeof(foundDev.device.serial))] = '\0';
+				found.emplace_back(new RADGalaxy(foundDev.device));
+				break;
+			}
+		}
+
+		return found;
+	}
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN,
+			Network::NetID::MSCAN,
+			Network::NetID::HSCAN2,
+			Network::NetID::HSCAN3,
+			Network::NetID::HSCAN4,
+			Network::NetID::HSCAN5,
+			Network::NetID::HSCAN6,
+			Network::NetID::HSCAN7,
+
+			Network::NetID::SWCAN,
+			Network::NetID::SWCAN2,
+
+			Network::NetID::LIN,
+			
+			Network::NetID::OP_Ethernet1,
+			Network::NetID::OP_Ethernet2,
+			Network::NetID::OP_Ethernet3,
+			Network::NetID::OP_Ethernet4,
+			Network::NetID::OP_Ethernet5,
+			Network::NetID::OP_Ethernet6,
+			Network::NetID::OP_Ethernet7,
+			Network::NetID::OP_Ethernet8,
+			Network::NetID::OP_Ethernet9,
+			Network::NetID::OP_Ethernet10,
+			Network::NetID::OP_Ethernet11,
+			Network::NetID::OP_Ethernet12
+		};
+		return supportedNetworks;
+	}
+
+	RADGalaxy(neodevice_t neodevice) : Device(neodevice) {
+		initialize<PCAP>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+		productId = PRODUCT_ID;
+	}
+
+protected:
+	void setupPacketizer(Packetizer& packetizer) override {
+		Device::setupPacketizer(packetizer);
+		packetizer.disableChecksum = true;
+		packetizer.align16bit = false;
+	}
+
+	virtual void setupEncoder(Encoder& encoder) override {
+		Device::setupEncoder(encoder);
+		encoder.supportCANFD = true;
+	}
+
+	virtual void setupDecoder(Decoder& decoder) override {
+		Device::setupDecoder(decoder);
+		decoder.timestampResolution = 10; // Timestamps are in 10ns increments instead of the usual 25ns
+	}
+
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	// The supported TX networks are the same as the supported RX networks for this device
+	virtual void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+};
+
+}
+
+#endif

include/icsneo/device/tree/radpluto/radpluto.h

@@ -0,0 +1,58 @@
+#ifndef __RADPLUTO_H_
+#define __RADPLUTO_H_
+
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/pcap.h"
+#include "icsneo/communication/packetizer.h"
+#include "icsneo/communication/decoder.h"
+
+namespace icsneo {
+
+class RADPluto : public Device {
+public:
+	// Serial numbers start with PL
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::RADPluto;
+	static constexpr const uint16_t PRODUCT_ID = 0x1104;
+	static constexpr const char* SERIAL_START = "PL";
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN,
+			Network::NetID::HSCAN2,
+
+			Network::NetID::LIN,
+
+			Network::NetID::Ethernet,
+			
+			Network::NetID::OP_Ethernet1,
+			Network::NetID::OP_Ethernet2,
+			Network::NetID::OP_Ethernet3,
+			Network::NetID::OP_Ethernet4
+		};
+		return supportedNetworks;
+	}
+
+	RADPluto(neodevice_t neodevice) : Device(neodevice) {
+		getWritableNeoDevice().type = DEVICE_TYPE;
+		productId = PRODUCT_ID;
+	}
+
+protected:
+	virtual void setupEncoder(Encoder& encoder) override {
+		Device::setupEncoder(encoder);
+		encoder.supportCANFD = true;
+	}
+
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	// The supported TX networks are the same as the supported RX networks for this device
+	virtual void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+};
+
+}
+
+#endif

include/icsneo/device/tree/radpluto/radplutousb.h

@@ -0,0 +1,29 @@
+#ifndef __RADPLUTOUSB_H_
+#define __RADPLUTOUSB_H_
+
+#include "icsneo/device/tree/radpluto/radpluto.h"
+#include "icsneo/platform/stm32.h"
+
+namespace icsneo {
+
+class RADPlutoUSB : public RADPluto {
+public:
+	// Serial numbers start with RP
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : STM32::FindByProduct(PRODUCT_ID))
+			found.emplace_back(new RADPlutoUSB(neodevice));
+
+		return found;
+	}
+
+private:
+	RADPlutoUSB(neodevice_t neodevice) : RADPluto(neodevice) {
+		initialize<STM32>();
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/radstar2/radstar2.h

@@ -0,0 +1,63 @@
+#ifndef __RADSTAR2_H_
+#define __RADSTAR2_H_
+
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/device/tree/radstar2/radstar2settings.h"
+
+namespace icsneo {
+
+class RADStar2 : public Device {
+public:
+	// Serial numbers start with RS
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::RADStar2;
+	static constexpr const uint16_t PRODUCT_ID = 0x0005;
+	static constexpr const char* SERIAL_START = "RS";
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN,
+			Network::NetID::MSCAN,
+
+			Network::NetID::LIN,
+
+			Network::NetID::OP_Ethernet1,
+			Network::NetID::OP_Ethernet2
+		};
+		return supportedNetworks;
+	}
+
+protected:
+	virtual void setupPacketizer(Packetizer& packetizer) override {
+		Device::setupPacketizer(packetizer);
+		packetizer.disableChecksum = true;
+		packetizer.align16bit = false;
+	}
+
+	virtual void setupEncoder(Encoder& encoder) override {
+		Device::setupEncoder(encoder);
+		encoder.supportCANFD = true;
+	}
+
+	virtual void setupDecoder(Decoder& decoder) override {
+		Device::setupDecoder(decoder);
+		decoder.timestampResolution = 10; // Timestamps are in 10ns increments instead of the usual 25ns
+	}
+
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	// The supported TX networks are the same as the supported RX networks for this device
+	virtual void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+
+	RADStar2(neodevice_t neodevice) : Device(neodevice) {
+		getWritableNeoDevice().type = DEVICE_TYPE;
+		productId = PRODUCT_ID;
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/radstar2/radstar2eth.h

@@ -0,0 +1,53 @@
+#ifndef __RADSTAR2ETH_H_
+#define __RADSTAR2ETH_H_
+
+#include "icsneo/device/tree/radstar2/radstar2.h"
+#include "icsneo/communication/network.h"
+#include "icsneo/communication/message/serialnumbermessage.h"
+#include "icsneo/platform/pcap.h"
+
+namespace icsneo {
+
+class RADStar2ETH : public RADStar2 {
+public:
+	// Serial numbers start with RS
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+		
+		for(auto& foundDev : PCAP::FindAll()) {
+			auto fakedev = std::shared_ptr<RADStar2ETH>(new RADStar2ETH({}));
+			for(auto& payload : foundDev.discoveryPackets)
+				fakedev->com->packetizer->input(payload);
+			for(auto& packet : fakedev->com->packetizer->output()) {
+				std::shared_ptr<Message> msg;
+				if(!fakedev->com->decoder->decode(msg, packet))
+					continue; // We failed to decode this packet
+
+				if(!msg || msg->network.getNetID() != Network::NetID::Main51)
+					continue; // Not a message we care about
+				auto sn = std::dynamic_pointer_cast<SerialNumberMessage>(msg);
+				if(!sn)
+					continue; // Not a serial number message
+				
+				if(sn->deviceSerial.length() < 2)
+					continue;
+				if(sn->deviceSerial.substr(0, 2) != SERIAL_START)
+					continue; // Not a RADStar2
+				
+				foundDev.device.serial[sn->deviceSerial.copy(foundDev.device.serial, sizeof(foundDev.device.serial))] = '\0';
+				found.push_back(std::make_shared<RADStar2ETH>(foundDev.device));
+				break;
+			}
+		}
+
+		return found;
+	}
+
+	RADStar2ETH(neodevice_t neodevice) : RADStar2(neodevice) {
+		initialize<PCAP, RADStar2Settings>();
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/radstar2/radstar2settings.h

@@ -0,0 +1,107 @@
+#ifndef __RADSTAR2SETTINGS_H_
+#define __RADSTAR2SETTINGS_H_
+
+#include <stdint.h>
+#include "icsneo/device/idevicesettings.h"
+
+#ifdef __cplusplus
+
+namespace icsneo {
+
+#endif
+
+#pragma pack(push, 2)
+typedef struct {
+	uint16_t perf_en;
+
+	OP_ETH_GENERAL_SETTINGS opEthGen;
+	OP_ETH_SETTINGS opEth1;
+	OP_ETH_SETTINGS opEth2;
+
+	CAN_SETTINGS can1;
+	CANFD_SETTINGS canfd1;
+	CAN_SETTINGS can2;
+	CANFD_SETTINGS canfd2;
+
+	uint16_t network_enables;
+	uint16_t network_enables_2;
+
+	LIN_SETTINGS lin1;
+	uint16_t misc_io_initial_ddr;
+	uint16_t misc_io_initial_latch;
+	uint16_t misc_io_report_period;
+	uint16_t misc_io_on_report_events;
+	uint16_t misc_io_analog_enable;
+	uint16_t ain_sample_period;
+	uint16_t ain_threshold;
+
+	uint32_t pwr_man_timeout;
+	uint16_t pwr_man_enable;
+
+	uint16_t network_enabled_on_boot;
+
+	uint16_t iso15765_separation_time_offset;
+
+	uint16_t iso_9141_kwp_enable_reserved;
+	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_1;
+	uint16_t iso_parity_1;
+
+	uint16_t iso_msg_termination_1;
+
+	uint16_t idle_wakeup_network_enables_1;
+	uint16_t idle_wakeup_network_enables_2;
+
+	uint16_t network_enables_3;
+	uint16_t idle_wakeup_network_enables_3;
+
+	uint16_t can_switch_mode;
+	STextAPISettings text_api;
+	uint16_t pc_com_mode;
+	TIMESYNC_ICSHARDWARE_SETTINGS timeSyncSettings;
+	uint16_t hwComLatencyTestEn;
+} radstar2_settings_t;
+#pragma pack(pop)
+
+#ifdef __cplusplus
+
+#include <iostream>
+
+class RADStar2Settings : public IDeviceSettings {
+public:
+	RADStar2Settings(std::shared_ptr<Communication> com) : IDeviceSettings(com, sizeof(radstar2_settings_t)) {
+		disableGSChecksumming = true;
+	}
+	
+	const CAN_SETTINGS* getCANSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<radstar2_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->can1);
+			case Network::NetID::MSCAN:
+				return &(cfg->can2);
+			default:
+				return nullptr;
+		}
+	}
+	const CANFD_SETTINGS* getCANFDSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<radstar2_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->canfd1);
+			case Network::NetID::MSCAN:
+				return &(cfg->canfd2);
+			default:
+				return nullptr;
+		}
+	}
+};
+
+}
+
+#endif // __cplusplus
+
+#endif

include/icsneo/device/tree/radstar2/radstar2usb.h

@@ -0,0 +1,29 @@
+#ifndef __RADSTAR2USB_H_
+#define __RADSTAR2USB_H_
+
+#include "icsneo/device/tree/radstar2/radstar2.h"
+#include "icsneo/platform/ftdi.h"
+
+namespace icsneo {
+
+class RADStar2USB : public RADStar2 {
+public:
+	// Serial numbers start with RS
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID))
+			found.emplace_back(new RADStar2USB(neodevice));
+
+		return found;
+	}
+
+private:
+	RADStar2USB(neodevice_t neodevice) : RADStar2(neodevice) {
+		initialize<FTDI, RADStar2Settings>();
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/radsupermoon/radsupermoon.h

@@ -0,0 +1,39 @@
+#ifndef __RADSUPERMOON_H_
+#define __RADSUPERMOON_H_
+
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
+
+namespace icsneo {
+
+class RADSupermoon : public Device {
+public:
+	// RSM does not connect at all yet (needs FTDI D3xx driver, not the 2xx compatible one)
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::RADSupermoon;
+	static constexpr const uint16_t PRODUCT_ID = 0x1201;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID))
+			found.emplace_back(new RADSupermoon(neodevice));
+
+		return found;
+	}
+
+protected:
+	virtual void setupDecoder(Decoder& decoder) override {
+		decoder.timestampResolution = 10; // Timestamps are in 10ns increments instead of the usual 25ns
+	}
+
+private:
+	RADSupermoon(neodevice_t neodevice) : Device(neodevice) {
+		initialize<FTDI>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+		productId = PRODUCT_ID;
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/valuecan3/valuecan3.h

@@ -0,0 +1,50 @@
+#ifndef __VALUECAN3_H_
+#define __VALUECAN3_H_
+
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/ftdi.h"
+#include "icsneo/device/tree/valuecan3/valuecan3settings.h"
+
+namespace icsneo {
+
+class ValueCAN3 : public Device {
+public:
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::VCAN3;
+	static constexpr const uint16_t PRODUCT_ID = 0x0601;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID))
+			found.emplace_back(new ValueCAN3(neodevice));
+
+		return found;
+	}
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN,
+			Network::NetID::MSCAN
+		};
+		return supportedNetworks;
+	}
+
+private:
+	ValueCAN3(neodevice_t neodevice) : Device(neodevice) {
+		initialize<FTDI, ValueCAN3Settings>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+		productId = PRODUCT_ID;
+	}
+
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	// The supported TX networks are the same as the supported RX networks for this device
+	virtual void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+};
+
+}
+
+#endif

include/icsneo/device/tree/valuecan3/valuecan3settings.h

@@ -0,0 +1,58 @@
+#ifndef __VALUECAN3SETTINGS_H_
+#define __VALUECAN3SETTINGS_H_
+
+#include <stdint.h>
+#include "icsneo/device/idevicesettings.h"
+
+#ifdef __cplusplus
+
+namespace icsneo {
+
+#endif
+
+#pragma pack(push, 2)
+typedef struct {
+	CAN_SETTINGS can1;
+	CAN_SETTINGS can2;
+
+	uint16_t network_enables;
+	uint16_t network_enabled_on_boot;
+
+	uint16_t iso15765_separation_time_offset;
+
+	uint16_t perf_en;
+
+	uint16_t misc_io_initial_ddr;
+	uint16_t misc_io_initial_latch;
+	uint16_t misc_io_report_period;
+	uint16_t misc_io_on_report_events;
+} valuecan3_settings_t;
+#pragma pack(pop)
+
+#ifdef __cplusplus
+
+#include <iostream>
+
+class ValueCAN3Settings : public IDeviceSettings {
+public:
+	ValueCAN3Settings(std::shared_ptr<Communication> com) : IDeviceSettings(com, sizeof(valuecan3_settings_t)) {}
+	const CAN_SETTINGS* getCANSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<valuecan3_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->can1);
+			case Network::NetID::MSCAN:
+				return &(cfg->can2);
+			default:
+				return nullptr;
+		}
+	}
+};
+
+}
+
+#endif // __cplusplus
+
+#endif

include/icsneo/device/tree/valuecan4/settings/valuecan4-1-2settings.h

@@ -0,0 +1,21 @@
+#ifndef __VALUECAN4_1_2_SETTINGS_H_
+#define __VALUECAN4_1_2_SETTINGS_H_
+
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/tree/valuecan4/settings/valuecan4settings.h"
+
+#ifdef __cplusplus
+
+namespace icsneo {
+
+class ValueCAN4_1_2Settings : public IDeviceSettings {
+public:
+	ValueCAN4_1_2Settings(std::shared_ptr<Communication> com) : IDeviceSettings(com, sizeof(valuecan4_1_2_settings_t)) {}
+	// We do not override getCANSettingsFor or getCANFDSettingsFor here because they will be device specific
+};
+
+}
+
+#endif // __cplusplus
+
+#endif

include/icsneo/device/tree/valuecan4/settings/valuecan4-1settings.h

@@ -0,0 +1,30 @@
+#ifndef __VALUECAN4_1_SETTINGS_H_
+#define __VALUECAN4_1_SETTINGS_H_
+
+#include "icsneo/device/tree/valuecan4/settings/valuecan4-1-2settings.h"
+
+#ifdef __cplusplus
+
+namespace icsneo {
+
+class ValueCAN4_1Settings : public ValueCAN4_1_2Settings {
+public:
+	ValueCAN4_1Settings(std::shared_ptr<Communication> com) : ValueCAN4_1_2Settings(com) {}
+	const CAN_SETTINGS* getCANSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<valuecan4_1_2_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->can1);
+			default:
+				return nullptr;
+		}
+	}
+};
+
+}
+
+#endif // __cplusplus
+
+#endif

include/icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h

@@ -0,0 +1,46 @@
+#ifndef __VALUECAN4_2EL_SETTINGS_H_
+#define __VALUECAN4_2EL_SETTINGS_H_
+
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h"
+
+#ifdef __cplusplus
+
+namespace icsneo {
+
+class ValueCAN4_2ELSettings : public ValueCAN4_4_2ELSettings {
+public:
+	ValueCAN4_2ELSettings(std::shared_ptr<Communication> com) : ValueCAN4_4_2ELSettings(com) {}
+	const CAN_SETTINGS* getCANSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<valuecan4_4_2el_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->can1);
+			case Network::NetID::HSCAN2:
+				return &(cfg->can2);
+			default:
+				return nullptr;
+		}
+	}
+	const CANFD_SETTINGS* getCANFDSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<valuecan4_4_2el_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->canfd1);
+			case Network::NetID::HSCAN2:
+				return &(cfg->canfd2);
+			default:
+				return nullptr;
+		}
+	}
+};
+
+}
+
+#endif // __cplusplus
+
+#endif

include/icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h

@@ -0,0 +1,45 @@
+#ifndef __VALUECAN4_2_SETTINGS_H_
+#define __VALUECAN4_2_SETTINGS_H_
+
+#include "icsneo/device/tree/valuecan4/settings/valuecan4-1-2settings.h"
+
+#ifdef __cplusplus
+
+namespace icsneo {
+
+class ValueCAN4_2Settings : public ValueCAN4_1_2Settings {
+public:
+	ValueCAN4_2Settings(std::shared_ptr<Communication> com) : ValueCAN4_1_2Settings(com) {}
+	const CAN_SETTINGS* getCANSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<valuecan4_1_2_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->can1);
+			case Network::NetID::HSCAN2:
+				return &(cfg->can2);
+			default:
+				return nullptr;
+		}
+	}
+	const CANFD_SETTINGS* getCANFDSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<valuecan4_1_2_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->canfd1);
+			case Network::NetID::HSCAN2:
+				return &(cfg->canfd2);
+			default:
+				return nullptr;
+		}
+	}
+};
+
+}
+
+#endif // __cplusplus
+
+#endif

include/icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h

@@ -0,0 +1,21 @@
+#ifndef __VALUECAN4_4_2EL_SETTINGS_H_
+#define __VALUECAN4_4_2EL_SETTINGS_H_
+
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/tree/valuecan4/settings/valuecan4settings.h"
+
+#ifdef __cplusplus
+
+namespace icsneo {
+
+class ValueCAN4_4_2ELSettings : public IDeviceSettings {
+public:
+	ValueCAN4_4_2ELSettings(std::shared_ptr<Communication> com) : IDeviceSettings(com, sizeof(valuecan4_4_2el_settings_t)) {}
+	// We do not override getCANSettingsFor, getCANFDSettingsFor, or getEthernetSettingsFor here because they will be device specific
+};
+
+}
+
+#endif // __cplusplus
+
+#endif

include/icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h

@@ -0,0 +1,54 @@
+#ifndef __VALUECAN4_4_SETTINGS_H_
+#define __VALUECAN4_4_SETTINGS_H_
+
+#include "icsneo/device/idevicesettings.h"
+#include "icsneo/device/tree/valuecan4/settings/valuecan4-4-2elsettings.h"
+
+#ifdef __cplusplus
+
+namespace icsneo {
+
+class ValueCAN4_4Settings : public ValueCAN4_4_2ELSettings {
+public:
+	ValueCAN4_4Settings(std::shared_ptr<Communication> com) : ValueCAN4_4_2ELSettings(com) {}
+	const CAN_SETTINGS* getCANSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<valuecan4_4_2el_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->can1);
+			case Network::NetID::HSCAN2:
+				return &(cfg->can2);
+			case Network::NetID::HSCAN3:
+				return &(cfg->can3);
+			case Network::NetID::HSCAN4:
+				return &(cfg->can4);
+			default:
+				return nullptr;
+		}
+	}
+	const CANFD_SETTINGS* getCANFDSettingsFor(Network net) const override {
+		auto cfg = getStructurePointer<valuecan4_4_2el_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		switch(net.getNetID()) {
+			case Network::NetID::HSCAN:
+				return &(cfg->canfd1);
+			case Network::NetID::HSCAN2:
+				return &(cfg->canfd2);
+			case Network::NetID::HSCAN3:
+				return &(cfg->canfd3);
+			case Network::NetID::HSCAN4:
+				return &(cfg->canfd4);
+			default:
+				return nullptr;
+		}
+	}
+};
+
+}
+
+#endif // __cplusplus
+
+#endif

include/icsneo/device/tree/valuecan4/settings/valuecan4settings.h

@@ -0,0 +1,86 @@
+#ifndef __VALUECAN4_SETTINGS_H_
+#define __VALUECAN4_SETTINGS_H_
+
+#include <stdint.h>
+#include "icsneo/device/idevicesettings.h"
+
+#ifdef __cplusplus
+
+namespace icsneo {
+
+#endif
+
+// This is where the actual settings structures for all the ValueCAN 4 line live
+// ValueCAN 4-1 and 4-2 share a structure, and 4-4 shares with 4-2EL
+
+#pragma pack(push, 2)
+typedef struct {
+	/* Performance Test */
+	uint16_t perf_en;
+
+	CAN_SETTINGS can1;
+	CANFD_SETTINGS canfd1;
+	CAN_SETTINGS can2;
+	CANFD_SETTINGS canfd2;
+
+	uint64_t network_enables;
+	uint64_t termination_enables;
+
+	uint32_t pwr_man_timeout;
+	uint16_t pwr_man_enable;
+
+	uint16_t network_enabled_on_boot;
+
+	/* ISO15765-2 Transport Layer */
+	int16_t iso15765_separation_time_offset;
+
+	STextAPISettings text_api;
+	struct
+	{
+		uint32_t disableUsbCheckOnBoot : 1;
+		uint32_t enableLatencyTest : 1;
+		uint32_t reserved : 30;
+	} flags;
+} valuecan4_1_2_settings_t, valuecan4_1_settings_t, valuecan4_2_settings_t;
+
+typedef struct {
+	uint16_t perf_en;
+	CAN_SETTINGS can1;
+	CANFD_SETTINGS canfd1;
+	CAN_SETTINGS can2;
+	CANFD_SETTINGS canfd2;
+	CAN_SETTINGS can3;
+	CANFD_SETTINGS canfd3;
+	CAN_SETTINGS can4;
+	CANFD_SETTINGS canfd4;
+	uint16_t network_enables;
+	uint16_t network_enables_2;
+	LIN_SETTINGS lin1;
+	uint16_t network_enabled_on_boot;
+	int16_t iso15765_separation_time_offset;
+	uint16_t iso_9141_kwp_enable_reserved;
+	ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_1;
+	uint16_t iso_parity_1;
+	uint16_t iso_msg_termination_1;
+	uint16_t network_enables_3;
+	STextAPISettings text_api;
+	uint64_t termination_enables;
+	ETHERNET_SETTINGS ethernet;
+	struct
+	{
+		uint32_t enableLatencyTest : 1;
+		uint32_t enablePcEthernetComm : 1;
+		uint32_t reserved : 30;
+	} flags;
+	uint16_t pwr_man_enable;
+	uint16_t pwr_man_timeout;
+} valuecan4_4_2el_settings_t, valuecan4_4_settings_t, valuecan4_2el_settings_t;
+#pragma pack(pop)
+
+#ifdef __cplusplus
+
+} // End of namespace
+
+#endif // __cplusplus
+
+#endif

include/icsneo/device/tree/valuecan4/valuecan4-1.h

@@ -0,0 +1,55 @@
+#ifndef __VALUECAN4_1_H_
+#define __VALUECAN4_1_H_
+
+#include "icsneo/device/tree/valuecan4/valuecan4.h"
+#include "icsneo/device/tree/valuecan4/settings/valuecan4-1settings.h"
+#include <string>
+
+namespace icsneo {
+
+class ValueCAN4_1 : public ValueCAN4 {
+public:
+	// Serial numbers start with V1 for 4-1
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::VCAN4_1;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : STM32::FindByProduct(PRODUCT_ID)) {
+			if(std::string(neodevice.serial).substr(0, 2) == "V1")
+				found.emplace_back(new ValueCAN4_1(neodevice));
+		}
+
+		return found;
+	}
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN
+		};
+		return supportedNetworks;
+	}
+
+protected:
+	void setupEncoder(Encoder& encoder) override {
+		ValueCAN4::setupEncoder(encoder);
+		encoder.supportCANFD = false; // VCAN 4-1 does not support CAN FD
+	}
+
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	// The supported TX networks are the same as the supported RX networks for this device
+	virtual void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+
+private:
+	ValueCAN4_1(neodevice_t neodevice) : ValueCAN4(neodevice) {
+		initialize<STM32, ValueCAN4_1Settings>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/valuecan4/valuecan4-2.h

@@ -0,0 +1,51 @@
+#ifndef __VALUECAN4_2_H_
+#define __VALUECAN4_2_H_
+
+#include "icsneo/device/tree/valuecan4/valuecan4.h"
+#include "icsneo/device/tree/valuecan4/settings/valuecan4-2settings.h"
+#include <string>
+
+namespace icsneo {
+
+class ValueCAN4_2 : public ValueCAN4 {
+public:
+	// Serial numbers start with V2 for 4-2
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::VCAN4_2;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : STM32::FindByProduct(PRODUCT_ID)) {
+			if(std::string(neodevice.serial).substr(0, 2) == "V2")
+				found.emplace_back(new ValueCAN4_2(neodevice));
+		}
+
+		return found;
+	}
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN,
+			Network::NetID::HSCAN2
+		};
+		return supportedNetworks;
+	}
+
+protected:
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	// The supported TX networks are the same as the supported RX networks for this device
+	virtual void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+
+private:
+	ValueCAN4_2(neodevice_t neodevice) : ValueCAN4(neodevice) {
+		initialize<STM32, ValueCAN4_2Settings>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/valuecan4/valuecan4-2el.h

@@ -0,0 +1,53 @@
+#ifndef __VALUECAN4_2EL_H_
+#define __VALUECAN4_2EL_H_
+
+#include "icsneo/device/tree/valuecan4/valuecan4.h"
+#include "icsneo/device/tree/valuecan4/settings/valuecan4-2elsettings.h"
+#include <string>
+
+namespace icsneo {
+
+class ValueCAN4_2EL : public ValueCAN4 {
+public:
+	// Serial numbers start with VE for 4-2EL
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::VCAN4_2EL;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : STM32::FindByProduct(PRODUCT_ID)) {
+			if(std::string(neodevice.serial).substr(0, 2) == "VE")
+				found.emplace_back(new ValueCAN4_2EL(neodevice));
+		}
+
+		return found;
+	}
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN,
+			Network::NetID::HSCAN2,
+
+			Network::NetID::Ethernet
+		};
+		return supportedNetworks;
+	}
+
+protected:
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	// The supported TX networks are the same as the supported RX networks for this device
+	virtual void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+
+private:
+	ValueCAN4_2EL(neodevice_t neodevice) : ValueCAN4(neodevice) {
+		initialize<STM32, ValueCAN4_2ELSettings>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/valuecan4/valuecan4-4.h

@@ -0,0 +1,53 @@
+#ifndef __VALUECAN4_4_H_
+#define __VALUECAN4_4_H_
+
+#include "icsneo/device/tree/valuecan4/valuecan4.h"
+#include "icsneo/device/tree/valuecan4/settings/valuecan4-4settings.h"
+#include <string>
+
+namespace icsneo {
+
+class ValueCAN4_4 : public ValueCAN4 {
+public:
+	// Serial numbers start with V4 for 4-4
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::VCAN4_4;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : STM32::FindByProduct(PRODUCT_ID)) {
+			if(std::string(neodevice.serial).substr(0, 2) == "V4")
+				found.emplace_back(new ValueCAN4_4(neodevice));
+		}
+
+		return found;
+	}
+
+	static const std::vector<Network>& GetSupportedNetworks() {
+		static std::vector<Network> supportedNetworks = {
+			Network::NetID::HSCAN,
+			Network::NetID::HSCAN2,
+			Network::NetID::HSCAN3,
+			Network::NetID::HSCAN4
+		};
+		return supportedNetworks;
+	}
+
+protected:
+	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
+		for(auto& netid : GetSupportedNetworks())
+			rxNetworks.emplace_back(netid);
+	}
+
+	// The supported TX networks are the same as the supported RX networks for this device
+	virtual void setupSupportedTXNetworks(std::vector<Network>& txNetworks) override { setupSupportedRXNetworks(txNetworks); }
+
+private:
+	ValueCAN4_4(neodevice_t neodevice) : ValueCAN4(neodevice) {
+		initialize<STM32, ValueCAN4_4Settings>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/valuecan4/valuecan4.h

@@ -0,0 +1,27 @@
+#ifndef __VALUECAN4_H_
+#define __VALUECAN4_H_
+
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/stm32.h"
+
+namespace icsneo {
+
+class ValueCAN4 : public Device {
+public:
+	static constexpr const uint16_t PRODUCT_ID = 0x1101;
+
+protected:
+	virtual void setupEncoder(Encoder& encoder) override {
+		Device::setupEncoder(encoder);
+		encoder.supportCANFD = true;
+	}
+
+	ValueCAN4(neodevice_t neodevice) : Device(neodevice) {
+		productId = PRODUCT_ID;
+	}
+};
+
+}
+
+#endif

include/icsneo/device/tree/vividcan/vividcan.h

@@ -0,0 +1,36 @@
+#ifndef __VIVIDCAN_H_
+#define __VIVIDCAN_H_
+
+#include "icsneo/device/device.h"
+#include "icsneo/device/devicetype.h"
+#include "icsneo/platform/stm32.h"
+
+namespace icsneo {
+
+class VividCAN : public Device {
+public:
+	// Serial numbers start with VV
+	static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::VividCAN;
+	static constexpr const uint16_t PRODUCT_ID = 0x1102;
+	static std::vector<std::shared_ptr<Device>> Find() {
+		std::vector<std::shared_ptr<Device>> found;
+
+		for(auto neodevice : STM32::FindByProduct(PRODUCT_ID))
+			found.emplace_back(new VividCAN(neodevice));
+
+		return found;
+	}
+
+	bool goOnline() override { return false; }
+
+private:
+	VividCAN(neodevice_t neodevice) : Device(neodevice) {
+		initialize<STM32>();
+		getWritableNeoDevice().type = DEVICE_TYPE;
+		productId = PRODUCT_ID;
+	}
+};
+
+}
+
+#endif