From 62fbf868fe8417cdd281031a6364d93a6c4eace0 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sun, 1 Jan 2023 23:47:47 +0300
Subject: [PATCH 1/5] Fix dev builds

Drone ssh defaults to arm now.. so need to specify amd64 arch
---
 .drone.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 862a83d2c..c4abce31e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,6 +2,10 @@ kind: pipeline
 type: docker
 name: "Release firmware"
 
+platform:
+  os: linux
+  arch: amd64
+
 steps:
   - name: "Update submodules"
     image: alpine/git
@@ -249,6 +253,10 @@ kind: pipeline
 type: docker
 name: "Dev build"
 
+platform:
+  os: linux
+  arch: amd64
+
 steps:
   - name: "Update submodules"
     image: alpine/git
@@ -304,7 +312,7 @@ steps:
       - ls -laS dev
 
   - name: "Clean dev folder"
-    image: appleboy/drone-ssh
+    image: appleboy/drone-ssh:linux-amd64
     settings:
       host:
         from_secret: dep_host

From 1534bcf7cb7ba351a401b4d560a82bf2706418d5 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sun, 1 Jan 2023 23:59:09 +0300
Subject: [PATCH 2/5] Why?!

appleboy broke 'latest' tag on dockerhub, its only for arm now
so, applying hotfix for now
---
 .drone.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c4abce31e..7d63ae1c4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -96,7 +96,7 @@ steps:
       - ls -laS ${DRONE_TAG}
 
   - name: "Upload default to updates srv"
-    image: appleboy/drone-scp
+    image: appleboy/drone-scp:linux-amd64
     settings:
       host:
         from_secret: dep_host
@@ -117,7 +117,7 @@ steps:
         - ${DRONE_TAG}/*.bin
 
   - name: "Upload no-anims to updates srv"
-    image: appleboy/drone-scp
+    image: appleboy/drone-scp:linux-amd64
     settings:
       host:
         from_secret: dep_host
@@ -132,7 +132,7 @@ steps:
       source: flipper-z-f7-update-${DRONE_TAG}n.tgz
 
   - name: "Upload extra apps version to updates srv"
-    image: appleboy/drone-scp
+    image: appleboy/drone-scp:linux-amd64
     settings:
       host:
         from_secret: dep_host
@@ -327,7 +327,7 @@ steps:
         - cd web/unleashedflip.com/public_html/fw/dev && rm -f ./*
 
   - name: "Upload default to updates srv"
-    image: appleboy/drone-scp
+    image: appleboy/drone-scp:linux-amd64
     settings:
       host:
         from_secret: dep_host
@@ -348,7 +348,7 @@ steps:
         - dev/*.bin
 
   - name: "Upload extra apps version to updates srv"
-    image: appleboy/drone-scp
+    image: appleboy/drone-scp:linux-amd64
     settings:
       host:
         from_secret: dep_host

From 72dc8e95d0941849929af98fd51a24590d61ca31 Mon Sep 17 00:00:00 2001
From: Georgii Surkov <37121527+gsurkov@users.noreply.github.com>
Date: Mon, 2 Jan 2023 12:01:59 +0300
Subject: [PATCH 3/5] Add .kateconfig and .kateproject to .gitignore (#2237)

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 61c594ed1..d54ed4a19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,10 @@ Brewfile.lock.json
 # Visual Studio Code
 .vscode/
 
+# Kate
+.kateproject
+.kateconfig
+
 # legendary cmake's
 build
 CMakeLists.txt

From 82f8ad45403f29d132034bf368742023c1071f52 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Tue, 3 Jan 2023 18:40:03 +0300
Subject: [PATCH 4/5] Add 350Mhz to default range

Actually this frequency is used by some part of home devices like ceiling fans
---
 .../subghz/views/subghz_frequency_analyzer.c  |  8 ++--
 documentation/DangerousSettings.md            |  2 +-
 documentation/SubGHzSettings.md               | 38 ++++++++++++++++++-
 .../targets/f7/furi_hal/furi_hal_subghz.c     |  2 +-
 lib/subghz/subghz_setting.c                   |  1 +
 5 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/applications/main/subghz/views/subghz_frequency_analyzer.c b/applications/main/subghz/views/subghz_frequency_analyzer.c
index ff971fd3b..4ca2afed2 100644
--- a/applications/main/subghz/views/subghz_frequency_analyzer.c
+++ b/applications/main/subghz/views/subghz_frequency_analyzer.c
@@ -23,10 +23,10 @@
 static const uint32_t subghz_frequency_list[] = {
     300000000, 302757000, 303875000, 304250000, 307000000, 307500000, 307800000, 309000000,
     310000000, 312000000, 312100000, 313000000, 313850000, 314000000, 314350000, 314980000,
-    315000000, 318000000, 330000000, 345000000, 348000000, 387000000, 390000000, 418000000,
-    433075000, 433220000, 433420000, 433657070, 433889000, 433920000, 434075000, 434176948,
-    434390000, 434420000, 434775000, 438900000, 440175000, 464000000, 779000000, 868350000,
-    868400000, 868800000, 868950000, 906400000, 915000000, 925000000, 928000000};
+    315000000, 318000000, 330000000, 345000000, 348000000, 350000000, 387000000, 390000000,
+    418000000, 433075000, 433220000, 433420000, 433657070, 433889000, 433920000, 434075000,
+    434176948, 434390000, 434420000, 434775000, 438900000, 440175000, 464000000, 779000000,
+    868350000, 868400000, 868800000, 868950000, 906400000, 915000000, 925000000, 928000000};
 
 typedef enum {
     SubGhzFrequencyAnalyzerStatusIDLE,
diff --git a/documentation/DangerousSettings.md b/documentation/DangerousSettings.md
index 780724644..1da2fc4ab 100644
--- a/documentation/DangerousSettings.md
+++ b/documentation/DangerousSettings.md
@@ -1,6 +1,6 @@
 ## How to extend SubGHz supported frequency range
 
-#### CC1101 Frequency range specs: 300-348 MHz, 386-464 MHz, and 778-928 MHz 
+#### CC1101 Frequency range specs: 300-348 MHz, 386-464 MHz, and 778-928 MHz  (+ 350MHz was added to default range)
 #### This setting will extend to: 281-361 MHz, 378-481 MHz, and 749-962 MHz
 
 1. Please do not do that unless you know what exactly you are doing
diff --git a/documentation/SubGHzSettings.md b/documentation/SubGHzSettings.md
index 2ab508ee1..906da27f2 100644
--- a/documentation/SubGHzSettings.md
+++ b/documentation/SubGHzSettings.md
@@ -1,6 +1,6 @@
 ## How to add new SubGHz frequencies
 
-#### CC1101 Frequency range specs: 300-348 MHz, 386-464 MHz, and 778-928 MHz 
+#### CC1101 Frequency range specs: 300-348 MHz, 386-464 MHz, and 778-928 MHz  (+ 350MHz was added to default range)
 
 Edit user settings file located on your microSD card - `subghz/assets/setting_user`
 
@@ -11,26 +11,60 @@ if you need your custom one, make sure it doesn't listed here
 ```
     /* 300 - 348 */
     300000000,
