NFC changes not merged in

[craftbyte]

Describe the bug.

It seems like the NFC refactor that happened in OFW didnt get through to here. This make building Seader not work.
https://flipc.org/bettse/seader?branch=main&firmware=xtreme.

It seems like FuriHalNfcDevData does not contain all the fields that OFW does.

Reproduction

Try building Seader for https://flipc.org/bettse/seader?branch=main&firmware=xtreme

Target

No response

Logs

applications_user/seader/lib/asn1/BIT_STRING.c: In function 'BIT_STRING_compare': applications_user/seader/lib/asn1/BIT_STRING.c:268:41: warning: unused variable 'specs' [-Wunused-variable] 268 | const asn_OCTET_STRING_specifics_t *specs = td->specifics; | ^~~~~ applications_user/seader/seader_worker.c: In function 'read_nfc': applications_user/seader/seader_worker.c:193:52: error: 'FuriHalNfcDevData' has no member named 'sak' 193 | OCTET_STRING_t sak = {.buf = &(nfc_data.sak), .size = 1}; | ^ applications_user/seader/seader_worker.c:198:46: error: 'FuriHalNfcDevData' has no member named 'atqa' 198 | if(mf_df_check_card_type(nfc_data.atqa[0], nfc_data.atqa[1], nfc_data.sak)) { | ^ applications_user/seader/seader_worker.c:198:64: error: 'FuriHalNfcDevData' has no member named 'atqa' 198 | if(mf_df_check_card_type(nfc_data.atqa[0], nfc_data.atqa[1], nfc_data.sak)) { | ^ applications_user/seader/seader_worker.c:198:82: error: 'FuriHalNfcDevData' has no member named 'sak' 198 | if(mf_df_check_card_type(nfc_data.atqa[0], nfc_data.atqa[1], nfc_data.sak)) { | ^ applications_user/seader/seader_worker.c:205:35: error: 'FuriHalNfcDevData' has no member named 'atqa' 205 | nfc_data.atqa[0], nfc_data.atqa[1], nfc_data.sak)) { | ^ applications_user/seader/seader_worker.c:205:53: error: 'FuriHalNfcDevData' has no member named 'atqa' 205 | nfc_data.atqa[0], nfc_data.atqa[1], nfc_data.sak)) { | ^ applications_user/seader/seader_worker.c:205:71: error: 'FuriHalNfcDevData' has no member named 'sak' 205 | nfc_data.atqa[0], nfc_data.atqa[1], nfc_data.sak)) { | ^ applications_user/seader/seader_worker.c:207:55: error: 'FuriHalNfcDevData' has no member named 'atqa' 207 | OCTET_STRING_t atqa = {.buf = nfc_data.atqa, .size = sizeof(nfc_data.atqa)}; | ^ applications_user/seader/seader_worker.c:207:85: error: 'FuriHalNfcDevData' has no member named 'atqa' 207 | OCTET_STRING_t atqa = {.buf = nfc_data.atqa, .size = sizeof(nfc_data.atqa)}; | ^ scons: *** [build/f7-firmware-C/.extapps/seader/seader_worker.o] Error 1

Anything else?

No response

[Willy-JL]

We do have that data. The issue is that we include the WIP nfc felica PR, which changed the nfc dev data struct to have a union of a_data and f_data, with the supposedly missing fields simply being part of the a_data member

[Willy-JL]

Pressed close by accident. Anyway those errors are easily fixed, just means that we have to include the app ourselves with the necessary tiny modifications

[Willy-JL]

removed the WIP nfc felica stuff, so this is now "fixed", apps are compatible as is