Merge pull request #20 from leedave/feature/conflict_0.103.1-rc

Feature/conflict 0.103.1 rc

application.fam

@@ -6,7 +6,7 @@ App(
     stack_size=3 * 1024,
     fap_icon="icons/xremote_10px.png",
     fap_icon_assets="icons",
-    fap_version="2.5",
+    fap_version="2.6",
     fap_category="Infrared",
     fap_author="Leedave",
     fap_description="One-Click, sends multiple commands",

docs/changelog.md

@@ -1,3 +1,6 @@
+## 2.6
+- Fix for conflict wiht SubGHz folder variable in 0.103.1-rc
+
 ## 2.5
 - Back button on info screen now reacts the same as ok button
 - Fixed crash on exit in fw 0.100.3

scenes/xremote_scene_ir_timer.c

@@ -41,11 +41,6 @@ bool xremote_scene_ir_timer_on_event(void* context, SceneManagerEvent event) {
         if(item->time > 9999) {
             item->time = 9999;
         }
-        //app->first_station = atoi(app->text_store[0]);
-        /*if(app->first_station > app->max_station) {
-            app->first_station = app->max_station;
-            snprintf(app->text_store[0], 5, "%lu", app->first_station);
-        }*/
         scene_manager_previous_scene(app->scene_manager);
         return true;
     }

scenes/xremote_scene_transmit.c

@@ -169,6 +169,11 @@ bool xremote_scene_transmit_on_event(void* context, SceneManagerEvent event) {
         }
     } else if(event.type == SceneManagerEventTypeTick) {
         FURI_LOG_D(TAG, "Tick Event");
+        with_view_model(
+            xremote_transmit_get_view(app->xremote_transmit),
+            void* model,
+            { UNUSED(model); },
+            true);
         if(app->state_notifications == SubGhzNotificationStateTx && app->led == 1) {
             //blink for subghz
         }

scenes/xremote_scene_xr_list.c

@@ -26,7 +26,6 @@ void xremote_scene_xr_list_on_enter(void* context) {
 
     if(success) {
         //Load Remote Button View
-        //scene_manager_next_scene(app->scene_manager, XRemoteSceneWip);
         scene_manager_next_scene(app->scene_manager, XRemoteSceneTransmit);
     } else {
         //scene_manager_next_scene(app->scene_manager, XRemoteSceneWip);

scenes/xremote_scene_xr_list_edit.c

@@ -21,10 +21,8 @@ void xremote_scene_xr_list_edit_on_enter(void* context) {
 
     if(success) {
         //Load Remote Button View
-        //scene_manager_next_scene(app->scene_manager, XRemoteSceneWip);
         scene_manager_next_scene(app->scene_manager, XRemoteSceneXrListEditItem);
     } else {
-        //scene_manager_next_scene(app->scene_manager, XRemoteSceneWip);
         scene_manager_previous_scene(app->scene_manager);
     }
 }

views/xremote_transmit.c

@@ -100,12 +100,36 @@ void xremote_transmit_draw(Canvas* canvas, XRemoteTransmitModel* model) {
     }
 }
 
+bool xremote_transmit_input(InputEvent* event, void* context) {
+    furi_assert(context);
+    XRemoteTransmit* instance = context;
+    if(event->type == InputTypeRelease) {
+        switch(event->key) {
+        case InputKeyBack:
+            with_view_model(
+                instance->view,
+                XRemoteTransmitModel * model,
+                {
+                    UNUSED(model);
+                    instance->callback(
+                        XRemoteCustomEventViewTransmitterSendStop, instance->context);
+                },
+                true);
+            break;
+        default:
+            break;
+        }
+    }
+    return true;
+}
+
 XRemoteTransmit* xremote_transmit_alloc() {
     XRemoteTransmit* instance = malloc(sizeof(XRemoteTransmit));
     instance->view = view_alloc();
     view_allocate_model(instance->view, ViewModelTypeLocking, sizeof(XRemoteTransmitModel));
     view_set_context(instance->view, instance);
     view_set_draw_callback(instance->view, (ViewDrawCallback)xremote_transmit_draw);
+    view_set_input_callback(instance->view, xremote_transmit_input);
     view_set_enter_callback(instance->view, xremote_transmit_enter);
 
     with_view_model(

views/xremote_transmit.h

@@ -21,4 +21,6 @@ void xremote_transmit_free(XRemoteTransmit* instance);
 
 View* xremote_transmit_get_view(XRemoteTransmit* instance);
 
-void xremote_transmit_enter(void* context);
+void xremote_transmit_enter(void* context);
+
+bool xremote_transmit_input(InputEvent* event, void* context);

xremote_i.h

@@ -23,9 +23,6 @@
 #include <gui/modules/button_menu.h>
 #include <gui/modules/button_panel.h>
 #include <gui/modules/variable_item_list.h>
-
-//#include <lib/subghz/protocols/protocol_items.h> //Not found
-
 #include <input/input.h>
 #include <notification/notification_messages.h>
 
@@ -53,13 +50,12 @@
 #define XREMOTE_TEXT_STORE_SIZE 128
 #define XREMOTE_MAX_ITEM_NAME_LENGTH 22
 #define XREMOTE_MAX_REMOTE_NAME_LENGTH 22
-#define XREMOTE_VERSION "2.5"
+#define XREMOTE_VERSION "2.6"
 
 #define INFRARED_APP_EXTENSION ".ir"
 #define INFRARED_APP_FOLDER ANY_PATH("infrared")
 
 #define SUBGHZ_APP_EXTENSION ".sub"
-#define SUBGHZ_APP_FOLDER ANY_PATH("subghz")
 
 #define TAG "XRemote"