Skip to content

[topic-gpio] samples: net: lwm2m_client: Convert to new GPIO API #22092

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
Jan 23, 2020
Merged

[topic-gpio] samples: net: lwm2m_client: Convert to new GPIO API #22092

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
12 changes: 5 additions & 7 deletions samples/net/lwm2m_client/src/lwm2m-client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,13 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
#else
#define DT_ALIAS_LED0_GPIOS_CONTROLLER "(fail)"
#define DT_ALIAS_LED0_GPIOS_PIN 0
#define DT_ALIAS_LED0_GPIOS_FLAGS 0
#endif
#endif

#define LED_GPIO_PORT DT_ALIAS_LED0_GPIOS_CONTROLLER
#define LED_GPIO_PIN DT_ALIAS_LED0_GPIOS_PIN
#define LED_GPIO_FLAGS DT_ALIAS_LED0_GPIOS_FLAGS

static u8_t bat_idx = LWM2M_DEVICE_PWR_SRC_TYPE_BAT_INT;
static int bat_mv = 3800;
Expand Down Expand Up @@ -107,7 +109,7 @@ static int led_on_off_cb(u16_t obj_inst_id, u16_t res_id, u16_t res_inst_id,

led_val = *(u8_t *) data;
if (led_val != led_state) {
ret = gpio_pin_write(led_dev, LED_GPIO_PIN, led_val);
ret = gpio_pin_set(led_dev, LED_GPIO_PIN, (int) led_val);
if (ret) {
/*
* We need an extra hook in LWM2M to better handle
Expand Down Expand Up @@ -136,12 +138,8 @@ static int init_led_device(void)
return -ENODEV;
}

ret = gpio_pin_configure(led_dev, LED_GPIO_PIN, GPIO_DIR_OUT);
if (ret) {
return ret;
}

ret = gpio_pin_write(led_dev, LED_GPIO_PIN, 0);
ret = gpio_pin_configure(led_dev, LED_GPIO_PIN, LED_GPIO_FLAGS |
GPIO_OUTPUT_INACTIVE);
Copy link
Contributor

@pabigot pabigot Jan 22, 2020

Choose a reason for hiding this comment

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

As a style thing (which we do not define) I find it easier to understand when split at the comma rather than within the argument expression:

ret = gpio_pin_configure(led_dev, LED_GPIO_PIN,
                         LED_GPIO_FLAGS | GPIO_OUTPUT_INACTIVE);

Copy link
Member Author

@carlescufi carlescufi Jan 23, 2020

Choose a reason for hiding this comment

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

I actually prefer the style where things are split to max line length and then at the bitwise or logical operator boundary myself.

Copy link
Contributor

@pabigot pabigot Jan 23, 2020

Choose a reason for hiding this comment

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

OK then.

if (ret) {
return ret;
}
Expand Down