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

Device: Add FIRE3 Flexray device type and its settings

Browse Source 
Device: Include FIRE3 Flexray in device finder
Device: Correct FIRE3 settings and add additional supported networks
Network: Add additional network enumerations

Communication: Add networks to all switch statements
This commit is contained in:
jschwartz
2023-01-17 09:12:10 -05:00
committed by Jonathan Schwartz
parent 9e7d442e83
commit dc1c4ede9d
10 changed files with 537 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/device/tree/neovifire3/neovifire3.h
+17 -1
View File
@@ -25,11 +25,27 @@ public:
Network::NetID::HSCAN5,
Network::NetID::HSCAN6,
Network::NetID::HSCAN7,
Network::NetID::DWCAN9,
Network::NetID::DWCAN10,
Network::NetID::DWCAN11,
Network::NetID::DWCAN12,
Network::NetID::DWCAN13,
Network::NetID::DWCAN14,
Network::NetID::DWCAN15,
Network::NetID::DWCAN16,
Network::NetID::Ethernet,
Network::NetID::Ethernet2,
Network::NetID::Ethernet3,
Network::NetID::LIN,
Network::NetID::LIN2
Network::NetID::LIN2,
Network::NetID::LIN3,
Network::NetID::LIN4,
Network::NetID::LIN5,
Network::NetID::LIN6,
Network::NetID::LIN7,
Network::NetID::LIN8,
};
return supportedNetworks;
}
include/icsneo/device/tree/neovifire3/neovifire3settings.h
+64 -5
View File
@@ -25,13 +25,15 @@ typedef struct {
uint16_t slaveVnetA;
uint32_t reserved;
uint64_t termination_enables;
union {
union
{
uint64_t word;
struct
{
uint16_t network_enables;
uint16_t network_enables_2;
uint16_t network_enables_3;
uint16_t network_enables_4;
};
} network_enables;
uint32_t pwr_man_timeout;
@@ -59,14 +61,15 @@ typedef struct {
ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_2;
uint16_t iso_parity_2;
uint16_t iso_msg_termination_2;
ETHERNET_SETTINGS ethernet;
ETHERNET_SETTINGS ethernet_1;
TIMESYNC_ICSHARDWARE_SETTINGS timeSync;
STextAPISettings text_api;
struct {
struct
{
uint32_t disableUsbCheckOnBoot : 1;
uint32_t enableLatencyTest : 1;
uint32_t busMessagesToAndroid : 1;
uint32_t enablePcEthernetComm : 1;
uint32_t reserved1 : 1;
uint32_t enableDefaultLogger : 1;
uint32_t enableDefaultUpload : 1;
uint32_t reserved : 26;
@@ -79,7 +82,63 @@ typedef struct {
uint16_t digitalIoThresholdEnable;
uint16_t misc_io_initial_ddr;
uint16_t misc_io_initial_latch;
ETHERNET_SETTINGS2 ethernet2;
ETHERNET_SETTINGS2 ethernet2_1;
ETHERNET_SETTINGS ethernet_2;
ETHERNET_SETTINGS2 ethernet2_2;
Fire3LinuxSettings os_settings;
RAD_GPTP_SETTINGS gPTP;
// VEM Networks
CAN_SETTINGS can9;
CANFD_SETTINGS canfd9;
CAN_SETTINGS can10;
CANFD_SETTINGS canfd10;
CAN_SETTINGS can11;
CANFD_SETTINGS canfd11;
CAN_SETTINGS can12;
CANFD_SETTINGS canfd12;
CAN_SETTINGS can13;
CANFD_SETTINGS canfd13;
CAN_SETTINGS can14;
CANFD_SETTINGS canfd14;
CAN_SETTINGS can15;
CANFD_SETTINGS canfd15;
CAN_SETTINGS can16;
CANFD_SETTINGS canfd16;
SWCAN_SETTINGS swcan1;
SWCAN_SETTINGS swcan2;
CAN_SETTINGS lsftcan1;
CAN_SETTINGS lsftcan2;
ETHERNET_SETTINGS ethernet_3;
ETHERNET_SETTINGS2 ethernet2_3;
LIN_SETTINGS lin3;
LIN_SETTINGS lin4;
LIN_SETTINGS lin5;
LIN_SETTINGS lin6;
LIN_SETTINGS lin7;
LIN_SETTINGS lin8;
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;
ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_5;
uint16_t iso_parity_5;
uint16_t iso_msg_termination_5;
ISO9141_KEYWORD2000_SETTINGS iso9141_kwp_settings_6;
uint16_t iso_parity_6;
uint16_t iso_msg_termination_6;
uint16_t selectable_network_1;
uint16_t selectable_network_2;
uint64_t network_enables_2;
uint64_t termination_enables_2;
} neovifire3_settings_t;
typedef struct {