+    302757000,
     303875000,
     304250000,
+    307000000,
+    307500000,
+    307800000,
+    309000000,
     310000000,
+    312000000,
+    312100000,
+    312200000,
+    313000000,
+    313850000,
+    314000000,
+    314350000,
+    314980000,
     315000000,
     318000000,
+    330000000,
+    345000000,
+    348000000,
+    350000000,
 
     /* 387 - 464 */
+    387000000,
     390000000,
     418000000,
     433075000, /* LPD433 first */
+    433220000,
     433420000,
-    433920000  /* LPD433 mid */
+    433657070,
+    433889000,
+    433920000 | FREQUENCY_FLAG_DEFAULT, /* LPD433 mid */
+    434075000,
+    434176948,
+    434190000,
+    434390000,
     434420000,
+    434620000,
     434775000, /* LPD433 last channels */
     438900000,
+    440175000,
+    464000000,
 
     /* 779 - 928 */
+    779000000,
     868350000,
+    868400000,
+    868800000,
+    868950000,
+    906400000,
     915000000,
     925000000,
+    928000000,
 ```
 
 ### User frequencies added AFTER that default list! You need to continue until you reach the end of that list
diff --git a/firmware/targets/f7/furi_hal/furi_hal_subghz.c b/firmware/targets/f7/furi_hal/furi_hal_subghz.c
index b32f171f1..4ea6f3524 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_subghz.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_subghz.c
@@ -338,7 +338,7 @@ bool furi_hal_subghz_is_tx_allowed(uint32_t value) {
     flipper_format_free(fff_data_file);
     furi_record_close(RECORD_STORAGE);
 
-    if(!(value >= 299999755 && value <= 348000335) &&
+    if(!(value >= 299999755 && value <= 350000335) &&
        !(value >= 386999938 && value <= 464000000) &&
        !(value >= 778999847 && value <= 928000000) && !(is_extended)) {
         FURI_LOG_I(TAG, "Frequency blocked - outside default range");
diff --git a/lib/subghz/subghz_setting.c b/lib/subghz/subghz_setting.c
index 733fc35b5..4261a5d39 100644
--- a/lib/subghz/subghz_setting.c
+++ b/lib/subghz/subghz_setting.c
@@ -39,6 +39,7 @@ static const uint32_t subghz_frequency_list[] = {
     330000000,
     345000000,
     348000000,
+    350000000,
 
     /* 387 - 464 */
     387000000,

From 28345b2fbdb96c03c3f6d844b542da9c131b3276 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Tue, 3 Jan 2023 18:41:22 +0300
Subject: [PATCH 5/5] Update TOTP

https://github.com/akopachov/flipper-zero_authenticator
---
 applications/plugins/totp/types/token_info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/plugins/totp/types/token_info.c b/applications/plugins/totp/types/token_info.c
index b9d22808d..b43293788 100644
--- a/applications/plugins/totp/types/token_info.c
+++ b/applications/plugins/totp/types/token_info.c
@@ -34,7 +34,7 @@ bool token_info_set_secret(
     int plain_secret_length =
         base32_decode((const uint8_t*)base32_token_secret, plain_secret, token_secret_length);
     bool result;
-    if(plain_secret_length >= 0) {
+    if(plain_secret_length > 0) {
         token_info->token =
             totp_crypto_encrypt(plain_secret, plain_secret_length, iv, &token_info->token_length);
         result = true;