Begin work on FlexRay support

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