Skip to content

Commit

Permalink
Merge remote-tracking branch 'mntm/dev' into js-app-internal
Browse files Browse the repository at this point in the history
  • Loading branch information
Willy-JL committed Nov 6, 2024
2 parents e63c0ab + 1f7543a commit ac44f44
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 7 deletions.
17 changes: 14 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,15 @@
- Apps:
- NFC: Cyborg Detector (by @RocketGod-git)
- Sub-GHz: Radio Scanner (by @RocketGod-git)
- GPIO: FlipperHTTP app suite (by @jblanked):
- FlipLibrary
- FlipSocial
- FlipStore
- FlipTrader
- FlipWeather
- FlipWiFi
- Web Crawler
- Tools: uPython (by @ofabel)
- Games: Umpire Indicator (by @RocketGod-git)
- Sub-GHz:
- Show satellites count with an icon (#215 by @m7i-org)
Expand Down Expand Up @@ -116,11 +125,11 @@
- MFKey: Added Static Encrypted Nested key recovery, Added NFC app support, Dropped FlipperNested support (by @noproto)
- WAV Player: Better fix for unresponsiveness, handle thread exit signal (by @CookiePLMonster)
- Laser Tag: External Infrared board support, crash fixes (by @RocketGod-git), RFID support for ammo reload, thread leak fix (by @jamisonderek)
- ESP Flasher: Update blackmagic bin with WiFi Logs (by @DrZlo13), support more board types (by @xMasterX)
- ESP Flasher: Add FlipperHTTP firmware (by @jblanked), update blackmagic bin with WiFi Logs (by @DrZlo13), support more board types (by @xMasterX)
- Picopass: File loading improvements and fixes (by @bettse), force ISO15693 1OutOf4 mode (by @aaronjamt)
- Quac!: External IR board support (by @daniilty), import all IR from file, iButton support, code improvements (by @rdefeo)
- DTMF Dolphin: Add EAS tone support (by @JendrBendr)
- NFC Playlist: Error screens for playlist already exists and item already in playlist, general improvements (by @acegoal07), refactor rename/new scene without thread (by @Willy-JL)
- NFC Playlist: Better error handling with many new error screens, general improvements (by @acegoal07), refactor rename/new scene without thread (by @Willy-JL)
- CLI-GUI Bridge: Fixes and improvements (by @ranchordo)
- Seader: Enable T=1, show error for timeout, fix wrong LRC logging, fix crash scanning NTAG215 with MFC option (by @bettse)
- BLE Spam: Fix menu index callback (by @Willy-JL)
Expand Down Expand Up @@ -222,4 +231,6 @@

### Removed:
- Apps:
- Mifare Nested: Superseded by NFC app after OFW PR 3822 (MIFARE Classic Key Recovery Improvements)
- Mifare Nested: Superseded by NFC app after OFW PR 3822 (MIFARE Classic Key Recovery Improvements)
- ESP Flasher:
- Removed Airtag Scanner and ESP32-S2 Wardriver due to low user interest and to make space for Ghost ESP
2 changes: 1 addition & 1 deletion applications/external
Submodule external updated 523 files
2 changes: 1 addition & 1 deletion applications/main/infrared/infrared_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ int32_t infrared_app(void* p) {
is_remote_loaded = false;
bool wrong_file_type = INFRARED_ERROR_CHECK(error, InfraredErrorCodeWrongFileType);
const char* format = wrong_file_type ?
"Library file\n\"%s\" can't be openned as a remote" :
"Library file\n\"%s\" can't be opened as a remote" :
"Failed to load\n\"%s\"";

infrared_show_error_message(infrared, format, file_path);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ bool infrared_scene_remote_list_on_event(void* context, SceneManagerEvent event)
bool wrong_file_type =
INFRARED_ERROR_CHECK(task_error, InfraredErrorCodeWrongFileType);
const char* format = wrong_file_type ?
"Library file\n\"%s\" can't be openned as a remote" :
"Library file\n\"%s\" can't be opened as a remote" :
"Failed to load\n\"%s\"";

infrared_show_error_message(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ bool infrared_scene_universal_from_file_on_event(void* context, SceneManagerEven
bool wrong_file_type =
INFRARED_ERROR_CHECK(task_error, InfraredErrorCodeWrongFileType);
const char* format = wrong_file_type ?
"Remote file\n\"%s\" can't be openned as a library" :
"Remote file\n\"%s\" can't be opened as a library" :
"Failed to load\n\"%s\"";

infrared_show_error_message(
Expand Down

0 comments on commit ac44f44

Please sign in to comment.