Begin work on FlexRay support

2026-08-05 01:18:36 +02:00 · 2019-10-16 16:43:31 -04:00
parent 0607986114
commit 2f9844df92
65 changed files with 1137 additions and 120 deletions
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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