Skip to content

Commit

Permalink
A bunch of changes to struct generator, works now.
Browse files Browse the repository at this point in the history
-Updated icsnVC40 header to latest MR (dr-1678) (~3.9.1.12)
-installer / main module is still broke to support this new structure.

Signed-off-by: David Rebbe <[email protected]>
  • Loading branch information
drebbe-intrepid committed Jun 18, 2019
1 parent d15445a commit d32d316
Show file tree
Hide file tree
Showing 125 changed files with 15,470 additions and 91 deletions.
404 changes: 337 additions & 67 deletions generate_icsneo40_structs.py

Large diffs are not rendered by default.

Empty file added ics/__init__.py
Empty file.
113 changes: 113 additions & 0 deletions ics/structures/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
__all__ = [
"s_extended_data_flash_header",
"neo_device",
"neo_device_ex",
"can_options",
"tagicsneo_vi_command",
"st_api_firmware_info",
"can_settings",
"canfd_settings",
"swcan_settings",
"lin_settings",
"iso9141_keyword2000_init_step",
"iso9141_keyword2000_settings",
"uart_settings",
"j1708_settings",
"s_red_settings",
"s_text_api_settings",
"fire_versions",
"plasma_fire_vnet",
"vcan3_versions",
"vcanrf_versions",
"radgalaxy_versions",
"radstar2_versions",
"vividcan_versions",
"cmprobe_versions",
"obd2pro_versions",
"vcan41_versions",
"vcan42_versions",
"neoecu_avb_versions",
"radsupermoon_versions",
"radmoon2_versions",
"pluto_versions",
"radgigalog_versions",
"s_neo_most_gateway_settings",
"op_eth_general_settings",
"op_eth_settings",
"ethernet_settings",
"ethernet_settings2",
"ethernet10_g_settings",
"disk_settings",
"canterm_settings",
"timesync_icshardware_settings",
"srad_gigalog_disk_status",
"srad_gigalog_disk_structure",
"srad_gigalog_disk_details",
"srad_gigalog_disk_format_progress",
"s_rad_gigalog_sub_cmd_hdr",
"s_rad_gigalog_comm",
"serdescam_settings",
"s_fire_settings",
"s_fire_vnet_settings",
"s_cyan_settings",
"svcan3_settings",
"svcan4_settings",
"svcanrf_settings",
"secu_settings",
"s_pendant_settings",
"sievb_settings",
"seevb_settings",
"srad_galaxy_settings",
"srad_star2_settings",
"srad_super_moon_settings",
"srad_moon2_settings",
"srad_gigalog_settings",
"s_vivid_can_settings",
"sobd2_sim_settings",
"s_cm_probe_settings",
"sobd2_pro_settings",
"svcan412_settings",
"secu_avb_settings",
"s_pluto_l2_address_lookup_entry_s",
"s_pluto_l2_address_lookup_params_s",
"s_pluto_l2_forwarding_params_s",
"s_pluto_l2_forwarding_entry_s",
"s_pluto_l2_policing_s",
"s_pluto_vlan_lookup_s",
"s_pluto_mac_config_s",
"s_pluto_retagging_entry_s",
"s_pluto_general_params_s",
"s_pluto_vl_lookup_entry_s",
"s_pluto_vl_policing_entry_s",
"s_pluto_vl_forwarding_params_s",
"s_pluto_vl_forwarding_entry_s",
"s_pluto_avb_params_s",
"s_pluto_clock_sync_params_s",
"s_pluto_custom_params_s",
"s_pluto_switch_settings",
"srad_pluto_settings",
"scan_hub_settings",
"s_flex_vnetz_settings",
"s_neo_ecu12_settings",
"svcan4_ind_settings",
"global_settings",
"s_device_settings",
"st_cm_iso157652_tx_message",
"iso15765_2015_tx_message",
"st_cm_iso157652_rx_message",
"spy_filter_long",
"ics_spy_message",
"ics_spy_message_flex_ray",
"ics_spy_message_long",
"ics_spy_message_j1850",
"ics_spy_message_vsb",
"ics_fire2_device_status",
"ics_vcan4_device_status",
"ics_flex_vnetz_device_status",
"j2534_adapter_information",
"erad_gigalog_disk_format",
"erad_gigalog_disk_layout",
"flex_vnet_mode",
"e_device_settings_type",
"e_plasma_ion_vnet_channel_t",
]
12 changes: 12 additions & 0 deletions ics/structures/can_options.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

