Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

examples/gpio.c: Fix some formatting & code style

Browse Source 
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2015-02-10 16:16:30 +00:00
parent b32507064d
commit 818e1a86de
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
examples/gpio.c
View File

@@ -33,12 +33,9 @@ struct gpio_source {
mraa_gpio_context context; mraa_gpio_context context;
}; };
char* board_name;
void void
print_version() { print_version() {
fprintf(stdout, "Version %s on %s\n", mraa_get_version(), board_name); fprintf(stdout, "Version %s on %s\n", mraa_get_version(), mraa_get_platform_name());
} }
void void
@@ -87,7 +84,7 @@ gpio_set(int pin, int level) {
mraa_gpio_dir(gpio, MRAA_GPIO_OUT); mraa_gpio_dir(gpio, MRAA_GPIO_OUT);
mraa_gpio_write(gpio, level); mraa_gpio_write(gpio, level);
return MRAA_SUCCESS; return MRAA_SUCCESS;
} else }
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -98,7 +95,7 @@ gpio_get(int pin, int* level) {
mraa_gpio_dir(gpio, MRAA_GPIO_IN); mraa_gpio_dir(gpio, MRAA_GPIO_IN);
*level = mraa_gpio_read(gpio); *level = mraa_gpio_read(gpio);
return MRAA_SUCCESS; return MRAA_SUCCESS;
} else }
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -114,12 +111,14 @@ gpio_isr_start(struct gpio_source* gpio_info) {
gpio_info->context = mraa_gpio_init(gpio_info->pin); gpio_info->context = mraa_gpio_init(gpio_info->pin);
if (gpio_info->context != NULL) { if (gpio_info->context != NULL) {
mraa_result_t status = mraa_gpio_dir(gpio_info->context, MRAA_GPIO_IN); mraa_result_t status = mraa_gpio_dir(gpio_info->context, MRAA_GPIO_IN);
if (status == MRAA_SUCCESS) if (status == MRAA_SUCCESS) {
status = mraa_gpio_isr(gpio_info->context, MRAA_GPIO_EDGE_BOTH, &gpio_isr_handler, gpio_info); status = mraa_gpio_isr(gpio_info->context, MRAA_GPIO_EDGE_BOTH, &gpio_isr_handler, gpio_info);
}
return status; return status;
} else } else {
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
}
mraa_result_t mraa_result_t
@@ -133,11 +132,6 @@ gpio_isr_stop(struct gpio_source* gpio_info) {
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
board_name = mraa_get_platform_name();
if (board_name == NULL) {
board_name = "Error";
}
if (argc == 1) { if (argc == 1) {
print_command_error(); print_command_error();
} }
@@ -154,18 +148,22 @@ main(int argc, char **argv)
int pin = atoi(argv[2]); int pin = atoi(argv[2]);
if (gpio_set(pin, atoi(argv[3])) != MRAA_SUCCESS) if (gpio_set(pin, atoi(argv[3])) != MRAA_SUCCESS)
fprintf(stdout, "Could not initialize gpio %d\n", pin); fprintf(stdout, "Could not initialize gpio %d\n", pin);
} else } else {
print_command_error(); print_command_error();
}
} else if (strcmp(argv[1], "get") == 0) { } else if (strcmp(argv[1], "get") == 0) {
if (argc == 3) { if (argc == 3) {
int pin = atoi(argv[2]); int pin = atoi(argv[2]);
int level; int level;
if (gpio_get(pin, &level) == MRAA_SUCCESS) if (gpio_get(pin, &level) == MRAA_SUCCESS) {
fprintf(stdout, "Pin %d = %d\n", pin, level); fprintf(stdout, "Pin %d = %d\n", pin, level);
else }
else {
fprintf(stdout, "Could not initialize gpio %d\n", pin); fprintf(stdout, "Could not initialize gpio %d\n", pin);
} else }
} else {
print_command_error(); print_command_error();
}
} else if (strcmp(argv[1], "monitor") == 0) { } else if (strcmp(argv[1], "monitor") == 0) {
if (argc == 3) { if (argc == 3) {
int pin = atoi(argv[2]); int pin = atoi(argv[2]);
@@ -177,10 +175,12 @@ main(int argc, char **argv)
while (getchar() != '\n'); while (getchar() != '\n');
gpio_isr_stop(&gpio_info); gpio_isr_stop(&gpio_info);
} }
else else {
fprintf(stdout, "Failed to register ISR for pin %d\n", pin); fprintf(stdout, "Failed to register ISR for pin %d\n", pin);
} else }
} else {
print_command_error(); print_command_error();
}
} else { } else {
print_command_error(); print_command_error();
} }