updated generated files to 911.12

drebbe-intrepid · drebbe-intrepid · commit c71bd3e9e577 · 2023-03-31T11:46:13.000-04:00
Signed-off-by: David Rebbe &lt;drebbe@intrepidcs.com&gt;
diff --git a/ics/hiddenimports.py b/ics/hiddenimports.py
@@ -77,6 +77,7 @@
     "ics.structures.a2_b_monitor_settings",
     "ics.structures.srada2_b_settings",
     "ics.structures.srad_moon2_settings",
+    "ics.structures.srad_moon3_settings",
     "ics.structures.srad_gigalog_settings",
     "ics.structures.srad_gigastar_settings",
     "ics.structures.s_vivid_can_settings",
@@ -119,7 +120,11 @@
     "ics.structures.s_ether_badge_settings",
     "ics.structures.srad_epsilon_switch_settings",
     "ics.structures.srad_epsilon_settings",
-    "ics.structures.swil_bridge_config",
+    "ics.structures.s_wil_fault_servicing_settings",
+    "ics.structures.s_wil_network_data_capture_settings",
+    "ics.structures.s_wil_connection_settings",
+    "ics.structures.s_spi_port_settings",
+    "ics.structures.s_wil_bridge_config",
     "ics.structures.sradbms_settings",
     "ics.structures.global_settings",
     "ics.structures.s_device_settings",
@@ -144,7 +149,6 @@
     "ics.structures.ics_rad_epsilon_device_status",
     "ics.structures.ics_rad_bms_device_status",
     "ics.structures.ics_device_status",
-    "ics.structures.ndis_adapter_information",
     "ics.structures.s_phy_reg_pkt_hdr",
     "ics.structures.s_phy_reg_pkt_clause22_mess",
     "ics.structures.s_phy_reg_pkt_clause45_mess",
diff --git a/ics/structures/__init__.py b/ics/structures/__init__.py
@@ -77,6 +77,7 @@
     "a2_b_monitor_settings",
     "srada2_b_settings",
     "srad_moon2_settings",
+    "srad_moon3_settings",
     "srad_gigalog_settings",
     "srad_gigastar_settings",
     "s_vivid_can_settings",
@@ -119,7 +120,11 @@
     "s_ether_badge_settings",
     "srad_epsilon_switch_settings",
     "srad_epsilon_settings",
-    "swil_bridge_config",
+    "s_wil_fault_servicing_settings",
+    "s_wil_network_data_capture_settings",
+    "s_wil_connection_settings",
+    "s_spi_port_settings",
+    "s_wil_bridge_config",
     "sradbms_settings",
     "global_settings",
     "s_device_settings",
@@ -144,7 +149,6 @@
     "ics_rad_epsilon_device_status",
     "ics_rad_bms_device_status",
     "ics_device_status",
-    "ndis_adapter_information",
     "s_phy_reg_pkt_hdr",
     "s_phy_reg_pkt_clause22_mess",
     "s_phy_reg_pkt_clause45_mess",
diff --git a/ics/structures/device_feature.py b/ics/structures/device_feature.py
@@ -26,6 +26,7 @@ def from_param(cls, obj):
     networkTerminationDWCAN06 = enum.auto()
     networkTerminationDWCAN07 = enum.auto()
     networkTerminationDWCAN08 = enum.auto()
+    enhancedFlashDriver = enum.auto()
     NUM_VALID_DEVICE_FEATURES = enum.auto()
     supportedFeatureMax  = 65535
 
diff --git a/ics/structures/e_device_settings_type.py b/ics/structures/e_device_settings_type.py
@@ -45,6 +45,7 @@ def from_param(cls, obj):
     DeviceRADEpsilonSettingsType = enum.auto()
     DeviceOBD2LCSettingsType = enum.auto()
     DeviceRADBMSSettingsType = enum.auto()
+    DeviceRADMoon3SettingsType = enum.auto()
     DeviceSettingsTypeMax = enum.auto()
     DeviceSettingsNone  = 4294967295
 
diff --git a/ics/structures/ethernet_settings2.py b/ics/structures/ethernet_settings2.py
@@ -12,7 +12,8 @@ class ethernet_settings2(ctypes.Structure):
         ('ip_addr', ctypes.c_uint32),
         ('netmask', ctypes.c_uint32),
         ('gateway', ctypes.c_uint32),
-        ('rsvd', ctypes.c_uint8 * 2),
+        ('flags2', ctypes.c_uint8),
+        ('rsvd', ctypes.c_uint8),
     ]
 
 