class can_options(ctypes.Structure):
_fields_ = [
('iNetworkID', ctypes.c_int32),
]

# Extra names go here:
CANOptions = can_options
# End of extra names

23 changes: 23 additions & 0 deletions ics/structures/can_settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

class can_settings(ctypes.Structure):
_pack_ = 2
_fields_ = [
('Mode', ctypes.c_uint8),
('SetBaudrate', ctypes.c_uint8),
('Baudrate', ctypes.c_uint8),
('transceiver_mode', ctypes.c_uint8),
('TqSeg1', ctypes.c_uint8),
('TqSeg2', ctypes.c_uint8),
('TqProp', ctypes.c_uint8),
('TqSync', ctypes.c_uint8),
('BRP', ctypes.c_uint16),
('auto_baud', ctypes.c_uint8),
('innerFrameDelay25us', ctypes.c_uint8),
]

# Extra names go here:
CAN_SETTINGS = can_settings
# End of extra names

21 changes: 21 additions & 0 deletions ics/structures/canfd_settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

class canfd_settings(ctypes.Structure):
_pack_ = 2
_fields_ = [
('FDMode', ctypes.c_uint8),
('FDBaudrate', ctypes.c_uint8),
('FDTqSeg1', ctypes.c_uint8),
('FDTqSeg2', ctypes.c_uint8),
('FDTqProp', ctypes.c_uint8),
('FDTqSync', ctypes.c_uint8),
('FDBRP', ctypes.c_uint16),
('FDTDC', ctypes.c_uint8),
('reserved', ctypes.c_uint8),
]

# Extra names go here:
CANFD_SETTINGS = canfd_settings
# End of extra names

15 changes: 15 additions & 0 deletions ics/structures/canterm_settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

class canterm_settings(ctypes.Structure):
_pack_ = 2
_fields_ = [
('term_enabled', ctypes.c_uint8),
('term_network', ctypes.c_uint8),
('reserved', ctypes.c_uint16 * 2),
]

# Extra names go here:
CANTERM_SETTINGS = canterm_settings
# End of extra names

13 changes: 13 additions & 0 deletions ics/structures/cmprobe_versions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

class cmprobe_versions(ctypes.Structure):
_pack_ = 2
_fields_ = [
('zynq_core_major', ctypes.c_uint8),
('zynq_core_minor', ctypes.c_uint8),
]

# Extra names go here:
# End of extra names

16 changes: 16 additions & 0 deletions ics/structures/disk_settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

class disk_settings(ctypes.Structure):
_pack_ = 2
_fields_ = [
('disk_layout', ctypes.c_uint8), # RAID0, spanned, etc
('disk_format', ctypes.c_uint8), # FAT32
('disk_enables', ctypes.c_uint32), # mask of enabled disks in this layout
('rsvd', ctypes.c_uint8 * 8),
]

# Extra names go here:
DISK_SETTINGS = disk_settings
# End of extra names

Empty file.
43 changes: 43 additions & 0 deletions ics/structures/e_device_settings_type.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

from enum import IntEnum

class e_device_settings_type(IntEnum):
"""A ctypes-compatible IntEnum superclass."""
@classmethod
def from_param(cls, obj):
return int(obj)

DeviceFireSettingsType = 0
DeviceFireVnetSettingsType = 1
DeviceFire2SettingsType = 2
DeviceVCAN3SettingsType = 3
DeviceRADGalaxySettingsType = 4
DeviceRADStar2SettingsType = 5
DeviceVCAN4SettingsType = 6
DeviceVCAN412SettingsType = 7
DeviceVividCANSettingsType = 8
DeviceECU_AVBSettingsType = 9
DeviceRADSuperMoonSettingsType = 10
DeviceRADMoon2SettingsType = 11
DeviceRADPlutoSettingsType = 12
DeviceRADGigalogSettingsType = 13
DeviceVCANRFSettingsType = 14
DeviceEEVBSettingsType = 15
DeviceVCAN4IndSettingsType = 16
DeviceNeoECU12SettingsType = 17
DeviceFlexVnetzSettingsType = 18
DeviceCANHUBSettingsType = 19
DeviceIEVBSettingsType = 20
DeviceOBD2SimSettingsType = 21
DeviceCMProbeSettingsType = 22
DeviceOBD2ProSettingsType = 23
DeviceRedSettingsType = 24
DeviceSettingsTypeMax = 25


