riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: s/GPIO(x,y)/GPIO_PIN(x,y)/

Browse Source
This commit is contained in:
Hauke Petersen 2015-09-15 11:46:35 +02:00 committed by Thomas Eichinger
parent d43dc9182f
commit 3ece1fc4c4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/periph_gpio/main.c
View File

@ -66,7 +66,7 @@ static int init_out(int argc, char **argv)
else { else {
pull = GPIO_NOPULL; pull = GPIO_NOPULL;
} }
if (gpio_init(GPIO(port, pin), GPIO_DIR_OUT, pull) < 0) { if (gpio_init(GPIO_PIN(port, pin), GPIO_DIR_OUT, pull) < 0) {
printf("Error while initializing PORT_%i.%i as output\n", port, pin); printf("Error while initializing PORT_%i.%i as output\n", port, pin);
return 1; return 1;
} }
@ -97,7 +97,7 @@ static int init_in(int argc, char **argv)
else { else {
pull = GPIO_NOPULL; pull = GPIO_NOPULL;
} }
if (gpio_init(GPIO(port, pin), GPIO_DIR_IN, pull) < 0) { if (gpio_init(GPIO_PIN(port, pin), GPIO_DIR_IN, pull) < 0) {
printf("Error while initializing PORT_%i.%02i as input\n", port, pin); printf("Error while initializing PORT_%i.%02i as input\n", port, pin);
return 1; return 1;
} }
@ -146,7 +146,7 @@ static int init_int(int argc, char **argv)
else { else {
pull = GPIO_NOPULL; pull = GPIO_NOPULL;
} }
if (gpio_init_int(GPIO(port, pin), pull, flank, cb, (void *)pin) < 0) { if (gpio_init_int(GPIO_PIN(port, pin), pull, flank, cb, (void *)pin) < 0) {
printf("Error while initializing PORT_%i.%02i as external interrupt\n", printf("Error while initializing PORT_%i.%02i as external interrupt\n",
port, pin); port, pin);
return 1; return 1;
@ -167,7 +167,7 @@ static int read(int argc, char **argv)
} }
port = atoi(argv[1]); port = atoi(argv[1]);
pin = atoi(argv[2]); pin = atoi(argv[2]);
if (gpio_read(GPIO(port, pin))) { if (gpio_read(GPIO_PIN(port, pin))) {
printf("PORT_%i.%02i is HIGH\n", port, pin); printf("PORT_%i.%02i is HIGH\n", port, pin);
} }
else { else {
@ -187,7 +187,7 @@ static int set(int argc, char **argv)
port = atoi(argv[1]); port = atoi(argv[1]);
pin = atoi(argv[2]); pin = atoi(argv[2]);
gpio_set(GPIO(port, pin)); gpio_set(GPIO_PIN(port, pin));
return 0; return 0;
} }
@ -201,7 +201,7 @@ static int clear(int argc, char **argv)
} }
port = atoi(argv[1]); port = atoi(argv[1]);
pin = atoi(argv[2]); pin = atoi(argv[2]);
gpio_clear(GPIO(port, pin)); gpio_clear(GPIO_PIN(port, pin));
return 0; return 0;
} }
@ -215,7 +215,7 @@ static int toggle(int argc, char **argv)
} }
port = atoi(argv[1]); port = atoi(argv[1]);
pin = atoi(argv[2]); pin = atoi(argv[2]);
gpio_toggle(GPIO(port, pin)); gpio_toggle(GPIO_PIN(port, pin));
return 0; return 0;
} }

2
tests/periph_spi/main.c
View File

@ -87,7 +87,7 @@ int parse_spi_dev(int argc, char **argv)
} }
port = atoi(argv[2]); port = atoi(argv[2]);
pin = atoi(argv[3]); pin = atoi(argv[3]);
spi_cs = GPIO(port,pin); spi_cs = GPIO_PIN(port,pin);
if (argc >= 5) { if (argc >= 5) {
spi_mode = argv[4][0] - '0'; spi_mode = argv[4][0] - '0';
if (spi_mode < 0 || spi_mode > 3) { if (spi_mode < 0 || spi_mode > 3) {