Equalize hekate main and Nyx common functions

This commit is contained in:
CTCaer committed 2020-06-13 18:16:29 +03:00
1 parent c9ee530205
commit 7dd3178d48
58 files changed
+1342 -191

No files matched your search

+28
View File
@@ -84,3 +84,31 @@ u8 btn_wait_timeout(u32 time_ms, u8 mask)
return res;
}
u8 btn_wait_timeout_single(u32 time_ms, u8 mask)
{
u8 single_button = mask & BTN_SINGLE;
mask &= ~BTN_SINGLE;
u32 timeout = get_tmr_ms() + time_ms;
u8 res = btn_read();
while (get_tmr_ms() < timeout)
{
if ((res & mask) == mask)
{
if (single_button && (res & ~mask)) // Undesired button detected.
res = btn_read();
else
return (res & mask);
}
else
res = btn_read();
};
// Timed out.
if (!single_button || !time_ms)
return (res & mask);
else
return 0; // Return no button press if single button requested.
}
+2
View File
@@ -23,10 +23,12 @@
#define BTN_POWER (1 << 0)
#define BTN_VOL_DOWN (1 << 1)
#define BTN_VOL_UP (1 << 2)
#define BTN_SINGLE (1 << 7)
u8 btn_read();
u8 btn_read_vol();
u8 btn_wait();
u8 btn_wait_timeout(u32 time_ms, u8 mask);
u8 btn_wait_timeout_single(u32 time_ms, u8 mask);
#endif