Skip to content

Commit

Permalink
Merge branch 'dev' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
xMasterX committed Jan 7, 2024
2 parents f0e011e + c85e130 commit b71fb8c
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 43 deletions.
35 changes: 7 additions & 28 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,15 @@
## Warning!!! Please read this before installing!!!
**This release has some unresolved issues, if any of those affects your daily usage, stay at 065 release or wait for next releases:** <br>
**Issues from this list will be fixed in next releases**
### Known NFC app regressions and issues:
## New changes
* NFC: Various NFC Mifare classic Read fixes (was caused by wrong logic in parsers) (mifare classic 4k, and others) (by @Leptopt1los)
* Apps: Fixed Unitemp and ESP32 Camera suite
* Apps: **Check out Apps updates by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
<br><br>
#### Known NFC post-refactor regressions list:
- Mifare Mini clones reading is broken (original mini working fine) (OFW)
- EMV simple data parser was removed with protocol with refactoring (OFW)
- Option to unlock Slix-L (NFC V) with preset or custom password was removed with refactoring (OFW)
- NFC CLI was removed with refactoring (OFW)
### Some apps that was made for old nfc stack is now not compatible with the new API and require complete remake:
**If you want to help with making this apps work again please send PR to the repo at link below**
- Current list of affected apps: https://github.com/xMasterX/all-the-plugins/tree/dev/apps_broken_by_last_refactors
- Also in app **Enhanced Sub-GHz Chat** - NFC part was temporarily removed to make app usable, NFC part of the app requires remaking it with new nfc stack <br>
**API was updated to v50.x**
## New changes
* NFC: Skip system dict bug fixed (by @Leptopt1los)
* NFC: Set ATQA scene bit numbering changed (by @Leptopt1los)
* NFC: Added plugin to read WashCity card balance (by @yaba | PR #683)
* NFC: Add manually MF Classic with custom UID (by @Leptopt1los | PR #690)
* NFC: Fix MyKey production date parsing by [@augustozanellato](https://github.com/flipperdevices/flipperzero-firmware/pull/3332/files)
* Apps: Move hid and snake apps into main repo (will be included in `c` builds)
* Docs: Remove weird newline in applications/ReadMe.md (by @Eczbek | PR #688)
* SubGHz: Proper fix for subghz keyboard lock display issue (thanks @Willy-JL)
* SubGHz: Use long press to exit transmitter (to avoid unwanted 2 buttons hold condition, holding arrow button and exit causes default button change, which is stays as hidden feature, but this change makes it harder to call it accidentally)
* Apps: **Check out Apps updates by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
* OFW: Desktop: fix rpc unlock on pin input screen
* OFW: UI refactor
* OFW: MFC emulation fixes
* OFW: Scripts: fix incorrect handling of storage stress test count option
* OFW: Add Samsung AC remotes DB93 and AR-EH04
* OFW: Update mf_classic_dict.nfc
* OFW: Nfc: HID MFC Plugin
* OFW: RPC: reverse input
* Update slideshow pictures by @Svaarich
- Also in app **Enhanced Sub-GHz Chat** - NFC part was temporarily removed to make app usable, NFC part of the app requires remaking it with new nfc stack

----

Expand Down
2 changes: 1 addition & 1 deletion applications/main/nfc/plugins/supported_cards/aime.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static bool aime_read(Nfc* nfc, NfcDevice* device) {

nfc_device_set_data(device, NfcProtocolMfClassic, data);

is_read = true;
is_read = mf_classic_is_card_read(data);
} while(false);

mf_classic_free(data);
Expand Down
2 changes: 1 addition & 1 deletion applications/main/nfc/plugins/supported_cards/hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static bool hid_read(Nfc* nfc, NfcDevice* device) {

nfc_device_set_data(device, NfcProtocolMfClassic, data);

is_read = true;
is_read = mf_classic_is_card_read(data);
} while(false);

mf_classic_free(data);
Expand Down
5 changes: 1 addition & 4 deletions applications/main/nfc/plugins/supported_cards/kazan.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "core/core_defines.h"
#include "core/log.h"
#include "core/string.h"
#include "nfc_supported_card_plugin.h"

#include "protocols/mf_classic/mf_classic.h"
Expand Down Expand Up @@ -189,7 +186,7 @@ static bool kazan_read(Nfc* nfc, NfcDevice* device) {

nfc_device_set_data(device, NfcProtocolMfClassic, data);

is_read = true;
is_read = mf_classic_is_card_read(data);
} while(false);

mf_classic_free(data);
Expand Down
2 changes: 1 addition & 1 deletion applications/main/nfc/plugins/supported_cards/metromoney.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static bool metromoney_read(Nfc* nfc, NfcDevice* device) {

nfc_device_set_data(device, NfcProtocolMfClassic, data);

is_read = true;
is_read = mf_classic_is_card_read(data);
} while(false);

mf_classic_free(data);
Expand Down
2 changes: 1 addition & 1 deletion applications/main/nfc/plugins/supported_cards/plantain.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static bool plantain_read(Nfc* nfc, NfcDevice* device) {

nfc_device_set_data(device, NfcProtocolMfClassic, data);

is_read = true;
is_read = mf_classic_is_card_read(data);
} while(false);

mf_classic_free(data);
Expand Down
2 changes: 1 addition & 1 deletion applications/main/nfc/plugins/supported_cards/saflok.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ static bool saflok_read(Nfc* nfc, NfcDevice* device) {

nfc_device_set_data(device, NfcProtocolMfClassic, data);

is_read = true;
is_read = mf_classic_is_card_read(data);
} while(false);

mf_classic_free(data);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@ static bool social_moscow_read(Nfc* nfc, NfcDevice* device) {

nfc_device_set_data(device, NfcProtocolMfClassic, data);

is_read = true;
is_read = mf_classic_is_card_read(data);
} while(false);

mf_classic_free(data);
Expand Down
2 changes: 1 addition & 1 deletion applications/main/nfc/plugins/supported_cards/troika.c
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ static bool troika_read(Nfc* nfc, NfcDevice* device) {

nfc_device_set_data(device, NfcProtocolMfClassic, data);

is_read = true;
is_read = mf_classic_is_card_read(data);
} while(false);

mf_classic_free(data);
Expand Down
2 changes: 1 addition & 1 deletion applications/main/nfc/plugins/supported_cards/two_cities.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static bool two_cities_read(Nfc* nfc, NfcDevice* device) {

nfc_device_set_data(device, NfcProtocolMfClassic, data);

is_read = true;
is_read = mf_classic_is_card_read(data);
} while(false);

mf_classic_free(data);
Expand Down
2 changes: 1 addition & 1 deletion applications/main/nfc/plugins/supported_cards/washcity.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static bool washcity_read(Nfc* nfc, NfcDevice* device) {

nfc_device_set_data(device, NfcProtocolMfClassic, data);

is_read = true;
is_read = mf_classic_is_card_read(data);
} while(false);

mf_classic_free(data);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "core/core_defines.h"
#include "core/string.h"
#include "furi_hal_rtc.h"
#include "nfc_supported_card_plugin.h"

Expand Down
Binary file modified assets/slideshow/update_default/frame_00.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/slideshow/update_default/frame_01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/slideshow/update_default/frame_02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/slideshow/update_default/frame_03.png
Binary file not shown.
Binary file removed assets/slideshow/update_default/frame_04.png
Binary file not shown.

0 comments on commit b71fb8c

Please sign in to comment.