Equalize hekate main and Nyx common functions

2020-06-13 18:16:29 +03:00
parent c9ee530205
commit 7dd3178d48
58 changed files with 1342 additions and 191 deletions
--- a/bootloader/utils/btn.c
+++ b/bootloader/utils/btn.c
@@ -70,6 +70,22 @@ u8 btn_wait()
 }

 u8 btn_wait_timeout(u32 time_ms, u8 mask)
+{
+	u32 timeout = get_tmr_ms() + time_ms;
+	u8 res = btn_read() & mask;
+
+	while (get_tmr_ms() < timeout)
+	{
+		if (res == mask)
+			break;
+		else
+			res = btn_read() & mask;
+	};
+
+	return res;
+}
+
+u8 btn_wait_timeout_single(u32 time_ms, u8 mask)
 {
 	u8 single_button = mask & BTN_SINGLE;
 	mask &= ~BTN_SINGLE;