Skip to content

fix(ctypes): Expanding fixes from examples #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
epage merged 2 commits into from
Jul 5, 2017
Merged

fix(ctypes): Expanding fixes from examples #68

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d461a46
fix(ctypes): Pass int to `check_for_error`
epage Jul 5, 2017
406e4c7
fix(ctypes): Properly initialize array in-params
epage Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions nixnet/_funcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def nx_create_session_by_ref(
mode,
):
size_of_database_refs_ctypes = _ctypedefs.u32(len(database_refs) * _ctypedefs.nxDatabaseRef_t.BYTES)
database_refs_ctypes = ctypes.POINTER(_ctypedefs.nxDatabaseRef_t)(database_refs)
database_refs_ctypes = (_ctypedefs.nxDatabaseRef_t * len(database_refs))(*database_refs)
interface_ctypes = _ctypedefs.char_p(interface.encode('ascii'))
mode_ctypes = _ctypedefs.u32(mode.value)
session_ref_ctypes = _ctypedefs.nxSessionRef_t()
Expand All @@ -52,7 +52,7 @@ def nx_create_session_by_ref(
mode_ctypes,
ctypes.pointer(session_ref_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return session_ref_ctypes.value


Expand All @@ -68,7 +68,7 @@ def nx_get_property_size(
property_id_ctypes,
ctypes.pointer(property_size_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return property_size_ctypes.value


Expand All @@ -87,7 +87,7 @@ def nx_get_sub_property_size(
property_id_ctypes,
ctypes.pointer(property_size_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return property_size_ctypes.value


Expand Down Expand Up @@ -133,15 +133,15 @@ def nx_write_signal_waveform(
):
session_ref_ctypes = _ctypedefs.nxSessionRef_t(session_ref)
timeout_ctypes = _ctypedefs.f64(timeout)
value_buffer_ctypes = ctypes.POINTER(_ctypedefs.f64)(value_buffer)
value_buffer_ctypes = (_ctypedefs.f64 * len(value_buffer))(*value_buffer)
size_of_value_buffer_ctypes = _ctypedefs.u32(len(value_buffer) * _ctypedefs.f64.BYTES)
result = _cfuncs.lib.nx_write_signal_waveform(
session_ref_ctypes,
timeout_ctypes,
value_buffer_ctypes,
size_of_value_buffer_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nx_write_signal_xy(
Expand All @@ -153,11 +153,11 @@ def nx_write_signal_xy(
):
session_ref_ctypes = _ctypedefs.nxSessionRef_t(session_ref)
timeout_ctypes = _ctypedefs.f64(timeout)
value_buffer_ctypes = ctypes.POINTER(_ctypedefs.f64)(value_buffer)
value_buffer_ctypes = (_ctypedefs.f64 * len(value_buffer))(*value_buffer)
size_of_value_buffer_ctypes = _ctypedefs.u32(len(value_buffer) * _ctypedefs.f64.BYTES)
timestamp_buffer_ctypes = ctypes.POINTER(_ctypedefs.nxTimestamp_t)(timestamp_buffer)
timestamp_buffer_ctypes = (_ctypedefs.nxTimestamp_t * len(timestamp_buffer))(*timestamp_buffer)
size_of_timestamp_buffer_ctypes = _ctypedefs.u32(len(timestamp_buffer) * _ctypedefs.nxTimestamp_t.BYTES)
num_pairs_buffer_ctypes = ctypes.POINTER(_ctypedefs.u32)(num_pairs_buffer)
num_pairs_buffer_ctypes = (_ctypedefs.u32 * len(num_pairs_buffer))(*num_pairs_buffer)
size_of_num_pairs_buffer_ctypes = _ctypedefs.u32(len(num_pairs_buffer) * _ctypedefs.u32.BYTES)
result = _cfuncs.lib.nx_write_signal_xy(
session_ref_ctypes,
Expand All @@ -169,7 +169,7 @@ def nx_write_signal_xy(
num_pairs_buffer_ctypes,
size_of_num_pairs_buffer_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nx_blink(
Expand All @@ -182,7 +182,7 @@ def nx_blink(
interface_ref_ctypes,
modifier_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nx_clear(
Expand All @@ -208,7 +208,7 @@ def nx_connect_terminals(
source_ctypes,
destination_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nx_disconnect_terminals(
Expand All @@ -224,7 +224,7 @@ def nx_disconnect_terminals(
source_ctypes,
destination_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nx_flush(
Expand All @@ -234,7 +234,7 @@ def nx_flush(
result = _cfuncs.lib.nx_flush(
session_ref_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nx_start(
Expand All @@ -260,7 +260,7 @@ def nx_stop(
session_ref_ctypes,
scope_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nx_system_open(
Expand All @@ -269,7 +269,7 @@ def nx_system_open(
result = _cfuncs.lib.nx_system_open(
ctypes.pointer(system_ref_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return system_ref_ctypes.value


Expand All @@ -280,7 +280,7 @@ def nx_system_close(
result = _cfuncs.lib.nx_system_close(
system_ref_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nx_wait(
Expand All @@ -301,7 +301,7 @@ def nx_wait(
timeout_ctypes,
ctypes.pointer(param_out_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return param_out_ctypes.value


Expand All @@ -314,7 +314,7 @@ def nxdb_open_database(
database_name_ctypes,
ctypes.pointer(database_ref_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return database_ref_ctypes.value


Expand All @@ -328,7 +328,7 @@ def nxdb_close_database(
database_ref_ctypes,
close_all_refs_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nxdb_create_object(
Expand All @@ -346,7 +346,7 @@ def nxdb_create_object(
object_name_ctypes,
ctypes.pointer(db_object_ref_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return db_object_ref_ctypes.value


Expand All @@ -365,7 +365,7 @@ def nxdb_find_object(
object_name_ctypes,
ctypes.pointer(db_object_ref_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return db_object_ref_ctypes.value


Expand All @@ -376,7 +376,7 @@ def nxdb_delete_object(
result = _cfuncs.lib.nxdb_delete_object(
db_object_ref_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nxdb_save_database(
Expand All @@ -389,7 +389,7 @@ def nxdb_save_database(
database_ref_ctypes,
db_filepath_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nxdb_get_property_size(
Expand All @@ -404,7 +404,7 @@ def nxdb_get_property_size(
property_id_ctypes,
ctypes.pointer(property_size_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return property_size_ctypes.value


Expand All @@ -423,7 +423,7 @@ def nxdb_get_dbc_attribute_size(
attribute_name_ctypes,
ctypes.pointer(attribute_text_size_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return attribute_text_size_ctypes.value


Expand All @@ -448,7 +448,7 @@ def nxdb_get_dbc_attribute(
attribute_text_ctypes,
ctypes.pointer(is_default_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return is_default_ctypes.value


Expand All @@ -473,7 +473,7 @@ def nxdb_merge(
wait_for_complete_ctypes,
ctypes.pointer(percent_complete_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return percent_complete_ctypes.value


Expand All @@ -490,7 +490,7 @@ def nxdb_add_alias(
database_filepath_ctypes,
default_baud_rate_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nxdb_add_alias64(
Expand All @@ -506,7 +506,7 @@ def nxdb_add_alias64(
database_filepath_ctypes,
default_baud_rate_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nxdb_remove_alias(
Expand All @@ -516,7 +516,7 @@ def nxdb_remove_alias(
result = _cfuncs.lib.nxdb_remove_alias(
database_alias_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)


def nxdb_deploy(
Expand All @@ -534,7 +534,7 @@ def nxdb_deploy(
wait_for_complete_ctypes,
ctypes.pointer(percent_complete_ctypes),
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)
return percent_complete_ctypes.value


Expand All @@ -548,4 +548,4 @@ def nxdb_undeploy(
ip_address_ctypes,
database_alias_ctypes,
)
_errors.check_for_error(result)
_errors.check_for_error(result.value)