diff --git a/generated/nidaqmx/_library_interpreter.py b/generated/nidaqmx/_library_interpreter.py index cd32270b..9f7a6e0f 100644 --- a/generated/nidaqmx/_library_interpreter.py +++ b/generated/nidaqmx/_library_interpreter.py @@ -117,9 +117,9 @@ def calculate_reverse_poly_coeff( with cfunc.arglock: if cfunc.argtypes is None: cfunc.argtypes = [ - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, ctypes.c_double, - ctypes.c_double, ctypes.c_int, ctypes.c_int, + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.c_uint, ctypes.c_double, ctypes.c_double, + ctypes.c_int, ctypes.c_int, wrapped_ndpointer(dtype=numpy.float64, flags=('C','W'))] @@ -387,9 +387,9 @@ def cfg_watchdog_ao_expir_states( if cfunc.argtypes is None: cfunc.argtypes = [ lib_importer.task_handle, ctypes_byte_str, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), wrapped_ndpointer(dtype=numpy.int32, - flags=('C','W')), ctypes.c_uint] + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + wrapped_ndpointer(dtype=numpy.int32, flags=('C')), + ctypes.c_uint] error_code = cfunc( task, channel_names, expir_state_array, output_type_array, @@ -404,7 +404,7 @@ def cfg_watchdog_co_expir_states( if cfunc.argtypes is None: cfunc.argtypes = [ lib_importer.task_handle, ctypes_byte_str, - wrapped_ndpointer(dtype=numpy.int32, flags=('C','W')), + wrapped_ndpointer(dtype=numpy.int32, flags=('C')), ctypes.c_uint] error_code = cfunc( @@ -419,7 +419,7 @@ def cfg_watchdog_do_expir_states( if cfunc.argtypes is None: cfunc.argtypes = [ lib_importer.task_handle, ctypes_byte_str, - wrapped_ndpointer(dtype=numpy.int32, flags=('C','W')), + wrapped_ndpointer(dtype=numpy.int32, flags=('C')), ctypes.c_uint] error_code = cfunc( @@ -659,10 +659,9 @@ def create_ai_force_bridge_polynomial_chan( ctypes_byte_str, ctypes.c_double, ctypes.c_double, ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_double, ctypes.c_double, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, ctypes.c_int, + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.c_uint, wrapped_ndpointer(dtype=numpy.float64, + flags=('C')), ctypes.c_uint, ctypes.c_int, ctypes.c_int, ctypes_byte_str] error_code = cfunc( @@ -688,11 +687,10 @@ def create_ai_force_bridge_table_chan( ctypes_byte_str, ctypes.c_double, ctypes.c_double, ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_double, ctypes.c_double, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, ctypes.c_int, - ctypes_byte_str] + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.c_uint, ctypes.c_int, + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.c_uint, ctypes.c_int, ctypes_byte_str] error_code = cfunc( task, physical_channel, name_to_assign_to_channel, min_val, @@ -888,10 +886,9 @@ def create_ai_pressure_bridge_polynomial_chan( ctypes_byte_str, ctypes.c_double, ctypes.c_double, ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_double, ctypes.c_double, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, ctypes.c_int, + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.c_uint, wrapped_ndpointer(dtype=numpy.float64, + flags=('C')), ctypes.c_uint, ctypes.c_int, ctypes.c_int, ctypes_byte_str] error_code = cfunc( @@ -917,11 +914,10 @@ def create_ai_pressure_bridge_table_chan( ctypes_byte_str, ctypes.c_double, ctypes.c_double, ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_double, ctypes.c_double, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, ctypes.c_int, - ctypes_byte_str] + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.c_uint, ctypes.c_int, + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.c_uint, ctypes.c_int, ctypes_byte_str] error_code = cfunc( task, physical_channel, name_to_assign_to_channel, min_val, @@ -993,7 +989,7 @@ def create_ai_rosette_strain_gage_chan( lib_importer.task_handle, ctypes_byte_str, ctypes_byte_str, ctypes.c_double, ctypes.c_double, ctypes.c_int, ctypes.c_double, - wrapped_ndpointer(dtype=numpy.int32, flags=('C','W')), + wrapped_ndpointer(dtype=numpy.int32, flags=('C')), ctypes.c_uint, ctypes.c_int, ctypes.c_int, ctypes.c_double, ctypes.c_double, ctypes.c_double, ctypes.c_double, ctypes.c_double] @@ -1123,10 +1119,9 @@ def create_ai_torque_bridge_polynomial_chan( ctypes_byte_str, ctypes.c_double, ctypes.c_double, ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_double, ctypes.c_double, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, ctypes.c_int, + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.c_uint, wrapped_ndpointer(dtype=numpy.float64, + flags=('C')), ctypes.c_uint, ctypes.c_int, ctypes.c_int, ctypes_byte_str] error_code = cfunc( @@ -1152,11 +1147,10 @@ def create_ai_torque_bridge_table_chan( ctypes_byte_str, ctypes.c_double, ctypes.c_double, ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_double, ctypes.c_double, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, ctypes.c_int, - ctypes_byte_str] + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.c_uint, ctypes.c_int, + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.c_uint, ctypes.c_int, ctypes_byte_str] error_code = cfunc( task, physical_channel, name_to_assign_to_channel, min_val, @@ -1728,10 +1722,9 @@ def create_polynomial_scale( if cfunc.argtypes is None: cfunc.argtypes = [ ctypes_byte_str, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, ctypes.c_int, + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.c_uint, wrapped_ndpointer(dtype=numpy.float64, + flags=('C')), ctypes.c_uint, ctypes.c_int, ctypes_byte_str] error_code = cfunc( @@ -1748,10 +1741,9 @@ def create_table_scale( if cfunc.argtypes is None: cfunc.argtypes = [ ctypes_byte_str, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.c_uint, ctypes.c_int, + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.c_uint, wrapped_ndpointer(dtype=numpy.float64, + flags=('C')), ctypes.c_uint, ctypes.c_int, ctypes_byte_str] error_code = cfunc( @@ -4317,7 +4309,7 @@ def read_digital_lines( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.uint8, flags=('C','W')), + wrapped_ndpointer(dtype=bool, flags=('C','W')), ctypes.c_uint, ctypes.POINTER(ctypes.c_int), ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] @@ -4768,8 +4760,8 @@ def set_analog_power_up_states_with_output_type( with cfunc.arglock: cfunc.argtypes = [ ctypes_byte_str, wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), wrapped_ndpointer(dtype=numpy.int32, - flags=('C','W')), ctypes.c_uint] + flags=('C')), wrapped_ndpointer(dtype=numpy.int32, + flags=('C')), ctypes.c_uint] error_code = cfunc( channel_names, state_array, channel_type_array, @@ -4853,7 +4845,7 @@ def set_chan_attribute_double_array(self, task, channel, attribute, value): with cfunc.arglock: cfunc.argtypes = [ lib_importer.task_handle, ctypes_byte_str, ctypes.c_int32, - wrapped_ndpointer(dtype=numpy.float64, flags=('C','W')), + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), ctypes.c_uint] error_code = cfunc( @@ -5104,7 +5096,7 @@ def set_scale_attribute_double_array(self, scale_name, attribute, value): with cfunc.arglock: cfunc.argtypes = [ ctypes_byte_str, ctypes.c_int32, - wrapped_ndpointer(dtype=numpy.float64, flags=('C','W')), + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), ctypes.c_uint] error_code = cfunc( @@ -5288,7 +5280,7 @@ def set_trig_attribute_double_array(self, task, attribute, value): with cfunc.arglock: cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int32, - wrapped_ndpointer(dtype=numpy.float64, flags=('C','W')), + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), ctypes.c_uint] error_code = cfunc( @@ -5310,7 +5302,7 @@ def set_trig_attribute_int32_array(self, task, attribute, value): with cfunc.arglock: cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int32, - wrapped_ndpointer(dtype=numpy.int32, flags=('C','W')), + wrapped_ndpointer(dtype=numpy.int32, flags=('C')), ctypes.c_uint] error_code = cfunc( @@ -5543,9 +5535,8 @@ def write_analog_f64( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, c_bool32, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.POINTER(ctypes.c_int), - ctypes.POINTER(c_bool32)] + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] error_code = cfunc( task, num_samps_per_chan, auto_start, timeout, data_layout, @@ -5578,7 +5569,7 @@ def write_binary_i16( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, c_bool32, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.int16, flags=('C','W')), + wrapped_ndpointer(dtype=numpy.int16, flags=('C')), ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] error_code = cfunc( @@ -5599,7 +5590,7 @@ def write_binary_i32( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, c_bool32, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.int32, flags=('C','W')), + wrapped_ndpointer(dtype=numpy.int32, flags=('C')), ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] error_code = cfunc( @@ -5620,9 +5611,8 @@ def write_binary_u16( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, c_bool32, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.uint16, - flags=('C','W')), ctypes.POINTER(ctypes.c_int), - ctypes.POINTER(c_bool32)] + wrapped_ndpointer(dtype=numpy.uint16, flags=('C')), + ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] error_code = cfunc( task, num_samps_per_chan, auto_start, timeout, data_layout, @@ -5642,9 +5632,8 @@ def write_binary_u32( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, c_bool32, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.uint32, - flags=('C','W')), ctypes.POINTER(ctypes.c_int), - ctypes.POINTER(c_bool32)] + wrapped_ndpointer(dtype=numpy.uint32, flags=('C')), + ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] error_code = cfunc( task, num_samps_per_chan, auto_start, timeout, data_layout, @@ -5664,11 +5653,9 @@ def write_ctr_freq( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, c_bool32, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.POINTER(ctypes.c_int), - ctypes.POINTER(c_bool32)] + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] error_code = cfunc( task, num_samps_per_chan, auto_start, timeout, data_layout, @@ -5704,11 +5691,9 @@ def write_ctr_ticks( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, c_bool32, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.uint32, - flags=('C','W')), - wrapped_ndpointer(dtype=numpy.uint32, - flags=('C','W')), ctypes.POINTER(ctypes.c_int), - ctypes.POINTER(c_bool32)] + wrapped_ndpointer(dtype=numpy.uint32, flags=('C')), + wrapped_ndpointer(dtype=numpy.uint32, flags=('C')), + ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] error_code = cfunc( task, num_samps_per_chan, auto_start, timeout, data_layout, @@ -5743,11 +5728,9 @@ def write_ctr_time( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, c_bool32, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), - wrapped_ndpointer(dtype=numpy.float64, - flags=('C','W')), ctypes.POINTER(ctypes.c_int), - ctypes.POINTER(c_bool32)] + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + wrapped_ndpointer(dtype=numpy.float64, flags=('C')), + ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] error_code = cfunc( task, num_samps_per_chan, auto_start, timeout, data_layout, @@ -5783,7 +5766,7 @@ def write_digital_lines( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, c_bool32, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.uint8, flags=('C','W')), + wrapped_ndpointer(dtype=bool, flags=('C')), ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] error_code = cfunc( @@ -5817,9 +5800,8 @@ def write_digital_u16( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, c_bool32, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.uint16, - flags=('C','W')), ctypes.POINTER(ctypes.c_int), - ctypes.POINTER(c_bool32)] + wrapped_ndpointer(dtype=numpy.uint16, flags=('C')), + ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] error_code = cfunc( task, num_samps_per_chan, auto_start, timeout, data_layout, @@ -5839,9 +5821,8 @@ def write_digital_u32( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, c_bool32, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.uint32, - flags=('C','W')), ctypes.POINTER(ctypes.c_int), - ctypes.POINTER(c_bool32)] + wrapped_ndpointer(dtype=numpy.uint32, flags=('C')), + ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] error_code = cfunc( task, num_samps_per_chan, auto_start, timeout, data_layout, @@ -5861,7 +5842,7 @@ def write_digital_u8( cfunc.argtypes = [ lib_importer.task_handle, ctypes.c_int, c_bool32, ctypes.c_double, ctypes.c_int, - wrapped_ndpointer(dtype=numpy.uint8, flags=('C','W')), + wrapped_ndpointer(dtype=numpy.uint8, flags=('C')), ctypes.POINTER(ctypes.c_int), ctypes.POINTER(c_bool32)] error_code = cfunc( @@ -5878,7 +5859,7 @@ def write_to_teds_from_array( if cfunc.argtypes is None: cfunc.argtypes = [ ctypes_byte_str, wrapped_ndpointer(dtype=numpy.uint8, - flags=('C','W')), ctypes.c_uint, ctypes.c_int] + flags=('C')), ctypes.c_uint, ctypes.c_int] error_code = cfunc( physical_channel, bit_stream, len(bit_stream), basic_teds_options) diff --git a/generated/nidaqmx/_task_modules/in_stream.py b/generated/nidaqmx/_task_modules/in_stream.py index e2b70c3b..baa52cb8 100644 --- a/generated/nidaqmx/_task_modules/in_stream.py +++ b/generated/nidaqmx/_task_modules/in_stream.py @@ -1083,8 +1083,8 @@ def read(self, number_of_samples_per_channel=READ_ALL_AVAILABLE): numpy_array = numpy.zeros(number_of_samples, dtype=dtype) _, samples_read, _ = self._interpreter.read_raw( - self._handle, numpy_array, num_samps_per_chan, - self.timeout) + self._handle, num_samps_per_chan, + self.timeout, numpy_array) if samples_read != number_of_samples: return numpy_array[:samples_read] diff --git a/generated/nidaqmx/stream_readers.py b/generated/nidaqmx/stream_readers.py index 679adb1b..a1cbcd16 100644 --- a/generated/nidaqmx/stream_readers.py +++ b/generated/nidaqmx/stream_readers.py @@ -1867,7 +1867,7 @@ def read_one_sample_multi_line(self, data, timeout=10): self._verify_array_digital_lines(data, False, True) _, samps_per_chan_read, num_bytes_per_samp = self._interpreter.read_digital_lines( - self._handle, data, 1, timeout, FillMode.GROUP_BY_CHANNEL.value) + self._handle, 1, timeout, FillMode.GROUP_BY_CHANNEL.value, data) def read_one_sample_one_line(self, timeout=10): """ diff --git a/generated/nidaqmx/stream_writers.py b/generated/nidaqmx/stream_writers.py index d48c38cf..39765a0a 100644 --- a/generated/nidaqmx/stream_writers.py +++ b/generated/nidaqmx/stream_writers.py @@ -1071,7 +1071,7 @@ def write_one_sample_port_uint32(self, data, timeout=10): AUTO_START_UNSET else True) return self._interpreter.write_digital_scalar_u32( - self._handle, auto_start, timeout, FillMode.GROUP_BY_CHANNEL.value, data) + self._handle, auto_start, timeout, data) class DigitalMultiChannelWriter(ChannelWriterBase): diff --git a/generated/nidaqmx/system/system.py b/generated/nidaqmx/system/system.py index fab6f0b5..9c657dfa 100644 --- a/generated/nidaqmx/system/system.py +++ b/generated/nidaqmx/system/system.py @@ -276,7 +276,7 @@ def get_digital_power_up_states(self, device_name): for d, p in zip(device.do_lines, states): power_up_states.append( DOPowerUpState(physical_channel=d.name, - power_up_state=PowerUpStates(p.value))) + power_up_state=PowerUpStates(p))) return power_up_states @@ -346,7 +346,7 @@ def get_digital_pull_up_pull_down_states(self, device_name): power_up_states.append( DOResistorPowerUpState( physical_channel=d.name, - power_up_state=ResistorState(p.value))) + power_up_state=ResistorState(p))) return power_up_states @@ -451,7 +451,7 @@ def get_analog_power_up_states(self, device_name): power_up_states.append( AOPowerUpState( physical_channel=a.name, - power_up_state=p.value, + power_up_state=p, channel_type=AOPowerUpOutputBehavior(c.value))) return power_up_states diff --git a/src/codegen/metadata/functions.py b/src/codegen/metadata/functions.py index 0a74aef4..22f549dd 100644 --- a/src/codegen/metadata/functions.py +++ b/src/codegen/metadata/functions.py @@ -18564,7 +18564,7 @@ 'type': 'int32' }, { - 'ctypes_data_type': 'numpy.uint8', + 'ctypes_data_type': 'numpy.bool', 'direction': 'out', 'has_explicit_buffer_size': True, 'is_list': True, @@ -24148,7 +24148,7 @@ 'type': 'int32' }, { - 'ctypes_data_type': 'numpy.uint8', + 'ctypes_data_type': 'numpy.bool', 'direction': 'in', 'is_list': True, 'is_optional_in_python': False, diff --git a/src/codegen/metadata/functions_addon.py b/src/codegen/metadata/functions_addon.py index ab8331fe..de23c57f 100644 --- a/src/codegen/metadata/functions_addon.py +++ b/src/codegen/metadata/functions_addon.py @@ -1,137 +1,137 @@ functions_override_metadata = { 'ReadAnalogF64': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadAnalogScalarF64': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadBinaryI16': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadBinaryI32': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadBinaryU16': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadBinaryU32': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadCounterF64': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadCounterF64Ex': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadCounterScalarF64': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadCounterScalarU32': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadCounterU32': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadCounterU32Ex': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadCtrFreq': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadCtrFreqScalar': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadCtrTicks': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadCtrTicksScalar': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadCtrTime': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadCtrTimeScalar': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadDigitalLines': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadDigitalScalarU32': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadDigitalU16': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadDigitalU32': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadDigitalU8': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadPowerScalarF64': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'WriteAnalogF64': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteAnalogScalarF64': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteBinaryI16': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteBinaryI32': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteBinaryU16': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteBinaryU32': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteCtrFreq': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteCtrFreqScalar': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteCtrTicks': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteCtrTicksScalar': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteCtrTime': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteCtrTimeScalar': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteDigitalLines': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteDigitalScalarU32': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteDigitalU16': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteDigitalU32': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'WriteDigitalU8': { - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', }, 'ReadPowerBinaryI16':{ - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadPowerF64':{ - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'ReadRaw':{ - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Read', }, 'WriteRaw':{ - 'python_codegen_method': 'CustomCode_Read_Write', + 'python_codegen_method': 'CustomCode_Write', } } \ No newline at end of file diff --git a/src/codegen/templates/_task_modules/in_stream.py.mako b/src/codegen/templates/_task_modules/in_stream.py.mako index 26bce23f..ab752f11 100644 --- a/src/codegen/templates/_task_modules/in_stream.py.mako +++ b/src/codegen/templates/_task_modules/in_stream.py.mako @@ -204,8 +204,8 @@ ${property_template.script_property(attribute)}\ numpy_array = numpy.zeros(number_of_samples, dtype=dtype) _, samples_read, _ = self._interpreter.read_raw( - self._handle, numpy_array, num_samps_per_chan, - self.timeout) + self._handle, num_samps_per_chan, + self.timeout, numpy_array) if samples_read != number_of_samples: return numpy_array[:samples_read] diff --git a/src/codegen/templates/system/system.py.mako b/src/codegen/templates/system/system.py.mako index 03f58585..b1122a42 100644 --- a/src/codegen/templates/system/system.py.mako +++ b/src/codegen/templates/system/system.py.mako @@ -216,7 +216,7 @@ ${function_template.script_function(function_object)} for d, p in zip(device.do_lines, states): power_up_states.append( DOPowerUpState(physical_channel=d.name, - power_up_state=PowerUpStates(p.value))) + power_up_state=PowerUpStates(p))) return power_up_states @@ -286,7 +286,7 @@ ${function_template.script_function(function_object)} power_up_states.append( DOResistorPowerUpState( physical_channel=d.name, - power_up_state=ResistorState(p.value))) + power_up_state=ResistorState(p))) return power_up_states @@ -391,7 +391,7 @@ ${function_template.script_function(function_object)} power_up_states.append( AOPowerUpState( physical_channel=a.name, - power_up_state=p.value, + power_up_state=p, channel_type=AOPowerUpOutputBehavior(c.value))) return power_up_states diff --git a/src/codegen/utilities/function_helpers.py b/src/codegen/utilities/function_helpers.py index 27ae2c2a..a54c7422 100644 --- a/src/codegen/utilities/function_helpers.py +++ b/src/codegen/utilities/function_helpers.py @@ -145,7 +145,10 @@ def get_instantiation_lines(function_parameters): def get_arguments_type(functions_metadata): """Gets the 'type' of parameters.""" argtypes = [] - is_read_write_function = functions_metadata.python_codegen_method == "CustomCode_Read_Write" + is_read_write_function = functions_metadata.python_codegen_method in ( + "CustomCode_Read", + "CustomCode_Write", + ) if is_read_write_function: argtypes.append("lib_importer.task_handle") @@ -185,8 +188,11 @@ def get_arguments_type(functions_metadata): def to_param_argtype(parameter): """Formats argument types.""" + flags = "'C','W'" if parameter.direction == "out" else "'C'" if parameter.is_list: - return f"wrapped_ndpointer(dtype={parameter.ctypes_data_type}, flags=('C','W'))" + if parameter.ctypes_data_type == "numpy.bool": + return f"wrapped_ndpointer(dtype=bool, flags=({flags}))" + return f"wrapped_ndpointer(dtype={parameter.ctypes_data_type}, flags=({flags}))" else: if parameter.ctypes_data_type == "ctypes.TaskHandle": return "lib_importer.task_handle" diff --git a/src/codegen/utilities/interpreter_helpers.py b/src/codegen/utilities/interpreter_helpers.py index 65c4c060..8a1f3365 100644 --- a/src/codegen/utilities/interpreter_helpers.py +++ b/src/codegen/utilities/interpreter_helpers.py @@ -285,12 +285,17 @@ def has_parameter_with_ivi_dance_size_mechanism(func): def is_custom_read_write_function(func): """Returns True if the function is a read or write function.""" - return func.python_codegen_method == "CustomCode_Read_Write" + return func.python_codegen_method in ("CustomCode_Read", "CustomCode_Write") def is_custom_read_function(func): """Returns True if the function is a read function.""" - return func.python_codegen_method == "CustomCode_Read_Write" and "read_" in func.function_name + return func.python_codegen_method == "CustomCode_Read" + + +def is_custom_write_function(func): + """Returns True if the function is a write function.""" + return func.python_codegen_method == "CustomCode_Write" def get_interpreter_output_params(func): diff --git a/src/handwritten/stream_readers.py b/src/handwritten/stream_readers.py index 679adb1b..a1cbcd16 100644 --- a/src/handwritten/stream_readers.py +++ b/src/handwritten/stream_readers.py @@ -1867,7 +1867,7 @@ def read_one_sample_multi_line(self, data, timeout=10): self._verify_array_digital_lines(data, False, True) _, samps_per_chan_read, num_bytes_per_samp = self._interpreter.read_digital_lines( - self._handle, data, 1, timeout, FillMode.GROUP_BY_CHANNEL.value) + self._handle, 1, timeout, FillMode.GROUP_BY_CHANNEL.value, data) def read_one_sample_one_line(self, timeout=10): """ diff --git a/src/handwritten/stream_writers.py b/src/handwritten/stream_writers.py index d48c38cf..39765a0a 100644 --- a/src/handwritten/stream_writers.py +++ b/src/handwritten/stream_writers.py @@ -1071,7 +1071,7 @@ def write_one_sample_port_uint32(self, data, timeout=10): AUTO_START_UNSET else True) return self._interpreter.write_digital_scalar_u32( - self._handle, auto_start, timeout, FillMode.GROUP_BY_CHANNEL.value, data) + self._handle, auto_start, timeout, data) class DigitalMultiChannelWriter(ChannelWriterBase):