Equalize hekate main and Nyx common functions

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;

bootloader/utils/btn.h

@@ -29,5 +29,6 @@ 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

bootloader/utils/dirlist.c

@@ -21,7 +21,7 @@
 #include "../mem/heap.h"
 #include "../utils/types.h"
 
-char *dirlist(const char *directory, const char *pattern, bool includeHiddenFiles)
+char *dirlist(const char *directory, const char *pattern, bool includeHiddenFiles, bool parse_dirs)
 {
 	u8 max_entries = 61;
 
@@ -40,12 +40,18 @@ char *dirlist(const char *directory, const char *pattern, bool includeHiddenFile
 			res = f_readdir(&dir, &fno);
 			if (res || !fno.fname[0])
 				break;
-			if (!(fno.fattrib & AM_DIR) && (fno.fname[0] != '.') && (includeHiddenFiles || !(fno.fattrib & AM_HID)))
+
+			bool curr_parse = parse_dirs ? (fno.fattrib & AM_DIR) : !(fno.fattrib & AM_DIR);
+
+			if (curr_parse)
 			{
-				strcpy(dir_entries + (k * 256), fno.fname);
-				k++;
-				if (k > (max_entries - 1))
-					break;
+				if ((fno.fname[0] != '.') && (includeHiddenFiles || !(fno.fattrib & AM_HID)))
+				{
+					strcpy(dir_entries + (k * 256), fno.fname);
+					k++;
+					if (k > (max_entries - 1))
+						break;
+				}
 			}
 		}
 		f_closedir(&dir);

bootloader/utils/dirlist.h

@@ -16,4 +16,4 @@
 
 #include "../utils/types.h"
 
-char *dirlist(const char *directory, const char *pattern, bool includeHiddenFiles);
+char *dirlist(const char *directory, const char *pattern, bool includeHiddenFiles, bool parse_dirs);