diff --git a/boards/arm/96b_argonkey/96b_argonkey.dts b/boards/arm/96b_argonkey/96b_argonkey.dts index bfcafa2a6c8d2..1b13110b5f8d9 100644 --- a/boards/arm/96b_argonkey/96b_argonkey.dts +++ b/boards/arm/96b_argonkey/96b_argonkey.dts @@ -62,7 +62,7 @@ compatible = "st,lsm6dsl"; reg = <1>; spi-max-frequency = <1000000>; - irq-gpios = <&gpiob 1 0>; + irq-gpios = <&gpiob 1 GPIO_ACTIVE_HIGH>; label = "LSM6DSL_SPI"; }; }; diff --git a/samples/boards/96b_argonkey/microphone/src/main.c b/samples/boards/96b_argonkey/microphone/src/main.c index 90f2c782d0f12..b4630a3ba6fc6 100644 --- a/samples/boards/96b_argonkey/microphone/src/main.c +++ b/samples/boards/96b_argonkey/microphone/src/main.c @@ -51,12 +51,12 @@ void signal_sampling_started(void) static struct device *led0, *led1; led0 = device_get_binding(DT_ALIAS_LED0_GPIOS_CONTROLLER); - gpio_pin_configure(led0, DT_ALIAS_LED0_GPIOS_PIN, GPIO_DIR_OUT); - gpio_pin_write(led0, DT_ALIAS_LED0_GPIOS_PIN, 1); + gpio_pin_configure(led0, DT_ALIAS_LED0_GPIOS_PIN, + GPIO_OUTPUT_ACTIVE | DT_ALIAS_LED0_GPIOS_FLAGS); led1 = device_get_binding(DT_ALIAS_LED1_GPIOS_CONTROLLER); - gpio_pin_configure(led1, DT_ALIAS_LED1_GPIOS_PIN, GPIO_DIR_OUT); - gpio_pin_write(led1, DT_ALIAS_LED1_GPIOS_PIN, 0); + gpio_pin_configure(led1, DT_ALIAS_LED1_GPIOS_PIN, + GPIO_OUTPUT_INACTIVE | DT_ALIAS_LED1_GPIOS_FLAGS); } void signal_sampling_stopped(void) @@ -64,12 +64,12 @@ void signal_sampling_stopped(void) static struct device *led0, *led1; led0 = device_get_binding(DT_ALIAS_LED0_GPIOS_CONTROLLER); - gpio_pin_configure(led0, DT_ALIAS_LED0_GPIOS_PIN, GPIO_DIR_OUT); - gpio_pin_write(led0, DT_ALIAS_LED0_GPIOS_PIN, 1); + gpio_pin_configure(led0, DT_ALIAS_LED0_GPIOS_PIN, + GPIO_OUTPUT_ACTIVE | DT_ALIAS_LED0_GPIOS_FLAGS); led1 = device_get_binding(DT_ALIAS_LED1_GPIOS_CONTROLLER); - gpio_pin_configure(led1, DT_ALIAS_LED1_GPIOS_PIN, GPIO_DIR_OUT); - gpio_pin_write(led1, DT_ALIAS_LED1_GPIOS_PIN, 1); + gpio_pin_configure(led1, DT_ALIAS_LED1_GPIOS_PIN, + GPIO_OUTPUT_ACTIVE | DT_ALIAS_LED1_GPIOS_FLAGS); } void signal_print_stopped(void) @@ -77,12 +77,12 @@ void signal_print_stopped(void) static struct device *led0, *led1; led0 = device_get_binding(DT_ALIAS_LED0_GPIOS_CONTROLLER); - gpio_pin_configure(led0, DT_ALIAS_LED0_GPIOS_PIN, GPIO_DIR_OUT); - gpio_pin_write(led0, DT_ALIAS_LED0_GPIOS_PIN, 0); + gpio_pin_configure(led0, DT_ALIAS_LED0_GPIOS_PIN, + GPIO_OUTPUT_INACTIVE | DT_ALIAS_LED0_GPIOS_FLAGS); led1 = device_get_binding(DT_ALIAS_LED1_GPIOS_CONTROLLER); - gpio_pin_configure(led1, DT_ALIAS_LED1_GPIOS_PIN, GPIO_DIR_OUT); - gpio_pin_write(led1, DT_ALIAS_LED1_GPIOS_PIN, 1); + gpio_pin_configure(led1, DT_ALIAS_LED1_GPIOS_PIN, + GPIO_OUTPUT_ACTIVE | DT_ALIAS_LED1_GPIOS_FLAGS); } void *rx_block[NUM_MS]; diff --git a/samples/boards/96b_argonkey/sensors/prj.conf b/samples/boards/96b_argonkey/sensors/prj.conf index e7f762ec57792..171e064a3bdc6 100644 --- a/samples/boards/96b_argonkey/sensors/prj.conf +++ b/samples/boards/96b_argonkey/sensors/prj.conf @@ -2,6 +2,7 @@ CONFIG_LOG=y CONFIG_PRINTK=y CONFIG_SPI=y CONFIG_I2C=y +CONFIG_LED=y CONFIG_GPIO=y CONFIG_SENSOR=y CONFIG_SENSOR_LOG_LEVEL_DBG=y diff --git a/samples/boards/96b_argonkey/sensors/src/main.c b/samples/boards/96b_argonkey/sensors/src/main.c index 8a585f45ad67b..a5432b5caa6d4 100644 --- a/samples/boards/96b_argonkey/sensors/src/main.c +++ b/samples/boards/96b_argonkey/sensors/src/main.c @@ -134,14 +134,15 @@ void main(void) #endif led0 = device_get_binding(DT_ALIAS_LED0_GPIOS_CONTROLLER); - gpio_pin_configure(led0, DT_ALIAS_LED0_GPIOS_PIN, GPIO_DIR_OUT); - gpio_pin_write(led0, DT_ALIAS_LED0_GPIOS_PIN, 1); + gpio_pin_configure(led0, DT_ALIAS_LED0_GPIOS_PIN, + GPIO_OUTPUT_ACTIVE | DT_ALIAS_LED0_GPIOS_FLAGS); led1 = device_get_binding(DT_ALIAS_LED1_GPIOS_CONTROLLER); - gpio_pin_configure(led1, DT_ALIAS_LED1_GPIOS_PIN, GPIO_DIR_OUT); + gpio_pin_configure(led1, DT_ALIAS_LED1_GPIOS_PIN, + GPIO_OUTPUT_INACTIVE | DT_ALIAS_LED1_GPIOS_FLAGS); for (i = 0; i < 5; i++) { - gpio_pin_write(led1, DT_ALIAS_LED1_GPIOS_PIN, on); + gpio_pin_set(led1, DT_ALIAS_LED1_GPIOS_PIN, on); k_sleep(K_MSEC(200)); on = (on == 1) ? 0 : 1; }