From f6cb396a21aab89f4ffa4471f3661336f56a5d1f Mon Sep 17 00:00:00 2001 From: Ankit Singh Date: Fri, 6 Mar 2026 14:48:45 +0530 Subject: [PATCH 1/5] updated the building blocks file path and dmm measurements --- src/nipcbatt/__init__.py | 2 +- .../i2c_read_communication.py | 2 +- .../i2c_write_communication.py | 2 +- .../serial_communication.py | 2 +- .../spi_read_communication.py | 2 +- .../spi_write_communication.py | 2 +- .../dc_rms_current_measurement.py | 2 +- .../dc_rms_voltage_measurement.py | 2 +- .../dc_voltage_generation.py | 2 +- .../digital_clock_generation.py | 2 +- ...ge_count_measurement_using_hardware_timer.py | 2 +- ...ge_count_measurement_using_software_timer.py | 2 +- .../digital_frequency_measurement.py | 2 +- .../digital_pulse_generation.py | 2 +- .../digital_pwm_measurement.py | 2 +- .../dynamic_digital_pattern_measurement.py | 2 +- .../frequency_domain_measurement.py | 2 +- .../power_supply_source_and_measure.py | 2 +- .../static_digital_state_generation.py | 2 +- .../static_digital_state_measurement.py | 2 +- .../synchronization_signal_routing.py | 2 +- .../temperature_measurement.py | 2 +- .../time_domain_measurement.py | 2 +- .../dmm/common/helper_functions.py | 6 +++--- .../dc_rms_current_measurement.py | 15 ++++++--------- .../dc_rms_voltage_measurement.py | 17 +++++++---------- .../resistance_measurement.py | 15 ++++++--------- .../static_digital_path_generation.py | 4 ++-- .../daq/_mock_daqmx/_mock_daqmx_utilities.py | 2 +- .../{daq => }/pcbatt_building_blocks.py | 0 .../custom_dc_rms_current_measurement.py | 11 +++-------- .../default_dc_rms_current_measurement.py | 11 +++-------- .../custom_dc_rms_voltage_measurement.py | 15 +++++---------- .../default_dc_rms_voltage_measurement.py | 12 ++++-------- .../custom_resistance_measurement.py | 11 +++-------- .../default_resistance_measurement.py | 11 +++-------- .../test_pcbatt_building_blocks.py | 2 +- 37 files changed, 70 insertions(+), 108 deletions(-) rename src/nipcbatt/pcbatt_library_core/{daq => }/pcbatt_building_blocks.py (100%) diff --git a/src/nipcbatt/__init__.py b/src/nipcbatt/__init__.py index 1726d1a..ccfbf89 100644 --- a/src/nipcbatt/__init__.py +++ b/src/nipcbatt/__init__.py @@ -104,7 +104,7 @@ VoltageRangeAndTerminalParameters, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import ( +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import ( BuildingBlockUsingDAQmx, BuildingBlockUsingInstrument, BuildingBlockUsingVisa, diff --git a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_read_communication.py b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_read_communication.py index 08e9dcb..d3d9e85 100644 --- a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_read_communication.py +++ b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_read_communication.py @@ -13,7 +13,7 @@ I2cReadCommunicationData, I2cReadParameters, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import ( +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import ( BuildingBlockUsingNi845xI2cDevice, ) diff --git a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_write_communication.py b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_write_communication.py index eacb630..ab7e85f 100644 --- a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_write_communication.py +++ b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_write_communication.py @@ -20,7 +20,7 @@ I2cWriteCommunicationConfiguration, I2cWriteParameters, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import ( +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import ( BuildingBlockUsingNi845xI2cDevice, ) diff --git a/src/nipcbatt/pcbatt_library/communications/serial_communications/serial_communication.py b/src/nipcbatt/pcbatt_library/communications/serial_communications/serial_communication.py index cf36efb..a145063 100644 --- a/src/nipcbatt/pcbatt_library/communications/serial_communications/serial_communication.py +++ b/src/nipcbatt/pcbatt_library/communications/serial_communications/serial_communication.py @@ -5,7 +5,7 @@ SerialCommunicationData, SerialCommunicationParameters, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingVisa +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingVisa class SerialCommunication(BuildingBlockUsingVisa): diff --git a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_read_communication.py b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_read_communication.py index 001dc8a..71a1e39 100644 --- a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_read_communication.py +++ b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_read_communication.py @@ -12,7 +12,7 @@ SpiReadCommunicationData, SpiReadParameters, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import ( +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import ( BuildingBlockUsingNi845xSpiDevice, ) diff --git a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_write_communication.py b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_write_communication.py index 68e7052..21cb358 100644 --- a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_write_communication.py +++ b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_write_communication.py @@ -19,7 +19,7 @@ SpiWriteCommunicationConfiguration, SpiWriteParameters, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import ( +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import ( BuildingBlockUsingNi845xSpiDevice, ) diff --git a/src/nipcbatt/pcbatt_library/daq/dc_rms_current_measurements/dc_rms_current_measurement.py b/src/nipcbatt/pcbatt_library/daq/dc_rms_current_measurements/dc_rms_current_measurement.py index bd2a068..334cc91 100644 --- a/src/nipcbatt/pcbatt_library/daq/dc_rms_current_measurements/dc_rms_current_measurement.py +++ b/src/nipcbatt/pcbatt_library/daq/dc_rms_current_measurements/dc_rms_current_measurement.py @@ -29,7 +29,7 @@ DcRmsCurrentMeasurementResultData, DcRmsCurrentMeasurementTerminalRangeParameters, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_utilities.guard_utilities import Guard from nipcbatt.pcbatt_utilities.numeric_utilities import invert_value diff --git a/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py b/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py index 5c235c8..efedcd0 100644 --- a/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py +++ b/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py @@ -34,7 +34,7 @@ DcRmsVoltageMeasurementConfiguration, DcRmsVoltageMeasurementResultData, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_utilities.guard_utilities import Guard from nipcbatt.pcbatt_utilities.numeric_utilities import invert_value diff --git a/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_generation.py b/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_generation.py index 37102eb..4e55754 100644 --- a/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_generation.py +++ b/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_generation.py @@ -18,7 +18,7 @@ from nipcbatt.pcbatt_library.daq.dc_voltage_generations.dc_voltage_generation_constants import ( ConstantsForDcVoltageGeneration, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_utilities.guard_utilities import Guard diff --git a/src/nipcbatt/pcbatt_library/daq/digital_clock_generations/digital_clock_generation.py b/src/nipcbatt/pcbatt_library/daq/digital_clock_generations/digital_clock_generation.py index e30fe2b..3eff539 100644 --- a/src/nipcbatt/pcbatt_library/daq/digital_clock_generations/digital_clock_generation.py +++ b/src/nipcbatt/pcbatt_library/daq/digital_clock_generations/digital_clock_generation.py @@ -15,7 +15,7 @@ DigitalClockGenerationData, DigitalClockGenerationTimingParameters, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_library_core.pcbatt_library_exceptions import ( PCBATTLibraryException, PCBATTLibraryExceptionMessages, diff --git a/src/nipcbatt/pcbatt_library/daq/digital_edge_count_measurements/digital_edge_count_measurement_using_hardware_timer.py b/src/nipcbatt/pcbatt_library/daq/digital_edge_count_measurements/digital_edge_count_measurement_using_hardware_timer.py index 7b27c41..6c8ed22 100644 --- a/src/nipcbatt/pcbatt_library/daq/digital_edge_count_measurements/digital_edge_count_measurement_using_hardware_timer.py +++ b/src/nipcbatt/pcbatt_library/daq/digital_edge_count_measurements/digital_edge_count_measurement_using_hardware_timer.py @@ -25,7 +25,7 @@ DigitalEdgeCountMeasurementResultData, DigitalEdgeCountMeasurementTimingParameters, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_library_core.pcbatt_library_exceptions import ( PCBATTLibraryException, PCBATTLibraryExceptionMessages, diff --git a/src/nipcbatt/pcbatt_library/daq/digital_edge_count_measurements/digital_edge_count_measurement_using_software_timer.py b/src/nipcbatt/pcbatt_library/daq/digital_edge_count_measurements/digital_edge_count_measurement_using_software_timer.py index 1dbcd04..698cd43 100644 --- a/src/nipcbatt/pcbatt_library/daq/digital_edge_count_measurements/digital_edge_count_measurement_using_software_timer.py +++ b/src/nipcbatt/pcbatt_library/daq/digital_edge_count_measurements/digital_edge_count_measurement_using_software_timer.py @@ -22,7 +22,7 @@ DigitalEdgeCountMeasurementTimingParameters, DigitalEdgeCountSoftwareTimerConfiguration, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_library_core.pcbatt_library_exceptions import ( PCBATTLibraryException, PCBATTLibraryExceptionMessages, diff --git a/src/nipcbatt/pcbatt_library/daq/digital_frequency_measurements/digital_frequency_measurement.py b/src/nipcbatt/pcbatt_library/daq/digital_frequency_measurements/digital_frequency_measurement.py index 6881262..6a092a3 100644 --- a/src/nipcbatt/pcbatt_library/daq/digital_frequency_measurements/digital_frequency_measurement.py +++ b/src/nipcbatt/pcbatt_library/daq/digital_frequency_measurements/digital_frequency_measurement.py @@ -14,7 +14,7 @@ DigitalFrequencyMeasurementCounterChannelParameters, DigitalFrequencyMeasurementResultData, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_library_core.pcbatt_library_exceptions import ( PCBATTLibraryException, PCBATTLibraryExceptionMessages, diff --git a/src/nipcbatt/pcbatt_library/daq/digital_pulse_generations/digital_pulse_generation.py b/src/nipcbatt/pcbatt_library/daq/digital_pulse_generations/digital_pulse_generation.py index 52b57c6..1d8aa48 100644 --- a/src/nipcbatt/pcbatt_library/daq/digital_pulse_generations/digital_pulse_generation.py +++ b/src/nipcbatt/pcbatt_library/daq/digital_pulse_generations/digital_pulse_generation.py @@ -16,7 +16,7 @@ DigitalPulseGenerationData, DigitalPulseGenerationTimingParameters, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_library_core.pcbatt_library_exceptions import ( PCBATTLibraryException, PCBATTLibraryExceptionMessages, diff --git a/src/nipcbatt/pcbatt_library/daq/digital_pwm_measurements/digital_pwm_measurement.py b/src/nipcbatt/pcbatt_library/daq/digital_pwm_measurements/digital_pwm_measurement.py index 36951e3..61063ac 100644 --- a/src/nipcbatt/pcbatt_library/daq/digital_pwm_measurements/digital_pwm_measurement.py +++ b/src/nipcbatt/pcbatt_library/daq/digital_pwm_measurements/digital_pwm_measurement.py @@ -18,7 +18,7 @@ DigitalPwmMeasurementResultData, DigitalPwmMeasurementTimingParameters, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_library_core.pcbatt_library_exceptions import ( PCBATTLibraryException, PCBATTLibraryExceptionMessages, diff --git a/src/nipcbatt/pcbatt_library/daq/dynamic_digital_pattern_measurements/dynamic_digital_pattern_measurement.py b/src/nipcbatt/pcbatt_library/daq/dynamic_digital_pattern_measurements/dynamic_digital_pattern_measurement.py index dfeff12..36f4cf3 100644 --- a/src/nipcbatt/pcbatt_library/daq/dynamic_digital_pattern_measurements/dynamic_digital_pattern_measurement.py +++ b/src/nipcbatt/pcbatt_library/daq/dynamic_digital_pattern_measurements/dynamic_digital_pattern_measurement.py @@ -31,7 +31,7 @@ DynamicDigitalPatternMeasurementConfiguration, DynamicDigitalPatternMeasurementResultData, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_library_core.pcbatt_library_exceptions import ( PCBATTLibraryException, PCBATTLibraryExceptionMessages, diff --git a/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_measurement.py b/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_measurement.py index cbef985..1a74ec9 100644 --- a/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_measurement.py +++ b/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_measurement.py @@ -40,7 +40,7 @@ FrequencyDomainMeasurementResultData, MultipleTonesMeasurementResultData, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_utilities.guard_utilities import Guard from nipcbatt.pcbatt_utilities.numeric_utilities import invert_value diff --git a/src/nipcbatt/pcbatt_library/daq/power_supply_source_and_measurements/power_supply_source_and_measure.py b/src/nipcbatt/pcbatt_library/daq/power_supply_source_and_measurements/power_supply_source_and_measure.py index 6abd969..21ee95a 100644 --- a/src/nipcbatt/pcbatt_library/daq/power_supply_source_and_measurements/power_supply_source_and_measure.py +++ b/src/nipcbatt/pcbatt_library/daq/power_supply_source_and_measurements/power_supply_source_and_measure.py @@ -27,7 +27,7 @@ PowerSupplySourceAndMeasureResultData, PowerSupplySourceAndMeasureTerminalParameters, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_utilities.guard_utilities import Guard from nipcbatt.pcbatt_utilities.numeric_utilities import invert_value diff --git a/src/nipcbatt/pcbatt_library/daq/static_digital_state_generations/static_digital_state_generation.py b/src/nipcbatt/pcbatt_library/daq/static_digital_state_generations/static_digital_state_generation.py index 704ad3d..e3b393a 100644 --- a/src/nipcbatt/pcbatt_library/daq/static_digital_state_generations/static_digital_state_generation.py +++ b/src/nipcbatt/pcbatt_library/daq/static_digital_state_generations/static_digital_state_generation.py @@ -16,7 +16,7 @@ StaticDigitalStateGenerationConfiguration, StaticDigitalStateGenerationData, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_library_core.pcbatt_library_exceptions import ( PCBATTLibraryException, PCBATTLibraryExceptionMessages, diff --git a/src/nipcbatt/pcbatt_library/daq/static_digital_state_measurements/static_digital_state_measurement.py b/src/nipcbatt/pcbatt_library/daq/static_digital_state_measurements/static_digital_state_measurement.py index 9949906..85acf24 100644 --- a/src/nipcbatt/pcbatt_library/daq/static_digital_state_measurements/static_digital_state_measurement.py +++ b/src/nipcbatt/pcbatt_library/daq/static_digital_state_measurements/static_digital_state_measurement.py @@ -21,7 +21,7 @@ from nipcbatt.pcbatt_library.daq.static_digital_state_measurements.static_digital_state_data_types import ( StaticDigitalStateMeasurementResultData, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_library_core.pcbatt_library_exceptions import ( PCBATTLibraryException, PCBATTLibraryExceptionMessages, diff --git a/src/nipcbatt/pcbatt_library/daq/synchronizations/synchronization_signal_routing.py b/src/nipcbatt/pcbatt_library/daq/synchronizations/synchronization_signal_routing.py index d7ae20e..3f1a6d6 100644 --- a/src/nipcbatt/pcbatt_library/daq/synchronizations/synchronization_signal_routing.py +++ b/src/nipcbatt/pcbatt_library/daq/synchronizations/synchronization_signal_routing.py @@ -3,7 +3,7 @@ import nidaqmx.constants from varname import nameof -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_utilities.guard_utilities import Guard diff --git a/src/nipcbatt/pcbatt_library/daq/temperature_measurements/temperature_measurement.py b/src/nipcbatt/pcbatt_library/daq/temperature_measurements/temperature_measurement.py index 5486397..bf9702e 100644 --- a/src/nipcbatt/pcbatt_library/daq/temperature_measurements/temperature_measurement.py +++ b/src/nipcbatt/pcbatt_library/daq/temperature_measurements/temperature_measurement.py @@ -19,7 +19,7 @@ from nipcbatt.pcbatt_library.daq.temperature_measurements.temperature_data_types import ( TemperatureMeasurementResultData, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_utilities.guard_utilities import Guard from nipcbatt.pcbatt_utilities.numeric_utilities import invert_value diff --git a/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_measurement.py b/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_measurement.py index a9c0c05..6ce6b4f 100644 --- a/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_measurement.py +++ b/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_measurement.py @@ -39,7 +39,7 @@ TimeDomainMeasurementConfiguration, TimeDomainMeasurementResultData, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_utilities.guard_utilities import Guard from nipcbatt.pcbatt_utilities.numeric_utilities import invert_value diff --git a/src/nipcbatt/pcbatt_library/dmm/common/helper_functions.py b/src/nipcbatt/pcbatt_library/dmm/common/helper_functions.py index 6e05138..010632c 100644 --- a/src/nipcbatt/pcbatt_library/dmm/common/helper_functions.py +++ b/src/nipcbatt/pcbatt_library/dmm/common/helper_functions.py @@ -116,12 +116,12 @@ def format_with_si_prefix(measured_value: float, total_digits: int) -> tuple[str @staticmethod def measurement( - range_in_digits: float, measured_value: float, measurement_function: nidmm.Function = None + resolution_in_digits: float, measured_value: float, measurement_function: nidmm.Function = None ) -> dict: """Formats the measurement value according to the specified resolution. Args: - range_in_digits: Resolution in digits (e.g., 6.5 for 6.5 digit resolution) + resolution_in_digits: Resolution in digits (e.g., 6.5 for 6.5 digit resolution) measured_value: The measured value to format measurement_function: Optional nidmm.Function to append appropriate unit @@ -154,7 +154,7 @@ def measurement( "Unit": unit, } - total_digits = int(range_in_digits) + 1 + total_digits = int(resolution_in_digits) + 1 formatted_number, prefix = FormatMeasurement.format_with_si_prefix( measured_value, total_digits ) diff --git a/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_measurement.py b/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_measurement.py index 1e7b542..2b81ac7 100644 --- a/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_measurement.py +++ b/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_measurement.py @@ -4,7 +4,7 @@ import nidmm -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingNIDMM +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingNIDMM from nipcbatt.pcbatt_library.common.common_data_types import MeasurementExecutionType from nipcbatt.pcbatt_library.dmm.common.common_data_types import ( @@ -70,9 +70,8 @@ def configure_and_measure( MeasurementExecutionType.MEASURE_ONLY, MeasurementExecutionType.CONFIGURE_AND_MEASURE, ): - dmm_read = self.session.read() return self.acquire_measurement( - configuration.measurement_function_parameters.resolution_in_digits.value, dmm_read + configuration.measurement_function_parameters.resolution_in_digits.value ) return None @@ -135,15 +134,13 @@ def configure_timing(self, parameters: TimingParameters): self.session.settle_time = parameters.settle_time_seconds def acquire_measurement( - self, range_in_digits: float, measured_value: float + self, resolution_in_digits: float ) -> DcRmsCurrentMeasurementResultData: """Acquires and formats the measurement result data. Args: - range_in_digits (float): + resolution_in_digits (float): The resolution in digits used for formatting the measured value. - measured_value (float): - The raw measured current value from the DMM. Returns: DcRmsCurrentMeasurementResultData: @@ -154,8 +151,8 @@ def acquire_measurement( 'Formatted_Measurement' """ measurement = FormatMeasurement.measurement( - range_in_digits=range_in_digits, - measured_value=measured_value, + resolution_in_digits=resolution_in_digits, + measured_value=self.session.read(), measurement_function=self.session.function, ) aperture_time = "{}{}".format( diff --git a/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py b/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py index 909054e..6d161d0 100644 --- a/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py +++ b/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py @@ -18,7 +18,7 @@ DcRmsVoltageMeasurementFunctionParameters, DcRmsVoltageMeasurementResultData, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import ( +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import ( BuildingBlockUsingNIDMM, ) @@ -71,9 +71,8 @@ def configure_and_measure( MeasurementExecutionType.MEASURE_ONLY, MeasurementExecutionType.CONFIGURE_AND_MEASURE, ): - dmm_read = self.session.read() return self.acquire_measurement( - configuration.measurement_function_parameters.resolution_in_digits.value, dmm_read + configuration.measurement_function_parameters.resolution_in_digits.value ) return None @@ -86,7 +85,7 @@ def close(self): def configure_measurement_function(self, parameters: DcRmsVoltageMeasurementFunctionParameters): """Configures the measurement function settings for the DMM. - Args:S + Args: parameters (DcRmsVoltageMeasurementFunctionParameters): An instance of `DcRmsVoltageMeasurementFunctionParameters` containing the measurement function type (DC/AC voltage) and resolution in digits to configure. @@ -136,15 +135,13 @@ def configure_timing(self, parameters: TimingParameters): self.session.settle_time = parameters.settle_time_seconds def acquire_measurement( - self, range_in_digits: float, measured_value: float + self, resolution_in_digits: float ) -> DcRmsVoltageMeasurementResultData: """Acquires and formats the measurement result data. Args: - range_in_digits (float): + resolution_in_digits (float): The resolution in digits used for formatting the measured value. - measured_value (float): - The raw measured voltage value from the DMM. Returns: DcRmsVoltageMeasurementResultData: @@ -155,8 +152,8 @@ def acquire_measurement( 'Formatted_Measurement' """ measurement = FormatMeasurement.measurement( - range_in_digits=range_in_digits, - measured_value=measured_value, + resolution_in_digits=resolution_in_digits, + measured_value=self.session.read(), measurement_function=self.session.function, ) aperture_time = "{}{}".format( diff --git a/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_measurement.py b/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_measurement.py index 83f7643..364a1f5 100644 --- a/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_measurement.py +++ b/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_measurement.py @@ -4,7 +4,7 @@ import nidmm -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingNIDMM +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingNIDMM from nipcbatt.pcbatt_library.common.common_data_types import MeasurementExecutionType from nipcbatt.pcbatt_library.dmm.common.common_data_types import ( @@ -70,9 +70,8 @@ def configure_and_measure( MeasurementExecutionType.MEASURE_ONLY, MeasurementExecutionType.CONFIGURE_AND_MEASURE, ): - dmm_read = self.session.read() return self.acquire_measurement( - configuration.measurement_function_parameters.resolution_in_digits.value, dmm_read + configuration.measurement_function_parameters.resolution_in_digits.value ) return None @@ -135,15 +134,13 @@ def configure_timing(self, parameters: TimingParameters): self.session.settle_time = parameters.settle_time_seconds def acquire_measurement( - self, range_in_digits: float, measured_value: float + self, resolution_in_digits: float ) -> ResistanceMeasurementResultData: """Acquires and formats the measurement result data. Args: - range_in_digits (float): + resolution_in_digits (float): The resolution in digits used for formatting the measured value. - measured_value (float): - The raw measured resistance value from the DMM. Returns: ResistanceMeasurementResultData: @@ -154,8 +151,8 @@ def acquire_measurement( 'Formatted_Measurement' """ measurement = FormatMeasurement.measurement( - range_in_digits=range_in_digits, - measured_value=measured_value, + resolution_in_digits=resolution_in_digits, + measured_value=self.session.read(), measurement_function=self.session.function, ) aperture_time = "{}{}".format( diff --git a/src/nipcbatt/pcbatt_library/switch/static_digital_path_generations/static_digital_path_generation.py b/src/nipcbatt/pcbatt_library/switch/static_digital_path_generations/static_digital_path_generation.py index 4f0ae44..24fd450 100644 --- a/src/nipcbatt/pcbatt_library/switch/static_digital_path_generations/static_digital_path_generation.py +++ b/src/nipcbatt/pcbatt_library/switch/static_digital_path_generations/static_digital_path_generation.py @@ -22,13 +22,13 @@ StaticDigitalPathGenerationConfiguration ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_library_core.pcbatt_library_exceptions import ( PCBATTLibraryException, PCBATTLibraryExceptionMessages, ) from nipcbatt.pcbatt_utilities.guard_utilities import Guard -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingNISWITCH +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingNISWITCH diff --git a/src/nipcbatt/pcbatt_library_core/daq/_mock_daqmx/_mock_daqmx_utilities.py b/src/nipcbatt/pcbatt_library_core/daq/_mock_daqmx/_mock_daqmx_utilities.py index 2765107..cd6f071 100644 --- a/src/nipcbatt/pcbatt_library_core/daq/_mock_daqmx/_mock_daqmx_utilities.py +++ b/src/nipcbatt/pcbatt_library_core/daq/_mock_daqmx/_mock_daqmx_utilities.py @@ -11,7 +11,7 @@ _MockSystem, _MockTask, ) -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import BuildingBlockUsingDAQmx +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingDAQmx from nipcbatt.pcbatt_utilities.reflection_utilities import substitute_method diff --git a/src/nipcbatt/pcbatt_library_core/daq/pcbatt_building_blocks.py b/src/nipcbatt/pcbatt_library_core/pcbatt_building_blocks.py similarity index 100% rename from src/nipcbatt/pcbatt_library_core/daq/pcbatt_building_blocks.py rename to src/nipcbatt/pcbatt_library_core/pcbatt_building_blocks.py diff --git a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/custom_dc_rms_current_measurement.py b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/custom_dc_rms_current_measurement.py index 8535c97..42e67f1 100644 --- a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/custom_dc_rms_current_measurement.py +++ b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/custom_dc_rms_current_measurement.py @@ -1,4 +1,4 @@ -"""DMM DC RMS Current measurement example with custom input parameters.""" +"""DMM DC-RMS Current measurement example with custom input parameters.""" import nidmm @@ -19,12 +19,7 @@ def main(): - """Configures and executes custom DMM DC RMS current measurement with logging. - - Returns: - DcRmsCurrentMeasurementResultData: Measurement results including - execution settings and measured current values. - """ + """Configures and executes custom DMM DC-RMS current measurement with logging.""" dmm_current_measurement = dmm.DcRmsCurrentMeasurement() logger = PcbattLogger(file="c:\\Temp\\current_measurement_logger.txt") @@ -51,7 +46,7 @@ def main(): # ======================= Initialize the DMM ============================ dmm_current_measurement.initialize("Sim_DMM", 50) - # ================= Default measurement configuration =================== + # ================= Custom measurement configuration =================== measurement = dmm_current_measurement.configure_and_measure(configuration=config) # ===================== Close the DMM session =========================== diff --git a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/default_dc_rms_current_measurement.py b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/default_dc_rms_current_measurement.py index 5e16fbb..5bfc382 100644 --- a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/default_dc_rms_current_measurement.py +++ b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/default_dc_rms_current_measurement.py @@ -1,23 +1,18 @@ -"""DMM DC RMS Current measurement example with default input parameters.""" +"""DMM DC-RMS Current measurement example with default input parameters.""" from nipcbatt import dmm from nipcbatt.pcbatt_utilities.pcbatt_logger import PcbattLogger def main(): - """Configures and executes default DMM DC RMS current measurement with logging. - - Returns: - DcRmsCurrentMeasurementResultData: Measurement results including - execution settings and measured current values. - """ + """Configures and executes default DMM DC-RMS current measurement with logging.""" dmm_current_measurement = dmm.DcRmsCurrentMeasurement() logger = PcbattLogger(file="c:\\Temp\\current_measurement_logger.txt") logger.attach(dmm_current_measurement) # ======================= Initialize the DMM ============================ - dmm_current_measurement.initialize("DMM", 50) + dmm_current_measurement.initialize("Sim_DMM", 50) # ================= Default measurement configuration =================== measurement = dmm_current_measurement.configure_and_measure( diff --git a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/custom_dc_rms_voltage_measurement.py b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/custom_dc_rms_voltage_measurement.py index a006970..5efa875 100644 --- a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/custom_dc_rms_voltage_measurement.py +++ b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/custom_dc_rms_voltage_measurement.py @@ -1,8 +1,8 @@ -"""DMM DC RMS Voltage mmeasurement example with custom input parameters.""" +"""DMM DC-RMS Voltage measurement example with custom input parameters.""" import nidmm -from nipcbatt.pcbatt_library import dmm +from nipcbatt import dmm from nipcbatt.pcbatt_library.common.common_data_types import MeasurementExecutionType from nipcbatt.pcbatt_library.dmm.common.common_data_types import ( ResolutionInDigits, @@ -19,12 +19,7 @@ def main(): - """Configures and executes custom DMM DC RMS voltage measurement with logging. - - Returns: - DcRmsVoltageMeasurementResultData: Measurement results including - execution settings and measured voltage values. - """ + """Configures and executes custom DMM DC-RMS voltage measurement with logging.""" dmm_voltage_measurement = dmm.DcRmsVoltageMeasurement() logger = PcbattLogger(file="c:\\Temp\\voltage_measurement_logger.txt") @@ -49,9 +44,9 @@ def main(): ac_min_frequency=40.0, ) # ======================= Initialize the DMM ============================ - dmm_voltage_measurement.initialize("DMM", 50) + dmm_voltage_measurement.initialize("Sim_DMM", 50) - # ================= Default measurement configuration =================== + # ================= Custom measurement configuration =================== measurement = dmm_voltage_measurement.configure_and_measure(configuration=config) # ===================== Close the DMM session =========================== diff --git a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/default_dc_rms_voltage_measurement.py b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/default_dc_rms_voltage_measurement.py index 88c2aba..1e844a5 100644 --- a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/default_dc_rms_voltage_measurement.py +++ b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/default_dc_rms_voltage_measurement.py @@ -1,23 +1,18 @@ -"""DMM DC RMS Voltage mmeasurement example with default input parameters.""" +"""DMM DC-RMS Voltage measurement example with default input parameters.""" from nipcbatt import dmm from nipcbatt.pcbatt_utilities.pcbatt_logger import PcbattLogger def main(): - """Configures and executes default DMM DC RMS voltage measurement with logging. - - Returns: - DcRmsVoltageMeasurementResultData: Measurement results including - execution settings and measured voltage values. - """ + """Configures and executes default DMM DC-RMS voltage measurement with logging.""" dmm_voltage_measurement = dmm.DcRmsVoltageMeasurement() logger = PcbattLogger(file="c:\\Temp\\voltage_measurement_logger.txt") logger.attach(dmm_voltage_measurement) # ======================= Initialize the DMM ============================ - dmm_voltage_measurement.initialize("DMM", 50) + dmm_voltage_measurement.initialize("Sim_DMM", 50) # ================= Default measurement configuration =================== measurement = dmm_voltage_measurement.configure_and_measure( @@ -29,6 +24,7 @@ def main(): # Print the measurement result print(measurement.dmm_execution_settings, measurement.measurement) + print("executed succesfully") if __name__ == "__main__": diff --git a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/custom_resistance_measurement.py b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/custom_resistance_measurement.py index 539a093..08d9e61 100644 --- a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/custom_resistance_measurement.py +++ b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/custom_resistance_measurement.py @@ -1,4 +1,4 @@ -"""DMM Resistance measurement example with custom input parameters.""" +"""Resistance measurement example with custom input parameters.""" import nidmm @@ -19,12 +19,7 @@ def main(): - """Configures and executes custom DMM resistance measurement with logging. - - Returns: - ResistanceMeasurementResultData: Measurement results including - execution settings and measured resistance values. - """ + """Configures and executes custom resistance measurement with logging.""" resistance_measurement = dmm.DcRmsResistanceMeasurement() logger = PcbattLogger(file="c:\\Temp\\resistance_measurement_logger.txt") @@ -48,7 +43,7 @@ def main(): ) # ======================= Initialize the DMM ============================ - resistance_measurement.initialize("DMM", 50) + resistance_measurement.initialize("Sim_DMM", 50) # ================= Custom measurement configuration =================== measurement = resistance_measurement.configure_and_measure(configuration=config) diff --git a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/default_resistance_measurement.py b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/default_resistance_measurement.py index 397db82..2bd2f75 100644 --- a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/default_resistance_measurement.py +++ b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/default_resistance_measurement.py @@ -1,23 +1,18 @@ -"""DMM Resistance measurement example with default input parameters.""" +"""Resistance measurement example with default input parameters.""" from nipcbatt import dmm from nipcbatt.pcbatt_utilities.pcbatt_logger import PcbattLogger def main(): - """Configures and executes default DMM resistance measurement with logging. - - Returns: - ResistanceMeasurementResultData: Measurement results including - execution settings and measured resistance values. - """ + """Configures and executes default resistance measurement with logging.""" resistance_measurement = dmm.DcRmsResistanceMeasurement() logger = PcbattLogger(file="c:\\Temp\\resistance_measurement_logger.txt") logger.attach(resistance_measurement) # ======================= Initialize the DMM ============================ - resistance_measurement.initialize("DMM", 50) + resistance_measurement.initialize("Sim_DMM", 50) # ================= Default measurement configuration =================== measurement = resistance_measurement.configure_and_measure( diff --git a/tests/nipcbatt_tests/pcbatt_library_core_tests/test_pcbatt_building_blocks.py b/tests/nipcbatt_tests/pcbatt_library_core_tests/test_pcbatt_building_blocks.py index cf0ff7e..a8d685c 100644 --- a/tests/nipcbatt_tests/pcbatt_library_core_tests/test_pcbatt_building_blocks.py +++ b/tests/nipcbatt_tests/pcbatt_library_core_tests/test_pcbatt_building_blocks.py @@ -35,7 +35,7 @@ from varname import nameof import nipcbatt.pcbatt_utilities.reflection_utilities -from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import ( +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import ( BuildingBlockUsingDAQmx, BuildingBlockUsingInstrument, ) From 52c615a51d6434448c9b9f9a299e29cb7d01c182 Mon Sep 17 00:00:00 2001 From: Ankit Singh Date: Mon, 9 Mar 2026 08:50:10 +0530 Subject: [PATCH 2/5] moved the communication common files --- src/nipcbatt/__init__.py | 2 +- .../{ => communications}/common/communication_data_types.py | 0 .../{ => communications}/common/communication_functions.py | 2 +- .../i2c_communications/i2c_communication_constants.py | 2 +- .../i2c_communications/i2c_read_communication.py | 2 +- .../communications/i2c_communications/i2c_read_data_types.py | 2 +- .../i2c_communications/i2c_write_communication.py | 4 ++-- .../communications/i2c_communications/i2c_write_data_types.py | 2 +- .../spi_communications/spi_communication_constants.py | 2 +- .../spi_communications/spi_read_communication.py | 2 +- .../communications/spi_communications/spi_read_data_types.py | 2 +- .../spi_communications/spi_write_communication.py | 4 ++-- .../communications/spi_communications/spi_write_data_types.py | 2 +- .../dc_rms_current_measurements/dc_rms_current_measurement.py | 3 ++- .../dc_rms_voltage_measurements/dc_rms_voltage_measurement.py | 3 ++- .../dmm/resistance_measurements/resistance_measurement.py | 3 ++- .../common/test_communication_functions.py | 4 ++-- 17 files changed, 22 insertions(+), 19 deletions(-) rename src/nipcbatt/pcbatt_library/{ => communications}/common/communication_data_types.py (100%) rename src/nipcbatt/pcbatt_library/{ => communications}/common/communication_functions.py (98%) diff --git a/src/nipcbatt/__init__.py b/src/nipcbatt/__init__.py index ccfbf89..3e154c1 100644 --- a/src/nipcbatt/__init__.py +++ b/src/nipcbatt/__init__.py @@ -91,7 +91,7 @@ SampleTimingEngine, StartTriggerType, ) -from nipcbatt.pcbatt_library.common.communication_data_types import ( +from nipcbatt.pcbatt_library.communications.common.communication_data_types import ( MemoryAddressParameters, MemoryPageCharacteristics, ) diff --git a/src/nipcbatt/pcbatt_library/common/communication_data_types.py b/src/nipcbatt/pcbatt_library/communications/common/communication_data_types.py similarity index 100% rename from src/nipcbatt/pcbatt_library/common/communication_data_types.py rename to src/nipcbatt/pcbatt_library/communications/common/communication_data_types.py diff --git a/src/nipcbatt/pcbatt_library/common/communication_functions.py b/src/nipcbatt/pcbatt_library/communications/common/communication_functions.py similarity index 98% rename from src/nipcbatt/pcbatt_library/common/communication_functions.py rename to src/nipcbatt/pcbatt_library/communications/common/communication_functions.py index 10a5000..32af75b 100644 --- a/src/nipcbatt/pcbatt_library/common/communication_functions.py +++ b/src/nipcbatt/pcbatt_library/communications/common/communication_functions.py @@ -5,7 +5,7 @@ import numpy from nipcbatt.pcbatt_communication_library._ni_845x_internal import _ni_845x_functions -from nipcbatt.pcbatt_library.common.communication_data_types import ( +from nipcbatt.pcbatt_library.communications.common.communication_data_types import ( MemoryAddressParameters, MemoryPageCharacteristics, ) diff --git a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_communication_constants.py b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_communication_constants.py index 3927939..5af6a4c 100644 --- a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_communication_constants.py +++ b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_communication_constants.py @@ -10,7 +10,7 @@ Ni845xI2cAddressingType, Ni845xVoltageLevel, ) -from nipcbatt.pcbatt_library.common.communication_data_types import ( +from nipcbatt.pcbatt_library.communications.common.communication_data_types import ( MemoryAddressParameters, ) from nipcbatt.pcbatt_library.communications.i2c_communications.i2c_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_read_communication.py b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_read_communication.py index d3d9e85..1f5cabf 100644 --- a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_read_communication.py +++ b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_read_communication.py @@ -1,7 +1,7 @@ """ Defines class used for I2C read communication on PCB points. """ from nipcbatt.pcbatt_communication_library.ni_845x_data_types import Ni845xPullupStatus -from nipcbatt.pcbatt_library.common.communication_functions import ( +from nipcbatt.pcbatt_library.communications.common.communication_functions import ( create_command_for_i2c_communications, ) from nipcbatt.pcbatt_library.communications.i2c_communications.i2c_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_read_data_types.py b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_read_data_types.py index f1c9377..ab3175c 100644 --- a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_read_data_types.py +++ b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_read_data_types.py @@ -3,7 +3,7 @@ import numpy from varname import nameof -from nipcbatt.pcbatt_library.common.communication_data_types import ( +from nipcbatt.pcbatt_library.communications.common.communication_data_types import ( MemoryAddressParameters, ) from nipcbatt.pcbatt_library.communications.i2c_communications.i2c_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_write_communication.py b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_write_communication.py index ab7e85f..2a3fb07 100644 --- a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_write_communication.py +++ b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_write_communication.py @@ -5,10 +5,10 @@ import numpy from nipcbatt.pcbatt_communication_library.ni_845x_data_types import Ni845xPullupStatus -from nipcbatt.pcbatt_library.common.communication_data_types import ( +from nipcbatt.pcbatt_library.communications.common.communication_data_types import ( MemoryAddressParameters, ) -from nipcbatt.pcbatt_library.common.communication_functions import ( +from nipcbatt.pcbatt_library.communications.common.communication_functions import ( compute_pages_characteristics, create_command_for_i2c_communications, ) diff --git a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_write_data_types.py b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_write_data_types.py index 31b9d4d..f752793 100644 --- a/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_write_data_types.py +++ b/src/nipcbatt/pcbatt_library/communications/i2c_communications/i2c_write_data_types.py @@ -3,7 +3,7 @@ import numpy from varname import nameof -from nipcbatt.pcbatt_library.common.communication_data_types import ( +from nipcbatt.pcbatt_library.communications.common.communication_data_types import ( MemoryAddressParameters, ) from nipcbatt.pcbatt_library.communications.i2c_communications.i2c_read_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_communication_constants.py b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_communication_constants.py index ac2aee4..cc98ecc 100644 --- a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_communication_constants.py +++ b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_communication_constants.py @@ -11,7 +11,7 @@ SpiConfigurationClockPhase, SpiConfigurationClockPolarity, ) -from nipcbatt.pcbatt_library.common.communication_data_types import ( +from nipcbatt.pcbatt_library.communications.common.communication_data_types import ( MemoryAddressParameters, ) from nipcbatt.pcbatt_library.communications.spi_communications.spi_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_read_communication.py b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_read_communication.py index 71a1e39..4adfce6 100644 --- a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_read_communication.py +++ b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_read_communication.py @@ -1,6 +1,6 @@ """ Defines class used for SPI read communication on PCB points. """ -from nipcbatt.pcbatt_library.common.communication_functions import ( +from nipcbatt.pcbatt_library.communications.common.communication_functions import ( create_command_for_spi_read_communication, ) from nipcbatt.pcbatt_library.communications.spi_communications.spi_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_read_data_types.py b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_read_data_types.py index 8838844..e2f4af1 100644 --- a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_read_data_types.py +++ b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_read_data_types.py @@ -3,7 +3,7 @@ import numpy from varname import nameof -from nipcbatt.pcbatt_library.common.communication_data_types import ( +from nipcbatt.pcbatt_library.communications.common.communication_data_types import ( MemoryAddressParameters, ) from nipcbatt.pcbatt_library.communications.spi_communications.spi_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_write_communication.py b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_write_communication.py index 21cb358..b7da120 100644 --- a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_write_communication.py +++ b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_write_communication.py @@ -4,10 +4,10 @@ import numpy -from nipcbatt.pcbatt_library.common.communication_data_types import ( +from nipcbatt.pcbatt_library.communications.common.communication_data_types import ( MemoryAddressParameters, ) -from nipcbatt.pcbatt_library.common.communication_functions import ( +from nipcbatt.pcbatt_library.communications.common.communication_functions import ( compute_pages_characteristics, create_command_for_spi_write_communication, ) diff --git a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_write_data_types.py b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_write_data_types.py index bb492f7..c643778 100644 --- a/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_write_data_types.py +++ b/src/nipcbatt/pcbatt_library/communications/spi_communications/spi_write_data_types.py @@ -3,7 +3,7 @@ import numpy from varname import nameof -from nipcbatt.pcbatt_library.common.communication_data_types import ( +from nipcbatt.pcbatt_library.communications.common.communication_data_types import ( MemoryAddressParameters, ) from nipcbatt.pcbatt_library.communications.spi_communications.spi_read_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_measurement.py b/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_measurement.py index 2b81ac7..b1a7565 100644 --- a/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_measurement.py +++ b/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_measurement.py @@ -150,9 +150,10 @@ def acquire_measurement( - measurement: Dictionary with keys 'Measured_Value', 'Unit', and 'Formatted_Measurement' """ + measured_value = self.session.read() measurement = FormatMeasurement.measurement( resolution_in_digits=resolution_in_digits, - measured_value=self.session.read(), + measured_value=measured_value, measurement_function=self.session.function, ) aperture_time = "{}{}".format( diff --git a/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py b/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py index 6d161d0..2698042 100644 --- a/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py +++ b/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py @@ -151,9 +151,10 @@ def acquire_measurement( - measurement: Dictionary with keys 'Measured_Value', 'Unit', and 'Formatted_Measurement' """ + measured_value = self.session.read() measurement = FormatMeasurement.measurement( resolution_in_digits=resolution_in_digits, - measured_value=self.session.read(), + measured_value=measured_value, measurement_function=self.session.function, ) aperture_time = "{}{}".format( diff --git a/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_measurement.py b/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_measurement.py index 364a1f5..bf6729b 100644 --- a/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_measurement.py +++ b/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_measurement.py @@ -150,9 +150,10 @@ def acquire_measurement( - measurement: Dictionary with keys 'Measured_Value', 'Unit', and 'Formatted_Measurement' """ + measured_value = self.session.read() measurement = FormatMeasurement.measurement( resolution_in_digits=resolution_in_digits, - measured_value=self.session.read(), + measured_value=measured_value, measurement_function=self.session.function, ) aperture_time = "{}{}".format( diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/common/test_communication_functions.py b/tests/nipcbatt_tests/pcbatt_library_tests/common/test_communication_functions.py index afe065c..a69bf42 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/common/test_communication_functions.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/common/test_communication_functions.py @@ -6,11 +6,11 @@ import unittest from typing import List -from parameterized import parameterized +from parameterized import parameterized from varname import nameof import nipcbatt -from nipcbatt.pcbatt_library.common.communication_functions import ( +from nipcbatt.pcbatt_library.communications.common.communication_functions import ( compute_pages_characteristics, create_command_for_spi_read_communication, create_command_for_spi_write_communication, From 651bd0786fef10a15ba292bfab6079904622524d Mon Sep 17 00:00:00 2001 From: Ankit Singh Date: Mon, 9 Mar 2026 09:13:04 +0530 Subject: [PATCH 3/5] moved the common files to daq --- src/nipcbatt/__init__.py | 4 ++-- src/nipcbatt/pcbatt_library/communications/common/__init__.py | 1 + src/nipcbatt/pcbatt_library/daq/common/__init__.py | 1 + .../pcbatt_library/{ => daq}/common/voltage_constants.py | 0 .../pcbatt_library/{ => daq}/common/voltage_data_types.py | 0 .../dc_rms_voltage_measurements/dc_rms_voltage_constants.py | 4 ++-- .../dc_rms_voltage_measurements/dc_rms_voltage_data_types.py | 2 +- .../dc_rms_voltage_measurements/dc_rms_voltage_measurement.py | 4 ++-- .../daq/dc_voltage_generations/dc_voltage_data_types.py | 2 +- .../daq/dc_voltage_generations/dc_voltage_generation.py | 2 +- .../dc_voltage_generations/dc_voltage_generation_constants.py | 2 +- .../frequency_domain_constants.py | 4 ++-- .../frequency_domain_data_types.py | 2 +- .../frequency_domain_measurement.py | 4 ++-- .../signal_voltage_generations/signal_voltage_data_types.py | 2 +- .../signal_voltage_generations/signal_voltage_generation.py | 2 +- .../signal_voltage_generation_constants.py | 2 +- .../daq/time_domain_measurements/time_domain_constants.py | 4 ++-- .../daq/time_domain_measurements/time_domain_data_types.py | 2 +- .../daq/time_domain_measurements/time_domain_measurement.py | 4 ++-- 20 files changed, 25 insertions(+), 23 deletions(-) create mode 100644 src/nipcbatt/pcbatt_library/communications/common/__init__.py create mode 100644 src/nipcbatt/pcbatt_library/daq/common/__init__.py rename src/nipcbatt/pcbatt_library/{ => daq}/common/voltage_constants.py (100%) rename src/nipcbatt/pcbatt_library/{ => daq}/common/voltage_data_types.py (100%) diff --git a/src/nipcbatt/__init__.py b/src/nipcbatt/__init__.py index 3e154c1..b3156b4 100644 --- a/src/nipcbatt/__init__.py +++ b/src/nipcbatt/__init__.py @@ -95,10 +95,10 @@ MemoryAddressParameters, MemoryPageCharacteristics, ) -from nipcbatt.pcbatt_library.common.voltage_constants import ( +from nipcbatt.pcbatt_library.daq.common.voltage_constants import ( ConstantsForVoltageMeasurement, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageGenerationChannelParameters, VoltageMeasurementChannelAndTerminalRangeParameters, VoltageRangeAndTerminalParameters, diff --git a/src/nipcbatt/pcbatt_library/communications/common/__init__.py b/src/nipcbatt/pcbatt_library/communications/common/__init__.py new file mode 100644 index 0000000..51334df --- /dev/null +++ b/src/nipcbatt/pcbatt_library/communications/common/__init__.py @@ -0,0 +1 @@ +"""Provides common data types and functions for communications measurements""" \ No newline at end of file diff --git a/src/nipcbatt/pcbatt_library/daq/common/__init__.py b/src/nipcbatt/pcbatt_library/daq/common/__init__.py new file mode 100644 index 0000000..be8d69f --- /dev/null +++ b/src/nipcbatt/pcbatt_library/daq/common/__init__.py @@ -0,0 +1 @@ +"""Provides common voltage data types and constants for DAQ measurements""" \ No newline at end of file diff --git a/src/nipcbatt/pcbatt_library/common/voltage_constants.py b/src/nipcbatt/pcbatt_library/daq/common/voltage_constants.py similarity index 100% rename from src/nipcbatt/pcbatt_library/common/voltage_constants.py rename to src/nipcbatt/pcbatt_library/daq/common/voltage_constants.py diff --git a/src/nipcbatt/pcbatt_library/common/voltage_data_types.py b/src/nipcbatt/pcbatt_library/daq/common/voltage_data_types.py similarity index 100% rename from src/nipcbatt/pcbatt_library/common/voltage_data_types.py rename to src/nipcbatt/pcbatt_library/daq/common/voltage_data_types.py diff --git a/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_constants.py b/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_constants.py index bf4395c..f8e36e9 100644 --- a/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_constants.py +++ b/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_constants.py @@ -10,10 +10,10 @@ MeasurementOptions, SampleClockTimingParameters, ) -from nipcbatt.pcbatt_library.common.voltage_constants import ( +from nipcbatt.pcbatt_library.daq.common.voltage_constants import ( ConstantsForVoltageMeasurement, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageRangeAndTerminalParameters, ) from nipcbatt.pcbatt_library.daq.dc_rms_voltage_measurements.dc_rms_voltage_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_data_types.py b/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_data_types.py index f81f191..3a22c51 100644 --- a/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_data_types.py +++ b/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_data_types.py @@ -11,7 +11,7 @@ MeasurementOptions, SampleClockTimingParameters, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageMeasurementChannelAndTerminalRangeParameters, VoltageRangeAndTerminalParameters, ) diff --git a/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py b/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py index efedcd0..7fe0217 100644 --- a/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py +++ b/src/nipcbatt/pcbatt_library/daq/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py @@ -20,10 +20,10 @@ SampleTimingEngine, StartTriggerType, ) -from nipcbatt.pcbatt_library.common.voltage_constants import ( +from nipcbatt.pcbatt_library.daq.common.voltage_constants import ( ConstantsForVoltageMeasurement, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageMeasurementChannelAndTerminalRangeParameters, VoltageRangeAndTerminalParameters, ) diff --git a/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_data_types.py b/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_data_types.py index 02684d5..15a23f4 100644 --- a/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_data_types.py +++ b/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_data_types.py @@ -4,7 +4,7 @@ from varname import nameof -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageGenerationChannelParameters, ) from nipcbatt.pcbatt_library_core.pcbatt_data_types import PCBATestToolkitData diff --git a/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_generation.py b/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_generation.py index 4e55754..c797054 100644 --- a/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_generation.py +++ b/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_generation.py @@ -9,7 +9,7 @@ import numpy from varname import nameof -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageGenerationChannelParameters, ) from nipcbatt.pcbatt_library.daq.dc_voltage_generations.dc_voltage_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_generation_constants.py b/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_generation_constants.py index 5ddf02e..2022904 100644 --- a/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_generation_constants.py +++ b/src/nipcbatt/pcbatt_library/daq/dc_voltage_generations/dc_voltage_generation_constants.py @@ -4,7 +4,7 @@ import nidaqmx.constants -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageGenerationChannelParameters, ) from nipcbatt.pcbatt_library.daq.dc_voltage_generations.dc_voltage_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_constants.py b/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_constants.py index ff69940..50ea6f2 100644 --- a/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_constants.py +++ b/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_constants.py @@ -12,10 +12,10 @@ MeasurementOptions, SampleClockTimingParameters, ) -from nipcbatt.pcbatt_library.common.voltage_constants import ( +from nipcbatt.pcbatt_library.daq.common.voltage_constants import ( ConstantsForVoltageMeasurement, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageRangeAndTerminalParameters, ) from nipcbatt.pcbatt_library.daq.frequency_domain_measurements.frequency_domain_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_data_types.py b/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_data_types.py index 30291ea..0513f8f 100644 --- a/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_data_types.py +++ b/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_data_types.py @@ -11,7 +11,7 @@ MeasurementOptions, SampleClockTimingParameters, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageMeasurementChannelAndTerminalRangeParameters, VoltageRangeAndTerminalParameters, ) diff --git a/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_measurement.py b/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_measurement.py index 1a74ec9..37d0fbb 100644 --- a/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_measurement.py +++ b/src/nipcbatt/pcbatt_library/daq/frequency_domain_measurements/frequency_domain_measurement.py @@ -25,10 +25,10 @@ SampleTimingEngine, StartTriggerType, ) -from nipcbatt.pcbatt_library.common.voltage_constants import ( +from nipcbatt.pcbatt_library.daq.common.voltage_constants import ( ConstantsForVoltageMeasurement, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageMeasurementChannelAndTerminalRangeParameters, VoltageRangeAndTerminalParameters, ) diff --git a/src/nipcbatt/pcbatt_library/daq/signal_voltage_generations/signal_voltage_data_types.py b/src/nipcbatt/pcbatt_library/daq/signal_voltage_generations/signal_voltage_data_types.py index 111afd7..219c277 100644 --- a/src/nipcbatt/pcbatt_library/daq/signal_voltage_generations/signal_voltage_data_types.py +++ b/src/nipcbatt/pcbatt_library/daq/signal_voltage_generations/signal_voltage_data_types.py @@ -7,7 +7,7 @@ from nipcbatt.pcbatt_library.common.common_data_types import ( DigitalStartTriggerParameters, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageGenerationChannelParameters, ) from nipcbatt.pcbatt_library_core.pcbatt_data_types import PCBATestToolkitData diff --git a/src/nipcbatt/pcbatt_library/daq/signal_voltage_generations/signal_voltage_generation.py b/src/nipcbatt/pcbatt_library/daq/signal_voltage_generations/signal_voltage_generation.py index 7c33dd4..c045f45 100644 --- a/src/nipcbatt/pcbatt_library/daq/signal_voltage_generations/signal_voltage_generation.py +++ b/src/nipcbatt/pcbatt_library/daq/signal_voltage_generations/signal_voltage_generation.py @@ -15,7 +15,7 @@ DigitalStartTriggerParameters, StartTriggerType, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageGenerationChannelParameters, ) from nipcbatt.pcbatt_library.daq.signal_voltage_generations.signal_voltage_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/daq/signal_voltage_generations/signal_voltage_generation_constants.py b/src/nipcbatt/pcbatt_library/daq/signal_voltage_generations/signal_voltage_generation_constants.py index 7ebd03e..47dcee2 100644 --- a/src/nipcbatt/pcbatt_library/daq/signal_voltage_generations/signal_voltage_generation_constants.py +++ b/src/nipcbatt/pcbatt_library/daq/signal_voltage_generations/signal_voltage_generation_constants.py @@ -8,7 +8,7 @@ DigitalStartTriggerParameters, StartTriggerType, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageGenerationChannelParameters, ) from nipcbatt.pcbatt_library.daq.signal_voltage_generations.signal_voltage_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_constants.py b/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_constants.py index 4c17206..c6f6097 100644 --- a/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_constants.py +++ b/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_constants.py @@ -18,10 +18,10 @@ MeasurementOptions, SampleClockTimingParameters, ) -from nipcbatt.pcbatt_library.common.voltage_constants import ( +from nipcbatt.pcbatt_library.daq.common.voltage_constants import ( ConstantsForVoltageMeasurement, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageRangeAndTerminalParameters, ) from nipcbatt.pcbatt_library.daq.time_domain_measurements.time_domain_data_types import ( diff --git a/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_data_types.py b/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_data_types.py index 6e5a701..94a1f31 100644 --- a/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_data_types.py +++ b/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_data_types.py @@ -11,7 +11,7 @@ MeasurementOptions, SampleClockTimingParameters, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageMeasurementChannelAndTerminalRangeParameters, VoltageRangeAndTerminalParameters, ) diff --git a/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_measurement.py b/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_measurement.py index 6ce6b4f..dbe86f9 100644 --- a/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_measurement.py +++ b/src/nipcbatt/pcbatt_library/daq/time_domain_measurements/time_domain_measurement.py @@ -25,10 +25,10 @@ SampleTimingEngine, StartTriggerType, ) -from nipcbatt.pcbatt_library.common.voltage_constants import ( +from nipcbatt.pcbatt_library.daq.common.voltage_constants import ( ConstantsForVoltageMeasurement, ) -from nipcbatt.pcbatt_library.common.voltage_data_types import ( +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( VoltageMeasurementChannelAndTerminalRangeParameters, VoltageRangeAndTerminalParameters, ) From f1b469ffacade9e25480240d88c7be900ae11e05 Mon Sep 17 00:00:00 2001 From: Ankit Singh Date: Tue, 10 Mar 2026 19:00:57 +0530 Subject: [PATCH 4/5] Moved some files from common to communication and daq, updated the import statement in library and tests --- src/nipcbatt/__init__.py | 13 -------- .../LED_Tests/analog_pwm_test.py | 4 +-- .../analog_voltage_measurement_test.py | 2 +- .../audio_tests/audio_filter_check.py | 4 +-- .../audio_tests/audio_line_check.py | 4 +-- .../communication_tests/i2c_comm_test.py | 4 +-- .../communication_tests/spi_comm_test.py | 4 +-- .../microphone_tests/microphone_test.py | 4 +-- .../power_supply_test_with_trigger.py | 2 +- .../power_supply_test_without_trigger.py | 2 +- .../sensor_tests/thermistor_test_cdaq.py | 2 +- .../signal_voltage_and_time_domain_measure.py | 4 +-- .../animation_and_sound_user_input_test.py | 4 +-- .../audio_filter_test.py | 6 ++-- .../power_diagnostics.py | 2 +- .../turn_off_all_ao_channels.py | 2 +- .../pcbatt_library/communications/__init__.py | 10 ++++++ src/nipcbatt/pcbatt_library/daq/__init__.py | 10 +++++- src/nipcbatt/pcbatt_library/dmm/__init__.py | 5 ++- .../dmm/common/helper_functions.py | 4 ++- .../dc_rms_current_constants.py | 4 +-- .../dc_rms_current_data_types.py | 2 +- .../dc_rms_current_measurement.py | 15 ++++----- .../dc_rms_voltage_constants.py | 6 ++-- .../dc_rms_voltage_data_types.py | 2 +- .../dc_rms_voltage_measurement.py | 12 +++---- .../resistance_constants.py | 4 --- .../resistance_data_types.py | 13 -------- .../resistance_measurement.py | 19 +++++------ src/nipcbatt/pcbatt_utilities/save_traces.py | 1 + .../custom_dc_rms_current_measurement.py | 29 ++++++----------- .../default_dc_rms_current_measurement.py | 2 +- .../custom_dc_rms_voltage_measurement.py | 29 ++++++----------- .../default_dc_rms_voltage_measurement.py | 2 +- .../custom_resistance_measurement.py | 32 +++++++------------ .../default_resistance_measurement.py | 2 +- .../PCIe_examples/PC_AO_DRCM.py | 2 +- .../PCIe_examples/PC_DCG_to_DPWMM_2DAQ_RSS.py | 2 +- .../PCIe_examples/PC_DRVG_DRVM.py | 4 +-- .../PCIe_examples/PC_SVG_DRVM.py | 4 +-- .../PCIe_examples/PC_SVG_FDVM.py | 4 +-- .../PCIe_examples/PC_SVG_TDVM.py | 4 +-- .../PCIe_examples/PC_SVG_TDVM_RSS.py | 8 ++--- .../PCIe_examples/PC_TTRM_DRVG.py | 2 +- .../TestScale_examples/TS_PSSM_to_TDVM.py | 8 ++--- .../cDAQ_examples/cDAQ_TTRM_DRVG_AO.py | 2 +- .../test_integration_dc_voltage_generation.py | 6 ++-- ...test_integration_i2c_read_communication.py | 2 +- ...est_integration_i2c_write_communication.py | 2 +- ...t_integration_signal_voltage_generation.py | 6 ++-- ...test_integration_spi_read_communication.py | 2 +- ...est_integration_spi_write_communication.py | 3 +- .../common/test_communication_data_types.py | 3 +- .../common/test_communication_functions.py | 21 ++++++------ .../common/test_voltage_data_types.py | 14 ++++---- .../test_dc_rms_current_measurement.py | 2 +- .../test_dc_rms_voltage_data_types.py | 16 +++++----- .../test_dc_voltage_data_types.py | 4 +-- .../test_frequency_domain_data_types.py | 16 +++++----- .../test_i2c_read_data_types.py | 12 +++---- .../test_i2c_write_data_types.py | 18 +++++------ .../test_signal_voltage_data_types.py | 8 ++--- .../test_spi_read_data_types.py | 12 +++---- .../test_spi_write_communication.py | 2 +- .../test_spi_write_data_types.py | 18 +++++------ .../test_time_domain_data_types.py | 16 +++++----- 66 files changed, 223 insertions(+), 266 deletions(-) diff --git a/src/nipcbatt/__init__.py b/src/nipcbatt/__init__.py index b3156b4..bb0466a 100644 --- a/src/nipcbatt/__init__.py +++ b/src/nipcbatt/__init__.py @@ -91,19 +91,6 @@ SampleTimingEngine, StartTriggerType, ) -from nipcbatt.pcbatt_library.communications.common.communication_data_types import ( - MemoryAddressParameters, - MemoryPageCharacteristics, -) -from nipcbatt.pcbatt_library.daq.common.voltage_constants import ( - ConstantsForVoltageMeasurement, -) -from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( - VoltageGenerationChannelParameters, - VoltageMeasurementChannelAndTerminalRangeParameters, - VoltageRangeAndTerminalParameters, -) - from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import ( BuildingBlockUsingDAQmx, BuildingBlockUsingInstrument, diff --git a/src/nipcbatt/pcbatt_automation/LED_Tests/analog_pwm_test.py b/src/nipcbatt/pcbatt_automation/LED_Tests/analog_pwm_test.py index 853a9e7..ce8d165 100644 --- a/src/nipcbatt/pcbatt_automation/LED_Tests/analog_pwm_test.py +++ b/src/nipcbatt/pcbatt_automation/LED_Tests/analog_pwm_test.py @@ -71,7 +71,7 @@ def main( results_map = {} # this structure will hold results in key-value pairs # Set the maximum and minimum range for tdvm measurement - global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, @@ -112,7 +112,7 @@ def main( # region configure SVG # Set the Signal Voltage generation range - voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( + voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=-10, range_max_volts=10 ) # Set the Sampling rate hertz and the generated siganl duration diff --git a/src/nipcbatt/pcbatt_automation/LED_Tests/analog_voltage_measurement_test.py b/src/nipcbatt/pcbatt_automation/LED_Tests/analog_voltage_measurement_test.py index 30d1bb9..76903af 100644 --- a/src/nipcbatt/pcbatt_automation/LED_Tests/analog_voltage_measurement_test.py +++ b/src/nipcbatt/pcbatt_automation/LED_Tests/analog_voltage_measurement_test.py @@ -55,7 +55,7 @@ def main( results_map = {} # this structure will hold results in key-value pairs # Set the minimum and maximum voltage range - global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.DIFF, range_min_volts=-10, range_max_volts=10, diff --git a/src/nipcbatt/pcbatt_automation/audio_tests/audio_filter_check.py b/src/nipcbatt/pcbatt_automation/audio_tests/audio_filter_check.py index 21b3827..0c8f432 100644 --- a/src/nipcbatt/pcbatt_automation/audio_tests/audio_filter_check.py +++ b/src/nipcbatt/pcbatt_automation/audio_tests/audio_filter_check.py @@ -80,7 +80,7 @@ def main( measurement_analysis_requirement=nipcbatt.MeasurementAnalysisRequirement.SKIP_ANALYSIS, ) - glob_chan_params = nipcbatt.VoltageRangeAndTerminalParameters( + glob_chan_params = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10.0, range_max_volts=10.0, @@ -111,7 +111,7 @@ def main( measurement_instance.configure_and_measure(configuration=meas_config_configure_only) # generate multi-tone wave and trigger to initiate measurement - vol_gen_range_params = nipcbatt.VoltageGenerationChannelParameters( + vol_gen_range_params = daq.VoltageGenerationChannelParameters( range_min_volts=-10.0, range_max_volts=10.0 ) diff --git a/src/nipcbatt/pcbatt_automation/audio_tests/audio_line_check.py b/src/nipcbatt/pcbatt_automation/audio_tests/audio_line_check.py index 8ce64f5..bf932c4 100644 --- a/src/nipcbatt/pcbatt_automation/audio_tests/audio_line_check.py +++ b/src/nipcbatt/pcbatt_automation/audio_tests/audio_line_check.py @@ -70,7 +70,7 @@ def main( logger.attach(measurement_instance) """Configure Freq Domain Measurement setting to wait for Hardware Trigger""" - glob_chan_params = nipcbatt.VoltageRangeAndTerminalParameters( + glob_chan_params = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10.0, range_max_volts=10.0, @@ -107,7 +107,7 @@ def main( measurement_instance.configure_and_measure(configuration=meas_config_configure_only) # generate sine wave and trigger to initiate measurement - vol_gen_range_params = nipcbatt.VoltageGenerationChannelParameters( + vol_gen_range_params = daq.VoltageGenerationChannelParameters( range_min_volts=-2.0, range_max_volts=2.0 ) diff --git a/src/nipcbatt/pcbatt_automation/communication_tests/i2c_comm_test.py b/src/nipcbatt/pcbatt_automation/communication_tests/i2c_comm_test.py index 1099fed..438e6ad 100644 --- a/src/nipcbatt/pcbatt_automation/communication_tests/i2c_comm_test.py +++ b/src/nipcbatt/pcbatt_automation/communication_tests/i2c_comm_test.py @@ -66,7 +66,7 @@ def main( ack_poll_timeout_milliseconds=10000, ) - read_mem_params = nipcbatt.MemoryAddressParameters( + read_mem_params = communications.MemoryAddressParameters( memory_address=0, # 0x00 address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -99,7 +99,7 @@ def main( data = [np.ubyte(0xAB), np.ubyte(0x1D), np.ubyte(0x11), np.ubyte(0xFF)] data_to_write = np.array(data) - write_mem_params = nipcbatt.MemoryAddressParameters( + write_mem_params = communications.MemoryAddressParameters( memory_address=0, # 0x00 address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, diff --git a/src/nipcbatt/pcbatt_automation/communication_tests/spi_comm_test.py b/src/nipcbatt/pcbatt_automation/communication_tests/spi_comm_test.py index f65f90c..00aacfe 100644 --- a/src/nipcbatt/pcbatt_automation/communication_tests/spi_comm_test.py +++ b/src/nipcbatt/pcbatt_automation/communication_tests/spi_comm_test.py @@ -66,7 +66,7 @@ def main( clock_polarity=nipcbatt.SpiConfigurationClockPolarity.CLOCK_POLARITY_IDLE_LOW, ) - read_mem_params = nipcbatt.MemoryAddressParameters( + read_mem_params = communications.MemoryAddressParameters( memory_address=0, # 0x00 address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -99,7 +99,7 @@ def main( data = [np.ubyte(0xAB), np.ubyte(0x1D), np.ubyte(0x11), np.ubyte(0xFF)] data_to_write = np.array(data) - write_mem_params = nipcbatt.MemoryAddressParameters( + write_mem_params = communications.MemoryAddressParameters( memory_address=0, # 0x00 address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, diff --git a/src/nipcbatt/pcbatt_automation/microphone_tests/microphone_test.py b/src/nipcbatt/pcbatt_automation/microphone_tests/microphone_test.py index 21d5c1b..9041001 100644 --- a/src/nipcbatt/pcbatt_automation/microphone_tests/microphone_test.py +++ b/src/nipcbatt/pcbatt_automation/microphone_tests/microphone_test.py @@ -71,7 +71,7 @@ def main( """Configure Freq Domain Measurement settings to wait for Hardware Trigger""" # Set the maximum and minimum range for FDVM measurement - global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, @@ -114,7 +114,7 @@ def main( # region configure SVG # Set the Siganl Voltage Generation Range - voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( + voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=-2, range_max_volts=2 ) # Set the Sampling rate hertz and the generated siganl duration diff --git a/src/nipcbatt/pcbatt_automation/power_supply_tests/power_supply_test_with_trigger.py b/src/nipcbatt/pcbatt_automation/power_supply_tests/power_supply_test_with_trigger.py index 76761d9..0fd9feb 100644 --- a/src/nipcbatt/pcbatt_automation/power_supply_tests/power_supply_test_with_trigger.py +++ b/src/nipcbatt/pcbatt_automation/power_supply_tests/power_supply_test_with_trigger.py @@ -77,7 +77,7 @@ def main( ) # intialize an instance of 'VoltageRangeAndTerminalParameters' - meas_global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + meas_global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, diff --git a/src/nipcbatt/pcbatt_automation/power_supply_tests/power_supply_test_without_trigger.py b/src/nipcbatt/pcbatt_automation/power_supply_tests/power_supply_test_without_trigger.py index fc994d1..bcede86 100644 --- a/src/nipcbatt/pcbatt_automation/power_supply_tests/power_supply_test_without_trigger.py +++ b/src/nipcbatt/pcbatt_automation/power_supply_tests/power_supply_test_without_trigger.py @@ -129,7 +129,7 @@ def main( ) # intialize an instance of 'VoltageRangeAndTerminalParameters' - meas_global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + meas_global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, diff --git a/src/nipcbatt/pcbatt_automation/sensor_tests/thermistor_test_cdaq.py b/src/nipcbatt/pcbatt_automation/sensor_tests/thermistor_test_cdaq.py index 7e1da1e..28870e4 100644 --- a/src/nipcbatt/pcbatt_automation/sensor_tests/thermistor_test_cdaq.py +++ b/src/nipcbatt/pcbatt_automation/sensor_tests/thermistor_test_cdaq.py @@ -73,7 +73,7 @@ def main( results_map = {} # this structure will hold results in key-value pairs """Set up the minimum and maximum range for the generation of voltage""" - range_settings = nipcbatt.VoltageGenerationChannelParameters( + range_settings = daq.VoltageGenerationChannelParameters( range_min_volts=-10.0, range_max_volts=10.0 ) diff --git a/src/nipcbatt/pcbatt_automation/synchronization_tests/signal_voltage_and_time_domain_measure.py b/src/nipcbatt/pcbatt_automation/synchronization_tests/signal_voltage_and_time_domain_measure.py index 3650c8c..acea972 100644 --- a/src/nipcbatt/pcbatt_automation/synchronization_tests/signal_voltage_and_time_domain_measure.py +++ b/src/nipcbatt/pcbatt_automation/synchronization_tests/signal_voltage_and_time_domain_measure.py @@ -92,7 +92,7 @@ def main( ) # intialize an instance of 'VoltageRangeAndTerminalParameters' - meas_global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + meas_global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, @@ -140,7 +140,7 @@ def main( ### MOVE TO SIGNAL GENERATION ### """Generate sine wave from analog module""" - range_params = nipcbatt.VoltageGenerationChannelParameters( + range_params = daq.VoltageGenerationChannelParameters( range_min_volts=-10.0, range_max_volts=10.0 ) diff --git a/src/nipcbatt/pcbatt_ft_demo_test_sequence/animation_and_sound_user_input_test.py b/src/nipcbatt/pcbatt_ft_demo_test_sequence/animation_and_sound_user_input_test.py index 790eebe..648f19f 100644 --- a/src/nipcbatt/pcbatt_ft_demo_test_sequence/animation_and_sound_user_input_test.py +++ b/src/nipcbatt/pcbatt_ft_demo_test_sequence/animation_and_sound_user_input_test.py @@ -58,7 +58,7 @@ def main(self): def configure_tweeter_meas( self, ) -> None: - global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, @@ -175,7 +175,7 @@ def fetch_tweeter_sound( # Fetches the measured DC Voltage (measured after Button action) and returns Time Domain Analysis Frequency # NOTE: This Step errors outs for non-periodic waveform captures. - global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, diff --git a/src/nipcbatt/pcbatt_ft_demo_test_sequence/audio_filter_test.py b/src/nipcbatt/pcbatt_ft_demo_test_sequence/audio_filter_test.py index 67900b9..b896fc5 100644 --- a/src/nipcbatt/pcbatt_ft_demo_test_sequence/audio_filter_test.py +++ b/src/nipcbatt/pcbatt_ft_demo_test_sequence/audio_filter_test.py @@ -49,7 +49,7 @@ def configure_audio_meas( ) -> None: # Configure Freq Domain Measurement settings to wait for Hardware Trigger from Audio Signal Generation - global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, @@ -86,7 +86,7 @@ def configure_audio_meas( def send_multi_tone_audio_signal( self, ) -> None: - voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( + voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=-10, range_max_volts=10 ) @@ -142,7 +142,7 @@ def measure_tone( ) -> None: # Fetches the Analog Input voltage waveforms (Started measure when Signal Voltage generation sends Trigger) and returns Freq Domain Analysis - global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, diff --git a/src/nipcbatt/pcbatt_ft_demo_test_sequence/power_diagnostics.py b/src/nipcbatt/pcbatt_ft_demo_test_sequence/power_diagnostics.py index 2dcb19b..3838524 100644 --- a/src/nipcbatt/pcbatt_ft_demo_test_sequence/power_diagnostics.py +++ b/src/nipcbatt/pcbatt_ft_demo_test_sequence/power_diagnostics.py @@ -147,7 +147,7 @@ def measure_idle_power_consumption( def measure_dc_regulator_voltages( self, ) -> None: - global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, diff --git a/src/nipcbatt/pcbatt_ft_demo_test_sequence/turn_off_all_ao_channels.py b/src/nipcbatt/pcbatt_ft_demo_test_sequence/turn_off_all_ao_channels.py index 8a4e514..87a0f8b 100644 --- a/src/nipcbatt/pcbatt_ft_demo_test_sequence/turn_off_all_ao_channels.py +++ b/src/nipcbatt/pcbatt_ft_demo_test_sequence/turn_off_all_ao_channels.py @@ -29,7 +29,7 @@ def main(self) -> None: def dc_voltage_generation_configure_initiate_and_sources_dc_voltage( self, ) -> None: - voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( + voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=-10, range_max_volts=10 ) diff --git a/src/nipcbatt/pcbatt_library/communications/__init__.py b/src/nipcbatt/pcbatt_library/communications/__init__.py index ae41be8..7aab550 100644 --- a/src/nipcbatt/pcbatt_library/communications/__init__.py +++ b/src/nipcbatt/pcbatt_library/communications/__init__.py @@ -1,4 +1,14 @@ "Provides commnuncations modules for pcbatt" +from nipcbatt.pcbatt_library.communications.common.communication_data_types import ( + MemoryAddressParameters, + MemoryPageCharacteristics, +) +from nipcbatt.pcbatt_library.communications.common.communication_functions import ( + compute_pages_characteristics, + create_command_for_i2c_communications, + create_command_for_spi_read_communication, + create_command_for_spi_write_communication, +) from nipcbatt.pcbatt_library.communications.i2c_communications.i2c_communication_constants import ( DEFAULT_I2C_COMMUNICATION_PARAMETERS, DEFAULT_I2C_DEVICE_PARAMETERS, diff --git a/src/nipcbatt/pcbatt_library/daq/__init__.py b/src/nipcbatt/pcbatt_library/daq/__init__.py index d1c140c..f3aaf2a 100644 --- a/src/nipcbatt/pcbatt_library/daq/__init__.py +++ b/src/nipcbatt/pcbatt_library/daq/__init__.py @@ -1,6 +1,14 @@ #pylint: disable=C0301 -"""Provides nipcbatt library of measurement, generation and modules uaing DAQ hardware""" +"""Provides nipcbatt library of measurement, generation and modules uaing DAQ hardware""" +from nipcbatt.pcbatt_library.daq.common.voltage_constants import ( + ConstantsForVoltageMeasurement, +) +from nipcbatt.pcbatt_library.daq.common.voltage_data_types import ( + VoltageMeasurementChannelAndTerminalRangeParameters, + VoltageGenerationChannelParameters, + VoltageRangeAndTerminalParameters, +) from nipcbatt.pcbatt_library.daq.dc_rms_current_measurements.dc_rms_current_constants import ( DEFAULT_DC_RMS_CURRENT_DIGITAL_START_TRIGGER_PARAMETERS, DEFAULT_DC_RMS_CURRENT_MEASUREMENT_CONFIGURATION, diff --git a/src/nipcbatt/pcbatt_library/dmm/__init__.py b/src/nipcbatt/pcbatt_library/dmm/__init__.py index dae2f3d..000e0e7 100644 --- a/src/nipcbatt/pcbatt_library/dmm/__init__.py +++ b/src/nipcbatt/pcbatt_library/dmm/__init__.py @@ -34,7 +34,6 @@ DcRmsVoltageMeasurement, ) from nipcbatt.pcbatt_library.dmm.resistance_measurements.resistance_constants import ( - DEFAULT_RESISTANCE_AC_MIN_FREQUENCY, DEFAULT_RESISTANCE_EXECUTION_TYPE, DEFAULT_RESISTANCE_MEASUREMENT_CONFIGURATION, DEFAULT_RESISTANCE_MEASUREMENT_PARAMETERS, @@ -49,8 +48,8 @@ ResistanceRangeAndFunctions, ) from nipcbatt.pcbatt_library.dmm.resistance_measurements.resistance_measurement import ( - DcRmsResistanceMeasurement) - + DcRmsResistanceMeasurement, +) from nipcbatt.pcbatt_library.dmm.dc_rms_current_measurements.dc_rms_current_constants import ( DEFAULT_DC_RMS_CURRENT_AC_MIN_FREQUENCY, DEFAULT_DC_RMS_CURRENT_EXECUTION_TYPE, diff --git a/src/nipcbatt/pcbatt_library/dmm/common/helper_functions.py b/src/nipcbatt/pcbatt_library/dmm/common/helper_functions.py index 010632c..ab43c29 100644 --- a/src/nipcbatt/pcbatt_library/dmm/common/helper_functions.py +++ b/src/nipcbatt/pcbatt_library/dmm/common/helper_functions.py @@ -116,7 +116,9 @@ def format_with_si_prefix(measured_value: float, total_digits: int) -> tuple[str @staticmethod def measurement( - resolution_in_digits: float, measured_value: float, measurement_function: nidmm.Function = None + resolution_in_digits: float, + measured_value: float, + measurement_function: nidmm.Function = None, ) -> dict: """Formats the measurement value according to the specified resolution. diff --git a/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_constants.py b/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_constants.py index e06fef8..017d820 100644 --- a/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_constants.py +++ b/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_constants.py @@ -21,8 +21,8 @@ class ConstantsForDcRmsCurrentMeasurements: RANGE_AND_FUNCTION = CurrentRangeAndFunctions.DC_Current_Auto_Range -"""Current measurement-specific range/function setting is defined - in ConstantsForDcRmsCurrentMeasurements.""" +# Current measurement-specific range/function setting is defined +# in ConstantsForDcRmsCurrentMeasurements. # Default execution type for current measurements DEFAULT_DC_RMS_CURRENT_EXECUTION_TYPE = ConstantsForDcRmsMeasurements.DEFAULT_EXECUTION_TYPE diff --git a/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_data_types.py b/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_data_types.py index 7636a96..322a6a3 100644 --- a/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_data_types.py +++ b/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_data_types.py @@ -40,7 +40,7 @@ class CurrentRangeAndFunctions(Enum): class DcRmsCurrentMeasurementFunctionParameters: - """Defines parameters used for configuration of DC-RMS current measurement..""" + """Defines parameters used for configuration of DC-RMS current measurement.""" def __init__( self, diff --git a/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_measurement.py b/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_measurement.py index b1a7565..42c3284 100644 --- a/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_measurement.py +++ b/src/nipcbatt/pcbatt_library/dmm/dc_rms_current_measurements/dc_rms_current_measurement.py @@ -4,8 +4,6 @@ import nidmm -from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingNIDMM - from nipcbatt.pcbatt_library.common.common_data_types import MeasurementExecutionType from nipcbatt.pcbatt_library.dmm.common.common_data_types import ( TimingParameters, @@ -20,6 +18,7 @@ DcRmsCurrentMeasurementFunctionParameters, DcRmsCurrentMeasurementResultData, ) +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingNIDMM class DcRmsCurrentMeasurement(BuildingBlockUsingNIDMM): @@ -52,7 +51,7 @@ def configure_and_measure( Returns: DcRmsCurrentMeasurementResultData | None: An instance of `DcRmsCurrentMeasurementResultData` containing DMM execution settings - and the measured current value,or None if only configuration was performed. + and the measured current value, or None if only configuration was performed. """ if configuration.execution_type in ( MeasurementExecutionType.CONFIGURE_ONLY, @@ -105,7 +104,7 @@ def configure_trigger(self, parameters: TriggerParameters): Args: parameters (TriggerParameters): An instance of `TriggerParameters` containing trigger source, - trigger delay, and enable/disable flag. + trigger delay, slope, and enable/disable flag. """ if not parameters.enable_trigger: self.session.configure_trigger( @@ -133,9 +132,7 @@ def configure_timing(self, parameters: TimingParameters): self.session.aperture_time = parameters.aperture_time_seconds self.session.settle_time = parameters.settle_time_seconds - def acquire_measurement( - self, resolution_in_digits: float - ) -> DcRmsCurrentMeasurementResultData: + def acquire_measurement(self, resolution_in_digits: float) -> DcRmsCurrentMeasurementResultData: """Acquires and formats the measurement result data. Args: @@ -146,7 +143,9 @@ def acquire_measurement( DcRmsCurrentMeasurementResultData: An instance of `DcRmsCurrentMeasurementResultData` containing: - dmm_execution_settings: Dictionary with keys 'Function', 'Range', - 'Resolution_in_Digits', 'Aperture_Time', 'Settle_Time', and 'AC_Min_Freq' + 'Digits_Resolution', 'Aperture_Time(s)', 'Settle_Time(s)', + 'Minimum_Frequency(Hz)', 'Absolute_Resolution', + 'Input_Resistance(Ohm)', and 'Auto_Range_Value' - measurement: Dictionary with keys 'Measured_Value', 'Unit', and 'Formatted_Measurement' """ diff --git a/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_constants.py b/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_constants.py index 8ae52ca..b0353e0 100644 --- a/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_constants.py +++ b/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_constants.py @@ -1,4 +1,4 @@ -"""Constants data types for DC-RMS Voltage Measurements.""" +"""Constants data types for DC-RMS Voltage Measurements.""" import dataclasses @@ -21,8 +21,8 @@ class ConstantsForDcRmsVoltageMeasurements: RANGE_AND_FUNCTION = VoltageRangeAndFunctions.DC_Voltage_Auto_Range -"""Voltage measurement-specific range/function setting is defined - in ConstantsForDcRmsVoltageMeasurements.""" +# Voltage measurement-specific range/function setting is defined +# in ConstantsForDcRmsVoltageMeasurements. # Default execution type for voltage measurements DEFAULT_DC_RMS_VOLTAGE_EXECUTION_TYPE = ConstantsForDcRmsMeasurements.DEFAULT_EXECUTION_TYPE diff --git a/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_data_types.py b/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_data_types.py index 53f603e..25fad25 100644 --- a/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_data_types.py +++ b/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_data_types.py @@ -36,7 +36,7 @@ class VoltageRangeAndFunctions(Enum): class DcRmsVoltageMeasurementFunctionParameters(PCBATestToolkitData): - """Defines parameters used for configuration of DC-RMS voltage measurement..""" + """Defines parameters used for configuration of DC-RMS voltage measurement.""" def __init__( self, diff --git a/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py b/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py index 2698042..363de0e 100644 --- a/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py +++ b/src/nipcbatt/pcbatt_library/dmm/dc_rms_voltage_measurements/dc_rms_voltage_measurement.py @@ -53,7 +53,7 @@ def configure_and_measure( Returns: DcRmsVoltageMeasurementResultData | None: An instance of `DcRmsVoltageMeasurementResultData` containing DMM execution settings - and the measured voltage value,or None if only configuration was performed. + and the measured voltage value, or None if only configuration was performed. """ if configuration.execution_type in ( MeasurementExecutionType.CONFIGURE_ONLY, @@ -106,7 +106,7 @@ def configure_trigger(self, parameters: TriggerParameters): Args: parameters (TriggerParameters): An instance of `TriggerParameters` containing trigger source, - trigger delay, slope and enable/disable flag. + trigger delay, slope, and enable/disable flag. """ if not parameters.enable_trigger: self.session.configure_trigger( @@ -134,9 +134,7 @@ def configure_timing(self, parameters: TimingParameters): self.session.aperture_time = parameters.aperture_time_seconds self.session.settle_time = parameters.settle_time_seconds - def acquire_measurement( - self, resolution_in_digits: float - ) -> DcRmsVoltageMeasurementResultData: + def acquire_measurement(self, resolution_in_digits: float) -> DcRmsVoltageMeasurementResultData: """Acquires and formats the measurement result data. Args: @@ -147,7 +145,9 @@ def acquire_measurement( DcRmsVoltageMeasurementResultData: An instance of `DcRmsVoltageMeasurementResultData` containing: - dmm_execution_settings: Dictionary with keys 'Function', 'Range', - 'Resolution_in_Digits', 'Aperture_Time', 'Settle_Time', and 'AC_Min_Freq' + 'Digits_Resolution', 'Aperture_Time(s)', 'Settle_Time(s)', + 'Minimum_Frequency(Hz)', 'Absolute_Resolution', + 'Input_Resistance(Ohm)', and 'Auto_Range_Value' - measurement: Dictionary with keys 'Measured_Value', 'Unit', and 'Formatted_Measurement' """ diff --git a/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_constants.py b/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_constants.py index 18f0cf6..5e88200 100644 --- a/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_constants.py +++ b/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_constants.py @@ -39,9 +39,6 @@ class ConstantsForDcRmsResistanceMeasurements: settle_time_seconds=ConstantsForDcRmsMeasurements.DEFAULT_SETTLE_TIME_SECONDS, ) -# Default AC minimum frequency -DEFAULT_RESISTANCE_AC_MIN_FREQUENCY = ConstantsForDcRmsMeasurements.DEFAULT_AC_MIN_FREQUENCY - # Default trigger parameters including trigger source, trigger delay, and trigger enable setting DEFAULT_RESISTANCE_TRIGGER_PARAMETERS = TriggerParameters( trigger_source=ConstantsForDcRmsMeasurements.DEFAULT_TRIGGER_SOURCE, @@ -56,5 +53,4 @@ class ConstantsForDcRmsResistanceMeasurements: measurement_function_parameters=DEFAULT_RESISTANCE_MEASUREMENT_PARAMETERS, trigger_parameters=DEFAULT_RESISTANCE_TRIGGER_PARAMETERS, timing_parameters=DEFAULT_RESISTANCE_TIMING_PARAMETERS, - ac_min_frequency=DEFAULT_RESISTANCE_AC_MIN_FREQUENCY, ) diff --git a/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_data_types.py b/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_data_types.py index bcca0a5..7cf0dc2 100644 --- a/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_data_types.py +++ b/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_data_types.py @@ -83,7 +83,6 @@ def __init__( measurement_function_parameters: ResistanceMeasurementFunctionParameters, trigger_parameters: TriggerParameters, timing_parameters: TimingParameters, - ac_min_frequency: float, ) -> None: """Initializes the resistance measurement configuration. @@ -96,14 +95,11 @@ def __init__( Trigger configuration including source, delay, and enable/disable settings. timing_parameters (TimingParameters): Timing settings including aperture time and settle time. - ac_min_frequency (float): - Minimum frequency for AC voltage measurements in Hz (ignored for DC measurements). """ self._execution_type = execution_type self._measurement_function_parameters = measurement_function_parameters self._trigger_parameters = trigger_parameters self._timing_parameters = timing_parameters - self._ac_min_frequency = ac_min_frequency @property def execution_type(self) -> MeasurementExecutionType: @@ -142,15 +138,6 @@ def timing_parameters(self) -> TimingParameters: """ return self._timing_parameters - @property - def ac_min_frequency(self) -> float: - """Gets the minimum AC frequency setting. - - Returns: - float: The minimum frequency for AC voltage measurements. - """ - return self._ac_min_frequency - class ResistanceMeasurementResultData(PCBATestToolkitData): """Defines resistance measurement results obtained from DMM Resistance Measurement.""" diff --git a/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_measurement.py b/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_measurement.py index bf6729b..c9b69ee 100644 --- a/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_measurement.py +++ b/src/nipcbatt/pcbatt_library/dmm/resistance_measurements/resistance_measurement.py @@ -4,8 +4,6 @@ import nidmm -from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingNIDMM - from nipcbatt.pcbatt_library.common.common_data_types import MeasurementExecutionType from nipcbatt.pcbatt_library.dmm.common.common_data_types import ( TimingParameters, @@ -16,10 +14,11 @@ RangeAndMeasurementFunctionParameters, ) from nipcbatt.pcbatt_library.dmm.resistance_measurements.resistance_data_types import ( - ResistanceMeasurementFunctionParameters, ResistanceMeasurementConfiguration, + ResistanceMeasurementFunctionParameters, ResistanceMeasurementResultData, ) +from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import BuildingBlockUsingNIDMM class DcRmsResistanceMeasurement(BuildingBlockUsingNIDMM): @@ -52,7 +51,7 @@ def configure_and_measure( Returns: ResistanceMeasurementResultData | None: An instance of `ResistanceMeasurementResultData` containing DMM execution settings - and the measured resistance value,or None if only configuration was performed. + and the measured resistance value, or None if only configuration was performed. """ if configuration.execution_type in ( MeasurementExecutionType.CONFIGURE_ONLY, @@ -63,8 +62,6 @@ def configure_and_measure( ) self.configure_trigger(parameters=configuration.trigger_parameters) self.configure_timing(parameters=configuration.timing_parameters) - if self.session.function == nidmm.Function.AC_VOLTS: - self.session.ac_min_freq = configuration.ac_min_frequency if configuration.execution_type in ( MeasurementExecutionType.MEASURE_ONLY, @@ -105,7 +102,7 @@ def configure_trigger(self, parameters: TriggerParameters): Args: parameters (TriggerParameters): An instance of `TriggerParameters` containing trigger source, - trigger delay, and enable/disable flag. + trigger delay, slope, and enable/disable flag. """ if not parameters.enable_trigger: self.session.configure_trigger( @@ -133,9 +130,7 @@ def configure_timing(self, parameters: TimingParameters): self.session.aperture_time = parameters.aperture_time_seconds self.session.settle_time = parameters.settle_time_seconds - def acquire_measurement( - self, resolution_in_digits: float - ) -> ResistanceMeasurementResultData: + def acquire_measurement(self, resolution_in_digits: float) -> ResistanceMeasurementResultData: """Acquires and formats the measurement result data. Args: @@ -146,7 +141,9 @@ def acquire_measurement( ResistanceMeasurementResultData: An instance of `ResistanceMeasurementResultData` containing: - dmm_execution_settings: Dictionary with keys 'Function', 'Range', - 'Resolution_in_Digits', 'Aperture_Time', and 'Settle_Time' + 'Digits_Resolution', 'Aperture_Time(s)', 'Settle_Time(s)', + 'Minimum_Frequency(Hz)', 'Absolute_Resolution', + 'Input_Resistance(Ohm)', and 'Auto_Range_Value' - measurement: Dictionary with keys 'Measured_Value', 'Unit', and 'Formatted_Measurement' """ diff --git a/src/nipcbatt/pcbatt_utilities/save_traces.py b/src/nipcbatt/pcbatt_utilities/save_traces.py index 18e2790..6bbf816 100644 --- a/src/nipcbatt/pcbatt_utilities/save_traces.py +++ b/src/nipcbatt/pcbatt_utilities/save_traces.py @@ -12,6 +12,7 @@ import pkg_resources +import nipcbatt from nipcbatt import daq from nipcbatt.pcbatt_utilities.csv_utilities import export_signal_to_csv_file diff --git a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/custom_dc_rms_current_measurement.py b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/custom_dc_rms_current_measurement.py index 42e67f1..b15c8db 100644 --- a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/custom_dc_rms_current_measurement.py +++ b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/custom_dc_rms_current_measurement.py @@ -2,19 +2,8 @@ import nidmm +import nipcbatt from nipcbatt import dmm -from nipcbatt.pcbatt_library.common.common_data_types import MeasurementExecutionType -from nipcbatt.pcbatt_library.dmm.common.common_data_types import ( - ResolutionInDigits, - Slope, - TimingParameters, - TriggerParameters, -) -from nipcbatt.pcbatt_library.dmm.dc_rms_current_measurements.dc_rms_current_data_types import ( - CurrentRangeAndFunctions, - DcRmsCurrentMeasurementConfiguration, - DcRmsCurrentMeasurementFunctionParameters, -) from nipcbatt.pcbatt_utilities.pcbatt_logger import PcbattLogger @@ -25,19 +14,19 @@ def main(): logger = PcbattLogger(file="c:\\Temp\\current_measurement_logger.txt") logger.attach(dmm_current_measurement) - config = DcRmsCurrentMeasurementConfiguration( - MeasurementExecutionType.CONFIGURE_AND_MEASURE, - trigger_parameters=TriggerParameters( + config = dmm.DcRmsCurrentMeasurementConfiguration( + nipcbatt.MeasurementExecutionType.CONFIGURE_AND_MEASURE, + trigger_parameters=dmm.TriggerParameters( trigger_source=nidmm.TriggerSource.IMMEDIATE, trigger_delay=5.0, - slope=Slope.FALLING_EDGE, + slope=dmm.Slope.FALLING_EDGE, enable_trigger=False, ), - measurement_function_parameters=DcRmsCurrentMeasurementFunctionParameters( - measurement_function=CurrentRangeAndFunctions.DC_1A, - resolution_in_digits=ResolutionInDigits.DIGITS_3_5, + measurement_function_parameters=dmm.DcRmsCurrentMeasurementFunctionParameters( + measurement_function=dmm.CurrentRangeAndFunctions.DC_1A, + resolution_in_digits=dmm.ResolutionInDigits.DIGITS_3_5, ), - timing_parameters=TimingParameters( + timing_parameters=dmm.TimingParameters( aperture_time_seconds=-1.0, settle_time_seconds=-1.0, ), diff --git a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/default_dc_rms_current_measurement.py b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/default_dc_rms_current_measurement.py index 5bfc382..b9f73e2 100644 --- a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/default_dc_rms_current_measurement.py +++ b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_current_measurement/default_dc_rms_current_measurement.py @@ -10,7 +10,7 @@ def main(): logger = PcbattLogger(file="c:\\Temp\\current_measurement_logger.txt") logger.attach(dmm_current_measurement) - + # ======================= Initialize the DMM ============================ dmm_current_measurement.initialize("Sim_DMM", 50) diff --git a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/custom_dc_rms_voltage_measurement.py b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/custom_dc_rms_voltage_measurement.py index 5efa875..1e12a71 100644 --- a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/custom_dc_rms_voltage_measurement.py +++ b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/custom_dc_rms_voltage_measurement.py @@ -2,19 +2,8 @@ import nidmm +import nipcbatt from nipcbatt import dmm -from nipcbatt.pcbatt_library.common.common_data_types import MeasurementExecutionType -from nipcbatt.pcbatt_library.dmm.common.common_data_types import ( - ResolutionInDigits, - Slope, - TimingParameters, - TriggerParameters, -) -from nipcbatt.pcbatt_library.dmm.dc_rms_voltage_measurements.dc_rms_voltage_data_types import ( - DcRmsVoltageMeasurementConfiguration, - DcRmsVoltageMeasurementFunctionParameters, - VoltageRangeAndFunctions, -) from nipcbatt.pcbatt_utilities.pcbatt_logger import PcbattLogger @@ -25,19 +14,19 @@ def main(): logger = PcbattLogger(file="c:\\Temp\\voltage_measurement_logger.txt") logger.attach(dmm_voltage_measurement) - config = DcRmsVoltageMeasurementConfiguration( - MeasurementExecutionType.CONFIGURE_AND_MEASURE, - trigger_parameters=TriggerParameters( + config = dmm.DcRmsVoltageMeasurementConfiguration( + nipcbatt.MeasurementExecutionType.CONFIGURE_AND_MEASURE, + trigger_parameters=dmm.TriggerParameters( trigger_source=nidmm.TriggerSource.IMMEDIATE, trigger_delay=5.0, - slope=Slope.RISING_EDGE, + slope=dmm.Slope.RISING_EDGE, enable_trigger=False, ), - measurement_function_parameters=DcRmsVoltageMeasurementFunctionParameters( - measurement_function=VoltageRangeAndFunctions.DC_1V, - resolution_in_digits=ResolutionInDigits.DIGITS_5_5, + measurement_function_parameters=dmm.DcRmsVoltageMeasurementFunctionParameters( + measurement_function=dmm.VoltageRangeAndFunctions.DC_1V, + resolution_in_digits=dmm.ResolutionInDigits.DIGITS_5_5, ), - timing_parameters=TimingParameters( + timing_parameters=dmm.TimingParameters( aperture_time_seconds=-1.0, settle_time_seconds=-1.0, ), diff --git a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/default_dc_rms_voltage_measurement.py b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/default_dc_rms_voltage_measurement.py index 1e844a5..96f0a3a 100644 --- a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/default_dc_rms_voltage_measurement.py +++ b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/dc_rms_voltage_measurement/default_dc_rms_voltage_measurement.py @@ -10,7 +10,7 @@ def main(): logger = PcbattLogger(file="c:\\Temp\\voltage_measurement_logger.txt") logger.attach(dmm_voltage_measurement) - + # ======================= Initialize the DMM ============================ dmm_voltage_measurement.initialize("Sim_DMM", 50) diff --git a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/custom_resistance_measurement.py b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/custom_resistance_measurement.py index 08d9e61..d276d57 100644 --- a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/custom_resistance_measurement.py +++ b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/custom_resistance_measurement.py @@ -2,19 +2,8 @@ import nidmm +import nipcbatt from nipcbatt import dmm -from nipcbatt.pcbatt_library.common.common_data_types import MeasurementExecutionType -from nipcbatt.pcbatt_library.dmm.common.common_data_types import ( - ResolutionInDigits, - Slope, - TimingParameters, - TriggerParameters, -) -from nipcbatt.pcbatt_library.dmm.resistance_measurements.resistance_data_types import ( - ResistanceMeasurementConfiguration, - ResistanceMeasurementFunctionParameters, - ResistanceRangeAndFunctions, -) from nipcbatt.pcbatt_utilities.pcbatt_logger import PcbattLogger @@ -26,20 +15,21 @@ def main(): logger.attach(resistance_measurement) - config = ResistanceMeasurementConfiguration( - execution_type=MeasurementExecutionType.CONFIGURE_AND_MEASURE, - trigger_parameters=TriggerParameters( + config = dmm.ResistanceMeasurementConfiguration( + execution_type=nipcbatt.MeasurementExecutionType.CONFIGURE_AND_MEASURE, + trigger_parameters=dmm.TriggerParameters( trigger_source=nidmm.TriggerSource.IMMEDIATE, trigger_delay=-1.0, - slope=Slope.FALLING_EDGE, + slope=dmm.Slope.FALLING_EDGE, enable_trigger=False, ), - measurement_function_parameters=ResistanceMeasurementFunctionParameters( - measurement_function=ResistanceRangeAndFunctions.TWO_W_RES_100k_Ohm, - resolution_in_digits=ResolutionInDigits.DIGITS_6_5, + measurement_function_parameters=dmm.ResistanceMeasurementFunctionParameters( + measurement_function=dmm.ResistanceRangeAndFunctions.TWO_W_RES_100k_Ohm, + resolution_in_digits=dmm.ResolutionInDigits.DIGITS_6_5, + ), + timing_parameters=dmm.TimingParameters( + aperture_time_seconds=-1.0, settle_time_seconds=-1.0 ), - timing_parameters=TimingParameters(aperture_time_seconds=-1.0, settle_time_seconds=-1.0), - ac_min_frequency=40.0, ) # ======================= Initialize the DMM ============================ diff --git a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/default_resistance_measurement.py b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/default_resistance_measurement.py index 2bd2f75..ef869f5 100644 --- a/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/default_resistance_measurement.py +++ b/src/nipcbatt/pcbatt_validation_examples/DMM_examples/resistance_measurement/default_resistance_measurement.py @@ -10,7 +10,7 @@ def main(): logger = PcbattLogger(file="c:\\Temp\\resistance_measurement_logger.txt") logger.attach(resistance_measurement) - + # ======================= Initialize the DMM ============================ resistance_measurement.initialize("Sim_DMM", 50) diff --git a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_AO_DRCM.py b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_AO_DRCM.py index 9e3c6c7..3e2e81a 100644 --- a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_AO_DRCM.py +++ b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_AO_DRCM.py @@ -21,7 +21,7 @@ # region DRVG configure and generate -voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( +voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=-10, range_max_volts=10 ) diff --git a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_DCG_to_DPWMM_2DAQ_RSS.py b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_DCG_to_DPWMM_2DAQ_RSS.py index af3b956..9bedff8 100644 --- a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_DCG_to_DPWMM_2DAQ_RSS.py +++ b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_DCG_to_DPWMM_2DAQ_RSS.py @@ -41,7 +41,7 @@ dpwmm_configuration = daq.DigitalPwmMeasurementConfiguration( parameters=counter_channel_parameters, - measurement_option=daq.MeasurementExecutionType.CONFIGURE_ONLY, + measurement_option=nipcbatt.MeasurementExecutionType.CONFIGURE_ONLY, ) dpwmm.configure_and_measure(configuration=dpwmm_configuration) diff --git a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_DRVG_DRVM.py b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_DRVG_DRVM.py index 5610a3e..737d800 100644 --- a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_DRVG_DRVM.py +++ b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_DRVG_DRVM.py @@ -20,7 +20,7 @@ # region drvg configure and generate -range_settings = nipcbatt.VoltageGenerationChannelParameters( +range_settings = daq.VoltageGenerationChannelParameters( range_min_volts=-10.0, range_max_volts=10.0 ) @@ -36,7 +36,7 @@ # region DC-RMS VM Configure and Measure -global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( +global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, diff --git a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_DRVM.py b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_DRVM.py index bc1a3c6..c97a2d1 100644 --- a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_DRVM.py +++ b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_DRVM.py @@ -58,7 +58,7 @@ class Waveform_type( drvm.initialize("Dev1/ai1") # region configure SVG -voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( +voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=-10, range_max_volts=10 ) @@ -137,7 +137,7 @@ class Waveform_type( # region DRVM configure and measure -global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( +global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.DIFF, range_min_volts=-10, range_max_volts=10, diff --git a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_FDVM.py b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_FDVM.py index 267157d..f881202 100644 --- a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_FDVM.py +++ b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_FDVM.py @@ -62,7 +62,7 @@ class Waveform_type( # region fdvm configure only -global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( +global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, @@ -100,7 +100,7 @@ class Waveform_type( fdvm.configure_and_measure(configuration=fdvm_config) # region configure SVG -voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( +voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=-10, range_max_volts=10 ) diff --git a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_TDVM.py b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_TDVM.py index b8adbe2..1d3a474 100644 --- a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_TDVM.py +++ b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_TDVM.py @@ -59,7 +59,7 @@ class Waveform_type( # region tdvm configure only -global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( +global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, @@ -97,7 +97,7 @@ class Waveform_type( tdvm.configure_and_measure(configuration=tdvm_config) # region configure SVG -voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( +voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=-10, range_max_volts=10 ) diff --git a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_TDVM_RSS.py b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_TDVM_RSS.py index 01f3e96..9de808f 100644 --- a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_TDVM_RSS.py +++ b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_SVG_TDVM_RSS.py @@ -66,7 +66,7 @@ class Waveform_type( # region tdvm configure only -global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( +global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.DIFF, range_min_volts=-10, range_max_volts=10, @@ -93,13 +93,13 @@ class Waveform_type( # Specific channel parameters # Channel 0 -cp0 = nipcbatt.VoltageRangeAndTerminalParameters( +cp0 = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.DIFF, range_min_volts=-10, range_max_volts=10, ) -channel0 = nipcbatt.VoltageMeasurementChannelAndTerminalRangeParameters( +channel0 = daq.VoltageMeasurementChannelAndTerminalRangeParameters( channel_name="Dev2/ai0", channel_parameters=cp0, ) @@ -121,7 +121,7 @@ class Waveform_type( # region configure SVG -voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( +voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=-10, range_max_volts=10 ) diff --git a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_TTRM_DRVG.py b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_TTRM_DRVG.py index 236a198..b58a532 100644 --- a/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_TTRM_DRVG.py +++ b/src/nipcbatt/pcbatt_validation_examples/PCIe_examples/PC_TTRM_DRVG.py @@ -23,7 +23,7 @@ # region drvg configure and generate -range_settings = nipcbatt.VoltageGenerationChannelParameters( +range_settings = daq.VoltageGenerationChannelParameters( range_min_volts=-10.0, range_max_volts=10.0 ) diff --git a/src/nipcbatt/pcbatt_validation_examples/TestScale_examples/TS_PSSM_to_TDVM.py b/src/nipcbatt/pcbatt_validation_examples/TestScale_examples/TS_PSSM_to_TDVM.py index 684329f..d81103c 100644 --- a/src/nipcbatt/pcbatt_validation_examples/TestScale_examples/TS_PSSM_to_TDVM.py +++ b/src/nipcbatt/pcbatt_validation_examples/TestScale_examples/TS_PSSM_to_TDVM.py @@ -24,7 +24,7 @@ # region TDVM configure only -global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( +global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, @@ -32,13 +32,13 @@ # Specific channel parameters -channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( +channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.DIFF, range_max_volts=5, range_min_volts=-5, ) -channel0 = nipcbatt.VoltageMeasurementChannelAndTerminalRangeParameters( +channel0 = daq.VoltageMeasurementChannelAndTerminalRangeParameters( channel_name="TS1_AI/ai2", channel_parameters=channel_parameters, ) @@ -118,7 +118,7 @@ # region TDVM measure only -global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( +global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=nidaqmx.constants.TerminalConfiguration.RSE, range_min_volts=-10, range_max_volts=10, diff --git a/src/nipcbatt/pcbatt_validation_examples/cDAQ_examples/cDAQ_TTRM_DRVG_AO.py b/src/nipcbatt/pcbatt_validation_examples/cDAQ_examples/cDAQ_TTRM_DRVG_AO.py index 6a9552c..056861e 100644 --- a/src/nipcbatt/pcbatt_validation_examples/cDAQ_examples/cDAQ_TTRM_DRVG_AO.py +++ b/src/nipcbatt/pcbatt_validation_examples/cDAQ_examples/cDAQ_TTRM_DRVG_AO.py @@ -31,7 +31,7 @@ # region drvg configure and generate -range_settings = nipcbatt.VoltageGenerationChannelParameters( +range_settings = daq.VoltageGenerationChannelParameters( range_min_volts=-10.0, range_max_volts=10.0 ) diff --git a/tests/nipcbatt_tests/pcbatt_library_integration_tests/dc_voltage_generations/test_integration_dc_voltage_generation.py b/tests/nipcbatt_tests/pcbatt_library_integration_tests/dc_voltage_generations/test_integration_dc_voltage_generation.py index 5b539a8..04fbf5b 100644 --- a/tests/nipcbatt_tests/pcbatt_library_integration_tests/dc_voltage_generations/test_integration_dc_voltage_generation.py +++ b/tests/nipcbatt_tests/pcbatt_library_integration_tests/dc_voltage_generations/test_integration_dc_voltage_generation.py @@ -1,4 +1,4 @@ -"""This module provides test of integration of DcVoltageGeneration.""" +"""This module provides test of integration of DcVoltageGeneration.""" import importlib.metadata import logging @@ -62,13 +62,13 @@ def test_dc_voltage_generation_generate_voltage_with_configure_and_generate_in_l ): """Checks if class `DcVoltageGeneration' can configure and generate when they are called one after the other.""" # noqa: W505, D202 - doc line too long (120 > 100 characters) (auto-generated noqa), No blank lines allowed after function docstring (auto-generated noqa) - generation_channel_parameters_1 = nipcbatt.VoltageGenerationChannelParameters( + generation_channel_parameters_1 = daq.VoltageGenerationChannelParameters( range_min_volts=-5.0, range_max_volts=5.0, ) output_voltages_1 = [2.0, 3.7] - generation_channel_parameters_2 = nipcbatt.VoltageGenerationChannelParameters( + generation_channel_parameters_2 = daq.VoltageGenerationChannelParameters( range_min_volts=-8.0, range_max_volts=8.0, ) diff --git a/tests/nipcbatt_tests/pcbatt_library_integration_tests/i2c_communications/test_integration_i2c_read_communication.py b/tests/nipcbatt_tests/pcbatt_library_integration_tests/i2c_communications/test_integration_i2c_read_communication.py index 16d9cad..1f69bbf 100644 --- a/tests/nipcbatt_tests/pcbatt_library_integration_tests/i2c_communications/test_integration_i2c_read_communication.py +++ b/tests/nipcbatt_tests/pcbatt_library_integration_tests/i2c_communications/test_integration_i2c_read_communication.py @@ -66,7 +66,7 @@ def test_integration_i2c_read_communication(self): ) read_parameters = communications.I2cReadParameters( number_of_bytes_to_read=2, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=0, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_ONE_BYTE, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, diff --git a/tests/nipcbatt_tests/pcbatt_library_integration_tests/i2c_communications/test_integration_i2c_write_communication.py b/tests/nipcbatt_tests/pcbatt_library_integration_tests/i2c_communications/test_integration_i2c_write_communication.py index c69f6cf..5bc37ae 100644 --- a/tests/nipcbatt_tests/pcbatt_library_integration_tests/i2c_communications/test_integration_i2c_write_communication.py +++ b/tests/nipcbatt_tests/pcbatt_library_integration_tests/i2c_communications/test_integration_i2c_write_communication.py @@ -69,7 +69,7 @@ def test_integration_i2c_write_communication(self): number_of_bytes_per_page=2, delay_between_page_write_operations_milliseconds=10, data_to_be_written=numpy.array([26, 192, 30, 120, 50]), - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=0, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_ONE_BYTE, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, diff --git a/tests/nipcbatt_tests/pcbatt_library_integration_tests/signal_voltage_generations/test_integration_signal_voltage_generation.py b/tests/nipcbatt_tests/pcbatt_library_integration_tests/signal_voltage_generations/test_integration_signal_voltage_generation.py index d5ee859..d0186ad 100644 --- a/tests/nipcbatt_tests/pcbatt_library_integration_tests/signal_voltage_generations/test_integration_signal_voltage_generation.py +++ b/tests/nipcbatt_tests/pcbatt_library_integration_tests/signal_voltage_generations/test_integration_signal_voltage_generation.py @@ -1,4 +1,4 @@ -"""This module provides test of integration of SignalVoltageGeneration.""" +"""This module provides test of integration of SignalVoltageGeneration.""" import importlib.metadata import logging @@ -72,7 +72,7 @@ def test_signal_voltage_generation_generate_only(self): def test_signal_voltage_generation_configure_and_generate_in_loop(self): """Checks if class `SignalVoltageGeneration' can configure and generate when they are called one after the other.""" # noqa: D205, D209, D415, W505 - 1 blank line required between summary line and description (auto-generated noqa), Multi-line docstring closing quotes should be on a separate line (auto-generated noqa), First line should end with a period, question mark, or exclamation point (auto-generated noqa), doc line too long (345 > 100 characters) (auto-generated noqa) - generation_channel_parameters_1 = nipcbatt.VoltageGenerationChannelParameters( + generation_channel_parameters_1 = daq.VoltageGenerationChannelParameters( range_min_volts=-5.0, range_max_volts=5.0, ) @@ -85,7 +85,7 @@ def test_signal_voltage_generation_configure_and_generate_in_loop(self): ), ) - generation_channel_parameters_2 = nipcbatt.VoltageGenerationChannelParameters( + generation_channel_parameters_2 = daq.VoltageGenerationChannelParameters( range_min_volts=-8.0, range_max_volts=8.0, ) diff --git a/tests/nipcbatt_tests/pcbatt_library_integration_tests/spi_communications/test_integration_spi_read_communication.py b/tests/nipcbatt_tests/pcbatt_library_integration_tests/spi_communications/test_integration_spi_read_communication.py index 5785281..2808208 100644 --- a/tests/nipcbatt_tests/pcbatt_library_integration_tests/spi_communications/test_integration_spi_read_communication.py +++ b/tests/nipcbatt_tests/pcbatt_library_integration_tests/spi_communications/test_integration_spi_read_communication.py @@ -65,7 +65,7 @@ def test_integration_spi_read_communication(self): ) read_parameters = communications.SpiReadParameters( number_of_bytes_to_read=32, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=0, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, diff --git a/tests/nipcbatt_tests/pcbatt_library_integration_tests/spi_communications/test_integration_spi_write_communication.py b/tests/nipcbatt_tests/pcbatt_library_integration_tests/spi_communications/test_integration_spi_write_communication.py index 31f2648..93821a3 100644 --- a/tests/nipcbatt_tests/pcbatt_library_integration_tests/spi_communications/test_integration_spi_write_communication.py +++ b/tests/nipcbatt_tests/pcbatt_library_integration_tests/spi_communications/test_integration_spi_write_communication.py @@ -9,6 +9,7 @@ from varname import nameof import nipcbatt +from nipcbatt import communications from nipcbatt.pcbatt_communication_library._ni_845x_internal import _ni_845x_functions @@ -88,7 +89,7 @@ def test_integration_spi_write_communication(self): 174, ] ), - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=0, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/common/test_communication_data_types.py b/tests/nipcbatt_tests/pcbatt_library_tests/common/test_communication_data_types.py index 3e0a801..24d9152 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/common/test_communication_data_types.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/common/test_communication_data_types.py @@ -8,6 +8,7 @@ from varname import nameof import nipcbatt +from nipcbatt import communications class TestMemoryAddressParameters(unittest.TestCase): @@ -46,7 +47,7 @@ def test_memory_address_parameters(self): expected_address_type = nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_ONE_BYTE expected_address_endianness = nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN - instance = nipcbatt.MemoryAddressParameters( + instance = communications.MemoryAddressParameters( memory_address=expected_memory_address, address_type=expected_address_type, address_endianness=expected_address_endianness, diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/common/test_communication_functions.py b/tests/nipcbatt_tests/pcbatt_library_tests/common/test_communication_functions.py index a69bf42..127f8e6 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/common/test_communication_functions.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/common/test_communication_functions.py @@ -10,6 +10,7 @@ from varname import nameof import nipcbatt +from nipcbatt import communications from nipcbatt.pcbatt_library.communications.common.communication_functions import ( compute_pages_characteristics, create_command_for_spi_read_communication, @@ -53,7 +54,7 @@ def tearDownClass(cls): 48, 128, [ - nipcbatt.MemoryPageCharacteristics(0, 48, 0), + communications.MemoryPageCharacteristics(0, 48, 0), ], ), ( @@ -62,9 +63,9 @@ def tearDownClass(cls): 340, 128, [ - nipcbatt.MemoryPageCharacteristics(0, 116, 12), - nipcbatt.MemoryPageCharacteristics(116, 128, 128), - nipcbatt.MemoryPageCharacteristics(244, 96, 256), + communications.MemoryPageCharacteristics(0, 116, 12), + communications.MemoryPageCharacteristics(116, 128, 128), + communications.MemoryPageCharacteristics(244, 96, 256), ], ), ( @@ -73,9 +74,9 @@ def tearDownClass(cls): 159, 96, [ - nipcbatt.MemoryPageCharacteristics(0, 40, 56), - nipcbatt.MemoryPageCharacteristics(40, 96, 96), - nipcbatt.MemoryPageCharacteristics(136, 23, 192), + communications.MemoryPageCharacteristics(0, 40, 56), + communications.MemoryPageCharacteristics(40, 96, 96), + communications.MemoryPageCharacteristics(136, 23, 192), ], ), ] @@ -86,7 +87,7 @@ def test_compute_pages_characteristics( memory_start_address: int, number_of_bytes_to_write: int, number_of_bytes_per_page: int, - expected_pages_characteristics: List[nipcbatt.MemoryPageCharacteristics], + expected_pages_characteristics: List[communications.MemoryPageCharacteristics], ): """unit test of compute_pages_characteristics.""" # noqa: D403, W505 - First word of the first line should be properly capitalized (auto-generated noqa), doc line too long (155 > 100 characters) (auto-generated noqa) logging.debug("running %s.", test_case_name) @@ -178,7 +179,7 @@ def test_create_array_for_spi_read_instruction( logging.debug("running %s.", test_case_name) actual_bytes_array = create_command_for_spi_read_communication( - address_parameters=nipcbatt.MemoryAddressParameters( + address_parameters=communications.MemoryAddressParameters( memory_address=memory_address, address_type=address_type, address_endianness=address_endianness, @@ -268,7 +269,7 @@ def test_create_array_for_spi_write_instruction( logging.debug("running %s.", test_case_name) actual_bytes_array = create_command_for_spi_write_communication( - address_parameters=nipcbatt.MemoryAddressParameters( + address_parameters=communications.MemoryAddressParameters( memory_address=memory_address, address_type=address_type, address_endianness=address_endianness, diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/common/test_voltage_data_types.py b/tests/nipcbatt_tests/pcbatt_library_tests/common/test_voltage_data_types.py index d05c52b..05b37ef 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/common/test_voltage_data_types.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/common/test_voltage_data_types.py @@ -1,4 +1,4 @@ -# pylint: disable=C0116 +# pylint: disable=C0116 """This module provides voltage data types check.""" import importlib.metadata @@ -45,7 +45,7 @@ def test_voltage_range_and_terminal_parameters(self): expected_range_min_volts = -9.0 expected_range_max_volts = 6.3 - instance = nipcbatt.VoltageRangeAndTerminalParameters( + instance = daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_terminal_configuration, range_min_volts=expected_range_min_volts, range_max_volts=expected_range_max_volts, @@ -94,13 +94,13 @@ def test_voltage_measurement_channel_and_terminal_range_parameters(self): expected_range_max_volts = 6.3 expected_channel_name = "Dev/ai0" - channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_terminal_configuration, range_min_volts=expected_range_min_volts, range_max_volts=expected_range_max_volts, ) - instance = nipcbatt.VoltageMeasurementChannelAndTerminalRangeParameters( + instance = daq.VoltageMeasurementChannelAndTerminalRangeParameters( channel_name=expected_channel_name, channel_parameters=channel_parameters, ) @@ -148,7 +148,7 @@ def test_voltage_generation_channel_parameters(self): expected_range_min_volts = -3.5 expected_range_max_volts = 4.0 - instance = nipcbatt.VoltageGenerationChannelParameters( + instance = daq.VoltageGenerationChannelParameters( range_min_volts=expected_range_min_volts, range_max_volts=expected_range_max_volts, ) @@ -162,7 +162,7 @@ def test_voltage_generation_channel_parameters_with_invalid_inputs(self): # Test if Valus error is raised when range Max = Min value self.assertRaises( ValueError, - lambda: nipcbatt.VoltageGenerationChannelParameters( + lambda: daq.VoltageGenerationChannelParameters( range_min_volts=3.0, range_max_volts=3.0 ), ) @@ -170,7 +170,7 @@ def test_voltage_generation_channel_parameters_with_invalid_inputs(self): # Test if value error is raised when Min is greater than Max self.assertRaises( ValueError, - lambda: nipcbatt.VoltageGenerationChannelParameters( + lambda: daq.VoltageGenerationChannelParameters( range_min_volts=4.0, range_max_volts=3.5, ), diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/dc_rms_current_measurements/test_dc_rms_current_measurement.py b/tests/nipcbatt_tests/pcbatt_library_tests/dc_rms_current_measurements/test_dc_rms_current_measurement.py index 5404ca3..5e0f7bf 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/dc_rms_current_measurements/test_dc_rms_current_measurement.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/dc_rms_current_measurements/test_dc_rms_current_measurement.py @@ -62,7 +62,7 @@ def test_dc_rms_current_measurement_analysis_with_empty_data(self): measurement = daq.DcRmsCurrentMeasurement() self.assertRaises( TypeError, - lambda: measurement.analyze_measurement_data(measurement_data=None, None), + lambda: measurement.analyze_measurement_data(measurement_data=None), ) diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/dc_rms_voltage_measurements/test_dc_rms_voltage_data_types.py b/tests/nipcbatt_tests/pcbatt_library_tests/dc_rms_voltage_measurements/test_dc_rms_voltage_data_types.py index 97f2336..382956a 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/dc_rms_voltage_measurements/test_dc_rms_voltage_data_types.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/dc_rms_voltage_measurements/test_dc_rms_voltage_data_types.py @@ -1,4 +1,4 @@ -"""This module provides DC-RMS voltage datatypes check.""" +"""This module provides DC-RMS voltage datatypes check.""" import importlib.metadata import logging @@ -210,7 +210,7 @@ def test_dc_rms_voltage_measurement_configuration(self): expected_specific_range_min_volts = -5.0 expected_specific_range_max_volts = 7.5 - expected_global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + expected_global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_terminal_configuration, range_min_volts=expected_range_min_volts, range_max_volts=expected_range_max_volts, @@ -228,9 +228,9 @@ def test_dc_rms_voltage_measurement_configuration(self): specific_channels_parameters = [] specific_channels_parameters.append( - nipcbatt.VoltageMeasurementChannelAndTerminalRangeParameters( + daq.VoltageMeasurementChannelAndTerminalRangeParameters( channel_name="Dev/ai0", - channel_parameters=nipcbatt.VoltageRangeAndTerminalParameters( + channel_parameters=daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_specific_terminal_configuration, range_min_volts=expected_specific_range_min_volts, range_max_volts=expected_specific_range_max_volts, @@ -238,9 +238,9 @@ def test_dc_rms_voltage_measurement_configuration(self): ) ) specific_channels_parameters.append( - nipcbatt.VoltageMeasurementChannelAndTerminalRangeParameters( + daq.VoltageMeasurementChannelAndTerminalRangeParameters( channel_name="Dev/ai1", - channel_parameters=nipcbatt.VoltageRangeAndTerminalParameters( + channel_parameters=daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_specific_terminal_configuration, range_min_volts=expected_specific_range_min_volts, range_max_volts=expected_specific_range_max_volts, @@ -248,9 +248,9 @@ def test_dc_rms_voltage_measurement_configuration(self): ) ) specific_channels_parameters.append( - nipcbatt.VoltageMeasurementChannelAndTerminalRangeParameters( + daq.VoltageMeasurementChannelAndTerminalRangeParameters( channel_name="Dev/ai2", - channel_parameters=nipcbatt.VoltageRangeAndTerminalParameters( + channel_parameters=daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_specific_terminal_configuration, range_min_volts=expected_specific_range_min_volts, range_max_volts=expected_specific_range_max_volts, diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/dc_voltage_generations/test_dc_voltage_data_types.py b/tests/nipcbatt_tests/pcbatt_library_tests/dc_voltage_generations/test_dc_voltage_data_types.py index 0926126..e69dc62 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/dc_voltage_generations/test_dc_voltage_data_types.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/dc_voltage_generations/test_dc_voltage_data_types.py @@ -1,4 +1,4 @@ -"""This module provides DC Voltage data types check.""" +"""This module provides DC Voltage data types check.""" import importlib.metadata import logging @@ -44,7 +44,7 @@ def test_dc_voltage_generation_configuration(self): expected_range_min_volts = -5.0 expected_range_max_volts = 5.0 expected_output_voltages = [1.2, 2.8, 3.2] - expected_voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( + expected_voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=expected_range_min_volts, range_max_volts=expected_range_max_volts, ) diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/frequency_domain_measurements/test_frequency_domain_data_types.py b/tests/nipcbatt_tests/pcbatt_library_tests/frequency_domain_measurements/test_frequency_domain_data_types.py index fdd31db..122754a 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/frequency_domain_measurements/test_frequency_domain_data_types.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/frequency_domain_measurements/test_frequency_domain_data_types.py @@ -1,4 +1,4 @@ -"""This module provides Frequency domain data types check.""" +"""This module provides Frequency domain data types check.""" import importlib.metadata import logging @@ -180,7 +180,7 @@ def test_frequency_domain_measurement_configuration(self): expected_specific_range_min_volts = -5.0 expected_specific_range_max_volts = 7.5 - expected_global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + expected_global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_terminal_configuration, range_min_volts=expected_range_min_volts, range_max_volts=expected_range_max_volts, @@ -198,9 +198,9 @@ def test_frequency_domain_measurement_configuration(self): specific_channels_parameters = [] specific_channels_parameters.append( - nipcbatt.VoltageMeasurementChannelAndTerminalRangeParameters( + daq.VoltageMeasurementChannelAndTerminalRangeParameters( channel_name="Dev/ai0", - channel_parameters=nipcbatt.VoltageRangeAndTerminalParameters( + channel_parameters=daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_specific_terminal_configuration, range_min_volts=expected_specific_range_min_volts, range_max_volts=expected_specific_range_max_volts, @@ -208,9 +208,9 @@ def test_frequency_domain_measurement_configuration(self): ) ) specific_channels_parameters.append( - nipcbatt.VoltageMeasurementChannelAndTerminalRangeParameters( + daq.VoltageMeasurementChannelAndTerminalRangeParameters( channel_name="Dev/ai1", - channel_parameters=nipcbatt.VoltageRangeAndTerminalParameters( + channel_parameters=daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_specific_terminal_configuration, range_min_volts=expected_specific_range_min_volts, range_max_volts=expected_specific_range_max_volts, @@ -218,9 +218,9 @@ def test_frequency_domain_measurement_configuration(self): ) ) specific_channels_parameters.append( - nipcbatt.VoltageMeasurementChannelAndTerminalRangeParameters( + daq.VoltageMeasurementChannelAndTerminalRangeParameters( channel_name="Dev/ai2", - channel_parameters=nipcbatt.VoltageRangeAndTerminalParameters( + channel_parameters=daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_specific_terminal_configuration, range_min_volts=expected_specific_range_min_volts, range_max_volts=expected_specific_range_max_volts, diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/i2c_communications/test_i2c_read_data_types.py b/tests/nipcbatt_tests/pcbatt_library_tests/i2c_communications/test_i2c_read_data_types.py index a551033..8a943f2 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/i2c_communications/test_i2c_read_data_types.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/i2c_communications/test_i2c_read_data_types.py @@ -69,7 +69,7 @@ def test_i2c_read_parameters_init_fails_when_number_of_bytes_to_read_is_equal_to nipcbatt.pcbatt_library.i2c_communications.i2c_read_data_types.I2cReadParameters. """ # noqa: D205, D415, W505 - 1 blank line required between summary line and description (auto-generated noqa), First line should end with a period, question mark, or exclamation point (auto-generated noqa), doc line too long (210 > 100 characters) (auto-generated noqa) expected_number_of_bytes_to_read = 0 - expected_memory_address_parameters = nipcbatt.MemoryAddressParameters( + expected_memory_address_parameters = communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -95,7 +95,7 @@ def test_i2c_read_parameters_init_fails_when_number_of_bytes_to_read_is_less_tha nipcbatt.pcbatt_library.i2c_communications.i2c_read_data_types.I2cReadParameters. """ # noqa: D205, D415, W505 - 1 blank line required between summary line and description (auto-generated noqa), First line should end with a period, question mark, or exclamation point (auto-generated noqa), doc line too long (210 > 100 characters) (auto-generated noqa) expected_number_of_bytes_to_read = -7 - expected_memory_address_parameters = nipcbatt.MemoryAddressParameters( + expected_memory_address_parameters = communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -119,7 +119,7 @@ def test_i2c_read_parameters(self): nipcbatt.pcbatt_library.i2c_communications.i2c_read_data_types.I2cReadParameters. """ # noqa: D205, D415, W505 - 1 blank line required between summary line and description (auto-generated noqa), First line should end with a period, question mark, or exclamation point (auto-generated noqa), doc line too long (210 > 100 characters) (auto-generated noqa) expected_number_of_bytes_to_read = 7 - expected_memory_address_parameters = nipcbatt.MemoryAddressParameters( + expected_memory_address_parameters = communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -183,7 +183,7 @@ def test_i2c_read_communication_configuration_init_fails_when_device_parameters_ ) expected_communication_read_parameters = communications.I2cReadParameters( number_of_bytes_to_read=7, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=128, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -216,7 +216,7 @@ def test_i2c_read_communication_configuration_init_fails_when_communication_para ) expected_communication_read_parameters = communications.I2cReadParameters( number_of_bytes_to_read=7, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=128, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -283,7 +283,7 @@ def test_i2c_read_communication_configuration(self): ) expected_communication_read_parameters = communications.I2cReadParameters( number_of_bytes_to_read=7, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=128, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/i2c_communications/test_i2c_write_data_types.py b/tests/nipcbatt_tests/pcbatt_library_tests/i2c_communications/test_i2c_write_data_types.py index 25bc457..56c9d2e 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/i2c_communications/test_i2c_write_data_types.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/i2c_communications/test_i2c_write_data_types.py @@ -76,7 +76,7 @@ def test_i2c_write_parameters_init_fails_when_data_to_be_written_is_none( number_of_bytes_per_page=128, delay_between_page_write_operations_milliseconds=10, data_to_be_written=None, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.LITTLE_ENDIAN, @@ -102,7 +102,7 @@ def test_i2c_write_parameters_init_fails_when_data_to_be_written_is_empty( number_of_bytes_per_page=128, delay_between_page_write_operations_milliseconds=10, data_to_be_written=numpy.array([]), - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.LITTLE_ENDIAN, @@ -127,7 +127,7 @@ def test_i2c_write_parameters_init_fails_when_number_of_bytes_per_page_is_less_t number_of_bytes_per_page=-128, delay_between_page_write_operations_milliseconds=10, data_to_be_written=numpy.array([0, 2]), - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.LITTLE_ENDIAN, @@ -152,7 +152,7 @@ def test_i2c_write_parameters_init_fails_when_number_of_bytes_per_page_is_equal_ number_of_bytes_per_page=0, delay_between_page_write_operations_milliseconds=10, data_to_be_written=numpy.array([0, 2]), - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.LITTLE_ENDIAN, @@ -177,7 +177,7 @@ def test_i2c_write_parameters_init_fails_when_delay_between_page_write_operation number_of_bytes_per_page=128, delay_between_page_write_operations_milliseconds=-10, data_to_be_written=numpy.array([0, 2]), - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.LITTLE_ENDIAN, @@ -200,7 +200,7 @@ def test_i2c_write_parameters(self): expected_data_to_be_written = numpy.array( expected_data_to_be_written_list, dtype=numpy.ubyte ) - expected_memory_address_parameters = nipcbatt.MemoryAddressParameters( + expected_memory_address_parameters = communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -285,7 +285,7 @@ def test_i2c_write_communication_configuration_init_fails_when_device_parameters number_of_bytes_per_page=128, delay_between_page_write_operations_milliseconds=10, data_to_be_written=data_to_be_written, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=128, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -324,7 +324,7 @@ def test_i2c_write_communication_configuration_init_fails_when_communication_par number_of_bytes_per_page=128, delay_between_page_write_operations_milliseconds=10, data_to_be_written=data_to_be_written, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=128, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -399,7 +399,7 @@ def test_i2c_write_communication_configuration(self): number_of_bytes_per_page=128, delay_between_page_write_operations_milliseconds=10, data_to_be_written=data_to_be_written, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=128, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/signal_voltage_generations/test_signal_voltage_data_types.py b/tests/nipcbatt_tests/pcbatt_library_tests/signal_voltage_generations/test_signal_voltage_data_types.py index 5bf8783..6cf29b4 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/signal_voltage_generations/test_signal_voltage_data_types.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/signal_voltage_generations/test_signal_voltage_data_types.py @@ -1,4 +1,4 @@ -"""This module provides Signal Voltage data types check.""" +"""This module provides Signal Voltage data types check.""" import importlib.metadata import logging @@ -699,7 +699,7 @@ def test_signal_voltage_generation_sine_wave_configuration(self): expected_range_min_volts = -1.0 expected_range_max_volts = 1.0 - expected_voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( + expected_voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=expected_range_min_volts, range_max_volts=expected_range_max_volts, ) @@ -876,7 +876,7 @@ def test_signal_voltage_generation_square_wave_configuration(self): expected_range_min_volts = -1.0 expected_range_max_volts = 1.0 - expected_voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( + expected_voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=expected_range_min_volts, range_max_volts=expected_range_max_volts, ) @@ -1051,7 +1051,7 @@ def test_signal_voltage_generation_multiple_tones_configuration(self): expected_range_min_volts = -1.0 expected_range_max_volts = 1.0 - expected_voltage_generation_range_parameters = nipcbatt.VoltageGenerationChannelParameters( + expected_voltage_generation_range_parameters = daq.VoltageGenerationChannelParameters( range_min_volts=expected_range_min_volts, range_max_volts=expected_range_max_volts, ) diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/spi_communications/test_spi_read_data_types.py b/tests/nipcbatt_tests/pcbatt_library_tests/spi_communications/test_spi_read_data_types.py index ec9b038..6570cb5 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/spi_communications/test_spi_read_data_types.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/spi_communications/test_spi_read_data_types.py @@ -69,7 +69,7 @@ def test_spi_read_parameters_init_fails_when_number_of_bytes_to_read_is_equal_to nipcbatt.pcbatt_library.spi_communications.spi_read_data_types.SpiReadParameters. """ # noqa: D205, D415, W505 - 1 blank line required between summary line and description (auto-generated noqa), First line should end with a period, question mark, or exclamation point (auto-generated noqa), doc line too long (210 > 100 characters) (auto-generated noqa) expected_number_of_bytes_to_read = 0 - expected_memory_address_parameters = nipcbatt.MemoryAddressParameters( + expected_memory_address_parameters = communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -95,7 +95,7 @@ def test_spi_read_parameters_init_fails_when_number_of_bytes_to_read_is_less_tha nipcbatt.pcbatt_library.spi_communications.spi_read_data_types.SpiReadParameters. """ # noqa: D205, D415, W505 - 1 blank line required between summary line and description (auto-generated noqa), First line should end with a period, question mark, or exclamation point (auto-generated noqa), doc line too long (210 > 100 characters) (auto-generated noqa) expected_number_of_bytes_to_read = -7 - expected_memory_address_parameters = nipcbatt.MemoryAddressParameters( + expected_memory_address_parameters = communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -119,7 +119,7 @@ def test_spi_read_parameters(self): nipcbatt.pcbatt_library.spi_communications.spi_read_data_types.SpiReadParameters. """ # noqa: D205, D415, W505 - 1 blank line required between summary line and description (auto-generated noqa), First line should end with a period, question mark, or exclamation point (auto-generated noqa), doc line too long (210 > 100 characters) (auto-generated noqa) expected_number_of_bytes_to_read = 7 - expected_memory_address_parameters = nipcbatt.MemoryAddressParameters( + expected_memory_address_parameters = communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -183,7 +183,7 @@ def test_spi_read_communication_configuration_init_fails_when_device_parameters_ ) expected_communication_read_parameters = communications.SpiReadParameters( number_of_bytes_to_read=7, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=128, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -215,7 +215,7 @@ def test_spi_read_communication_configuration_init_fails_when_communication_para ) expected_communication_read_parameters = communications.SpiReadParameters( number_of_bytes_to_read=7, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=128, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -280,7 +280,7 @@ def test_spi_read_communication_configuration(self): ) expected_communication_read_parameters = communications.SpiReadParameters( number_of_bytes_to_read=7, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=128, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/spi_communications/test_spi_write_communication.py b/tests/nipcbatt_tests/pcbatt_library_tests/spi_communications/test_spi_write_communication.py index ec68605..b386a50 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/spi_communications/test_spi_write_communication.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/spi_communications/test_spi_write_communication.py @@ -79,7 +79,7 @@ def test_spi_write_communication(self): 174, ] ), - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=0, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/spi_communications/test_spi_write_data_types.py b/tests/nipcbatt_tests/pcbatt_library_tests/spi_communications/test_spi_write_data_types.py index bdcea0e..1c805c7 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/spi_communications/test_spi_write_data_types.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/spi_communications/test_spi_write_data_types.py @@ -76,7 +76,7 @@ def test_spi_write_parameters_init_fails_when_data_to_be_written_is_none( number_of_bytes_per_page=128, delay_between_page_write_operations_milliseconds=10, data_to_be_written=None, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.LITTLE_ENDIAN, @@ -102,7 +102,7 @@ def test_spi_write_parameters_init_fails_when_data_to_be_written_is_empty( number_of_bytes_per_page=128, delay_between_page_write_operations_milliseconds=10, data_to_be_written=numpy.array([]), - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.LITTLE_ENDIAN, @@ -127,7 +127,7 @@ def test_spi_write_parameters_init_fails_when_number_of_bytes_per_page_is_less_t number_of_bytes_per_page=-128, delay_between_page_write_operations_milliseconds=10, data_to_be_written=numpy.array([0, 2]), - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.LITTLE_ENDIAN, @@ -152,7 +152,7 @@ def test_spi_write_parameters_init_fails_when_number_of_bytes_per_page_is_equal_ number_of_bytes_per_page=0, delay_between_page_write_operations_milliseconds=10, data_to_be_written=numpy.array([0, 2]), - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.LITTLE_ENDIAN, @@ -177,7 +177,7 @@ def test_spi_write_parameters_init_fails_when_delay_between_page_write_operation number_of_bytes_per_page=128, delay_between_page_write_operations_milliseconds=-10, data_to_be_written=numpy.array([0, 2]), - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.LITTLE_ENDIAN, @@ -200,7 +200,7 @@ def test_spi_write_parameters(self): expected_data_to_be_written = numpy.array( expected_data_to_be_written_list, dtype=numpy.ubyte ) - expected_memory_address_parameters = nipcbatt.MemoryAddressParameters( + expected_memory_address_parameters = communications.MemoryAddressParameters( memory_address=50, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -285,7 +285,7 @@ def test_spi_write_communication_configuration_init_fails_when_device_parameters number_of_bytes_per_page=128, delay_between_page_write_operations_milliseconds=10, data_to_be_written=data_to_be_written, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=128, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -323,7 +323,7 @@ def test_spi_write_communication_configuration_init_fails_when_communication_par number_of_bytes_per_page=128, delay_between_page_write_operations_milliseconds=10, data_to_be_written=data_to_be_written, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=128, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, @@ -396,7 +396,7 @@ def test_spi_write_communication_configuration(self): number_of_bytes_per_page=128, delay_between_page_write_operations_milliseconds=10, data_to_be_written=data_to_be_written, - memory_address_parameters=nipcbatt.MemoryAddressParameters( + memory_address_parameters=communications.MemoryAddressParameters( memory_address=128, address_type=nipcbatt.DataMemoryAddressType.ADDRESS_ENCODED_ON_TWO_BYTES, address_endianness=nipcbatt.DataMemoryAddressEndianness.BIG_ENDIAN, diff --git a/tests/nipcbatt_tests/pcbatt_library_tests/time_domain_measurements/test_time_domain_data_types.py b/tests/nipcbatt_tests/pcbatt_library_tests/time_domain_measurements/test_time_domain_data_types.py index ea512c8..963ed49 100644 --- a/tests/nipcbatt_tests/pcbatt_library_tests/time_domain_measurements/test_time_domain_data_types.py +++ b/tests/nipcbatt_tests/pcbatt_library_tests/time_domain_measurements/test_time_domain_data_types.py @@ -1,4 +1,4 @@ -# pylint: disable=C0301 +# pylint: disable=C0301 """This module provides time domain data types check.""" import importlib.metadata @@ -158,7 +158,7 @@ def test_time_domain_measurement_configuration(self): expected_specific_range_min_volts = -5.0 expected_specific_range_max_volts = 7.5 - global_channel_parameters = nipcbatt.VoltageRangeAndTerminalParameters( + global_channel_parameters = daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_terminal_configuration, range_min_volts=expected_range_min_volts, range_max_volts=expected_range_max_volts, @@ -176,9 +176,9 @@ def test_time_domain_measurement_configuration(self): specific_channels_parameters = [] specific_channels_parameters.append( - nipcbatt.VoltageMeasurementChannelAndTerminalRangeParameters( + daq.VoltageMeasurementChannelAndTerminalRangeParameters( channel_name="Dev/ai0", - channel_parameters=nipcbatt.VoltageRangeAndTerminalParameters( + channel_parameters=daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_specific_terminal_configuration, range_min_volts=expected_specific_range_min_volts, range_max_volts=expected_specific_range_max_volts, @@ -186,9 +186,9 @@ def test_time_domain_measurement_configuration(self): ) ) specific_channels_parameters.append( - nipcbatt.VoltageMeasurementChannelAndTerminalRangeParameters( + daq.VoltageMeasurementChannelAndTerminalRangeParameters( channel_name="Dev/ai1", - channel_parameters=nipcbatt.VoltageRangeAndTerminalParameters( + channel_parameters=daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_specific_terminal_configuration, range_min_volts=expected_specific_range_min_volts, range_max_volts=expected_specific_range_max_volts, @@ -196,9 +196,9 @@ def test_time_domain_measurement_configuration(self): ) ) specific_channels_parameters.append( - nipcbatt.VoltageMeasurementChannelAndTerminalRangeParameters( + daq.VoltageMeasurementChannelAndTerminalRangeParameters( channel_name="Dev/ai2", - channel_parameters=nipcbatt.VoltageRangeAndTerminalParameters( + channel_parameters=daq.VoltageRangeAndTerminalParameters( terminal_configuration=expected_specific_terminal_configuration, range_min_volts=expected_specific_range_min_volts, range_max_volts=expected_specific_range_max_volts, From 656a78bfa7e343c17c6f5a12774cf84e22535ea6 Mon Sep 17 00:00:00 2001 From: Ankit Singh Date: Tue, 10 Mar 2026 22:02:44 +0530 Subject: [PATCH 5/5] updated the resistance measurement integration test --- .../test_dmm_resistance_measurements.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/nipcbatt_tests/pcbatt_library_integration_tests/resistance_measurments/test_dmm_resistance_measurements.py b/tests/nipcbatt_tests/pcbatt_library_integration_tests/resistance_measurments/test_dmm_resistance_measurements.py index 2b2190d..a160801 100644 --- a/tests/nipcbatt_tests/pcbatt_library_integration_tests/resistance_measurments/test_dmm_resistance_measurements.py +++ b/tests/nipcbatt_tests/pcbatt_library_integration_tests/resistance_measurments/test_dmm_resistance_measurements.py @@ -68,7 +68,6 @@ def test_configure_only_resistance(self): measurement_function_parameters=meas_params, trigger_parameters=trig_params, timing_parameters=timing_params, - ac_min_frequency=10.0 ) result = uut.configure_and_measure(cfg) @@ -105,7 +104,6 @@ def test_measure_only_resistance(self): measurement_function_parameters=meas_params, trigger_parameters=trig_params, timing_parameters=timing_params, - ac_min_frequency=10.0 ) result = uut.configure_and_measure(cfg) @@ -144,7 +142,6 @@ def test_configure_and_measure_resistance_2w_trigger_disabled(self): measurement_function_parameters=meas_params, trigger_parameters=trig_params, timing_parameters=timing_params, - ac_min_frequency=25.0 ) result = uut.configure_and_measure(cfg) @@ -185,7 +182,6 @@ def test_configure_and_measure_resistance_4w_trigger_enabled(self): measurement_function_parameters=meas_params, trigger_parameters=trig_params, timing_parameters=timing_params, - ac_min_frequency=123.0 ) result = uut.configure_and_measure(cfg) @@ -229,7 +225,6 @@ def test_multiple_resistance_ranges_and_resolutions(self): enable_trigger=True ), timing_parameters=dmm.TimingParameters(0.001, 0.01), - ac_min_frequency=10.0 ) result = uut.configure_and_measure(cfg)