diff --git a/setup.py b/setup.py index 981dba2..bcc3496 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from setuptools import setup, find_packages NAME = "z_wave_ts_silabs" -VERSION = "0.4.6" +VERSION = "0.4.7" # To install the library, run the following # diff --git a/z_wave_ts_silabs/processes.py b/z_wave_ts_silabs/processes.py index eda0674..fcb233c 100644 --- a/z_wave_ts_silabs/processes.py +++ b/z_wave_ts_silabs/processes.py @@ -232,23 +232,7 @@ def __init__(self, ctxt: SessionContext): if not os.path.exists(uic_config_file_path): raise FileNotFoundError - rust_platform: str | None = None - if platform.system() == 'Linux': - if platform.machine() == 'x86_64': # is amd64 on windows - rust_platform = "x86_64-unknown-linux-gnu" - elif platform.machine() == 'arm64': - rust_platform = "aarch64-unknown-linux-gnu" - elif platform.machine() == 'arm': - rust_platform = "armv7-unknown-linux-gnueabihf" - elif platform.system() == 'Darwin': - if platform.machine() == 'x86_64': - rust_platform = "x86_64-apple-darwin" - elif platform.machine() == 'arm64': - rust_platform = "aarch64-apple-darwin" - if rust_platform is None: - raise OSError(f"unsupported OS: {platform.system()}") - - cmd_line = f'{ctxt.uic}/build/cargo/uic_upvl_build/{rust_platform}/debug/uic-upvl --conf {uic_config_file_path}' + cmd_line = f'{ctxt.uic}/uic-upvl --conf {uic_config_file_path}' super().__init__(ctxt, 'upvl', cmd_line) @@ -313,23 +297,7 @@ def __init__(self, ctxt: SessionContext, devices_to_update: list[dict[str, str]] _logger.debug(f'uic-image-provider: images.json: {self.images_json}') f.write(json.dumps(self.images_json)) - rust_platform: str | None = None - if platform.system() == 'Linux': - if platform.machine() == 'x86_64': # is amd64 on windows - rust_platform = "x86_64-unknown-linux-gnu" - elif platform.machine() == 'arm64': - rust_platform = "aarch64-unknown-linux-gnu" - elif platform.machine() == 'arm': - rust_platform = "armv7-unknown-linux-gnueabihf" - elif platform.system() == 'Darwin': - if platform.machine() == 'x86_64': - rust_platform = "x86_64-apple-darwin" - elif platform.machine() == 'arm64': - rust_platform = "aarch64-apple-darwin" - if rust_platform is None: - raise OSError(f"unsupported OS: {platform.system()}") - - cmd_line = f'{ctxt.uic}/build/cargo/uic_image_provider_build/{rust_platform}/debug/uic-image-provider --conf {uic_config_file_path}' + cmd_line = f'{ctxt.uic}/uic-image-provider --conf {uic_config_file_path}' super().__init__(ctxt,'image_provider', cmd_line) @@ -351,7 +319,7 @@ def __init__(self, ctxt: SessionContext, region: str, tty_path: str, update_file protocol_pref='2,1' if 'LR' in region else '1,2' )) - cmd_line = f'{ctxt.uic}/build/applications/zpc/zpc --conf {uic_config_file_path}' + cmd_line = f'{ctxt.uic}/zpc --conf {uic_config_file_path}' if update_file is not None: sapi_ver_regex = r"\[zpc_ncp_update\] chip_serial_api_version: (?P(7.\d{1,3}.\d{1,3}))" self.patterns = { @@ -394,7 +362,7 @@ def _generate_uic_configuration_file(self, ctxt: SessionContext, region: str, lo f"# Unify configuration file (autogenerated on: {datetime.now()})\n" f"log:\n" f" level: '{log_level}'\n" - f"mapdir: '{ctxt.uic}/build/applications/zpc/components/dotdot_mapper/rules'\n" + f"mapdir: '{ctxt.uic}/rules'\n" f"zpc:\n" f" inclusion_protocol_preference: '{protocol_pref}'\n" f" normal_tx_power_dbm: {tx_power}\n" @@ -403,7 +371,7 @@ def _generate_uic_configuration_file(self, ctxt: SessionContext, region: str, lo f" serial_log_file: '{ctxt.current_test_logdir}/sapi.log'\n" f" datastore_file: '{ctxt.current_test_logdir}/zpc.db'\n" f" poll:\n" - f" attribute_list_file: '{ctxt.uic}/applications/zpc/components/zpc_rust/zwave_poll_config.yaml'\n" + f" attribute_list_file: '{ctxt.uic}/zwave_poll_config.yaml'\n" f" ota:\n" f" cache_path: '{ctxt.current_test_logdir}/zpc_ota_cache'\n" # maybe append this in the relevant processes instead ?