Merge pull request #11 from leedave/feature/catalog_sdk_upd

Feature/catalog sdk upd

Author: leedave

application.fam

@@ -6,9 +6,9 @@ App(
     stack_size=3 * 1024,
     fap_icon="icons/xremote_10px.png",
     fap_icon_assets="icons",
-    fap_version="2.1",
+    fap_version="2.2",
     fap_category="Infrared",
     fap_author="Leedave",
     fap_description="One-Click, sends multiple commands",
-    fap_weburl="https://github.com/leedave/flipper-zero-cross-remote"
+    fap_weburl="https://github.com/leedave/flipper-zero-cross-remote",
 )

docs/changelog.md

@@ -1,3 +1,6 @@
+## 2.2
+- Fixed incompatibility to Flipper-catalog / uFBT compiler
+
 ## v2.1
 - Added ability to individually set IR Signal time
 

helpers/gui/int_input.c

@@ -2,7 +2,6 @@
 
 #include <gui/elements.h>
 #include <furi.h>
-#include <assets_icons.h>
 
 /** IntInput type */
 struct IntInput {

helpers/gui/int_input.h

@@ -6,6 +6,7 @@
 #pragma once
 
 #include <gui/view.h>
+#include "xremote_icons.h"
 
 #ifdef __cplusplus
 extern "C" {

helpers/subghz/subghz_txrx.c

@@ -1,6 +1,6 @@
 #include "subghz_txrx_i.h"
 
-#include <lib/subghz/protocols/protocol_items.h>
+#include <lib/subghz/subghz_protocol_registry.h>
 #include <applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h>
 #include <lib/subghz/devices/cc1101_int/cc1101_int_interconnect.h>
 

scenes/xremote_scene_edit_item.c

@@ -16,10 +16,15 @@ void xremote_scene_edit_item_on_enter(void* context) {
     XRemote* app = context;
     submenu_add_item(
         app->editmenu, "Rename", SubmenuIndexRename, xremote_scene_edit_item_submenu_callback, app);
-    
-    if(xremote_cross_remote_get_item_type(app->cross_remote, app->edit_item) == XRemoteRemoteItemTypeInfrared) {
+
+    if(xremote_cross_remote_get_item_type(app->cross_remote, app->edit_item) ==
+       XRemoteRemoteItemTypeInfrared) {
         submenu_add_item(
-        app->editmenu, "Set Timing", SubmenuIndexTiming, xremote_scene_edit_item_submenu_callback, app);
+            app->editmenu,
+            "Set Timing",
+            SubmenuIndexTiming,
+            xremote_scene_edit_item_submenu_callback,
+            app);
     }
 
     submenu_add_item(

scenes/xremote_scene_ir_timer.c

@@ -38,7 +38,7 @@ bool xremote_scene_ir_timer_on_event(void* context, SceneManagerEvent event) {
     } else if(event.type == SceneManagerEventTypeCustom) {
         CrossRemoteItem* item = xremote_cross_remote_get_item(app->cross_remote, app->edit_item);
         xremote_cross_remote_item_set_time(item, atoi(app->text_store[1]));
-        if (item->time > 9999) {
+        if(item->time > 9999) {
             item->time = 9999;
         }
         //app->first_station = atoi(app->text_store[0]);