Update and bug fix

Author: Hong5489

README.md

@@ -2,12 +2,12 @@
 
 It is a plugin like [UniversalRF Remix](https://github.com/ESurge/flipperzero-firmware-unirfremix) but for infrared files. I do this plugin for convenience, because the main IR app need to navigate for different button abit troublesome (buttons like up,down,left,right,back). I found it useful for TV and TV box.
 
-It supports short press and long press input for different ir remote buttons. Tested on the [unleashed firmware version unlshd-023](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/unlshd-023)
+It supports short press and long press input for different ir remote buttons. Tested on the [unleashed firmware version unlshd-047](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/unlshd-047)
 
 
 ## How to install
 
-1. Update unleashed firmware to the version unlshd-023, then download the `ir_remote.fap` from [releases](https://github.com/Hong5489/ir_remote/tags)
+1. Update unleashed firmware to the version unlshd-047, then download the `ir_remote.fap` from [releases](https://github.com/Hong5489/ir_remote/tags)
 
 2. Put the `ir_remote.fap` file in your flipper's SD card, under `apps` folder
 
@@ -17,7 +17,7 @@ It supports short press and long press input for different ir remote buttons. Te
 
 The format With `HOLD` one is long press, without is short press
 
-Example of the configuration file:
+Example of the configuration file (Update: the string format can be in any order):
 ```
 REMOTE: /ext/infrared/Philips_32PFL4208T.ir
 UP: Up
@@ -60,4 +60,13 @@ Choose config file to map
 
 Show all button name in the config file (If empty will show N/A). Upper part short press, Lower part long press
 
-![image2](ir2.png)
+![image2](ir2.png)
+
+## Update
+Thanks to [friebel](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/535), [d4ve10](https://github.com/Hong5489/ir_remote/pull/4) and [polarikus](https://github.com/Hong5489/ir_remote/pull/2)
+- Added auto create `ir_remote` directory
+- Fixed string format 
+- Added for hold button will send IR multiple times
+
+## TODO
+- Mulitiple remote in one config file

application.fam

@@ -8,7 +8,7 @@ App(
         "gui",
         "dialogs",
     ],
-    fap_category="Tools",
+    fap_category="Tools_Extra",
     fap_icon="ir_10px.png",
     fap_icon_assets="images",
 )

infrared_remote_app.c

@@ -15,9 +15,18 @@
 #include "infrared_remote.h"
 #include "infrared_remote_button.h"
 #define TAG "ir_remote"
+#define MENU_BTN_TXT_X 36
 
 #include <flipper_format/flipper_format.h>
 
+struct InfraredSignal {
+    bool is_raw;
+    union {
+        InfraredMessage message;
+        InfraredRawSignal raw;
+    } payload;
+};
+
 typedef struct {
 	int status;
 	ViewPort* view_port;
@@ -61,12 +70,12 @@ static void app_draw_callback(Canvas* canvas, void* ctx) {
 		//Labels
 		canvas_set_font(canvas, FontSecondary);
 
-		canvas_draw_str_aligned(canvas, 32, 8,AlignCenter,AlignCenter, furi_string_get_cstr(app->up_button));
-		canvas_draw_str_aligned(canvas, 32, 18,AlignCenter,AlignCenter, furi_string_get_cstr(app->down_button));
-		canvas_draw_str_aligned(canvas, 32, 28,AlignCenter,AlignCenter, furi_string_get_cstr(app->left_button));
-		canvas_draw_str_aligned(canvas, 32, 38,AlignCenter,AlignCenter, furi_string_get_cstr(app->right_button));
-		canvas_draw_str_aligned(canvas, 32, 48,AlignCenter,AlignCenter, furi_string_get_cstr(app->ok_button));
-		canvas_draw_str_aligned(canvas, 32, 58, AlignCenter, AlignCenter, furi_string_get_cstr(app->back_button));
+		canvas_draw_str_aligned(canvas, MENU_BTN_TXT_X, 8,AlignCenter,AlignCenter, furi_string_get_cstr(app->up_button));
+		canvas_draw_str_aligned(canvas, MENU_BTN_TXT_X, 18,AlignCenter,AlignCenter, furi_string_get_cstr(app->down_button));
+		canvas_draw_str_aligned(canvas, MENU_BTN_TXT_X, 28,AlignCenter,AlignCenter, furi_string_get_cstr(app->left_button));
+		canvas_draw_str_aligned(canvas, MENU_BTN_TXT_X, 38,AlignCenter,AlignCenter, furi_string_get_cstr(app->right_button));
+		canvas_draw_str_aligned(canvas, MENU_BTN_TXT_X, 48,AlignCenter,AlignCenter, furi_string_get_cstr(app->ok_button));
+		canvas_draw_str_aligned(canvas, MENU_BTN_TXT_X, 58, AlignCenter, AlignCenter, furi_string_get_cstr(app->back_button));
 
 		canvas_draw_line(canvas, 0, 65, 64, 65);
 
@@ -77,12 +86,12 @@ static void app_draw_callback(Canvas* canvas, void* ctx) {
 		canvas_draw_icon(canvas, 0, 107, &I_Ok_btn_9x9);
 		canvas_draw_icon(canvas, 0, 118, &I_back_10px);
 
-		canvas_draw_str_aligned(canvas, 32, 73,AlignCenter,AlignCenter, furi_string_get_cstr(app->up_hold_button));
-		canvas_draw_str_aligned(canvas, 32, 83,AlignCenter,AlignCenter, furi_string_get_cstr(app->down_hold_button));
-		canvas_draw_str_aligned(canvas, 32, 93,AlignCenter,AlignCenter, furi_string_get_cstr(app->left_hold_button));
-		canvas_draw_str_aligned(canvas, 32, 103,AlignCenter,AlignCenter, furi_string_get_cstr(app->right_hold_button));
-		canvas_draw_str_aligned(canvas, 32, 113,AlignCenter,AlignCenter, furi_string_get_cstr(app->ok_hold_button));
-		canvas_draw_str_aligned(canvas, 32, 123, AlignCenter, AlignCenter, "Exit App");
+		canvas_draw_str_aligned(canvas, MENU_BTN_TXT_X, 73,AlignCenter,AlignCenter, furi_string_get_cstr(app->up_hold_button));
+		canvas_draw_str_aligned(canvas, MENU_BTN_TXT_X, 83,AlignCenter,AlignCenter, furi_string_get_cstr(app->down_hold_button));
+		canvas_draw_str_aligned(canvas, MENU_BTN_TXT_X, 93,AlignCenter,AlignCenter, furi_string_get_cstr(app->left_hold_button));
+		canvas_draw_str_aligned(canvas, MENU_BTN_TXT_X, 103,AlignCenter,AlignCenter, furi_string_get_cstr(app->right_hold_button));
+		canvas_draw_str_aligned(canvas, MENU_BTN_TXT_X, 113,AlignCenter,AlignCenter, furi_string_get_cstr(app->ok_hold_button));
+		canvas_draw_str_aligned(canvas, MENU_BTN_TXT_X, 123, AlignCenter, AlignCenter, "Exit App");
 	}
 
 
@@ -133,6 +142,9 @@ int32_t infrared_remote_app(void* p) {
 	dialog_file_browser_set_basic_options(&browser_options, ".txt", &I_sub1_10px);
 	FuriString* map_file = furi_string_alloc();
 	furi_string_set(map_file,"/ext/ir_remote");
+	if(!storage_file_exists(storage, ANY_PATH("ir_remote"))){
+        storage_common_mkdir(storage, ANY_PATH("ir_remote"));//Make Folder If dir not exist
+    }
 
 	bool res = dialog_file_browser_show(dialogs, map_file, map_file, &browser_options);
 
@@ -220,6 +232,8 @@ int32_t infrared_remote_app(void* p) {
 		//set missing filenames to N/A
 		//assign button signals
 		size_t index = 0;
+		// Add rewind to fix the string ordering issue
+		flipper_format_rewind(ff);
 		if(!flipper_format_read_string(ff, "UP", app->up_button)) {
 			FURI_LOG_W(TAG, "Could not read UP string");
 			furi_string_set(app->up_button,"N/A");
@@ -232,6 +246,7 @@ int32_t infrared_remote_app(void* p) {
 			}
 		}
 
+		flipper_format_rewind(ff);
 		if(!flipper_format_read_string(ff, "DOWN", app->down_button)) {
 			FURI_LOG_W(TAG, "Could not read DOWN string");
 			furi_string_set(app->down_button,"N/A");
@@ -244,6 +259,7 @@ int32_t infrared_remote_app(void* p) {
 			}
 		}
 
+		flipper_format_rewind(ff);
 		if(!flipper_format_read_string(ff, "LEFT", app->left_button)) {
 			FURI_LOG_W(TAG, "Could not read LEFT string");
 			furi_string_set(app->left_button,"N/A");
@@ -256,6 +272,7 @@ int32_t infrared_remote_app(void* p) {
 			}
 		}
 
+		flipper_format_rewind(ff);
 		if(!flipper_format_read_string(ff, "RIGHT", app->right_button)) {
 			FURI_LOG_W(TAG, "Could not read RIGHT string");
 			furi_string_set(app->right_button,"N/A");
@@ -268,6 +285,7 @@ int32_t infrared_remote_app(void* p) {
 			}
 		}
 
+		flipper_format_rewind(ff);
 		if(!flipper_format_read_string(ff, "OK", app->ok_button)) {
 			FURI_LOG_W(TAG, "Could not read OK string");
 			furi_string_set(app->ok_button,"N/A");
@@ -280,6 +298,7 @@ int32_t infrared_remote_app(void* p) {
 			}
 		}
 
+		flipper_format_rewind(ff);
 		if(!flipper_format_read_string(ff, "BACK", app->back_button)) {
 			FURI_LOG_W(TAG, "Could not read BACK string");
 			furi_string_set(app->back_button,"N/A");
@@ -292,6 +311,7 @@ int32_t infrared_remote_app(void* p) {
 			}
 		}
 
+		flipper_format_rewind(ff);
 		if(!flipper_format_read_string(ff, "UPHOLD", app->up_hold_button)) {
 			FURI_LOG_W(TAG, "Could not read UPHOLD string");
 			furi_string_set(app->up_hold_button,"N/A");
@@ -304,6 +324,7 @@ int32_t infrared_remote_app(void* p) {
 			}
 		}
 
+		flipper_format_rewind(ff);
 		if(!flipper_format_read_string(ff, "DOWNHOLD", app->down_hold_button)) {
 			FURI_LOG_W(TAG, "Could not read DOWNHOLD string");
 			furi_string_set(app->down_hold_button,"N/A");
@@ -316,6 +337,7 @@ int32_t infrared_remote_app(void* p) {
 			}
 		}
 
+		flipper_format_rewind(ff);
 		if(!flipper_format_read_string(ff, "LEFTHOLD", app->left_hold_button)) {
 			FURI_LOG_W(TAG, "Could not read LEFTHOLD string");
 			furi_string_set(app->left_hold_button,"N/A");
@@ -328,6 +350,7 @@ int32_t infrared_remote_app(void* p) {
 			}
 		}
 
+		flipper_format_rewind(ff);
 		if(!flipper_format_read_string(ff, "RIGHTHOLD", app->right_hold_button)) {
 			FURI_LOG_W(TAG, "Could not read RIGHTHOLD string");
 			furi_string_set(app->right_hold_button,"N/A");
@@ -339,7 +362,8 @@ int32_t infrared_remote_app(void* p) {
 				right_hold_enabled = true;
 			}
 		}
-
+		
+		flipper_format_rewind(ff);
 		if(!flipper_format_read_string(ff, "OKHOLD", app->ok_hold_button)) {
 			FURI_LOG_W(TAG, "Could not read OKHOLD string");
 			furi_string_set(app->ok_hold_button,"N/A");
@@ -472,11 +496,11 @@ int32_t infrared_remote_app(void* p) {
 					if (is_transmitting) {
 						infrared_worker_tx_stop(app->infrared_worker);
 					}
-
-					if(infrared_signal_is_raw(active_signal)) {
+					// Check the signal is raw
+					if(active_signal->is_raw){
 						InfraredRawSignal* raw_signal = infrared_signal_get_raw_signal(active_signal);
-						infrared_worker_set_raw_signal(app->infrared_worker, raw_signal->timings, raw_signal->timings_size);
-					} else {
+						infrared_worker_set_raw_signal(app->infrared_worker,raw_signal->timings,raw_signal->timings_size);
+					}else{
 						InfraredMessage* message = infrared_signal_get_message(active_signal);
 						infrared_worker_set_decoded_signal(app->infrared_worker, message);
 					}