diff --git a/.drone.yml b/.drone.yml index 862a83d2c..7d63ae1c4 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 @@ -92,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 @@ -113,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 @@ -128,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 @@ -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 @@ -319,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 @@ -340,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 diff --git a/.gitignore b/.gitignore index 813505b50..d3e1ef2c8 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 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/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; 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,