Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-03 22:23:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add more specific error types

Browse Source
This commit is contained in:
Willy-JL
2025-03-10 02:57:01 +00:00
parent 730f1b6ecf
commit 385e8b3b1c
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/nfc/protocols/type_4_tag/type_4_tag.h
+3
View File
@@ -13,6 +13,9 @@ typedef enum {
Type4TagErrorNotPresent,
Type4TagErrorProtocol,
Type4TagErrorTimeout,
Type4TagErrorWrongFormat,
Type4TagErrorNotSupported,
Type4TagErrorUnknown,
} Type4TagError;
typedef struct {
lib/nfc/protocols/type_4_tag/type_4_tag_poller_i.c
+6 -6
View File
@@ -36,7 +36,7 @@ Type4TagError type_4_tag_apdu_trx(Type4TagPoller* instance, BitBuffer* tx_buf, B
size_t response_len = bit_buffer_get_size_bytes(rx_buf);
if(response_len < TYPE_4_TAG_ISO_STATUS_LEN) {
return Type4TagErrorProtocol;
return Type4TagErrorWrongFormat;
}
const uint8_t success[TYPE_4_TAG_ISO_STATUS_LEN] = {TYPE_4_TAG_ISO_STATUS_SUCCESS};
@@ -50,7 +50,7 @@ Type4TagError type_4_tag_apdu_trx(Type4TagPoller* instance, BitBuffer* tx_buf, B
return Type4TagErrorNone;
} else {
FURI_LOG_E(TAG, "APDU failed: 0x%02X%02X", status[0], status[1]);
return Type4TagErrorProtocol;
return Type4TagErrorUnknown;
}
}
@@ -112,7 +112,7 @@ Type4TagError type_4_tag_poller_read_cc(Type4TagPoller* instance) {
const Type4TagCc* cc = (const Type4TagCc*)bit_buffer_get_data(instance->rx_buffer);
if(cc->t4t_vno != TYPE_4_TAG_T4T_CC_VNO) {
FURI_LOG_E(TAG, "Unsupported T4T version");
error = Type4TagErrorProtocol;
error = Type4TagErrorNotSupported;
break;
}
@@ -133,7 +133,7 @@ Type4TagError type_4_tag_poller_read_cc(Type4TagPoller* instance) {
}
if(!ndef_file_ctrl) {
FURI_LOG_E(TAG, "No NDEF file ctrl TLV");
error = Type4TagErrorProtocol;
error = Type4TagErrorWrongFormat;
break;
}
@@ -219,7 +219,7 @@ Type4TagError type_4_tag_poller_read_ndef(Type4TagPoller* instance) {
// AKA 2 * 255 byte chunks = 510 bytes -2 byte NDEF len header
// TODO: Surely there has to be another way?
FURI_LOG_E(TAG, "NDEF file too long: %zu bytes", ndef_len);
error = Type4TagErrorProtocol;
error = Type4TagErrorNotSupported;
break;
}
simple_array_init(instance->data->ndef_data, ndef_len);
@@ -251,7 +251,7 @@ Type4TagError type_4_tag_poller_read_ndef(Type4TagPoller* instance) {
"Wrong NDEF chunk len: %zu != %zu",
bit_buffer_get_size_bytes(instance->rx_buffer),
ndef_len);
error = Type4TagErrorProtocol;
error = Type4TagErrorWrongFormat;
break;
}
memcpy(&ndef_data[ndef_pos], bit_buffer_get_data(instance->rx_buffer), chunk_len);