diff --git a/ReadMe.md b/ReadMe.md index dc7068c48..0d82b1707 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -18,7 +18,8 @@ - Added some stupid breaks for default switch cases. - Updated: [IFTTT Virtual Button (By Ferrazzi)](https://github.com/Ferrazzi/FlipperZero_IFTTT_Virtual_Button) `Req: ESP8266 w/ IFTTT FW Flashed` - Fixes for slower animations to be MUCH faster -- [BadUSB as FAP #396 (By ESurge)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/396) +- [BadUSB: BadUSB as FAP #396 (By ESurge)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/396) +- [RFID: LFRFID AS FAP #397 (By ROgueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/397) (With Thanks to ESurge)
TO DO / REMOVED
@@ -101,14 +102,14 @@ $ ./fbt plugin_dist - Assets: Includes sample SubGHz assets for Crosswalk, Handicap Doors, Sextoys, Tesla Charge Port, and Unitree Go1 Robot Dog - Assets: Includes Sonic Screw Driver sound for the Wav Player - Assets: Running DolphinRestorer.fap on new install will auto-level to Level 7. -- [BadUSB as FAP #396 (By ESurge)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/396) +- [BadUSB: BadUSB as FAP #396 (By ESurge)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/396) - BadUSB: Added ignore DUCKY_LANG cmd to retain compatibility with existing scripts [(Thanks to v1nc)](https://github.com/v1nc/flipperzero-firmware) - BadUSB: Assets for Kiosk Evasion (By nocomp) and Wifi Stealer (By 7h30th3r0n3) - BadUSB: [Dummy decoy/bad usb keyboard layout #1525 (By dummy-decoy)](https://github.com/flipperdevices/flipperzero-firmware/pull/1525) - BadUSB: nb-NO Added norwegian keyboard layout [(By jd-raymaker)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/357) - BadUSB: show script errors on screen [(By CromFr)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/200) - BadUSB: sk-SK maping keybord for BadUsb [(By jaroslavmraz)](https://github.com/flipperdevices/flipperzero-firmware/pull/1619) -- Clock.fap, iButton.fap and U2F.fap loader apps and available as Favorites [Thanks to ESurge](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/336) +- Clock: Clock.fap loader apps and available as Favorites [Thanks to ESurge](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/336) - Desktop: Hidden top bar [Thanks to ESurge](https://github.com/ESurge/) - Desktop: Exclude icons on the left and show minimal battery [Thanks to skizzophrenic/Talking-Sasquach](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/360) - Development free space thanks to removal of unused debug tools and [thanks to ESurge](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/46/files) for removal of first start assets. @@ -134,10 +135,12 @@ $ ./fbt plugin_dist - GPIO: Feature to read EEPROM of SFP Modules using I2C [(By marcusju)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/198) - GPIO: [I²C-Scanner #1431 (By GitChris3004)](https://github.com/flipperdevices/flipperzero-firmware/pull/1431) - iButton: [Fixed issue when loading iButton keys or U2F token from Archive app #382 (By ESurge)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/382) +- iButton: iButton.fap loader apps and available as Favorites [Thanks to ESurge](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/336) - Icon Decode/Encode [(Thanks to PixlEmly)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/55/files) - IR: Universal AC, Audio, Fans & Projectors from [Unleashed/Eng1n33r](https://github.com/DarkFlippers/unleashed-firmware) - Plugins: 2048, Arkanoid, Snake, and Tetris show score. Thanks to [whoamins](https://github.com/flipperdevices/flipperzero-firmware/commit/7feda832ede1ba8468eff2ca055fef3ddbdc16ac) and [DevMilanIan](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/188) With position changes by RogueMaster. Also all + Tic Tac Toe updated by [Unleashed/Eng1n33r](https://github.com/DarkFlippers/unleashed-firmware) for stability. - Plugins: Icon for Clock [Thanks to Redlink](https://github.com/redlink2/flipperzero-firmware/tree/menuChanges) +- [RFID: LFRFID AS FAP #397 (By ROgueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/397) (With Thanks to ESurge) - Settings: "Lock W PIN + Off" add to UP menu [(By RogueMaster)] - Settings: Actual PIN Lock [(By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/applications/desktop/desktop.c) - Settings: Auto-Lock Options Added: 10s+15s+90s [(By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c) @@ -163,6 +166,7 @@ $ ./fbt plugin_dist - SubGHz: New frequency analyzer [(By ClusterM)](https://github.com/flipperdevices/flipperzero-firmware/pull/1501) [feedback mode (by darmiel)](https://github.com/darmiel/flipper-playlist/tree/feat/stealth-frequency-analyzer) [Quiet Mode (by Himura2la)](https://github.com/ClusterM/flipperzero-firmware/pull/1) [New frequency analyzer #1557 (By ClusterM)](https://github.com/flipperdevices/flipperzero-firmware/pull/1557) - SubGHz: Protocols An-Motors, BFT Mitto, Came Atomo, FAAC SLH (Spa), HCS101, Keeloq, Keeloq Common, Nice Flor S, SecPlus v1+v2 and Star Line updates from [Eng1n33r](https://github.com/DarkFlippers/unleashed-firmware) - SubGHz: Unlock from SD flag from [(cloudbreakdaniel)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/97db0dc91ee3dff812b4dec0618e3f198de14405). Update `subghz/assets/extend_range.txt` with [this file](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/assets/resources/subghz/assets/extend_range.txt) on SD. **UPDATE IGNORE FLAG TO TRUE TO UNLEASH YOUR FLIPPER!!** +- U2F: U2F.fap loader apps and available as Favorites [Thanks to ESurge](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/336)
diff --git a/applications/main/application.fam b/applications/main/application.fam index 0f7e5d44d..c618f42b9 100644 --- a/applications/main/application.fam +++ b/applications/main/application.fam @@ -8,7 +8,8 @@ App( # "ibutton", "ibutton_loader", "infrared", - "lfrfid", + # "lfrfid", + "lfrfid_loader", "nfc", "subghz", #"bad_usb", diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c index a72a24e31..5304747cb 100644 --- a/applications/main/archive/scenes/archive_scene_browser.c +++ b/applications/main/archive/scenes/archive_scene_browser.c @@ -71,6 +71,14 @@ static void archive_run_in_app(ArchiveBrowserView* browser, ArchiveFile_t* selec char* result = malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1); + strcpy(result, tmpType); + strcat(result, furi_string_get_cstr(selected->path)); + status = loader_start(loader, "Applications", result); + } else if(strcmp(flipper_app_name[selected->type], "125 kHz RFID") == 0) { + char* tmpType = "/ext/apps/Main/lfrfid.fap¯"; + char* result = + malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1); + strcpy(result, tmpType); strcat(result, furi_string_get_cstr(selected->path)); status = loader_start(loader, "Applications", result); diff --git a/applications/main/bad_usb/gpioIcon.png b/applications/main/bad_usb/gpioIcon.png deleted file mode 100644 index 5b2f4293c..000000000 Binary files a/applications/main/bad_usb/gpioIcon.png and /dev/null differ diff --git a/applications/main/lfrfid/125_10px.png b/applications/main/lfrfid/125_10px.png new file mode 100644 index 000000000..ce01284a2 Binary files /dev/null and b/applications/main/lfrfid/125_10px.png differ diff --git a/applications/main/lfrfid/application.fam b/applications/main/lfrfid/application.fam index 4a1498181..7385fccf4 100644 --- a/applications/main/lfrfid/application.fam +++ b/applications/main/lfrfid/application.fam @@ -1,7 +1,7 @@ App( appid="lfrfid", name="125 kHz RFID", - apptype=FlipperAppType.APP, + apptype=FlipperAppType.EXTERNAL, entry_point="lfrfid_app", cdefines=["APP_LF_RFID"], requires=[ @@ -11,9 +11,12 @@ App( provides=[ "lfrfid_start", ], - icon="A_125khz_14", + # icon="A_125khz_14", stack_size=2 * 1024, order=20, + fap_category="Main", + fap_icon="125_10px.png", + fap_icon_assets="images", ) App( diff --git a/applications/main/lfrfid/images/125_10px.png b/applications/main/lfrfid/images/125_10px.png new file mode 100644 index 000000000..ce01284a2 Binary files /dev/null and b/applications/main/lfrfid/images/125_10px.png differ diff --git a/applications/main/lfrfid/images/ButtonRight_4x7.png b/applications/main/lfrfid/images/ButtonRight_4x7.png new file mode 100644 index 000000000..8e1c74c1c Binary files /dev/null and b/applications/main/lfrfid/images/ButtonRight_4x7.png differ diff --git a/applications/main/lfrfid/images/DolphinCommon_56x48.png b/applications/main/lfrfid/images/DolphinCommon_56x48.png new file mode 100644 index 000000000..089aaed83 Binary files /dev/null and b/applications/main/lfrfid/images/DolphinCommon_56x48.png differ diff --git a/applications/main/lfrfid/images/DolphinMafia_115x62.png b/applications/main/lfrfid/images/DolphinMafia_115x62.png new file mode 100644 index 000000000..53dffb4fa Binary files /dev/null and b/applications/main/lfrfid/images/DolphinMafia_115x62.png differ diff --git a/applications/main/lfrfid/images/DolphinNice_96x59.png b/applications/main/lfrfid/images/DolphinNice_96x59.png new file mode 100644 index 000000000..b111196c7 Binary files /dev/null and b/applications/main/lfrfid/images/DolphinNice_96x59.png differ diff --git a/applications/main/lfrfid/images/NFC_manual_60x50.png b/applications/main/lfrfid/images/NFC_manual_60x50.png new file mode 100644 index 000000000..787c0bcfe Binary files /dev/null and b/applications/main/lfrfid/images/NFC_manual_60x50.png differ diff --git a/applications/main/lfrfid/images/RFIDDolphinReceive_97x61.png b/applications/main/lfrfid/images/RFIDDolphinReceive_97x61.png new file mode 100644 index 000000000..ff967599c Binary files /dev/null and b/applications/main/lfrfid/images/RFIDDolphinReceive_97x61.png differ diff --git a/applications/main/lfrfid/images/RFIDDolphinSend_97x61.png b/applications/main/lfrfid/images/RFIDDolphinSend_97x61.png new file mode 100644 index 000000000..343b9f734 Binary files /dev/null and b/applications/main/lfrfid/images/RFIDDolphinSend_97x61.png differ diff --git a/applications/main/lfrfid/images/RFIDDolphinSuccess_108x57.png b/applications/main/lfrfid/images/RFIDDolphinSuccess_108x57.png new file mode 100644 index 000000000..341999109 Binary files /dev/null and b/applications/main/lfrfid/images/RFIDDolphinSuccess_108x57.png differ diff --git a/applications/main/lfrfid/images/RFIDSmallChip_14x14.png b/applications/main/lfrfid/images/RFIDSmallChip_14x14.png new file mode 100644 index 000000000..24219a548 Binary files /dev/null and b/applications/main/lfrfid/images/RFIDSmallChip_14x14.png differ diff --git a/applications/main/lfrfid/images/Round_loader_8x8/frame_01.png b/applications/main/lfrfid/images/Round_loader_8x8/frame_01.png new file mode 100644 index 000000000..a5dc239d8 Binary files /dev/null and b/applications/main/lfrfid/images/Round_loader_8x8/frame_01.png differ diff --git a/applications/main/lfrfid/images/Round_loader_8x8/frame_02.png b/applications/main/lfrfid/images/Round_loader_8x8/frame_02.png new file mode 100644 index 000000000..162d8a8f4 Binary files /dev/null and b/applications/main/lfrfid/images/Round_loader_8x8/frame_02.png differ diff --git a/applications/main/lfrfid/images/Round_loader_8x8/frame_03.png b/applications/main/lfrfid/images/Round_loader_8x8/frame_03.png new file mode 100644 index 000000000..5483e4734 Binary files /dev/null and b/applications/main/lfrfid/images/Round_loader_8x8/frame_03.png differ diff --git a/applications/main/lfrfid/images/Round_loader_8x8/frame_04.png b/applications/main/lfrfid/images/Round_loader_8x8/frame_04.png new file mode 100644 index 000000000..ce2fbbd47 Binary files /dev/null and b/applications/main/lfrfid/images/Round_loader_8x8/frame_04.png differ diff --git a/applications/main/lfrfid/images/Round_loader_8x8/frame_05.png b/applications/main/lfrfid/images/Round_loader_8x8/frame_05.png new file mode 100644 index 000000000..8b786c029 Binary files /dev/null and b/applications/main/lfrfid/images/Round_loader_8x8/frame_05.png differ diff --git a/applications/main/lfrfid/images/Round_loader_8x8/frame_rate b/applications/main/lfrfid/images/Round_loader_8x8/frame_rate new file mode 100644 index 000000000..d8263ee98 --- /dev/null +++ b/applications/main/lfrfid/images/Round_loader_8x8/frame_rate @@ -0,0 +1 @@ +2 \ No newline at end of file diff --git a/applications/main/lfrfid/images/SDQuestion_35x43.png b/applications/main/lfrfid/images/SDQuestion_35x43.png new file mode 100644 index 000000000..9b9c9a58e Binary files /dev/null and b/applications/main/lfrfid/images/SDQuestion_35x43.png differ diff --git a/applications/main/lfrfid/lfrfid_i.h b/applications/main/lfrfid/lfrfid_i.h index 72b061930..c6abc63f4 100644 --- a/applications/main/lfrfid/lfrfid_i.h +++ b/applications/main/lfrfid/lfrfid_i.h @@ -5,7 +5,6 @@ #include #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include +#include #define LFRFID_KEY_NAME_SIZE 22 #define LFRFID_TEXT_STORE_SIZE 40 diff --git a/applications/main/lfrfid/views/lfrfid_view_read.c b/applications/main/lfrfid/views/lfrfid_view_read.c index 094afb617..e179ca577 100644 --- a/applications/main/lfrfid/views/lfrfid_view_read.c +++ b/applications/main/lfrfid/views/lfrfid_view_read.c @@ -1,6 +1,6 @@ #include "lfrfid_view_read.h" #include -#include +#include #define TEMP_STR_LEN 128 diff --git a/applications/main/lfrfid_loader/application.fam b/applications/main/lfrfid_loader/application.fam new file mode 100644 index 000000000..333dd00af --- /dev/null +++ b/applications/main/lfrfid_loader/application.fam @@ -0,0 +1,14 @@ +App( + appid="lfrfid_loader", + name="125 kHz RFID", + apptype=FlipperAppType.APP, + entry_point="lfrfid_loader_app", + requires=[ + "gui", + "dialogs", + ], + stack_size=int(2 * 1024), + icon="A_125khz_14", + order=80, + link="/ext/apps/Main/lfrfid.fap", +) diff --git a/applications/main/lfrfid_loader/lfrfid_loader_app.c b/applications/main/lfrfid_loader/lfrfid_loader_app.c new file mode 100644 index 000000000..ad6a96c64 --- /dev/null +++ b/applications/main/lfrfid_loader/lfrfid_loader_app.c @@ -0,0 +1,9 @@ +#include + +#define TAG "lfrfid_loader_app" + +int32_t lfrfid_loader_app(void* p) { + UNUSED(p); + + return 0; +} \ No newline at end of file