diff --git a/CHANGELOG.md b/CHANGELOG.md index f05a88aab..a6bf4b4a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,51 +1,9 @@ ## Main changes - Current API: 87.0 -* SubGHz: Add support for **Came Atomo (TOP44RBN)** remotes (thanks @mishamyte for recordings) -* SubGHz: Add **Elplast 18bit** static code protocol (hello Hackcat ^_^) -* SubGHz: Try to **decode BFT** (2 buttons remotes only) **on the fly** in regular Read mode (no more KL Unknown and all of that for free?!) (for 4 button remote follow docs [here](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)) -* SubGHz: **Tune Linear** (edited by @WillyJL in PR #919 #920) (add better EZCode support) and **Dickert MAHS** protocol decoders -* SubGHz: RAW protocol fixes (by @WillyJL) -* SubGHz: Add **ZKTeco 430.5 MHz** add manually support -* SubGHz: Add variant of 'Add Manually' menu with manual editing for each value (PR #909 #911 #914 | by @MrLego8-9) -* SubGHz: Temporarily remove HoneywellSec protocol due to unstable decoding and incorrect encoding -* NFC: Returning fix for reading PWD locked MFUL (PR #922 | by @mishamyte) -* NFC: Added UL-C keys to the dictionary (PR #923 | by @mishamyte) -* NFC: Add MIFARE Classic "Show Keys" UI (by @aaronjamt) -* Apps: HID PTT: adding global zoom and google meet shortcuts for MacOS (PR #921 | by @hryamzik) -* OFW: NFC FeliCa: Service Directory Traverse + Dump All Unencrypted-Readable Services' Blocks -* OFW: **NFC CLI commands** -* OFW: LFRFID: **Show ISO-3166 Country Names For Pet Chips** -* OFW: **JS views finished** -* OFW: BLE: improved pairing security -* OFW: FeliCa Emulation: Handle certain Polling commands in firmware -* OFW PR 4287: Fix Ultralight EV1 regression (by @noproto) -* OFW PR 4271: NFC: **Ultralight C NFC App Key Management, Dictionary Attack** (by @noproto) -* OFW PR 4265: NFC: **Fix read crash** with unexpectedly large MFC AUTH(0) response (by @WillyJL) -* OFW PR 4251: CLI: **Fix long delay** with quick connect/disconnect (by @WillyJL) -* LFRFID: Add additional procotols supported by **EM4305** chipset (by @jamisonderek) +* OFW PR 4279: NFC FeliCa Minor Fix: FelicaPollerEventType should only be Incomplete if the tag is FeliCa Lite (by @zinongli) * Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev) ## Other changes -* SubGHz: Fix crash in add manually menu -* OFW PR 4293: NFC FeliCa Improvement: Dump All Systems (by @zinongli) -* OFW PR 4285: ViewStack: Store View by value to save memory (by @CookiePLMonster) -* OFW PR 4290: Storage: Dont send mount event if SD mounted at boot (by @WillyJL) -* OFW PR 4283: NFC lib: Expose nfc_common.h (by @zinongli) -* OFW: Fix wrbl command tooltip -* OFW: VSCode: Reduce file watcher resource usage -* OFW: cli: Buzzer command -* OFW: Update demo_windows.txt -* OFW: Fix PVS warnings -* OFW: NFC: Amusement IC Card Parser (FeliCa Lite & Lite-S) -* OFW: hid_app mouse clicker: make mouse button selectable -* OFW: JS: Expose button event type in gui/widget button callback -* OFW: NFC: MFC 1k Banapass Parser -* OFW: GUI Bug Fix: Number Input Save Icon -* Add possibility to use custom buttons when using the SubGHz remote app (by @MrLego8-9) -* Input Settings: Add Vibro Trigger option (by @956MB & @WillyJL) -* BT Remote: Add Rename Option (by @aaronjamt & @WillyJL) -* Simplify Bad USB BLE profile (by @aaronjamt & @WillyJL) -* NFC: Fix incorrect Saflok year formula (by @Eltrick) -* JS: Expose button event type in gui/widget button callback (by @WillyJL) +* Enable halloween anim

#### Known NFC post-refactor regressions list: - Mifare Mini clones reading is broken (original mini working fine) (OFW) diff --git a/lib/nfc/protocols/felica/felica_poller.c b/lib/nfc/protocols/felica/felica_poller.c index 98e07df42..056ed4320 100644 --- a/lib/nfc/protocols/felica/felica_poller.c +++ b/lib/nfc/protocols/felica/felica_poller.c @@ -486,9 +486,12 @@ NfcCommand felica_poller_state_handler_read_lite_blocks(FelicaPoller* instance) NfcCommand felica_poller_state_handler_read_success(FelicaPoller* instance) { FURI_LOG_D(TAG, "Read Success"); - if(!instance->auth.context.auth_status.internal || - !instance->auth.context.auth_status.external) { - instance->data->blocks_read--; + if((!instance->auth.context.auth_status.internal || + !instance->auth.context.auth_status.external) && + instance->data->workflow_type == FelicaLite) { + if(instance->data->blocks_read != 0) { + instance->data->blocks_read--; + } instance->felica_event.type = FelicaPollerEventTypeIncomplete; } else { memcpy(