update api, add icons, fix picopass again

applications/plugins/arkanoid/application.fam

@@ -7,4 +7,6 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     order=30,
+    fap_icon="arkanoid_10px.png",
+    fap_category="Games",
 )

applications/plugins/barcode_generator/application.fam

@@ -10,4 +10,6 @@ App(
     ],
     stack_size=1 * 1024,
     order=50,
+    fap_icon="barcode_10px.png",
+    fap_category="Misc",
 )

applications/plugins/esp8266_deauth/application.fam

@@ -7,4 +7,6 @@ App(
     requires=["gui"],
     stack_size=2 * 1024,
     order=100,
+    fap_icon="wifi_10px.png",
+    fap_category="GPIO",
 )

applications/plugins/flipfrid/application.fam

@@ -7,8 +7,6 @@ App(
     requires=["gui", "storage", "dialogs", "input", "notification"],
     stack_size=1 * 1024,
     order=15,
-    fap_libs=[
-        "lfrfid",
-        "toolbox",
-    ],
+    fap_icon="rfid_10px.png",
+    fap_category="Tools",
 )

applications/plugins/flipfrid/flipfrid.h

@@ -4,7 +4,7 @@
 #include <input/input.h>
 #include <gui/gui.h>
 #include <gui/modules/submenu.h>
-#include "m-string.h"
+#include <m-string.h>
 #include <dialogs/dialogs.h>
 #include <notification/notification.h>
 #include <notification/notification_messages.h>

applications/plugins/mousejacker/application.fam

@@ -10,4 +10,6 @@ App(
     ],
     stack_size=2 * 1024,
     order=60,
+    fap_icon="mouse_10px.png",
+    fap_category="GPIO",
 )

applications/plugins/multi_converter/application.fam

@@ -7,4 +7,6 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     order=19,
+    fap_icon="converter_10px.png",
+    fap_category="Misc",
 )

applications/plugins/music_player/application.fam

@@ -12,7 +12,7 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_icon="../../../assets/icons/Archive/music_10px.png",
-    fap_category="Misc",
+    fap_category="Games",
 )
 
 App(

applications/plugins/nrfsniff/application.fam

@@ -7,4 +7,6 @@ App(
     requires=["gui"],
     stack_size=2 * 1024,
     order=70,
+    fap_icon="../../../assets/icons/Archive/sub1_10px.png",
+    fap_category="GPIO",
 )

applications/plugins/picopass/picopass_worker.c

@@ -105,7 +105,7 @@ ReturnCode picopass_detect_card(int timeout) {
 
     err = rfalPicoPassPollerCheckPresence();
     if(err != ERR_RF_COLLISION) {
-        FURI_LOG_E(TAG, "rfalPicoPassPollerCheckPresence error %d", err);
+        //FURI_LOG_E(TAG, "rfalPicoPassPollerCheckPresence error %d", err);
         return err;
     }
 

applications/plugins/playlist/application.fam

@@ -7,4 +7,6 @@ App(
     requires=["storage", "gui", "dialogs", "subghz"],
     stack_size=2 * 1024,
     order=14,
+    fap_icon="../../../assets/icons/Archive/sub1_10px.png",
+    fap_category="Tools",
 )

applications/plugins/sentry_safe/application.fam

@@ -7,4 +7,6 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     order=80,
+    fap_icon="safe_10px.png",
+    fap_category="GPIO",
 )

applications/plugins/subbrute/application.fam

@@ -7,4 +7,6 @@ App(
     requires=["gui","dialogs"],
     stack_size=2 * 1024,
     order=11,
+    fap_icon="../../../assets/icons/Archive/sub1_10px.png",
+    fap_category="Tools",
 )

applications/plugins/tetris_game/application.fam

@@ -7,4 +7,6 @@ App(
     requires=["gui"],
     stack_size=2 * 1024,
     order=20,
+    fap_icon="tetris_10px.png",
+    fap_category="Games",
 )

applications/plugins/tictactoe_game/application.fam

@@ -7,4 +7,6 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     order=40,
+    fap_icon="tictactoe_10px.png",
+    fap_category="Games",
 )

applications/plugins/wav_player/application.fam

@@ -6,4 +6,6 @@ App(
     cdefines=["APP_WAV_PLAYER"],
     stack_size=4 * 1024,
     order=46,
+    fap_icon="wav_10px.png",
+    fap_category="Games",
 )

applications/plugins/wifi_marauder_companion/application.fam

@@ -7,4 +7,6 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     order=90,
+    fap_icon="wifi_10px.png",
+    fap_category="GPIO",
 )

applications/plugins/wifi_scanner/application.fam

@@ -7,4 +7,6 @@ App(
     requires=["gui"],
     stack_size=2 * 1024,
     order=110,
+    fap_icon="wifi_10px.png",
+    fap_category="GPIO",
 )

applications/services/gui/application.fam

