Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
exsilium committed Oct 16, 2016
2 parents 46dbc9b + 540e8a6 commit 9db652b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const wpan_cluster_table_entry_t custom_ep_clusters[] = {
{CUSTOM_EP_CUSTOM_CLUSTER, custom_ep_rx_cluster, NULL,
WPAN_CLUST_FLAG_INOUT | WPAN_CLUST_FLAG_NOT_ZCL},
WPAN_CLUST_ENTRY_LIST_END
;
};


int custom_ep_default_cluster(const wpan_envelope_t FAR *envelope, void FAR *context)
Expand Down Expand Up @@ -178,8 +178,9 @@ void rtc_periodic_task(void)
#ifdef relayTimer_irq
void relayTimer_irq(void)
{
gpio_set(LED_GROVE, !gpio_get(LED_GROVE));
puts("EVENT TRIGGERED: relayTimer_irq");
gpio_set(RELAY, 0);
gpio_set(RELAY_2, 0);
}
#endif

Expand Down

0 comments on commit 9db652b

Please sign in to comment.