From a928cb6ed7c68a2521a3c932792aaa480d9318ed Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Tue, 16 Aug 2022 09:43:21 +0300 Subject: [PATCH] add some checks for custom flipper name and update audio ir asset by Amec0e --- CHANGELOG.md | 9 +++---- .../subghz/scenes/subghz_scene_show_only_rx.c | 2 +- assets/resources/Manifest | 4 +-- assets/resources/infrared/assets/audio.ir | 26 +++++++++++++++++++ scripts/sconsdist.py | 2 +- scripts/version.py | 2 +- 6 files changed, 35 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32357fc39..a7339cb86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,8 @@ ### New changes -* Add extra frequencies and modulations in SubGHz -* Allow setting custom flipper name - details -> [How to change Flipper name](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/CustomFlipperName.md) -* Updated Universal remote assets -* Some small changes, use record defines in apps -* OFW: fbt: support for LOADER_AUTOSTART; post-build size stats +* Added Volume buttons support for Universal audio remote +* Updated Universal remote assets and nfc dict +* Added some extra checks for custom flipper names +* OFW: replaced icon and some gui changes **Note: Prefer installing using web updater or by self update package, all needed assets will be installed** diff --git a/applications/subghz/scenes/subghz_scene_show_only_rx.c b/applications/subghz/scenes/subghz_scene_show_only_rx.c index 9ab9f37c6..18608dc5b 100644 --- a/applications/subghz/scenes/subghz_scene_show_only_rx.c +++ b/applications/subghz/scenes/subghz_scene_show_only_rx.c @@ -13,7 +13,7 @@ void subghz_scene_show_only_rx_on_enter(void* context) { Popup* popup = subghz->popup; const char* header_text = "Transmission is blocked"; - const char* message_text = "Frequency\nis outside of\ndefault range.\nCheck docs."; + const char* message_text = "This frequency is\noutside of default\nrange"; popup_set_header(popup, header_text, 63, 3, AlignCenter, AlignTop); popup_set_text(popup, message_text, 0, 17, AlignLeft, AlignTop); diff --git a/assets/resources/Manifest b/assets/resources/Manifest index 717bd8a5e..494331db7 100644 --- a/assets/resources/Manifest +++ b/assets/resources/Manifest @@ -1,5 +1,5 @@ V:0 -T:1660527585 +T:1660631306 D:badusb D:dolphin D:infrared @@ -242,7 +242,7 @@ F:f267f0654781049ca323b11bb4375519:581:dolphin/L3_Lab_research_128x54/frame_9.bm F:41106c0cbc5144f151b2b2d3daaa0527:727:dolphin/L3_Lab_research_128x54/meta.txt D:infrared/assets F:cedef6d481ec8a10072168bfe82b9ec4:60995:infrared/assets/ac.ir -F:32f6c92ac6e32a86c71115ff26672422:46580:infrared/assets/audio.ir +F:36aa7f5091da97b5ebde068f87273673:46941:infrared/assets/audio.ir F:8c76edec36ff5ea6681e125018b73d77:123998:infrared/assets/tv.ir F:a157a80f5a668700403d870c23b9567d:470:music_player/Marble_Machine.fmf D:nfc/assets diff --git a/assets/resources/infrared/assets/audio.ir b/assets/resources/infrared/assets/audio.ir index cb400f896..86eb92029 100644 --- a/assets/resources/infrared/assets/audio.ir +++ b/assets/resources/infrared/assets/audio.ir @@ -623,6 +623,32 @@ frequency: 38000 duty_cycle: 0.330000 data: 3486 1728 448 448 420 1318 419 423 445 451 417 452 416 454 425 444 424 445 423 446 422 447 421 448 420 421 447 449 419 1319 418 451 417 453 415 453 426 444 424 445 423 446 422 447 421 1317 420 449 419 1319 418 451 417 452 416 453 415 454 425 445 423 446 422 447 421 447 421 421 447 1291 446 423 445 425 443 1322 415 1322 425 444 424 445 423 446 422 1289 448 448 420 422 446 1292 445 451 417 452 416 1322 415 74924 3486 1755 421 447 421 1317 420 449 419 450 418 451 417 452 416 453 415 454 425 417 451 445 423 446 422 420 448 448 420 1317 420 450 418 451 417 452 416 426 442 427 452 444 424 445 423 1315 422 447 421 1317 420 449 419 450 418 451 417 425 443 453 415 454 425 444 424 418 450 446 422 1315 422 448 420 421 447 1291 446 1319 418 451 417 452 416 454 414 1323 424 445 423 419 449 1316 421 422 446 450 418 1293 444 74912 3487 1755 421 448 420 1290 447 423 445 451 417 452 416 453 415 454 425 445 423 446 422 446 422 447 421 421 447 449 419 1319 418 452 416 426 442 454 425 444 424 445 423 446 422 447 421 1290 447 449 419 1319 418 452 416 452 416 453 415 427 451 445 423 446 422 447 421 448 420 449 419 1319 418 424 444 452 416 1322 415 1323 424 444 424 445 423 446 422 1317 420 449 419 423 445 1320 417 453 415 427 452 1313 424 # +# POLK AUDIO +# +name: POWER +type: parsed +protocol: NECext +address: C8 91 00 00 +command: 00 FF 00 00 +# +name: MUTE +type: parsed +protocol: NECext +address: C8 91 00 00 +command: 20 DF 00 00 +# +name: VOL+ +type: parsed +protocol: NECext +address: C8 91 00 00 +command: 1E E1 00 00 +# +name: VOL- +type: parsed +protocol: NECext +address: C8 91 00 00 +command: 1F E0 00 00 +# # PHILLIPS # name: VOL+ diff --git a/scripts/sconsdist.py b/scripts/sconsdist.py index 2520f130a..f5eaf0e3b 100644 --- a/scripts/sconsdist.py +++ b/scripts/sconsdist.py @@ -138,7 +138,7 @@ class Main(App): environ.get("CUSTOM_FLIPPER_NAME", None) or "" ) - if (log_custom_fz_name != ""): + if (log_custom_fz_name != "") and (len(log_custom_fz_name) <= 8) and (log_custom_fz_name.isalnum()) and (log_custom_fz_name.isascii()): self.logger.info( f"Flipper Custom Name is set:\n\tName: {log_custom_fz_name} : length - {len(log_custom_fz_name)} chars" ) diff --git a/scripts/version.py b/scripts/version.py index 5f34f1b1f..a51909233 100644 --- a/scripts/version.py +++ b/scripts/version.py @@ -42,7 +42,7 @@ class GitVersion: or "" ) - if (custom_fz_name != "") and (len(custom_fz_name) <= 8): + if (custom_fz_name != "") and (len(custom_fz_name) <= 8) and (custom_fz_name.isalnum()) and (custom_fz_name.isascii()): return { "GIT_COMMIT": commit, "GIT_BRANCH": branch,