@@ -13,6 +13,7 @@ App(
     sdk_headers=[
         "gui.h",
         "elements.h",
+        "canvas_i.h",
         "view_dispatcher.h",
         "view_stack.h",
         "modules/button_menu.h",

applications/services/gui/canvas_i.h

@@ -8,6 +8,10 @@
 #include "canvas.h"
 #include <u8g2.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** Canvas structure
  */
 struct Canvas {
@@ -88,3 +92,7 @@ void canvas_set_orientation(Canvas* canvas, CanvasOrientation orientation);
  * @return     CanvasOrientation
  */
 CanvasOrientation canvas_get_orientation(const Canvas* canvas);
+
+#ifdef __cplusplus
+}
+#endif

firmware/SConscript

@@ -7,6 +7,7 @@ env.Append(
         *env.GlobRecursive("*.h", "#/firmware/targets/furi_hal_include", "*_i.h"),
         *env.GlobRecursive("*.h", "#/firmware/targets/f${TARGET_HW}/furi_hal", "*_i.h"),
         File("#/firmware/targets/f7/platform_specific/intrinsic_export.h"),
+        File("#/firmware/targets/furi_hal_include/furi_hal_subghz.h"),
     ],
 )
 env.SetDefault(SDK_DEFINITION=env.File("./targets/f${TARGET_HW}/api_symbols.csv"))

lib/SConscript

@@ -23,6 +23,7 @@ env.Append(
         File("#/lib/one_wire/one_wire_device.h"),
         File("#/lib/one_wire/ibutton/ibutton_worker.h"),
         File("#/lib/one_wire/maxim_crc.h"),
+        File("#/lib/u8g2/u8g2.h"),
     ],
 )
 

lib/STM32CubeWB.scons

@@ -13,11 +13,11 @@ env.Append(
         "USE_FULL_ASSERT",
         "USE_FULL_LL_DRIVER",
     ],
-    SDK_HEADERS=env.GlobRecursive(
-        "*_ll_*.h",
-        "#/lib/STM32CubeWB/Drivers/STM32WBxx_HAL_Driver/Inc/",
-        exclude="*usb.h",
-    ),
+    SDK_HEADERS=[
+        *env.GlobRecursive("*_ll_*.h", "#/lib/STM32CubeWB/Drivers/STM32WBxx_HAL_Driver/Inc/", exclude="*usb.h"),
+        File("#/lib/STM32CubeWB/Middlewares/Third_Party/FreeRTOS/Source/include/FreeRTOS.h"),
+        File("#/lib/STM32CubeWB/Middlewares/Third_Party/FreeRTOS/Source/include/stream_buffer.h"),
+    ],
 )
 
 if env["RAM_EXEC"]:

lib/drivers/SConscript

@@ -4,6 +4,9 @@ env.Append(
     CPPPATH=[
         "#/lib/drivers",
     ],
+    SDK_HEADERS=[
+        File("#/lib/drivers/nrf24.h"),
+    ],
 )
 
 

lib/lfrfid/SConscript

@@ -7,6 +7,9 @@ env.Append(
     CPPPATH=[
         "#/lib/lfrfid",
     ],
+    SDK_HEADERS=[
+        File("#/lib/lfrfid/lfrfid_worker.h"),
+    ],
 )
 
 libenv = env.Clone(FW_LIB_NAME="lfrfid")

lib/subghz/SConscript

@@ -10,6 +10,8 @@ env.Append(
         File("#/lib/subghz/subghz_worker.h"),
         File("#/lib/subghz/subghz_tx_rx_worker.h"),
         File("#/lib/subghz/transmitter.h"),
+        File("#/lib/subghz/protocols/registry.h"),
+        File("#/lib/subghz/protocols/raw.h"),
     ],
 )
 

lib/subghz/protocols/raw.h

@@ -4,6 +4,10 @@
 
 #include <furi_hal.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SUBGHZ_PROTOCOL_RAW_NAME "RAW"
 
 typedef void (*SubGhzProtocolEncoderRAWCallbackEnd)(void* context);
@@ -189,3 +193,7 @@ bool subghz_protocol_encoder_raw_deserialize(void* context, FlipperFormat* flipp
  * @return LevelDuration
  */
 LevelDuration subghz_protocol_encoder_raw_yield(void* context);
+
+#ifdef __cplusplus
+}
+#endif

lib/subghz/protocols/registry.h

@@ -37,6 +37,10 @@
 #include "intertechno_v3.h"
 #include "clemsa.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Registration by name SubGhzProtocol.
  * @param name Protocol name
@@ -56,3 +60,7 @@ const SubGhzProtocol* subghz_protocol_registry_get_by_index(size_t index);
  * @return Number of protocols
  */
 size_t subghz_protocol_registry_count();
+
+#ifdef __cplusplus
+}
+#endif

lib/toolbox/SConscript

@@ -23,6 +23,8 @@ env.Append(
         File("#/lib/toolbox/stream/stream.h"),
         File("#/lib/toolbox/stream/file_stream.h"),
         File("#/lib/toolbox/stream/string_stream.h"),
+        File("#/lib/toolbox/stream/buffered_file_stream.h"),
+        File("#/lib/toolbox/protocols/protocol_dict.h"),
     ],
 )