diff options
| author | Bdale Garbee <bdale@gag.com> | 2015-02-22 14:55:40 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2015-02-22 14:55:40 -0700 |
| commit | 4af4e36cda96d053458eeb040e35886890917385 (patch) | |
| tree | 2b1b870b5b15af2fea0297b8cc9a5dff73d265df /src/cc1111/ao_button.c | |
| parent | 91b1a80650a7dcd7c5bf819618a8cea0fceb37d9 (diff) | |
| parent | 106b16b4d5d024543d7ad8c4b4762151e253f3c4 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/cc1111/ao_button.c')
| -rw-r--r-- | src/cc1111/ao_button.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cc1111/ao_button.c b/src/cc1111/ao_button.c index 69f3475f..a0f221c2 100644 --- a/src/cc1111/ao_button.c +++ b/src/cc1111/ao_button.c @@ -72,12 +72,12 @@ ao_button_mask(uint8_t reg) } char -ao_button_get(void) __critical +ao_button_get(uint16_t timeout) __critical { char b; while (ao_fifo_empty(ao_button_fifo)) - if (ao_sleep(&ao_button_fifo)) + if (ao_sleep_for(&ao_button_fifo, timeout)) return 0; ao_fifo_remove(ao_button_fifo, b); return b; |