From effcb445ce47714c34e8e970e033f877a025e2cf Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 14 Oct 2022 19:19:44 +0300
Subject: [PATCH 01/10] update minesweeper

https://github.com/panki27/minesweeper
---
 .../plugins/minesweeper/minesweeper.c         | 122 +++++-------------
 1 file changed, 30 insertions(+), 92 deletions(-)

diff --git a/applications/plugins/minesweeper/minesweeper.c b/applications/plugins/minesweeper/minesweeper.c
index 6d29bab2d..d3a5207f9 100644
--- a/applications/plugins/minesweeper/minesweeper.c
+++ b/applications/plugins/minesweeper/minesweeper.c
@@ -42,10 +42,7 @@ typedef enum {
     TileTypeMine
 } TileType;
 
-typedef enum {
-    FieldEmpty, // <-- same goes for this
-    FieldMine
-} Field;
+typedef enum { FieldEmpty, FieldMine } Field;
 
 typedef struct {
     Field minefield[PLAYFIELD_WIDTH][PLAYFIELD_HEIGHT];
@@ -99,6 +96,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     furi_string_printf(timeStr, "%01d:%02d", minutes, seconds);
     canvas_draw_str_aligned(canvas, 128, 0, AlignRight, AlignTop, furi_string_get_cstr(timeStr));
 
+    uint8_t* tile_to_draw;
+
     for(int y = 0; y < PLAYFIELD_HEIGHT; y++) {
         for(int x = 0; x < PLAYFIELD_WIDTH; x++) {
             if(x == minesweeper_state->cursor_x && y == minesweeper_state->cursor_y) {
@@ -106,114 +105,53 @@ static void render_callback(Canvas* const canvas, void* ctx) {
             }
             switch(minesweeper_state->playfield[x][y]) {
             case TileType0:
-                canvas_draw_xbm(
-                    canvas,
-                    x * TILE_HEIGHT, // x
-                    8 + (y * TILE_WIDTH), // y
-                    TILE_WIDTH,
-                    TILE_HEIGHT,
-                    tile_0_bits);
+                tile_to_draw = tile_0_bits;
                 break;
             case TileType1:
-                canvas_draw_xbm(
-                    canvas,
-                    x * TILE_HEIGHT, // x
-                    8 + (y * TILE_WIDTH), // y
-                    TILE_WIDTH,
-                    TILE_HEIGHT,
-                    tile_1_bits);
+                tile_to_draw = tile_1_bits;
                 break;
             case TileType2:
-                canvas_draw_xbm(
-                    canvas,
-                    x * TILE_HEIGHT, // x
-                    8 + (y * TILE_WIDTH), // y
-                    TILE_WIDTH,
-                    TILE_HEIGHT,
-                    tile_2_bits);
+                tile_to_draw = tile_2_bits;
                 break;
             case TileType3:
-                canvas_draw_xbm(
-                    canvas,
-                    x * TILE_HEIGHT, // x
-                    8 + (y * TILE_WIDTH), // y
-                    TILE_WIDTH,
-                    TILE_HEIGHT,
-                    tile_3_bits);
+                tile_to_draw = tile_3_bits;
                 break;
             case TileType4:
-                canvas_draw_xbm(
-                    canvas,
-                    x * TILE_HEIGHT, // x
-                    8 + (y * TILE_WIDTH), // y
-                    TILE_WIDTH,
-                    TILE_HEIGHT,
-                    tile_4_bits);
+                tile_to_draw = tile_4_bits;
                 break;
             case TileType5:
-                canvas_draw_xbm(
-                    canvas,
-                    x * TILE_HEIGHT, // x
-                    8 + (y * TILE_WIDTH), // y
-                    TILE_WIDTH,
-                    TILE_HEIGHT,
-                    tile_5_bits);
+                tile_to_draw = tile_5_bits;
                 break;
             case TileType6:
-                canvas_draw_xbm(
-                    canvas,
-                    x * TILE_HEIGHT, // x
-                    8 + (y * TILE_WIDTH), // y
-                    TILE_WIDTH,
-                    TILE_HEIGHT,
-                    tile_6_bits);
+                tile_to_draw = tile_6_bits;
                 break;
             case TileType7:
-                canvas_draw_xbm(
-                    canvas,
-                    x * TILE_HEIGHT, // x
-                    8 + (y * TILE_WIDTH), // y
-                    TILE_WIDTH,
-                    TILE_HEIGHT,
-                    tile_7_bits);
+                tile_to_draw = tile_7_bits;
                 break;
             case TileType8:
-                canvas_draw_xbm(
-                    canvas,
-                    x * TILE_HEIGHT, // x
-                    8 + (y * TILE_WIDTH), // y
-                    TILE_WIDTH,
-                    TILE_HEIGHT,
-                    tile_8_bits);
+                tile_to_draw = tile_8_bits;
                 break;
             case TileTypeFlag:
-                canvas_draw_xbm(
-                    canvas,
-                    x * TILE_HEIGHT, // x
-                    8 + (y * TILE_WIDTH), // y
-                    TILE_WIDTH,
-                    TILE_HEIGHT,
-                    tile_flag_bits);
+                tile_to_draw = tile_flag_bits;
                 break;
             case TileTypeUncleared:
-                canvas_draw_xbm(
-                    canvas,
-                    x * TILE_HEIGHT, // x
-                    8 + (y * TILE_WIDTH), // y
-                    TILE_WIDTH,
-                    TILE_HEIGHT,
-                    tile_uncleared_bits);
+                tile_to_draw = tile_uncleared_bits;
                 break;
             case TileTypeMine:
-                canvas_draw_xbm(
-                    canvas,
-                    x * TILE_HEIGHT, // x
-                    8 + (y * TILE_WIDTH), // y
-                    TILE_WIDTH,
-                    TILE_HEIGHT,
-                    tile_mine_bits);
+                tile_to_draw = tile_mine_bits;
+                break;
+            default:
+                // this should never happen
+                tile_to_draw = tile_mine_bits;
                 break;
             }
+            canvas_draw_xbm(
+                canvas,
+                x * TILE_HEIGHT, // x
+                8 + (y * TILE_WIDTH), // y
+                TILE_WIDTH,
+                TILE_HEIGHT,
+                tile_to_draw);
             if(x == minesweeper_state->cursor_x && y == minesweeper_state->cursor_y) {
                 canvas_invert_color(canvas);
             }
@@ -479,25 +417,25 @@ int32_t minesweeper_app(void* p) {
                     case InputKeyUp:
                         minesweeper_state->cursor_y--;
                         if(minesweeper_state->cursor_y < 0) {
-                            minesweeper_state->cursor_y = 0;
+                            minesweeper_state->cursor_y = PLAYFIELD_HEIGHT - 1;
                         }
                         break;
                     case InputKeyDown:
                         minesweeper_state->cursor_y++;
                         if(minesweeper_state->cursor_y >= PLAYFIELD_HEIGHT) {
-                            minesweeper_state->cursor_y = PLAYFIELD_HEIGHT - 1;
+                            minesweeper_state->cursor_y = 0;
                         }
                         break;
                     case InputKeyRight:
                         minesweeper_state->cursor_x++;
                         if(minesweeper_state->cursor_x >= PLAYFIELD_WIDTH) {
-                            minesweeper_state->cursor_x = PLAYFIELD_WIDTH - 1;
+                            minesweeper_state->cursor_x = 0;
                         }
                         break;
                     case InputKeyLeft:
                         minesweeper_state->cursor_x--;
                         if(minesweeper_state->cursor_x < 0) {
-                            minesweeper_state->cursor_x = 0;
+                            minesweeper_state->cursor_x = PLAYFIELD_WIDTH - 1;
                         }
                         break;
                     case InputKeyOk:

From 5f3637ca4499217fa40ae04a6e8e489f4189da35 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 14 Oct 2022 19:48:05 +0300
Subject: [PATCH 02/10] update discord link with qr code

---
 assets/slideshow/update_default/frame_01.png | Bin 3213 -> 933 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/slideshow/update_default/frame_01.png b/assets/slideshow/update_default/frame_01.png
index ea37077ccd150cf1ac6149567f0cdb3a9ac6eb4b..8a1b6585738886eee91d24c415ea17210706e004 100644
GIT binary patch
delta 922
zcmV;L17-Y;8Kno18Gi-<007d~e}4b~00DDSM?wIu&K&6g00Uo1L_t(|ob8<LZo?o9
zMZ>iBe`WTIE%GqFHinSeN1D{8gnErJ{z^)%wO&bBzMd8!d6raw;G_ZsClw$#sQ|%A
z1qe<mKyXq4f|CjmoK%3|qyhvd6(BgN0KxeleOO8{P1*{K(tr815ZT6a1<F}@lK-Ry
z2+q&~G|&~qtx#^ITbY$7`2$jb2vB8_lonA!?wnG}vTaE_w@Lxf6;6-Sz1_<qXyti=
zyDaVEoFrd(3xKX{s?3tZDt#xnIC}GPW4L1)wkUwN5AZ2ab4?Ya*4jOGU46^aUTX+%
z0Vq3_lU`u@*?$g}hJmFN=m$M*U))Jk0?IB$3~K=-2Xf@W_vS&8S5o5Zt_-7NJ(;)o
z0M=EC{+QbNPq!M9Ly4Mxddzdn$V^~xAPeA?xs&EWLLv`&b|U>xbc^7;ek2sM5Y`9a
z;FQavbV!(YUGfFAo`*100IxlkTglq0-|2fkr5EOTXMa6s32OnYj;MA#RRXILuTp+f
zKfr9Egd5MzYwasQ<ypmSNT)f^N>~ffSQ&bHhIHumsl_D^fSAGFdoHP>m1ouJh(P86
zf@A6j(0cFMW(#Q?nwEW2zThd+0tBawo)P4|w`${it;I<nKu=nL;J9Q0t)*4#`KWvu
z9ms^w1Al0G^4f8)Ld*%cMgeF;C5O~_iF);#aoV1|o~&<Hg3vy|sFUW+7gd9*7J#-(
zq4B#^AhBi;H5P+w%zXRGMhWc$XnXQLkzpR--(av~M>-Fkw~;yjb%gc-Jb1fxaPa}?
z_}OY77Y#^qadIR)p?!c^W>)|1JCHa`nLuk_0Dm2au2i%ZVDV8b-oD3$-)Wsj|6^zi
zpt+D9EB2|ai3@eFYw<IJ(0ClJ>Y;fCg!^~C-I1FiWE9|e!Jl?CXWQzQJ|hUdvqxJi
zm^uDQ7oS7p*MzeG9v7`vzuVbMDZhWc<M;RU^{8zgRrDjD5u`P1THnBu-d(xcr3$2U
z4}ZbPXOiR&8wISq*}{X~HmQ{t8MpNrL9;)&)^Z^Eg;OJdQFRho+35p-oVfa%V$O!)
z2um#hx;LZML=JBLlTCc%E*tmSIu0Sc1&Ge0&j_NQqus*Re8DN~?l#I=z#-h7&R0|e
w8?(ZqD;t$VYe7!32)iSX%mW<ANecM`t`qY%gzZ^-^Z)<=07*qoM6N<$f_D|S82|tP

literal 3213
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


From 9ff29d12b2e25e6053b9fcff41a4c64523094f23 Mon Sep 17 00:00:00 2001
From: Johannes Mittendorfer <joushx@users.noreply.github.com>
Date: Fri, 14 Oct 2022 18:54:52 +0200
Subject: [PATCH 03/10] Fix typo in fap loader logging (#1875)

---
 applications/main/fap_loader/fap_loader_app.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/main/fap_loader/fap_loader_app.c b/applications/main/fap_loader/fap_loader_app.c
index 6c909aeeb..faf8eefc8 100644
--- a/applications/main/fap_loader/fap_loader_app.c
+++ b/applications/main/fap_loader/fap_loader_app.c
@@ -101,7 +101,7 @@ static bool fap_loader_run_selected_app(FapLoader* loader) {
         }
 
         FURI_LOG_I(TAG, "Loaded in %ums", (size_t)(furi_get_tick() - start));
-        FURI_LOG_I(TAG, "FAP Loader is staring app");
+        FURI_LOG_I(TAG, "FAP Loader is starting app");
 
         FuriThread* thread = flipper_application_spawn(loader->app, NULL);
         furi_thread_start(thread);

From ead9f134f4e554cd29d30ed4b7c55bc184db3774 Mon Sep 17 00:00:00 2001
From: gornekich <n.gorbadey@gmail.com>
Date: Fri, 14 Oct 2022 21:21:23 +0400
Subject: [PATCH 04/10] [FL-2623] Add BLE disconnect request #1686
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: LionZXY <nikita@kulikof.ru>
Co-authored-by: あく <alleteam@gmail.com>
---
 applications/services/bt/bt_service/bt.c      | 19 +++++--
 firmware/targets/f7/ble_glue/serial_service.c | 53 ++++++++++++++++++-
 firmware/targets/f7/ble_glue/serial_service.h |  8 +++
 .../targets/f7/furi_hal/furi_hal_bt_serial.c  | 10 ++++
 .../furi_hal_include/furi_hal_bt_serial.h     | 11 ++++
 5 files changed, 97 insertions(+), 4 deletions(-)

diff --git a/applications/services/bt/bt_service/bt.c b/applications/services/bt/bt_service/bt.c
index aeb2beec9..c003013e4 100644
--- a/applications/services/bt/bt_service/bt.c
+++ b/applications/services/bt/bt_service/bt.c
@@ -165,6 +165,11 @@ static uint16_t bt_serial_event_callback(SerialServiceEvent event, void* context
         ret = rpc_session_get_available_size(bt->rpc_session);
     } else if(event.event == SerialServiceEventTypeDataSent) {
         furi_event_flag_set(bt->rpc_event, BT_RPC_EVENT_BUFF_SENT);
+    } else if(event.event == SerialServiceEventTypesBleResetRequest) {
+        FURI_LOG_I(TAG, "BLE restart request received");
+        BtMessage message = {.type = BtMessageTypeSetProfile, .data.profile = BtProfileSerial};
+        furi_check(
+            furi_message_queue_put(bt->message_queue, &message, FuriWaitForever) == FuriStatusOk);
     }
     return ret;
 }
@@ -226,6 +231,7 @@ static bool bt_on_gap_event_callback(GapEvent event, void* context) {
                 rpc_session_set_context(bt->rpc_session, bt);
                 furi_hal_bt_serial_set_event_callback(
                     RPC_BUFFER_SIZE, bt_serial_event_callback, bt);
+                furi_hal_bt_serial_set_rpc_status(FuriHalBtSerialRpcStatusActive);
             } else {
                 FURI_LOG_W(TAG, "RPC is busy, failed to open new session");
             }
@@ -241,6 +247,7 @@ static bool bt_on_gap_event_callback(GapEvent event, void* context) {
     } else if(event.type == GapEventTypeDisconnected) {
         if(bt->profile == BtProfileSerial && bt->rpc_session) {
             FURI_LOG_I(TAG, "Close RPC connection");
+            furi_hal_bt_serial_set_rpc_status(FuriHalBtSerialRpcStatusNotActive);
             furi_event_flag_set(bt->rpc_event, BT_RPC_EVENT_DISCONNECTED);
             rpc_session_close(bt->rpc_session);
             furi_hal_bt_serial_set_event_callback(0, NULL, NULL);
@@ -330,14 +337,20 @@ static void bt_change_profile(Bt* bt, BtMessage* message) {
             }
             furi_hal_bt_set_key_storage_change_callback(bt_on_key_storage_change_callback, bt);
             bt->profile = message->data.profile;
-            *message->result = true;
+            if(message->result) {
+                *message->result = true;
+            }
         } else {
             FURI_LOG_E(TAG, "Failed to start Bt App");
-            *message->result = false;
+            if(message->result) {
+                *message->result = false;
+            }
         }
     } else {
         bt_show_warning(bt, "Radio stack doesn't support this app");
-        *message->result = false;
+        if(message->result) {
+            *message->result = false;
+        }
     }
     furi_event_flag_set(bt->api_event, BT_API_UNLOCK_EVENT);
 }
diff --git a/firmware/targets/f7/ble_glue/serial_service.c b/firmware/targets/f7/ble_glue/serial_service.c
index 536557cce..c6421dc28 100644
--- a/firmware/targets/f7/ble_glue/serial_service.c
+++ b/firmware/targets/f7/ble_glue/serial_service.c
@@ -11,6 +11,7 @@ typedef struct {
     uint16_t rx_char_handle;
     uint16_t tx_char_handle;
     uint16_t flow_ctrl_char_handle;
+    uint16_t rpc_status_char_handle;
     FuriMutex* buff_size_mtx;
     uint32_t buff_size;
     uint16_t bytes_ready_to_receive;
@@ -28,6 +29,8 @@ static const uint8_t char_rx_uuid[] =
     {0x00, 0x00, 0xfe, 0x62, 0x8e, 0x22, 0x45, 0x41, 0x9d, 0x4c, 0x21, 0xed, 0xae, 0x82, 0xed, 0x19};
 static const uint8_t flow_ctrl_uuid[] =
     {0x00, 0x00, 0xfe, 0x63, 0x8e, 0x22, 0x45, 0x41, 0x9d, 0x4c, 0x21, 0xed, 0xae, 0x82, 0xed, 0x19};
+static const uint8_t rpc_status_uuid[] =
+    {0x00, 0x00, 0xfe, 0x64, 0x8e, 0x22, 0x45, 0x41, 0x9d, 0x4c, 0x21, 0xed, 0xae, 0x82, 0xed, 0x19};
 
 static SVCCTL_EvtAckStatus_t serial_svc_event_handler(void* event) {
     SVCCTL_EvtAckStatus_t ret = SVCCTL_EvtNotAck;
@@ -67,6 +70,17 @@ static SVCCTL_EvtAckStatus_t serial_svc_event_handler(void* event) {
                     furi_check(furi_mutex_release(serial_svc->buff_size_mtx) == FuriStatusOk);
                 }
                 ret = SVCCTL_EvtAckFlowEnable;
+            } else if(attribute_modified->Attr_Handle == serial_svc->rpc_status_char_handle + 1) {
+                SerialServiceRpcStatus* rpc_status =
+                    (SerialServiceRpcStatus*)attribute_modified->Attr_Data;
+                if(*rpc_status == SerialServiceRpcStatusNotActive) {
+                    if(serial_svc->callback) {
+                        SerialServiceEvent event = {
+                            .event = SerialServiceEventTypesBleResetRequest,
+                        };
+                        serial_svc->callback(event, serial_svc->context);
+                    }
+                }
             }
         } else if(blecore_evt->ecode == ACI_GATT_SERVER_CONFIRMATION_VSEVT_CODE) {
             FURI_LOG_T(TAG, "Ack received");
@@ -82,6 +96,18 @@ static SVCCTL_EvtAckStatus_t serial_svc_event_handler(void* event) {
     return ret;
 }
 
+static void serial_svc_update_rpc_char(SerialServiceRpcStatus status) {
+    tBleStatus ble_status = aci_gatt_update_char_value(
+        serial_svc->svc_handle,
+        serial_svc->rpc_status_char_handle,
+        0,
+        sizeof(SerialServiceRpcStatus),
+        (uint8_t*)&status);
+    if(ble_status) {
+        FURI_LOG_E(TAG, "Failed to update RPC status char: %d", ble_status);
+    }
+}
+
 void serial_svc_start() {
     tBleStatus status;
     serial_svc = malloc(sizeof(SerialSvc));
@@ -90,7 +116,7 @@ void serial_svc_start() {
 
     // Add service
     status = aci_gatt_add_service(
-        UUID_TYPE_128, (Service_UUID_t*)service_uuid, PRIMARY_SERVICE, 10, &serial_svc->svc_handle);
+        UUID_TYPE_128, (Service_UUID_t*)service_uuid, PRIMARY_SERVICE, 12, &serial_svc->svc_handle);
     if(status) {
         FURI_LOG_E(TAG, "Failed to add Serial service: %d", status);
     }
@@ -141,6 +167,22 @@ void serial_svc_start() {
     if(status) {
         FURI_LOG_E(TAG, "Failed to add Flow Control characteristic: %d", status);
     }
+    // Add RPC status characteristic
+    status = aci_gatt_add_char(
+        serial_svc->svc_handle,
+        UUID_TYPE_128,
+        (const Char_UUID_t*)rpc_status_uuid,
+        sizeof(SerialServiceRpcStatus),
+        CHAR_PROP_READ | CHAR_PROP_WRITE | CHAR_PROP_NOTIFY,
+        ATTR_PERMISSION_AUTHEN_READ | ATTR_PERMISSION_AUTHEN_WRITE,
+        GATT_NOTIFY_ATTRIBUTE_WRITE,
+        10,
+        CHAR_VALUE_LEN_CONSTANT,
+        &serial_svc->rpc_status_char_handle);
+    if(status) {
+        FURI_LOG_E(TAG, "Failed to add RPC status characteristic: %d", status);
+    }
+    serial_svc_update_rpc_char(SerialServiceRpcStatusNotActive);
     // Allocate buffer size mutex
     serial_svc->buff_size_mtx = furi_mutex_alloc(FuriMutexTypeNormal);
 }
@@ -198,6 +240,10 @@ void serial_svc_stop() {
         if(status) {
             FURI_LOG_E(TAG, "Failed to delete Flow Control characteristic: %d", status);
         }
+        status = aci_gatt_del_char(serial_svc->svc_handle, serial_svc->rpc_status_char_handle);
+        if(status) {
+            FURI_LOG_E(TAG, "Failed to delete RPC Status characteristic: %d", status);
+        }
         // Delete service
         status = aci_gatt_del_service(serial_svc->svc_handle);
         if(status) {
@@ -242,3 +288,8 @@ bool serial_svc_update_tx(uint8_t* data, uint16_t data_len) {
 
     return true;
 }
+
+void serial_svc_set_rpc_status(SerialServiceRpcStatus status) {
+    furi_assert(serial_svc);
+    serial_svc_update_rpc_char(status);
+}
diff --git a/firmware/targets/f7/ble_glue/serial_service.h b/firmware/targets/f7/ble_glue/serial_service.h
index a1e5bc1cc..7d38066f4 100644
--- a/firmware/targets/f7/ble_glue/serial_service.h
+++ b/firmware/targets/f7/ble_glue/serial_service.h
@@ -10,9 +10,15 @@
 extern "C" {
 #endif
 
+typedef enum {
+    SerialServiceRpcStatusNotActive = 0UL,
+    SerialServiceRpcStatusActive = 1UL,
+} SerialServiceRpcStatus;
+
 typedef enum {
     SerialServiceEventTypeDataReceived,
     SerialServiceEventTypeDataSent,
+    SerialServiceEventTypesBleResetRequest,
 } SerialServiceEventType;
 
 typedef struct {
@@ -34,6 +40,8 @@ void serial_svc_set_callbacks(
     SerialServiceEventCallback callback,
     void* context);
 
+void serial_svc_set_rpc_status(SerialServiceRpcStatus status);
+
 void serial_svc_notify_buffer_is_empty();
 
 void serial_svc_stop();
diff --git a/firmware/targets/f7/furi_hal/furi_hal_bt_serial.c b/firmware/targets/f7/furi_hal/furi_hal_bt_serial.c
index 9bdad5bf2..aa09dde52 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_bt_serial.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_bt_serial.c
@@ -31,6 +31,16 @@ void furi_hal_bt_serial_notify_buffer_is_empty() {
     serial_svc_notify_buffer_is_empty();
 }
 
+void furi_hal_bt_serial_set_rpc_status(FuriHalBtSerialRpcStatus status) {
+    SerialServiceRpcStatus st;
+    if(status == FuriHalBtSerialRpcStatusActive) {
+        st = SerialServiceRpcStatusActive;
+    } else {
+        st = SerialServiceRpcStatusNotActive;
+    }
+    serial_svc_set_rpc_status(st);
+}
+
 bool furi_hal_bt_serial_tx(uint8_t* data, uint16_t size) {
     if(size > FURI_HAL_BT_SERIAL_PACKET_SIZE_MAX) {
         return false;
diff --git a/firmware/targets/furi_hal_include/furi_hal_bt_serial.h b/firmware/targets/furi_hal_include/furi_hal_bt_serial.h
index e1b7af224..1b6e79ab0 100644
--- a/firmware/targets/furi_hal_include/furi_hal_bt_serial.h
+++ b/firmware/targets/furi_hal_include/furi_hal_bt_serial.h
@@ -8,6 +8,11 @@ extern "C" {
 
 #define FURI_HAL_BT_SERIAL_PACKET_SIZE_MAX SERIAL_SVC_DATA_LEN_MAX
 
+typedef enum {
+    FuriHalBtSerialRpcStatusNotActive,
+    FuriHalBtSerialRpcStatusActive,
+} FuriHalBtSerialRpcStatus;
+
 /** Serial service callback type */
 typedef SerialServiceEventCallback FuriHalBtSerialCallback;
 
@@ -30,6 +35,12 @@ void furi_hal_bt_serial_set_event_callback(
     FuriHalBtSerialCallback callback,
     void* context);
 
+/** Set BLE RPC status
+ *
+ * @param status        FuriHalBtSerialRpcStatus instance
+ */
+void furi_hal_bt_serial_set_rpc_status(FuriHalBtSerialRpcStatus status);
+
 /** Notify that application buffer is empty
  */
 void furi_hal_bt_serial_notify_buffer_is_empty();

From f81999ea4a0dff606e0a19c6e50f3459e2ec3689 Mon Sep 17 00:00:00 2001
From: Nikolay Minaylov <nm29719@gmail.com>
Date: Fri, 14 Oct 2022 20:35:53 +0300
Subject: [PATCH 05/10] Fix number of dolphin_apps (#1874)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: あく <alleteam@gmail.com>
---
 applications/services/dolphin/helpers/dolphin_deed.c | 6 ++----
 applications/services/dolphin/helpers/dolphin_deed.h | 3 ---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/applications/services/dolphin/helpers/dolphin_deed.c b/applications/services/dolphin/helpers/dolphin_deed.c
index d3c40298d..ce3e058b5 100644
--- a/applications/services/dolphin/helpers/dolphin_deed.c
+++ b/applications/services/dolphin/helpers/dolphin_deed.c
@@ -35,9 +35,9 @@ static const DolphinDeedWeight dolphin_deed_weights[] = {
     {2, DolphinAppIbutton}, // DolphinDeedIbuttonAdd
 
     {3, DolphinAppBadusb}, // DolphinDeedBadUsbPlayScript
-    {3, DolphinAppU2f}, // DolphinDeedU2fAuthorized
+    {3, DolphinAppPlugin}, // DolphinDeedU2fAuthorized
 
-    {1, DolphinAppGpio}, // DolphinDeedGpioUartBridge
+    {1, DolphinAppPlugin}, // DolphinDeedGpioUartBridge
 
     {1, DolphinAppPlugin}, // DolphinDeedPluginStart
     {1, DolphinAppPlugin}, // DolphinDeedPluginGameStart
@@ -51,8 +51,6 @@ static uint8_t dolphin_deed_limits[] = {
     20, // DolphinAppIr
     20, // DolphinAppIbutton
     20, // DolphinAppBadusb
-    20, // DolphinAppU2f
-    20, // DolphinAppGpio
     20, // DolphinAppPlugin
 };
 
diff --git a/applications/services/dolphin/helpers/dolphin_deed.h b/applications/services/dolphin/helpers/dolphin_deed.h
index 969f0d5cc..abe027d79 100644
--- a/applications/services/dolphin/helpers/dolphin_deed.h
+++ b/applications/services/dolphin/helpers/dolphin_deed.h
@@ -13,8 +13,6 @@ typedef enum {
     DolphinAppIr,
     DolphinAppIbutton,
     DolphinAppBadusb,
-    DolphinAppU2f,
-    DolphinAppGpio,
     DolphinAppPlugin,
     DolphinAppMAX,
 } DolphinApp;
@@ -55,7 +53,6 @@ typedef enum {
     DolphinDeedBadUsbPlayScript,
 
     DolphinDeedU2fAuthorized,
-
     DolphinDeedGpioUartBridge,
 
     DolphinDeedPluginStart,

From 865baed0bbcd30fc378f2e92eb00ebc20be8dcdd Mon Sep 17 00:00:00 2001
From: Kevin Kwok <antimatter15@gmail.com>
Date: Fri, 14 Oct 2022 11:07:23 -0700
Subject: [PATCH 06/10] Fix FileNotFoundError in ./fbt flash_usb (#1876)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix FileNotFoundError in ./fbt flash_usb
* scripts: update.py: proper fix for file naming

Co-authored-by: あく <alleteam@gmail.com>
Co-authored-by: hedger <hedger@nanode.su>
---
 scripts/update.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/update.py b/scripts/update.py
index 6be1dce06..3259c5b09 100755
--- a/scripts/update.py
+++ b/scripts/update.py
@@ -78,8 +78,12 @@ class Main(App):
 
     def generate(self):
         stage_basename = "updater.bin"  # used to be basename(self.args.stage)
-        dfu_basename = "firmware.dfu"  # used to be basename(self.args.dfu)
-        radiobin_basename = "radio.bin"  # used to be basename(self.args.radiobin)
+        dfu_basename = (
+            "firmware.dfu" if self.args.dfu else ""
+        )  # used to be basename(self.args.dfu)
+        radiobin_basename = (
+            "radio.bin" if self.args.radiobin else ""
+        )  # used to be basename(self.args.radiobin)
         resources_basename = ""
 
         radio_version = 0

From d0d94a9b82cc306dce60cd6e49a0bd222dd5927f Mon Sep 17 00:00:00 2001
From: RogueMaster <anifan115@gmail.com>
Date: Fri, 14 Oct 2022 14:11:40 -0400
Subject: [PATCH 07/10] Update ReadMe.md

---
 ReadMe.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ReadMe.md b/ReadMe.md
index 9f3b4a252..553a8ba74 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -11,11 +11,8 @@
 
 - To avoid Application errors and duplicates, delete /ext/apps before doing the RM firmware update
 - Known Issues:	 `Chess`
-- Last Synced/Checked [Unleashed/xMasterX](https://github.com/DarkFlippers/unleashed-firmware), changes in [changelog](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/CHANGELOG.md): `2022-10-14 16:52 GMT`
-- Last Synced/Checked [OFW](https://github.com/flipperdevices/flipperzero-firmware), changes in [commits](https://github.com/flipperdevices/flipperzero-firmware/commits/dev): `2022-10-14 16:52 GMT`
-- Added: [Tuning Fork (By besya)](https://github.com/besya/flipperzero-tuning-fork)[PR by skizzophrenic](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/360)
-- Fixed Desktop issue [By skizzophrenic/Talking-Sasquach](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/363)
-- Update from OFW PR to fix dolphion level issue, level may reset again
+- Last Synced/Checked [Unleashed/xMasterX](https://github.com/DarkFlippers/unleashed-firmware), changes in [changelog](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/CHANGELOG.md): `2022-10-14 18:11 GMT`
+- Last Synced/Checked [OFW](https://github.com/flipperdevices/flipperzero-firmware), changes in [commits](https://github.com/flipperdevices/flipperzero-firmware/commits/dev): `2022-10-14 18:11 GMT`
 
 <details>
   <summary><B>TO DO / REMOVED</b></summary><br/>

From f06930e4ae98bfad66c38f9bea5bb67601c64001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=81=8F?= <alleteam@gmail.com>
Date: Sat, 15 Oct 2022 03:23:06 +0900
Subject: [PATCH 08/10] Desktop: fix fap in settings (#1877)

---
 applications/main/fap_loader/application.fam               | 1 +
 .../scenes/desktop_settings_scene_favorite.c               | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/applications/main/fap_loader/application.fam b/applications/main/fap_loader/application.fam
index bd0403e0e..784ee9508 100644
--- a/applications/main/fap_loader/application.fam
+++ b/applications/main/fap_loader/application.fam
@@ -3,6 +3,7 @@ App(
     name="Applications",
     apptype=FlipperAppType.APP,
     entry_point="fap_loader_app",
+    cdefines=["APP_FAP_LOADER"],
     requires=[
         "gui",
         "storage",
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c
index 07ba9925f..bdd9589ed 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c
@@ -11,9 +11,16 @@ static bool favorite_fap_selector_item_callback(
     uint8_t** icon_ptr,
     FuriString* item_name) {
     UNUSED(context);
+#ifdef APP_FAP_LOADER
     Storage* storage = furi_record_open(RECORD_STORAGE);
     bool success = fap_loader_load_name_and_icon(file_path, storage, icon_ptr, item_name);
     furi_record_close(RECORD_STORAGE);
+#else
+    UNUSED(file_path);
+    UNUSED(icon_ptr);
+    UNUSED(item_name);
+    bool success = false;
+#endif
     return success;
 }
 

From 6442caa3e456d7549899e8a6f8022f30f42b6058 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 14 Oct 2022 01:31:44 +0300
Subject: [PATCH 09/10] Revert "fbt - fix flash usb without resources "

This reverts commit ce173fd44c1dd5d7dc8b072fb91a073d78150061.
---
 scripts/update.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/scripts/update.py b/scripts/update.py
index 1ff818c46..6be1dce06 100755
--- a/scripts/update.py
+++ b/scripts/update.py
@@ -80,7 +80,6 @@ class Main(App):
         stage_basename = "updater.bin"  # used to be basename(self.args.stage)
         dfu_basename = "firmware.dfu"  # used to be basename(self.args.dfu)
         radiobin_basename = "radio.bin"  # used to be basename(self.args.radiobin)
-        radiobin_basename_arg = basename(self.args.radiobin)
         resources_basename = ""
 
         radio_version = 0
@@ -116,7 +115,7 @@ class Main(App):
         if self.args.dfu:
             dfu_size = os.stat(self.args.dfu).st_size
             shutil.copyfile(self.args.dfu, join(self.args.directory, dfu_basename))
-        if radiobin_basename_arg:
+        if radiobin_basename:
             shutil.copyfile(
                 self.args.radiobin, join(self.args.directory, radiobin_basename)
             )
@@ -156,13 +155,10 @@ class Main(App):
         file.writeComment("little-endian hex!")
         file.writeKey("Loader CRC", self.int2ffhex(self.crc(self.args.stage)))
         file.writeKey("Firmware", dfu_basename)
-        if radiobin_basename_arg:
-            file.writeKey("Radio", radiobin_basename)
-        else:
-            file.writeKey("Radio", "")
+        file.writeKey("Radio", radiobin_basename or "")
         file.writeKey("Radio address", self.int2ffhex(radio_addr))
         file.writeKey("Radio version", self.int2ffhex(radio_version, 12))
-        if radiobin_basename_arg:
+        if radiobin_basename:
             file.writeKey("Radio CRC", self.int2ffhex(self.crc(self.args.radiobin)))
         else:
             file.writeKey("Radio CRC", self.int2ffhex(0))

From e631285ff3620c06a68db0aaddab1fd065b3a13a Mon Sep 17 00:00:00 2001
From: RogueMaster <anifan115@gmail.com>
Date: Fri, 14 Oct 2022 16:25:24 -0400
Subject: [PATCH 10/10] Update ReadMe.md

---
 ReadMe.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReadMe.md b/ReadMe.md
index 553a8ba74..0f4b96e53 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -11,8 +11,8 @@
 
 - To avoid Application errors and duplicates, delete /ext/apps before doing the RM firmware update
 - Known Issues:	 `Chess`
-- Last Synced/Checked [Unleashed/xMasterX](https://github.com/DarkFlippers/unleashed-firmware), changes in [changelog](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/CHANGELOG.md): `2022-10-14 18:11 GMT`
-- Last Synced/Checked [OFW](https://github.com/flipperdevices/flipperzero-firmware), changes in [commits](https://github.com/flipperdevices/flipperzero-firmware/commits/dev): `2022-10-14 18:11 GMT`
+- Last Synced/Checked [Unleashed/xMasterX](https://github.com/DarkFlippers/unleashed-firmware), changes in [changelog](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/CHANGELOG.md): `2022-10-14 20:25 GMT`
+- Last Synced/Checked [OFW](https://github.com/flipperdevices/flipperzero-firmware), changes in [commits](https://github.com/flipperdevices/flipperzero-firmware/commits/dev): `2022-10-14 20:25 GMT`
 
 <details>
   <summary><B>TO DO / REMOVED</b></summary><br/>