diff --git a/ics/structures/global_settings.py b/ics/structures/global_settings.py
@@ -28,6 +28,7 @@
 from ics.structures.srad_gigastar_settings import *
 from ics.structures.srad_jupiter_settings import *
 from ics.structures.srad_moon2_settings import *
+from ics.structures.srad_moon3_settings import *
 from ics.structures.srad_pluto_settings import *
 from ics.structures.srad_star2_settings import *
 from ics.structures.srad_super_moon_settings import *
@@ -80,6 +81,7 @@ class Nameless46561(ctypes.Union):
         ('epsilon', SRADEpsilonSettings),
         ('obd2lc', SOBD2LCSettings),
         ('rad_bms', SRADBMSSettings),
+        ('radmoon3', SRADMoon3Settings),
     ]
 
 
diff --git a/ics/structures/ndis_adapter_information.py b/ics/structures/ndis_adapter_information.py
diff --git a/ics/structures/s_device_settings.py b/ics/structures/s_device_settings.py
@@ -30,6 +30,7 @@
 from ics.structures.srad_gigastar_settings import *
 from ics.structures.srad_jupiter_settings import *
 from ics.structures.srad_moon2_settings import *
+from ics.structures.srad_moon3_settings import *
 from ics.structures.srad_pluto_settings import *
 from ics.structures.srad_star2_settings import *
 from ics.structures.srad_super_moon_settings import *
@@ -83,6 +84,7 @@ class Settings(ctypes.Union):
         ('rad_a2b', SRADA2BSettings),
         ('epsilon', SRADEpsilonSettings),
         ('rad_bms', SRADBMSSettings),
+        ('radmoon3', SRADMoon3Settings),
     ]
 
 
diff --git a/ics/structures/s_fire3_settings.py b/ics/structures/s_fire3_settings.py
@@ -11,10 +11,11 @@
 from ics.structures.iso9141_keyword2000_settings import *
 from ics.structures.lin_settings import *
 from ics.structures.s_text_api_settings import *
+from ics.structures.srad_gptp_settings_s import *
 from ics.structures.timesync_icshardware_settings import *
 
 
-class Nameless63050(ctypes.Structure):
+class Nameless39639(ctypes.Structure):
     _pack_ = 2
     _fields_ = [
         ('network_enables', ctypes.c_uint16),
@@ -27,10 +28,10 @@ class Nameless63050(ctypes.Structure):
 
 class network_enables(ctypes.Union):
     _pack_ = 2
-    _anonymous_  = ('Nameless63050',)
+    _anonymous_  = ('Nameless39639',)
     _fields_ = [
         ('word', ctypes.c_uint64),
-        ('Nameless63050', Nameless63050),
+        ('Nameless39639', Nameless39639),
     ]
 
 
@@ -102,6 +103,7 @@ class s_fire3_settings(ctypes.Structure):
         ('ethernet_2', ETHERNET_SETTINGS),
         ('ethernet2_2', ETHERNET_SETTINGS2),
         ('os_settings', Fire3LinuxSettings),
+        ('gPTP', RAD_GPTP_SETTINGS),
     ]
 
 
diff --git a/ics/structures/s_flex_vnetz_settings.py b/ics/structures/s_flex_vnetz_settings.py
@@ -11,7 +11,7 @@
 from ics.structures.timesync_icshardware_settings import *
 
 
-class Nameless35335(ctypes.Structure):
+class Nameless6024(ctypes.Structure):
     _pack_ = 2
     _fields_ = [
         ('network_enables', ctypes.c_uint16),
@@ -23,10 +23,10 @@ class Nameless35335(ctypes.Structure):
 
 class network_enables(ctypes.Union):
     _pack_ = 2
-    _anonymous_  = ('Nameless35335',)
+    _anonymous_  = ('Nameless6024',)
     _fields_ = [
         ('word', ctypes.c_uint64),
-        ('Nameless35335', Nameless35335),
+        ('Nameless6024', Nameless6024),
     ]
 
 
diff --git a/ics/structures/s_phy_reg_pkt.py b/ics/structures/s_phy_reg_pkt.py
@@ -11,8 +11,8 @@ class Nameless3555(ctypes.Structure):
         ('Enabled', ctypes.c_uint16, 1),
         ('WriteEnable', ctypes.c_uint16, 1),
         ('Clause45Enable', ctypes.c_uint16, 1),
-        ('status', ctypes.c_uint16, 2),
-        ('reserved', ctypes.c_uint16, 3),
+        ('status', ctypes.c_uint16, 3),
+        ('reserved', ctypes.c_uint16, 2),
         ('BusIndex', ctypes.c_uint16, 4),
         ('version', ctypes.c_uint16, 4),
     ]
