Users/ankit/folder restructure

src/nipcbatt/__init__.py

@@ -91,20 +91,7 @@
     SampleTimingEngine,
     StartTriggerType,
 )
-from nipcbatt.pcbatt_library.common.communication_data_types import (
-    MemoryAddressParameters,
-    MemoryPageCharacteristics,
-)
-from nipcbatt.pcbatt_library.common.voltage_constants import (
-    ConstantsForVoltageMeasurement,
-)
-from nipcbatt.pcbatt_library.common.voltage_data_types import (
-    VoltageGenerationChannelParameters,
-    VoltageMeasurementChannelAndTerminalRangeParameters,
-    VoltageRangeAndTerminalParameters,
-)
-
-from nipcbatt.pcbatt_library_core.daq.pcbatt_building_blocks import (
+from nipcbatt.pcbatt_library_core.pcbatt_building_blocks import (
     BuildingBlockUsingDAQmx,
     BuildingBlockUsingInstrument,
     BuildingBlockUsingVisa,

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

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,

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
     )
 

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
     )
 

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,

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,

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

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,

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,

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
     )
 

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
     )
 

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,

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,

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,

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
         )
 

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,

src/nipcbatt/pcbatt_library/communications/common/__init__.py

@@ -0,0 +1 @@
+"""Provides common data types and functions for communications measurements"""  

src/nipcbatt/pcbatt_library/common/communication_functions.py → 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,
 )

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 (

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 (
@@ -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,
 )
 

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 (

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,
 )
@@ -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,
 )
 

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 (

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):

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 (

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 (
@@ -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,
 )
 

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 (