From 62e56e2618baaf46333954d1e47cab2dd71d02b8 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Thu, 29 Sep 2022 08:20:00 +0300 Subject: [PATCH 1/5] rename apps to make it look a bit better in Apps tab in archive app now old assets are removed so we can avoid duplicates --- applications/debug/application.fam | 4 ++-- applications/debug/uart_echo/application.fam | 2 +- applications/debug/usb_mouse/application.fam | 2 +- applications/plugins/arkanoid/application.fam | 2 +- applications/plugins/barcode_generator/application.fam | 2 +- applications/plugins/bt_hid_app/application.fam | 2 +- applications/plugins/doom/application.fam | 2 +- applications/plugins/esp8266_deauth/application.fam | 2 +- applications/plugins/flappy_bird/application.fam | 2 +- applications/plugins/flipfrid/application.fam | 2 +- applications/plugins/mousejacker/application.fam | 2 +- applications/plugins/multi_converter/application.fam | 2 +- applications/plugins/music_player/application.fam | 2 +- applications/plugins/nrfsniff/application.fam | 2 +- applications/plugins/picopass/application.fam | 2 +- applications/plugins/playlist/application.fam | 2 +- applications/plugins/sentry_safe/application.fam | 2 +- applications/plugins/signal_generator/application.fam | 2 +- applications/plugins/snake_game/application.fam | 2 +- applications/plugins/spectrum_analyzer/application.fam | 2 +- applications/plugins/subbrute/application.fam | 2 +- applications/plugins/tetris_game/application.fam | 2 +- applications/plugins/tictactoe_game/application.fam | 2 +- applications/plugins/wav_player/application.fam | 2 +- applications/plugins/wifi_marauder_companion/application.fam | 2 +- applications/plugins/wifi_scanner/application.fam | 2 +- applications/plugins/zombiez/application.fam | 2 +- applications/services/desktop/scenes/desktop_scene_main.c | 4 ++-- 28 files changed, 30 insertions(+), 30 deletions(-) diff --git a/applications/debug/application.fam b/applications/debug/application.fam index a33b3693d..c52907002 100644 --- a/applications/debug/application.fam +++ b/applications/debug/application.fam @@ -7,8 +7,8 @@ App( "vibro_test", "keypad_test", "usb_test", - "usb_mouse", - "uart_echo", + "USB_Mouse", + "UART_Echo", "display_test", "text_box_test", "file_browser_test", diff --git a/applications/debug/uart_echo/application.fam b/applications/debug/uart_echo/application.fam index 956aa17af..a979c2e4f 100644 --- a/applications/debug/uart_echo/application.fam +++ b/applications/debug/uart_echo/application.fam @@ -1,5 +1,5 @@ App( - appid="uart_echo", + appid="UART_Echo", name="UART Echo", apptype=FlipperAppType.PLUGIN, entry_point="uart_echo_app", diff --git a/applications/debug/usb_mouse/application.fam b/applications/debug/usb_mouse/application.fam index 9c2f19da6..fb7595e10 100644 --- a/applications/debug/usb_mouse/application.fam +++ b/applications/debug/usb_mouse/application.fam @@ -1,5 +1,5 @@ App( - appid="usb_mouse", + appid="USB_Mouse", name="USB Mouse", apptype=FlipperAppType.PLUGIN, entry_point="usb_mouse_app", diff --git a/applications/plugins/arkanoid/application.fam b/applications/plugins/arkanoid/application.fam index 99a2f10bc..05520b4bf 100644 --- a/applications/plugins/arkanoid/application.fam +++ b/applications/plugins/arkanoid/application.fam @@ -1,5 +1,5 @@ App( - appid="arkanoid_game", + appid="Arkanoid", name="Arkanoid", apptype=FlipperAppType.EXTERNAL, entry_point="arkanoid_game_app", diff --git a/applications/plugins/barcode_generator/application.fam b/applications/plugins/barcode_generator/application.fam index 05ddbae0f..0724fdfba 100644 --- a/applications/plugins/barcode_generator/application.fam +++ b/applications/plugins/barcode_generator/application.fam @@ -1,5 +1,5 @@ App( - appid="barcode_generator", + appid="Barcode_Generator", name="UPC-A Generator", apptype=FlipperAppType.EXTERNAL, entry_point="barcode_UPCA_generator_app", diff --git a/applications/plugins/bt_hid_app/application.fam b/applications/plugins/bt_hid_app/application.fam index e6a3b1752..e18783e9a 100644 --- a/applications/plugins/bt_hid_app/application.fam +++ b/applications/plugins/bt_hid_app/application.fam @@ -1,5 +1,5 @@ App( - appid="bt_hid", + appid="Bluetooth_Remote", name="Bluetooth Remote", apptype=FlipperAppType.PLUGIN, entry_point="bt_hid_app", diff --git a/applications/plugins/doom/application.fam b/applications/plugins/doom/application.fam index a032e14eb..d9ae4d67d 100644 --- a/applications/plugins/doom/application.fam +++ b/applications/plugins/doom/application.fam @@ -1,5 +1,5 @@ App( - appid="game_doom", + appid="DOOM", name="DOOM", apptype=FlipperAppType.EXTERNAL, entry_point="doom_app", diff --git a/applications/plugins/esp8266_deauth/application.fam b/applications/plugins/esp8266_deauth/application.fam index 8342edfba..0b305e1fb 100644 --- a/applications/plugins/esp8266_deauth/application.fam +++ b/applications/plugins/esp8266_deauth/application.fam @@ -1,5 +1,5 @@ App( - appid="esp8266_deauth", + appid="ESP8266_Deauther", name="[ESP8266] Deauther", apptype=FlipperAppType.EXTERNAL, entry_point="esp8266_deauth_app", diff --git a/applications/plugins/flappy_bird/application.fam b/applications/plugins/flappy_bird/application.fam index daee5791d..dd8c67e85 100644 --- a/applications/plugins/flappy_bird/application.fam +++ b/applications/plugins/flappy_bird/application.fam @@ -1,5 +1,5 @@ App( - appid="game_flappybird", + appid="FlappyBird", name="Flappy Bird", apptype=FlipperAppType.EXTERNAL, entry_point="flappy_game_app", diff --git a/applications/plugins/flipfrid/application.fam b/applications/plugins/flipfrid/application.fam index 77cfefbed..4a09f1064 100644 --- a/applications/plugins/flipfrid/application.fam +++ b/applications/plugins/flipfrid/application.fam @@ -1,5 +1,5 @@ App( - appid="flipfrid", + appid="RFID_Fuzzer", name="RFID Fuzzer", apptype=FlipperAppType.EXTERNAL, entry_point="flipfrid_start", diff --git a/applications/plugins/mousejacker/application.fam b/applications/plugins/mousejacker/application.fam index 9c71bf7a3..07ee51ae3 100644 --- a/applications/plugins/mousejacker/application.fam +++ b/applications/plugins/mousejacker/application.fam @@ -1,5 +1,5 @@ App( - appid="mouse_jacker", + appid="NRF24_Mouse_Jacker", name="[NRF24] Mouse Jacker", apptype=FlipperAppType.EXTERNAL, entry_point="mousejacker_app", diff --git a/applications/plugins/multi_converter/application.fam b/applications/plugins/multi_converter/application.fam index 5da46e06b..b19bce895 100644 --- a/applications/plugins/multi_converter/application.fam +++ b/applications/plugins/multi_converter/application.fam @@ -1,5 +1,5 @@ App( - appid="multi_converter", + appid="Multi_Converter", name="Multi Converter", apptype=FlipperAppType.EXTERNAL, entry_point="multi_converter_app", diff --git a/applications/plugins/music_player/application.fam b/applications/plugins/music_player/application.fam index 30f2b9268..cfb50c451 100644 --- a/applications/plugins/music_player/application.fam +++ b/applications/plugins/music_player/application.fam @@ -1,5 +1,5 @@ App( - appid="music_player", + appid="Music_Player", name="Music Player", apptype=FlipperAppType.PLUGIN, entry_point="music_player_app", diff --git a/applications/plugins/nrfsniff/application.fam b/applications/plugins/nrfsniff/application.fam index 269f139a9..5caa945ee 100644 --- a/applications/plugins/nrfsniff/application.fam +++ b/applications/plugins/nrfsniff/application.fam @@ -1,5 +1,5 @@ App( - appid="nrf_sniff", + appid="NRF24_Sniffer", name="[NRF24] Sniffer", apptype=FlipperAppType.EXTERNAL, entry_point="nrfsniff_app", diff --git a/applications/plugins/picopass/application.fam b/applications/plugins/picopass/application.fam index 7a81e0804..888ecc128 100644 --- a/applications/plugins/picopass/application.fam +++ b/applications/plugins/picopass/application.fam @@ -1,5 +1,5 @@ App( - appid="picopass", + appid="Picopass", name="PicoPass Reader", apptype=FlipperAppType.EXTERNAL, entry_point="picopass_app", diff --git a/applications/plugins/playlist/application.fam b/applications/plugins/playlist/application.fam index 991809ae3..8be27aa6c 100644 --- a/applications/plugins/playlist/application.fam +++ b/applications/plugins/playlist/application.fam @@ -1,5 +1,5 @@ App( - appid="sub_playlist", + appid="SubGHz_Playlist", name="Sub-GHz Playlist", apptype=FlipperAppType.EXTERNAL, entry_point="playlist_app", diff --git a/applications/plugins/sentry_safe/application.fam b/applications/plugins/sentry_safe/application.fam index f409e0b06..070a677ba 100644 --- a/applications/plugins/sentry_safe/application.fam +++ b/applications/plugins/sentry_safe/application.fam @@ -1,5 +1,5 @@ App( - appid="sentry_safe", + appid="GPIO_Sentry_Safe", name="[GPIO] Sentry Safe", apptype=FlipperAppType.EXTERNAL, entry_point="sentry_safe_app", diff --git a/applications/plugins/signal_generator/application.fam b/applications/plugins/signal_generator/application.fam index 7794ee492..c2bb097a4 100644 --- a/applications/plugins/signal_generator/application.fam +++ b/applications/plugins/signal_generator/application.fam @@ -1,5 +1,5 @@ App( - appid="signal_generator", + appid="Signal_Generator", name="Signal Generator", apptype=FlipperAppType.PLUGIN, entry_point="signal_gen_app", diff --git a/applications/plugins/snake_game/application.fam b/applications/plugins/snake_game/application.fam index d55f53bb1..abf4f72c5 100644 --- a/applications/plugins/snake_game/application.fam +++ b/applications/plugins/snake_game/application.fam @@ -1,5 +1,5 @@ App( - appid="snake_game", + appid="Snake", name="Snake Game", apptype=FlipperAppType.PLUGIN, entry_point="snake_game_app", diff --git a/applications/plugins/spectrum_analyzer/application.fam b/applications/plugins/spectrum_analyzer/application.fam index 5028c999b..04bb946ee 100644 --- a/applications/plugins/spectrum_analyzer/application.fam +++ b/applications/plugins/spectrum_analyzer/application.fam @@ -1,5 +1,5 @@ App( - appid="spectrum_analyzer", + appid="Spectrum_Analyzer", name="Spectrum Analyzer", apptype=FlipperAppType.EXTERNAL, entry_point="spectrum_analyzer_app", diff --git a/applications/plugins/subbrute/application.fam b/applications/plugins/subbrute/application.fam index 1afdc539f..5e9dd9c8d 100644 --- a/applications/plugins/subbrute/application.fam +++ b/applications/plugins/subbrute/application.fam @@ -1,5 +1,5 @@ App( - appid="subbrute", + appid="SubGHz_Bruteforcer", name="Sub-GHz Bruteforcer", apptype=FlipperAppType.EXTERNAL, entry_point="subbrute_app", diff --git a/applications/plugins/tetris_game/application.fam b/applications/plugins/tetris_game/application.fam index 9a298a3d5..69dda3297 100644 --- a/applications/plugins/tetris_game/application.fam +++ b/applications/plugins/tetris_game/application.fam @@ -1,5 +1,5 @@ App( - appid="tetris_game", + appid="Tetris", name="Tetris", apptype=FlipperAppType.EXTERNAL, entry_point="tetris_game_app", diff --git a/applications/plugins/tictactoe_game/application.fam b/applications/plugins/tictactoe_game/application.fam index 289f4f88d..2e769417e 100644 --- a/applications/plugins/tictactoe_game/application.fam +++ b/applications/plugins/tictactoe_game/application.fam @@ -1,5 +1,5 @@ App( - appid="tictactoe_game", + appid="TicTacToe", name="Tic Tac Toe", apptype=FlipperAppType.EXTERNAL, entry_point="tictactoe_game_app", diff --git a/applications/plugins/wav_player/application.fam b/applications/plugins/wav_player/application.fam index 4e8d81ab2..394e45d29 100644 --- a/applications/plugins/wav_player/application.fam +++ b/applications/plugins/wav_player/application.fam @@ -1,5 +1,5 @@ App( - appid="wav_player", + appid="WAV_Player", name="WAV Player", apptype=FlipperAppType.EXTERNAL, entry_point="wav_player_app", diff --git a/applications/plugins/wifi_marauder_companion/application.fam b/applications/plugins/wifi_marauder_companion/application.fam index 0548905d9..e3185d50a 100644 --- a/applications/plugins/wifi_marauder_companion/application.fam +++ b/applications/plugins/wifi_marauder_companion/application.fam @@ -1,5 +1,5 @@ App( - appid="wifi_marauder", + appid="ESP32_WiFi_Marauder", name="[ESP32] WiFi Marauder", apptype=FlipperAppType.EXTERNAL, entry_point="wifi_marauder_app", diff --git a/applications/plugins/wifi_scanner/application.fam b/applications/plugins/wifi_scanner/application.fam index 22ca79673..dc229efc0 100644 --- a/applications/plugins/wifi_scanner/application.fam +++ b/applications/plugins/wifi_scanner/application.fam @@ -1,5 +1,5 @@ App( - appid="wifi_scanner", + appid="WiFi_Scanner", name="[WiFi] Scanner", apptype=FlipperAppType.EXTERNAL, entry_point="wifi_scanner_app", diff --git a/applications/plugins/zombiez/application.fam b/applications/plugins/zombiez/application.fam index 14cad08ce..3245187d2 100644 --- a/applications/plugins/zombiez/application.fam +++ b/applications/plugins/zombiez/application.fam @@ -1,5 +1,5 @@ App( - appid="game_zombiez", + appid="Zombiez", name="Zombiez", apptype=FlipperAppType.EXTERNAL, entry_point="zombiez_game_app", diff --git a/applications/services/desktop/scenes/desktop_scene_main.c b/applications/services/desktop/scenes/desktop_scene_main.c index dc9ac04d0..c66ada158 100644 --- a/applications/services/desktop/scenes/desktop_scene_main.c +++ b/applications/services/desktop/scenes/desktop_scene_main.c @@ -165,8 +165,8 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) { break; } case DesktopMainEventOpenGameMenu: { - LoaderStatus status = loader_start( - desktop->loader, "Applications", EXT_PATH("/apps/Games/snake_game.fap")); + LoaderStatus status = + loader_start(desktop->loader, "Applications", EXT_PATH("/apps/Games/Snake.fap")); if(status != LoaderStatusOk) { FURI_LOG_E(TAG, "loader_start failed: %d", status); } From 972c0dcb4a0c18a81e44c72e4f53c41f0159712b Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Thu, 29 Sep 2022 08:20:30 +0300 Subject: [PATCH 2/5] hide layouts folder in badusb app --- applications/main/bad_usb/scenes/bad_usb_scene_file_select.c | 1 + applications/services/gui/modules/file_browser_worker.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_file_select.c b/applications/main/bad_usb/scenes/bad_usb_scene_file_select.c index 9eb225fd1..53e5ecc7b 100644 --- a/applications/main/bad_usb/scenes/bad_usb_scene_file_select.c +++ b/applications/main/bad_usb/scenes/bad_usb_scene_file_select.c @@ -8,6 +8,7 @@ static bool bad_usb_file_select(BadUsbApp* bad_usb) { DialogsFileBrowserOptions browser_options; dialog_file_browser_set_basic_options( &browser_options, BAD_USB_APP_SCRIPT_EXTENSION, &I_badusb_10px); + browser_options.skip_assets = true; // Input events and views are managed by file_browser bool res = dialog_file_browser_show( diff --git a/applications/services/gui/modules/file_browser_worker.c b/applications/services/gui/modules/file_browser_worker.c index 36df6cc83..a316a0779 100644 --- a/applications/services/gui/modules/file_browser_worker.c +++ b/applications/services/gui/modules/file_browser_worker.c @@ -13,6 +13,7 @@ #define TAG "BrowserWorker" #define ASSETS_DIR "assets" +#define BADUSB_LAYOUTS_DIR "layouts" #define BROWSER_ROOT STORAGE_ANY_PATH_PREFIX #define FILE_NAME_LEN_MAX 256 #define LONG_LOAD_THRESHOLD 100 @@ -78,7 +79,8 @@ static bool browser_filter_by_name(BrowserWorker* browser, string_t name, bool i if(is_folder) { // Skip assets folders (if enabled) if(browser->skip_assets) { - return ((string_cmp_str(name, ASSETS_DIR) == 0) ? (false) : (true)); + return ((string_cmp_str(name, ASSETS_DIR) == 0) ? (false) : (true)) && + ((string_cmp_str(name, BADUSB_LAYOUTS_DIR) == 0) ? (false) : (true)); } else { return true; } From 9176387b9f7e2a8b0e7e6987ab58dd7b768fb76a Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Thu, 29 Sep 2022 09:14:47 +0300 Subject: [PATCH 3/5] update assets and changelog --- CHANGELOG.md | 19 +++++------ assets/resources/infrared/assets/ac.ir | 44 +++++++++++++++++++++++++- assets/resources/infrared/assets/tv.ir | 26 ++++++++++++++- 3 files changed, 78 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00640615d..a0dd50a35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,18 @@ ### New changes -* PR: SubGHz new feature -> press Ok in Frequency analyzer to use frequency in Read modes (by @derskythe | PR #77) -* PR: SubGHz save last settings (frequency and modulation) (by @derskythe | PR #77) -* Plugins: SubGHz Bruteforcer - add chamberlain 9bit 300mhz, removed unnecessary checks (made it a bit faster), fixed title position & menu text -* SubGHz: Fix Add Manually item names, Add BETT protocol in add manually +* Hide layouts folder in badusb app +* SubGHz: Added 868.8 mhz into user config for sommer systems +* Renamed apps to make it look a bit better in Apps tab in archive app * Infrared: Update assets (by @Amec0e) -* OFW: Refactor infrared brute force code -* OFW: Add formatting to DESfire data dump +* OFW: Keyboard: show Uppercase keys when replacing content +* OFW: Furi Thread: don't use thread pointer after FuriThreadStateStopped callback +* OFW: Resources cleanup in updater +* OFW: Signal Generator app -#### **DFU files no longer included in releases to avoid issues with wrong manual installation of assets - use .tgz file with qFlipper, or install automatically via web updater or use microSD update package** +#### [🎲 Download extra apps pack](https://download-directory.github.io/?url=https://github.com/UberGuidoZ/Flipper/tree/main/Applications/Unleashed) -[- How to install](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/HowToInstall.md) +[-> How to install firmware](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/HowToInstall.md) -[- Download qFlipper 1.2.0 (allows .tgz installation) (official link)](https://update.flipperzero.one/builds/qFlipper/1.2.0/) +[-> Download qFlipper 1.2.0 (allows .tgz installation) (official link)](https://update.flipperzero.one/builds/qFlipper/1.2.0/) **Note: To avoid issues with .dfu, prefer installing using .tgz with qFlipper, web updater or by self update package, all needed assets will be installed** diff --git a/assets/resources/infrared/assets/ac.ir b/assets/resources/infrared/assets/ac.ir index 8f219bb14..54384cf40 100644 --- a/assets/resources/infrared/assets/ac.ir +++ b/assets/resources/infrared/assets/ac.ir @@ -1,7 +1,25 @@ Filetype: IR library file Version: 1 -# Last Updated 20th Sept, 2022 +# Last Updated 28th Sept, 2022 # +# SWING ON +name: SWING +type: raw +frequency: 38000 +duty_cycle: 0.330000 +data: 3158 1552 601 1065 575 1093 596 328 560 330 555 329 556 1068 573 338 545 341 544 1095 571 1096 571 341 543 1101 566 342 543 342 542 1125 543 1125 542 343 542 1124 542 1125 542 344 542 343 542 1126 542 344 541 345 541 1124 542 344 542 345 541 344 541 345 540 345 541 343 541 345 540 345 541 345 541 345 541 345 541 345 541 343 541 345 541 345 541 344 542 344 541 1127 541 345 541 344 542 1126 541 345 541 345 541 1126 541 1127 541 345 541 343 541 345 541 345 541 345 541 344 541 1127 541 346 541 1127 540 1127 541 345 541 344 541 345 541 346 540 1127 541 1127 540 344 541 1128 541 1126 541 1127 541 345 541 345 541 344 540 345 541 345 541 345 541 345 541 345 541 344 541 345 541 345 541 345 541 345 541 345 541 345 541 344 541 345 541 345 541 345 541 345 541 345 541 345 541 344 541 345 541 345 541 345 541 345 541 345 541 345 541 344 541 345 541 345 541 345 541 345 541 345 541 345 540 1127 541 345 541 345 541 344 541 346 541 1127 542 +# ON +name: POWER +type: raw +frequency: 38000 +duty_cycle: 0.330000 +data: 3126 1586 542 1123 544 1124 543 346 540 344 542 344 541 1124 543 345 541 343 541 1124 543 1125 542 346 540 1124 542 346 540 346 516 1149 518 1150 517 369 516 1151 517 1148 518 369 517 370 516 1148 518 369 516 369 541 1125 543 342 542 344 542 345 541 346 540 371 515 371 515 371 514 370 514 371 515 371 515 371 515 371 515 371 515 370 515 371 514 371 515 372 515 1151 515 371 515 372 515 1151 515 372 514 372 515 1153 514 1153 515 371 515 372 514 370 514 372 514 372 514 372 514 1153 514 1153 514 1131 538 1127 539 347 539 346 540 346 540 345 540 1128 540 347 540 1126 540 346 540 345 541 345 541 345 541 345 541 345 541 343 541 345 541 345 541 345 541 345 541 345 541 344 541 343 541 344 542 344 542 345 541 345 541 344 542 343 541 344 542 345 541 344 542 345 541 345 541 345 541 344 540 345 541 345 541 345 541 345 541 345 541 345 541 343 541 345 541 345 541 345 541 345 541 345 541 345 541 344 541 1127 541 344 541 1127 541 345 541 +# ON +name: POWER +type: raw +frequency: 38000 +duty_cycle: 0.330000 +data: 3034 3976 1907 1980 1914 2004 1880 1006 941 1032 915 999 937 1008 939 1982 933 1008 1907 2008 939 978 1916 998 970 980 936 976 971 1034 913 1000 936 1984 942 997 1939 975 941 1003 944 1004 943 999 937 1037 941 971 965 984 942 999 969 1919 975 1025 3890 3957 1936 1982 1912 1940 1944 1038 909 1033 914 996 940 1009 938 1948 967 1009 1917 1970 945 994 1942 979 937 1034 913 1003 944 1000 936 1012 935 1981 934 1008 1907 1036 932 982 944 1036 911 1027 910 1004 964 984 942 1033 914 999 937 1976 939 1008 3917 3982 1932 1922 1941 1945 1970 981 945 997 940 1008 939 1004 943 1979 936 998 1917 1943 972 1002 1913 1032 904 1013 944 1000 936 1041 906 1001 967 1923 972 1003 1912 1030 906 1009 969 975 941 1004 943 1002 945 996 940 975 972 1005 942 1944 971 968 4915 # ON name: POWER type: raw @@ -1232,4 +1250,28 @@ type: parsed protocol: NEC address: 80 00 00 00 command: 92 00 00 00 +# OFF +name: POWER +type: raw +frequency: 38000 +duty_cycle: 0.330000 +data: 3031 3980 1912 1945 1969 1950 1912 973 994 981 965 951 975 1027 909 1950 975 965 971 974 1941 1006 940 977 969 1003 964 951 975 1000 936 1006 940 973 973 1974 941 973 1942 1006 941 974 993 950 975 999 937 1036 910 975 992 952 974 998 938 1950 975 967 3947 3987 1916 2002 1881 1975 1939 947 999 943 972 971 996 948 967 1949 997 949 976 997 1907 980 966 1006 941 975 971 1001 945 999 968 945 970 976 970 1974 972 942 1942 975 992 952 994 949 977 970 997 948 967 979 967 1005 942 999 968 1923 971 1000 3914 3958 1965 1919 1995 1893 1969 984 962 954 972 996 971 973 942 1949 976 992 965 947 1947 1002 965 950 976 1001 945 997 939 1007 939 1006 940 998 969 1915 1000 944 2002 946 969 944 992 956 1001 943 972 1000 967 949 966 977 969 1001 966 1926 968 1003 4889 +# OFF +name: POWER +type: raw +frequency: 38000 +duty_cycle: 0.330000 +data: 3160 1550 576 1092 576 1091 577 329 555 338 573 329 558 1065 601 329 557 329 556 1065 601 1066 575 338 547 1093 574 339 546 339 546 1095 573 1095 572 339 546 1096 572 1097 571 341 544 341 544 1124 544 342 543 342 543 1125 542 344 542 344 541 344 542 344 542 343 541 344 542 344 542 344 542 344 542 344 542 344 542 343 541 344 542 344 542 344 542 344 542 344 542 344 542 343 541 345 542 1126 542 343 541 345 541 1126 542 1126 542 344 542 344 542 344 542 343 541 344 542 345 541 1126 541 1126 541 1127 542 1127 541 343 542 345 541 344 542 345 542 1125 541 345 542 1127 541 343 542 345 541 345 541 345 541 345 541 345 541 345 541 343 541 345 541 345 541 345 541 345 541 345 541 345 541 344 541 345 541 345 541 345 541 345 541 345 541 345 541 344 540 345 541 345 541 345 541 345 541 345 541 344 541 345 541 345 541 345 541 346 540 345 541 344 540 345 541 346 540 345 541 345 541 345 540 1128 541 1126 541 345 541 346 541 1126 541 345 541 +# SWING OFF +name: SWING +type: raw +frequency: 38000 +duty_cycle: 0.330000 +data: 3186 1522 603 1065 602 1063 603 330 554 330 556 330 551 1068 600 330 529 340 546 1093 573 1094 573 340 545 1095 573 340 545 340 545 1097 570 1098 569 343 543 1123 544 1125 542 343 542 343 542 1126 542 344 542 343 542 1126 541 344 542 345 541 345 541 343 541 344 541 345 541 344 541 345 541 345 541 345 541 343 541 345 541 345 541 345 541 344 541 345 541 344 541 1126 541 345 541 344 541 1126 541 345 541 344 541 1127 541 1125 541 345 541 345 541 345 541 345 541 345 541 344 541 1128 540 345 540 1128 541 1126 541 345 541 346 540 346 540 345 540 1129 540 1128 540 344 541 346 540 346 540 346 540 346 540 345 541 346 540 344 540 346 540 346 539 346 540 346 540 346 540 346 539 344 540 346 540 346 540 346 540 346 540 346 540 345 539 346 540 346 540 346 540 346 540 346 539 346 540 345 540 346 540 346 540 347 539 346 540 346 540 346 540 345 539 346 540 346 540 346 540 346 540 346 539 1129 540 1127 539 347 539 347 540 1127 539 346 540 +# +name: MODE +type: raw +frequency: 38000 +duty_cycle: 0.330000 +data: 3157 1552 601 1065 575 1093 598 330 554 330 530 340 545 1094 573 338 545 341 545 1094 572 1095 572 340 544 1097 570 342 543 341 543 1101 567 1123 543 342 542 1124 543 1124 543 344 542 342 542 1125 542 344 542 345 541 1125 541 344 542 344 542 344 542 344 542 344 542 343 541 344 541 345 541 344 542 344 542 344 541 345 541 343 541 344 542 344 541 344 542 344 541 1126 542 344 542 344 541 1126 542 344 542 345 541 1126 541 1126 541 345 541 343 541 345 541 345 541 344 542 344 541 1127 541 1126 541 1125 541 1127 541 345 541 344 541 344 541 344 541 1126 541 344 541 1126 542 344 541 344 541 344 541 344 542 344 542 343 541 345 541 345 541 344 542 344 542 345 540 343 541 344 541 344 541 344 542 344 541 344 541 344 542 343 541 344 542 344 541 345 541 345 541 344 542 344 541 343 541 344 542 344 542 344 542 344 542 344 542 344 542 343 541 344 542 344 542 345 541 344 542 345 541 345 541 343 542 345 542 1127 541 344 541 1126 542 344 542 # diff --git a/assets/resources/infrared/assets/tv.ir b/assets/resources/infrared/assets/tv.ir index 4a60dfdb4..4ea018d39 100755 --- a/assets/resources/infrared/assets/tv.ir +++ b/assets/resources/infrared/assets/tv.ir @@ -1,6 +1,30 @@ Filetype: IR library file Version: 1 -# Last Updated 25th Sept, 2022 +# Last Updated 28th Sept, 2022 +# +name: POWER +type: raw +frequency: 38000 +duty_cycle: 0.330000 +data: 3557 1672 516 388 488 1237 515 389 487 389 487 389 487 389 486 389 487 388 487 365 512 386 490 386 489 386 489 387 488 1263 488 389 485 391 483 392 483 394 481 397 479 398 478 421 455 398 478 421 455 1297 455 421 455 421 455 421 455 421 455 421 455 421 455 421 455 421 455 1298 454 421 455 1298 454 1298 454 1298 454 1298 454 421 455 422 454 1298 454 422 454 1298 454 1299 453 1299 453 1298 454 422 454 1298 454 74664 3522 1735 454 422 454 1299 453 422 454 422 454 422 454 422 454 422 454 422 454 422 454 422 454 422 454 422 454 422 454 1299 453 422 454 422 454 422 454 422 454 422 454 422 454 422 454 422 454 422 454 1299 453 422 454 422 454 423 453 423 453 423 453 422 454 423 453 423 453 1299 453 423 453 1299 453 1299 453 1300 452 1299 453 423 453 423 453 1300 452 423 453 1300 452 1300 452 1300 452 1300 452 423 453 1300 452 74665 3522 1735 453 422 454 1299 453 422 454 422 454 422 454 422 454 422 454 422 453 422 454 422 454 422 454 422 454 422 454 1299 453 422 454 422 454 422 454 422 454 422 454 422 454 422 454 422 454 423 453 1299 453 423 453 422 454 422 454 422 454 422 454 423 453 423 453 423 453 1299 453 423 453 1299 453 1299 453 1299 453 1299 453 423 453 423 453 1299 453 423 453 1299 453 1299 453 1299 453 1300 452 423 453 1299 453 74662 3527 1705 482 394 482 1270 482 394 482 393 483 394 482 393 483 393 483 393 483 393 483 393 483 394 482 393 483 394 482 1294 458 418 458 417 459 417 459 418 458 418 458 418 458 418 458 418 458 418 458 1295 457 419 456 419 457 419 457 419 457 419 457 419 457 419 457 419 457 1296 456 419 457 1296 456 1297 455 1297 455 1299 453 446 430 446 430 1323 429 446 430 1323 429 1323 429 1323 429 1323 429 446 430 1323 429 +# +name: VOL+ +type: raw +frequency: 38000 +duty_cycle: 0.330000 +data: 3542 1717 467 411 465 1285 467 411 493 383 493 382 494 381 466 409 467 408 493 383 493 383 492 384 491 387 488 413 462 1290 461 416 459 416 460 416 460 417 459 417 459 416 460 417 459 417 459 417 459 1293 459 417 459 417 459 417 459 417 458 417 459 417 459 417 459 417 458 417 459 417 459 417 459 417 459 417 459 1293 459 417 459 417 459 417 459 417 459 417 459 417 459 417 459 1294 458 417 459 1294 458 74496 3534 1725 460 416 460 1293 459 416 460 417 459 417 459 416 460 416 460 416 460 416 460 416 460 416 460 416 459 417 459 1293 459 416 460 417 459 417 459 417 459 416 460 417 459 417 459 416 460 417 459 1293 459 416 460 417 459 416 460 417 459 417 459 416 460 416 460 417 459 417 459 417 459 417 459 417 459 416 460 1293 459 417 459 417 459 417 459 417 459 417 459 417 459 417 459 1293 459 417 459 1293 459 74497 3534 1725 459 416 460 1293 459 416 460 417 459 417 459 416 460 417 459 417 459 416 460 417 459 417 459 417 459 417 459 1293 459 417 459 417 459 417 459 417 459 417 459 417 458 417 459 417 459 417 459 1294 458 417 459 417 459 417 459 417 459 417 459 417 459 417 459 417 459 417 459 418 458 418 458 417 459 418 458 1294 458 417 459 418 458 418 458 418 458 418 458 418 458 418 458 1294 458 418 458 1294 458 +# +name: VOL- +type: raw +frequency: 38000 +duty_cycle: 0.330000 +data: 3540 1691 494 383 465 1284 468 409 492 383 493 383 492 384 491 386 488 388 486 414 461 415 460 416 460 416 460 416 460 1293 459 416 460 416 460 416 460 416 460 416 460 416 460 417 459 417 459 417 459 1293 459 417 459 417 459 417 459 417 459 417 459 417 459 417 459 417 459 1293 459 416 460 417 459 417 459 416 459 1294 458 417 459 417 458 1294 458 417 459 417 459 417 459 417 459 1294 458 417 459 1294 458 74801 3534 1725 459 416 460 1293 459 416 460 416 460 416 460 417 459 417 459 417 459 417 459 417 459 417 459 417 459 417 459 1293 459 417 459 417 459 417 459 417 459 417 459 417 459 417 459 417 459 417 459 1294 458 417 459 417 459 417 459 417 459 417 459 417 459 417 459 417 459 1294 458 417 459 417 459 418 458 418 458 1294 458 418 458 418 458 1294 458 418 458 418 458 418 458 418 458 1294 458 418 458 1294 458 +# +name: MUTE +type: raw +frequency: 38000 +duty_cycle: 0.330000 +data: 3512 1685 500 409 467 1256 496 409 467 409 466 410 466 410 466 409 467 410 466 410 466 410 495 381 495 380 522 353 493 1256 469 407 494 381 495 382 493 383 492 384 491 386 489 413 462 414 461 415 460 1291 461 415 461 415 461 415 461 415 461 415 461 415 461 415 461 415 461 415 461 1292 460 415 461 415 461 1292 460 1292 460 415 461 415 461 415 461 1292 460 416 460 415 461 1292 460 1292 460 415 461 1292 460 74573 3531 1726 460 416 460 1292 460 416 460 416 460 416 460 392 484 415 460 416 460 416 460 393 483 393 483 392 484 393 483 1268 484 392 484 392 484 392 484 392 484 392 484 392 484 392 484 392 484 392 484 1268 484 392 484 392 484 392 484 392 484 392 484 392 484 392 484 392 484 392 484 1268 484 392 484 391 485 1268 484 1268 484 392 484 392 484 392 484 1292 460 392 484 392 484 1269 483 1269 483 392 484 1292 460 # name: POWER type: raw From 7df70d7c62f6cbb91a0c695171fe5efc0c7bda6a Mon Sep 17 00:00:00 2001 From: Sergey Gavrilov Date: Thu, 29 Sep 2022 03:37:07 +1000 Subject: [PATCH 4/5] Revert "Furi Thread: don't use thread pointer after FuriThreadStateStopped callback (#1799)" This reverts commit 5883e134d4c870a2b08f705eb48a2e56f8a24a23. --- furi/core/thread.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/furi/core/thread.c b/furi/core/thread.c index 538ae4d87..58cb9bc09 100644 --- a/furi/core/thread.c +++ b/furi/core/thread.c @@ -85,6 +85,7 @@ static void furi_thread_body(void* context) { } furi_assert(thread->state == FuriThreadStateRunning); + furi_thread_set_state(thread, FuriThreadStateStopped); if(thread->is_service) { FURI_LOG_E( @@ -98,10 +99,7 @@ static void furi_thread_body(void* context) { furi_assert(pvTaskGetThreadLocalStoragePointer(NULL, 0) != NULL); vTaskSetThreadLocalStoragePointer(NULL, 0, NULL); - // from here we can't use thread pointer - furi_thread_set_state(thread, FuriThreadStateStopped); - - vTaskDelete(NULL); + vTaskDelete(thread->task_handle); furi_thread_catch(); } @@ -207,9 +205,7 @@ void furi_thread_start(FuriThread* thread) { bool furi_thread_join(FuriThread* thread) { furi_assert(thread); - furi_check(furi_thread_get_current() != thread); - - while(eTaskGetState(thread->task_handle) != eDeleted) { + while(thread->state != FuriThreadStateStopped) { furi_delay_ms(10); } From 226f8517f38764eff2e5d28798dda85958b7246e Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Thu, 29 Sep 2022 11:01:15 +0300 Subject: [PATCH 5/5] update readme and changelog --- CHANGELOG.md | 2 +- ReadMe.md | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0dd50a35..0d6ac87aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Renamed apps to make it look a bit better in Apps tab in archive app * Infrared: Update assets (by @Amec0e) * OFW: Keyboard: show Uppercase keys when replacing content -* OFW: Furi Thread: don't use thread pointer after FuriThreadStateStopped callback +* OFW: (Temporarily excluded due to crashes) Furi Thread: don't use thread pointer after FuriThreadStateStopped callback * OFW: Resources cleanup in updater * OFW: Signal Generator app diff --git a/ReadMe.md b/ReadMe.md index fbc97304f..df6dcf257 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -36,9 +36,11 @@ Our Discord Community: * Universal remote for Projectors, Fans, A/Cs and Audio(soundbars, etc.) * BadUSB keyboard layouts * Customizable Flipper name +* SubGHz -> Press OK in frequency analyzer to use detected frequency in Read modes * Other small fixes and changes throughout +* See other changes in changelog and in readme below -See changelog in releases for latest updates! +Also check changelog in releases for latest updates! ### Current modified and new SubGHz protocols list: - HCS101 @@ -59,8 +61,8 @@ See changelog in releases for latest updates! ### Community apps included: -- RFID Fuzzer plugin [(by Ganapati)](https://github.com/Eng1n33r/flipperzero-firmware/pull/54) with some changes by xMasterX -- Sub-GHz bruteforce plugin [(by Ganapati & xMasterX)](https://github.com/Eng1n33r/flipperzero-firmware/pull/57) +- RFID Fuzzer plugin [(by Ganapati)](https://github.com/Eng1n33r/flipperzero-firmware/pull/54) with changes by @xMasterX & New protocols by @mvanzanten +- Sub-GHz bruteforce plugin [(by Ganapati & xMasterX)](https://github.com/Eng1n33r/flipperzero-firmware/pull/57) & Refactored by @derskythe - Sub-GHz playlist plugin [(by darmiel)](https://github.com/Eng1n33r/flipperzero-firmware/pull/62) - ESP8266 Deauther plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module) - WiFi Scanner plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module) @@ -85,8 +87,10 @@ Games: ### Other changes - BadUSB -> Keyboard layouts [(by rien > dummy-decoy)](https://github.com/dummy-decoy/flipperzero-firmware/tree/dummy_decoy/bad_usb_keyboard_layout) -- SubGHz -> New frequency analyzer - [(by ClusterM)](https://github.com/ClusterM) +- SubGHz -> New frequency analyzer - [(by ClusterM)](https://github.com/Eng1n33r/flipperzero-firmware/pull/43) - SubGHz -> Detect RAW feature - [(by perspecdev)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/152) +- SubGHz -> Save last used frequency and moduluation [(by derskythe)](https://github.com/Eng1n33r/flipperzero-firmware/pull/77) +- SubGHz -> Press OK in frequency analyzer to use detected frequency in Read modes [(by derskythe)](https://github.com/Eng1n33r/flipperzero-firmware/pull/77) # Instructions ## [- How to install firmware](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/HowToInstall.md) @@ -99,7 +103,7 @@ Games: ### **Plugins** -## [- 💎 Extra plugins precompiled for Unleashed](https://github.com/UberGuidoZ/Flipper/tree/main/Applications/Unleashed) +## [- 🎲 Download Extra plugins for Unleashed](https://github.com/UberGuidoZ/Flipper/tree/main/Applications/Unleashed) ## [- Configure Sub-GHz Remote App](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/SubGHzRemotePlugin.md) @@ -139,9 +143,10 @@ Games:
# Where I can find IR, SubGhz, ... files, DBs, and other stuff? -## [Awesome Flipper Zero - Github](https://github.com/djsime1/awesome-flipperzero) ## [UberGuidoZ Playground - Large collection of files - Github](https://github.com/UberGuidoZ/Flipper) +## [Awesome Flipper Zero - Github](https://github.com/djsime1/awesome-flipperzero) ## [CAME-12bit, NICE-12bit, Linear-10bit, PT-2240 - SubGHz fixed code bruteforce](https://github.com/tobiabocchi/flipperzero-bruteforce) +## [SMC5326, UNILARM - SubGHz fixed code bruteforce](https://github.com/Hong5489/flipperzero-gate-bruteforce)