diff --git a/ics/structures/s_phy_reg_pkt_status.py b/ics/structures/s_phy_reg_pkt_status.py
@@ -14,7 +14,7 @@ def from_param(cls, obj):
     PHYREG_FAILURE = enum.auto()
     PHYREG_INVALID_MDIO_BUS_INDEX = enum.auto()
     PHYREG_INVALID_PHY_ADDR = enum.auto()
-    PHYREG_RESERVED0 = enum.auto()
+    PHYREG_UNSUPPORTED_MDIO_CLAUSE = enum.auto()
     PHYREG_RESERVED1 = enum.auto()
     PHYREG_RESERVED2 = enum.auto()
     PHYREG_RESERVED3 = enum.auto()
diff --git a/ics/structures/s_pluto_vl_lookup_entry_s.py b/ics/structures/s_pluto_vl_lookup_entry_s.py
@@ -28,7 +28,7 @@ class vllupformat1(ctypes.Structure):
 
 
 
-class Nameless6024(ctypes.Union):
+class Nameless11656(ctypes.Union):
     _pack_ = 2
     _fields_ = [
         ('vllupformat0', vllupformat0),
@@ -39,9 +39,9 @@ class Nameless6024(ctypes.Union):
 
 class s_pluto_vl_lookup_entry_s(ctypes.Structure):
     _pack_ = 2
-    _anonymous_  = ('Nameless6024',)
+    _anonymous_  = ('Nameless11656',)
     _fields_ = [
-        ('Nameless6024', Nameless6024),
+        ('Nameless11656', Nameless11656),
     ]
 
 
diff --git a/ics/structures/s_spi_port_settings.py b/ics/structures/s_spi_port_settings.py
@@ -0,0 +1,17 @@
+# This file was auto generated; Do not modify, if you value your sanity!
+import ctypes
+import enum
+
+
+
+class s_spi_port_settings(ctypes.Structure):
+    _pack_ = 2
+    _fields_ = [
+        ('port_a_onbaord_external', ctypes.c_uint8),
+        ('port_b_onbaord_external', ctypes.c_uint8),
+    ]
+
+
+_sSPI_PORT_SETTINGS = s_spi_port_settings
+sSPI_PORT_SETTINGS = s_spi_port_settings
+
diff --git a/ics/structures/s_wil_bridge_config.py b/ics/structures/s_wil_bridge_config.py
@@ -10,19 +10,18 @@ class config(ctypes.Structure):
         ('can_id', ctypes.c_uint, 29),
         ('can_id_isExtended', ctypes.c_uint, 1),
         ('tcp_port', ctypes.c_uint16),
-        ('manager_onboard_external', ctypes.c_uint, 1),
         ('reserved', ctypes.c_uint, 18),
     ]
 
 
 
-class swil_bridge_config(ctypes.Union):
+class s_wil_bridge_config(ctypes.Union):
     _pack_ = 2
     _fields_ = [
         ('dword', ctypes.c_uint64),
         ('config', config),
     ]
 
 
-SWILBridgeConfig = swil_bridge_config
+sWILBridgeConfig = s_wil_bridge_config
 
