diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2011-06-06 07:43:23 +0200 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2011-06-06 07:43:23 +0200 |
| commit | 85b41913139682838141a44b8d6e2d3f2df2cccb (patch) | |
| tree | 6a1449b4067294f51f63d58a4dcb1e85367c98af /pyk8055 | |
| parent | e740fa93f096152ef6efe0d7c3246f0127cca9bb (diff) | |
| download | k8055-85b41913139682838141a44b8d6e2d3f2df2cccb.zip k8055-85b41913139682838141a44b8d6e2d3f2df2cccb.tar.gz | |
rename k8055_(set|read)_all_values to k8055_(write|read)_all_(outputs|inputs)
Diffstat (limited to 'pyk8055')
| -rw-r--r-- | pyk8055/libk8055.i | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pyk8055/libk8055.i b/pyk8055/libk8055.i index f788df3..ec16028 100644 --- a/pyk8055/libk8055.i +++ b/pyk8055/libk8055.i @@ -69,8 +69,8 @@ extern int k8055_set_all_digital( struct k8055_dev* dev ); extern int k8055_clear_all_digital( struct k8055_dev* dev ); extern int k8055_read_all_digital( struct k8055_dev* dev ); /*extern int k8055_write_all_digital( struct k8055_dev* dev, int data );*/ -extern int k8055_set_all_values( struct k8055_dev* dev, int d_data, int a_data1, int a_data2 ); -extern int k8055_read_all_values( struct k8055_dev* dev, int* data1, int* data2, int* data3, int* data4, int* data5 ); +extern int k8055_write_all_outputs( struct k8055_dev* dev, int d_data, int a_data1, int a_data2 ); +extern int k8055_read_all_inputs( struct k8055_dev* dev, int* data1, int* data2, int* data3, int* data4, int* data5 ); extern int k8055_reset_counter( struct k8055_dev* dev, int counter ); extern int k8055_read_counter( struct k8055_dev* dev, int counter ); extern int k8055_set_counter_debounce_time( struct k8055_dev* dev, int counter, int debounce_time ); @@ -212,7 +212,7 @@ class k8055: def SetAllValues(self,ddata, adata1, adata2): """Write digital output channel bitmask (0-255) and both analog channels data (0-255,0-255)""" - return _pyk8055.k8055_set_all_values(self.dev,ddata, adata1, adata2) + return _pyk8055.k8055_write_all_outputs(self.dev,ddata, adata1, adata2) def ReadAllValues(self): """Read data from all input channels at once @@ -220,7 +220,7 @@ class k8055: Returns list, [return-value,digital input data, analog channel_data1, analog channel_data2, counter1, counter2] """ - return _pyk8055.k8055_read_all_values(self.dev) + return _pyk8055.k8055_read_all_inputs(self.dev) def ResetCounter(self,CounterNo): """Reset input counter (1/2), input channel 1/2""" @@ -270,8 +270,8 @@ extern int k8055_set_all_digital( struct k8055_dev* dev ); extern int k8055_clear_all_digital( struct k8055_dev* dev ); extern int k8055_read_all_digital( struct k8055_dev* dev ); /*extern int k8055_write_all_digital( struct k8055_dev* dev, int data );*/ -extern int k8055_set_all_values( struct k8055_dev* dev, int d_data, int a_data1, int a_data2 ); -extern int k8055_read_all_values( struct k8055_dev* dev, int* data1, int* data2, int* data3, int* data4, int* data5 ); +extern int k8055_write_all_outputs( struct k8055_dev* dev, int d_data, int a_data1, int a_data2 ); +extern int k8055_read_all_inputs( struct k8055_dev* dev, int* data1, int* data2, int* data3, int* data4, int* data5 ); extern int k8055_reset_counter( struct k8055_dev* dev, int counter ); extern int k8055_read_counter( struct k8055_dev* dev, int counter ); extern int k8055_set_counter_debounce_time( struct k8055_dev* dev, int counter, int debounce_time ); |