aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2012-05-29 22:08:36 +0200
committerJakob Odersky <jodersky@gmail.com>2012-05-29 22:08:36 +0200
commit7982c719bdf2d815b4ea7bfbe797fba650d978a0 (patch)
treecd5a00ac48581240a2d37a94de6ce0dd3d6bf107
parentcf0d873c397ed842a51ae9303ee10454b9e95281 (diff)
downloadk8055-7982c719bdf2d815b4ea7bfbe797fba650d978a0.tar.gz
k8055-7982c719bdf2d815b4ea7bfbe797fba650d978a0.tar.bz2
k8055-7982c719bdf2d815b4ea7bfbe797fba650d978a0.zip
refactoring
-rw-r--r--src/k8055.c20
-rw-r--r--src/k8055.h4
2 files changed, 12 insertions, 12 deletions
diff --git a/src/k8055.c b/src/k8055.c
index fbb37dc..51dcc49 100644
--- a/src/k8055.c
+++ b/src/k8055.c
@@ -320,7 +320,7 @@ static int read_data(int port, int cycles) {
return 0;
}
-static int intToDebounce(int x) {
+static int int_to_debounce(int x) {
int t = x;
/* the velleman k8055 use a exponetial formula to split up the
DebounceTime 0-7450 over value 1-255. I've tested every value and
@@ -403,10 +403,10 @@ int k8055_set_debounce_time(int port, int counter, int debounce) {
k8055_device *device = &devices[port];
if (counter == 0) {
- device->data_out[OUT_COUNTER_1_DEBOUNCE_OFFSET] = intToDebounce(debounce);
+ device->data_out[OUT_COUNTER_1_DEBOUNCE_OFFSET] = int_to_debounce(debounce);
device->data_out[0] = CMD_SET_DEBOUNCE_1;
} else if (counter == 1) {
- device->data_out[OUT_COUNTER_2_DEBOUNCE_OFFSET] = intToDebounce(debounce);
+ device->data_out[OUT_COUNTER_2_DEBOUNCE_OFFSET] = int_to_debounce(debounce);
device->data_out[0] = CMD_SET_DEBOUNCE_2;
} else {
print_error("can't set debounce time for unknown counter");
@@ -416,14 +416,14 @@ int k8055_set_debounce_time(int port, int counter, int debounce) {
return write_data(port);
}
-static int get_all_cycle(int port, int *digitalBitmask, int *analog1, int *analog2, int *counter1, int *counter2, int cycles) {
+static int get_all_cycle(int port, int *bitmask, int *analog1, int *analog2, int *counter1, int *counter2, int cycles) {
int r = read_data(port, cycles);
if (r != 0) return r;
k8055_device *device = &devices[port];
- if (digitalBitmask != NULL)
- *digitalBitmask = (
+ if (bitmask != NULL)
+ *bitmask = (
((device->data_in[IN_DIGITAL_OFFSET] >> 4) & 0x03) | /* Input 1 and 2 */
((device->data_in[IN_DIGITAL_OFFSET] << 2) & 0x04) | /* Input 3 */
((device->data_in[IN_DIGITAL_OFFSET] >> 3) & 0x18)); /* Input 4 and 5 */
@@ -438,10 +438,10 @@ static int get_all_cycle(int port, int *digitalBitmask, int *analog1, int *analo
return 0;
}
-int k8055_get_all(int port, int *digitalBitmask, int *analog1, int *analog2, int *counter1, int *counter2) {
- return get_all_cycle(port, digitalBitmask, analog1, analog2, counter1, counter2, 2);
+int k8055_get_all_input(int port, int *bitmask, int *analog1, int *analog2, int *counter1, int *counter2) {
+ return get_all_cycle(port, bitmask, analog1, analog2, counter1, counter2, 2);
}
-int k8055_quick_get_all(int port, int *digitalBitmask, int *analog1, int *analog2, int *counter1, int *counter2) {
- return getAllCycle(port, digitalBitmask, analog1, analog2, counter1, counter2, 1);
+int k8055_quick_get_all_input(int port, int *bitmask, int *analog1, int *analog2, int *counter1, int *counter2) {
+ return getAllCycle(port, bitmask, analog1, analog2, counter1, counter2, 1);
}
diff --git a/src/k8055.h b/src/k8055.h
index a71ea20..21f6ae9 100644
--- a/src/k8055.h
+++ b/src/k8055.h
@@ -122,7 +122,7 @@ int k8055_set_debounce_time(int port, int counter, int debounce);
* @return K8055_ERROR_INDEX if port or counter are invalid indices
* @return K8055_ERROR_CLOSED if the board associated to the given port is not open
* @return K8055_ERROR_READ if another error occurred during the read process */
-int k8055_get_all(int port, int *digitalBitMask, int *analog1, int *analog2, int *counter1, int *counter2);
+int k8055_get_all_input(int port, int *digitalBitmask, int *analog1, int *analog2, int *counter1, int *counter2);
/**Reads all current data of a given board into the passed parameters. NULL is a valid parameter.
* This function reads data once from the board and no guarantee of actuality is given.
@@ -136,7 +136,7 @@ int k8055_get_all(int port, int *digitalBitMask, int *analog1, int *analog2, int
* @return K8055_ERROR_INDEX if port or counter are invalid indices
* @return K8055_ERROR_CLOSED if the board associated to the given port is not open
* @return K8055_ERROR_READ if another error occurred during the read process */
-int k8055_quick_get_all(int port, int *digitalBitMask, int *analog1, int *analog2, int *counter1, int *counter2);
+int k8055_quick_get_all_input(int port, int *digitalBitmask, int *analog1, int *analog2, int *counter1, int *counter2);
#ifdef __cplusplus
}