diff --git a/ics/structures/s_wil_connection_settings.py b/ics/structures/s_wil_connection_settings.py
@@ -0,0 +1,23 @@
+# This file was auto generated; Do not modify, if you value your sanity!
+import ctypes
+import enum
+
+from ics.structures.s_wil_fault_servicing_settings import *
+from ics.structures.s_wil_network_data_capture_settings import *
+
+
+class s_wil_connection_settings(ctypes.Structure):
+    _pack_ = 2
+    _fields_ = [
+        ('using_port_a', ctypes.c_uint8),
+        ('using_port_b', ctypes.c_uint8),
+        ('attemptConnect', ctypes.c_uint8),
+        ('fault_servicing_config', sWIL_FAULT_SERVICING_SETTINGS),
+        ('network_data_capture_config', sWIL_NETWORK_DATA_CAPTURE_SETTINGS),
+        ('sensor_buffer_size', ctypes.c_uint16),
+    ]
+
+
+_sWIL_CONNECTION_SETTINGS = s_wil_connection_settings
+sWIL_CONNECTION_SETTINGS = s_wil_connection_settings
+
diff --git a/ics/structures/s_wil_fault_servicing_settings.py b/ics/structures/s_wil_fault_servicing_settings.py
@@ -0,0 +1,16 @@
+# This file was auto generated; Do not modify, if you value your sanity!
+import ctypes
+import enum
+
+
+
+class s_wil_fault_servicing_settings(ctypes.Structure):
+    _pack_ = 2
+    _fields_ = [
+        ('wBMSDeviceID', ctypes.c_uint8),
+        ('enabled', ctypes.c_uint8),
+    ]
+
+
+sWIL_FAULT_SERVICING_SETTINGS = s_wil_fault_servicing_settings
+
diff --git a/ics/structures/s_wil_network_data_capture_settings.py b/ics/structures/s_wil_network_data_capture_settings.py
@@ -0,0 +1,15 @@
+# This file was auto generated; Do not modify, if you value your sanity!
+import ctypes
+import enum
+
+
+
+class s_wil_network_data_capture_settings(ctypes.Structure):
+    _pack_ = 2
+    _fields_ = [
+        ('enabled', ctypes.c_uint8),
+    ]
+
+
+sWIL_NETWORK_DATA_CAPTURE_SETTINGS = s_wil_network_data_capture_settings
+
diff --git a/ics/structures/sobd2_lc_settings.py b/ics/structures/sobd2_lc_settings.py
@@ -13,7 +13,7 @@
 from ics.structures.swcan_settings import *
 
 
-class Nameless39639(ctypes.Structure):
+class Nameless8267(ctypes.Structure):
     _pack_ = 2
     _fields_ = [
         ('network_enables', ctypes.c_uint16),
@@ -25,10 +25,10 @@ class Nameless39639(ctypes.Structure):
 
 class network_enables(ctypes.Union):
     _pack_ = 2
-    _anonymous_  = ('Nameless39639',)
+    _anonymous_  = ('Nameless8267',)
     _fields_ = [
         ('word', ctypes.c_uint64),
-        ('Nameless39639', Nameless39639),
+        ('Nameless8267', Nameless8267),
     ]
 
 
diff --git a/ics/structures/srad_moon3_settings.py b/ics/structures/srad_moon3_settings.py
@@ -0,0 +1,33 @@
+# This file was auto generated; Do not modify, if you value your sanity!
+import ctypes
+import enum
+
+from ics.structures.ethernet10_g_settings import *
+
+
+class flags(ctypes.Structure):
+    _pack_ = 2
+    _fields_ = [
+        ('enableLatencyTest', ctypes.c_uint16, 1),
+        ('reserved', ctypes.c_uint16, 15),
+    ]
+
+
+
+class srad_moon3_settings(ctypes.Structure):
+    _pack_ = 2
+    _fields_ = [
+        ('perf_en', ctypes.c_uint16),
+        ('autoEth10g', ETHERNET10G_SETTINGS),
+        ('eth10g', ETHERNET10G_SETTINGS),
+        ('network_enables', ctypes.c_uint16),
+        ('network_enables_2', ctypes.c_uint16),
+        ('network_enabled_on_boot', ctypes.c_uint16),
+        ('network_enables_3', ctypes.c_uint16),
+        ('flags', flags),
+    ]
+
+
+_SRADMoon3Settings = srad_moon3_settings
+SRADMoon3Settings = srad_moon3_settings
+
diff --git a/ics/structures/srada2_b_settings.py b/ics/structures/srada2_b_settings.py
diff --git a/ics/structures/sradbms_settings.py b/ics/structures/sradbms_settings.py
diff --git a/ics/structures/st_chip_versions.py b/ics/structures/st_chip_versions.py
diff --git a/ics/structures/svcan4_ind_settings.py b/ics/structures/svcan4_ind_settings.py
diff --git a/icsnVC40.h.enums.json b/icsnVC40.h.enums.json
diff --git a/icsnVC40.h.json b/icsnVC40.h.json
diff --git a/icsnVC40_processed.h b/icsnVC40_processed.h
diff --git a/src/setup_module_auto_defines.cpp b/src/setup_module_auto_defines.cpp

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ class ethernet_settings2(ctypes.Structure):`
`12`	`12`	`('ip_addr', ctypes.c_uint32),`
`13`	`13`	`('netmask', ctypes.c_uint32),`
`14`	`14`	`('gateway', ctypes.c_uint32),`
`15`		`- ('rsvd', ctypes.c_uint8 * 2),`
	`15`	`+ ('flags2', ctypes.c_uint8),`
	`16`	`+ ('rsvd', ctypes.c_uint8),`
`16`	`17`	`]`
`17`	`18`
`18`	`19`