Skip to content

[TOPIC-GPIO] sample/board: 96b_argonkey: update to use new GPIO API #21203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 18, 2019
Merged

[TOPIC-GPIO] sample/board: 96b_argonkey: update to use new GPIO API #21203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boards/arm/96b_argonkey/96b_argonkey.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Copy link
Member

@mnkp mnkp Dec 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could let the PR that updates lsm6dsl driver make this modification. That was the approach so far.

Copy link
Contributor Author

@avisconti avisconti Dec 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. My main concern was to avoid conflicts, but it shouldn't create any issue no matter which PR gets merged first.

label = "LSM6DSL_SPI";
};
};
Expand Down
24 changes: 12 additions & 12 deletions samples/boards/96b_argonkey/microphone/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,38 +51,38 @@ 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)
{
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)
{
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];
Expand Down
1 change: 1 addition & 0 deletions samples/boards/96b_argonkey/sensors/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions samples/boards/96b_argonkey/sensors/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down