pim/lightswitch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make distinction between channels toggled via GPIO (button) or RPC

Browse Source
This commit is contained in:
Pim van Pelt
2018-11-01 14:31:59 +01:00
parent f1614f3e6e
commit d332f08da4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/channel.c
View File

@ -113,7 +113,7 @@ exit:
if (s_channels[idx].button_gpio != GPIO_INVALID) { if (s_channels[idx].button_gpio != GPIO_INVALID) {
mgos_gpio_set_mode(s_channels[idx].button_gpio, MGOS_GPIO_MODE_INPUT); mgos_gpio_set_mode(s_channels[idx].button_gpio, MGOS_GPIO_MODE_INPUT);
mgos_gpio_set_button_handler(s_channels[idx].button_gpio, MGOS_GPIO_PULL_UP, MGOS_GPIO_INT_EDGE_POS, 200, channel_handler, NULL); mgos_gpio_set_button_handler(s_channels[idx].button_gpio, MGOS_GPIO_PULL_UP, MGOS_GPIO_INT_EDGE_NEG, 20, channel_handler, (void*) 1);
} }
} }
} }
@ -171,6 +171,7 @@ bool channel_get(int idx) {
return s_channels[idx].relay_state == 1; return s_channels[idx].relay_state == 1;
} }
// Channel handler arg is non-NULL if it was a pushbutton, and NULL if it was an RPC.
void channel_handler(int gpio, void *arg) { void channel_handler(int gpio, void *arg) {
uint8_t idx; uint8_t idx;
bool state; bool state;
@ -181,7 +182,12 @@ void channel_handler(int gpio, void *arg) {
return; return;
} }
LOG(LL_INFO, ("GPIO %d triggered button %d", gpio, idx)); if (!arg) { // pushbutton
LOG(LL_INFO, ("RPC triggered channel %d", idx));
} else {
LOG(LL_INFO, ("Button on GPIO %d triggered channel %d", gpio, idx));
}
state = channel_get(idx); state = channel_get(idx);
channel_set(idx, !state); channel_set(idx, !state);