# Extra names go here:
EDeviceSettingsType = e_device_settings_type
# End of extra names

22 changes: 22 additions & 0 deletions ics/structures/e_plasma_ion_vnet_channel_t.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

from enum import IntEnum

class e_plasma_ion_vnet_channel_t(IntEnum):
"""A ctypes-compatible IntEnum superclass."""
@classmethod
def from_param(cls, obj):
return int(obj)

PlasmaIonVnetChannelMain = 0
PlasmaIonVnetChannelA = 1
PlasmaIonVnetChannelB = 2
eSoftCore = 3
eFpgaStatusResp = 4


# Extra names go here:
EPlasmaIonVnetChannel_t = e_plasma_ion_vnet_channel_t
# End of extra names

20 changes: 20 additions & 0 deletions ics/structures/erad_gigalog_disk_format.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

from enum import IntEnum

class erad_gigalog_disk_format(IntEnum):
"""A ctypes-compatible IntEnum superclass."""
@classmethod
def from_param(cls, obj):
return int(obj)

RADGigalogDiskFormatUnknown = 0
RADGigalogDiskFormatFAT32 = 1
RADGigalogDiskFormatexFAT = 2


# Extra names go here:
ERADGigalogDiskFormat = erad_gigalog_disk_format
# End of extra names

22 changes: 22 additions & 0 deletions ics/structures/erad_gigalog_disk_layout.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

from enum import IntEnum

class erad_gigalog_disk_layout(IntEnum):
"""A ctypes-compatible IntEnum superclass."""
@classmethod
def from_param(cls, obj):
return int(obj)

RADGigalogDiskLayoutSpanned = 0
RADGigalogDiskLayoutRAID0 = 1
RADGigalogDiskLayoutRAID1 = 2
RADGigalogDiskLayoutRAID5 = 3
RADGigalogDiskLayoutIndividual = 4


# Extra names go here:
ERADGigalogDiskLayout = erad_gigalog_disk_layout
# End of extra names

18 changes: 18 additions & 0 deletions ics/structures/ethernet10_g_settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

class ethernet10_g_settings(ctypes.Structure):
_pack_ = 2
_fields_ = [
('flags', ctypes.c_uint32),
('ip_addr', ctypes.c_uint32),
('netmask', ctypes.c_uint32),
('gateway', ctypes.c_uint32),
('link_speed', ctypes.c_uint8), # 0=10, 1=100, 2=1000, 3=2500, 4=5000, 5=10000
('rsvd2', ctypes.c_uint8 * 7),
]

# Extra names go here:
ETHERNET10G_SETTINGS = ethernet10_g_settings
# End of extra names

18 changes: 18 additions & 0 deletions ics/structures/ethernet10_g_settings_t.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

class ethernet10_g_settings_t(ctypes.Structure):
_pack_ = 2
_fields_ = [
('flags', ctypes.c_uint32),
('ip_addr', ctypes.c_uint32),
('netmask', ctypes.c_uint32),
('gateway', ctypes.c_uint32),
('link_speed', ctypes.c_uint8), # 0=10, 1=100, 2=1000, 3=2500, 4=5000, 5=10000
('rsvd2', ctypes.c_uint8 * 7),
]

# Extra names go here:
ETHERNET10G_SETTINGS = ethernet10_g_settings_t
# End of extra names

17 changes: 17 additions & 0 deletions ics/structures/ethernet_settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This file was auto generated; Do not modify, if you value your sanity!
import ctypes

class ethernet_settings(ctypes.Structure):
_pack_ = 2
_fields_ = [
('duplex', ctypes.c_uint8),
('link_speed', ctypes.c_uint8),
('auto_neg', ctypes.c_uint8),
('led_mode', ctypes.c_uint8),
('rsvd', ctypes.c_uint8 * 4),
]

# Extra names go here:
ETHERNET_SETTINGS = ethernet_settings
# End of extra names

Loading

0 comments on commit d32d316

Please sign in to comment.