Merge branch 'solosky:develop' into develop

Author: James-Makoto

fw/application/Makefile

@@ -332,7 +332,7 @@ SRC_FILES += \
   $(CHAMELEON_ROOT)/application/src/rfid/nfctag/hf/crypto1_helper.c \
   $(CHAMELEON_ROOT)/application/src/rfid/nfctag/hf/nfc_14a.c \
   $(CHAMELEON_ROOT)/application/src/rfid/nfctag/hf/nfc_mf1.c \
-  $(CHAMELEON_ROOT)/application/src/rfid/nfctag/hf/nfc_ntag.c \
+  $(CHAMELEON_ROOT)/application/src/rfid/nfctag/hf/nfc_mf0_ntag.c \
   $(CHAMELEON_ROOT)/application/src/rfid/crc_utils.c \
   $(CHAMELEON_ROOT)/application/src/rfid/hex_utils.c \
   $(CHAMELEON_ROOT)/application/src/rfid/mf1_crapto1.c \

fw/application/src/app/chameleon/port/tag_helper.c

@@ -5,6 +5,7 @@
 #include "nrf_log.h"
 #include "utils2.h"
 #include <string.h>
+#define NFC_TAG_NTAG_DATA_SIZE 4
 
 const static tag_specific_type_name_t tag_type_names[] = {
     {TAG_TYPE_UNDEFINED, "-", "-", 0},
@@ -14,9 +15,17 @@ const static tag_specific_type_name_t tag_type_names[] = {
     {TAG_TYPE_MIFARE_2048, "MF 2K", "MiFare 2K", 128 * NFC_TAG_MF1_DATA_SIZE},
     {TAG_TYPE_MIFARE_4096, "MF 4K", "MiFare 4K", 256 * NFC_TAG_MF1_DATA_SIZE},
     // NTAG series
-    {TAG_TYPE_NTAG_213, "N213", "NTAG 213", 45 * NFC_TAG_NTAG_DATA_SIZE},
-    {TAG_TYPE_NTAG_215, "N215", "NTAG 215", 135 * NFC_TAG_NTAG_DATA_SIZE},
-    {TAG_TYPE_NTAG_216, "N216", "NTAG 216", 231 * NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_NTAG_210, "N210", "NTAG 210", NTAG210_PAGES * NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_NTAG_212, "N212", "NTAG 212", NTAG212_PAGES * NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_NTAG_213, "N213", "NTAG 213", NTAG213_PAGES * NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_NTAG_215, "N215", "NTAG 215", NTAG215_PAGES * NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_NTAG_216, "N216", "NTAG 216", NTAG216_PAGES * NFC_TAG_NTAG_DATA_SIZE},
+   
+    {TAG_TYPE_MF0ICU1, "ICU1", "MF0ICU1", MF0ICU1_PAGES * NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_MF0ICU2, "ICU2", "MF0ICU2", MF0ICU2_PAGES * NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_MF0UL11,"UL11", "MFOUL11", MF0UL11_PAGES * NFC_TAG_NTAG_DATA_SIZE},
+    {TAG_TYPE_MF0UL21,"UL21", "MF0UL21", MF0UL21_PAGES * NFC_TAG_NTAG_DATA_SIZE},
+
 };
 // typedef enum {
 //     NFC_TAG_MF1_WRITE_NORMAL    = 0u,
@@ -75,9 +84,9 @@ const nfc_tag_14a_coll_res_reference_t *tag_helper_get_active_coll_res_ref() {
         // nfc_tag_mf1_information_t *m_tag_information = (nfc_tag_mf1_information_t *)tag_buffer->buffer;
         // return &m_tag_information->res_coll;
     } else {
-        // nfc_tag_ntag_information_t *m_tag_information = (nfc_tag_ntag_information_t *)tag_buffer->buffer;
+        // nfc_tag_mf0_ntag_information_t *m_tag_information = (nfc_tag_mf0_ntag_information_t *)tag_buffer->buffer;
         // return &m_tag_information->res_coll;
-        return get_ntag_coll_res();
+        return nfc_tag_mf0_ntag_get_coll_res();
     }
 }
 
@@ -150,7 +159,7 @@ uint8_t *tag_helper_get_active_tag_memory_data() {
         nfc_tag_mf1_information_t *m_tag_information = (nfc_tag_mf1_information_t *)tag_buffer->buffer;
         return &m_tag_information->memory;
     } else {
-        nfc_tag_ntag_information_t *m_tag_information = (nfc_tag_ntag_information_t *)tag_buffer->buffer;
+        nfc_tag_mf0_ntag_information_t *m_tag_information = (nfc_tag_mf0_ntag_information_t *)tag_buffer->buffer;
         return &m_tag_information->memory;
     }
 }
@@ -160,12 +169,12 @@ void tag_helper_generate_uid() {
     tag_group_type_t tag_group_type = tag_helper_get_tag_group_type(tag_type);
     tag_data_buffer_t *tag_buffer = get_buffer_by_tag_type(tag_type);
     if (tag_group_type == TAG_GROUP_NTAG) {
-        nfc_tag_ntag_information_t *m_tag_information = (nfc_tag_ntag_information_t *)tag_buffer->buffer;
+        nfc_tag_mf0_ntag_information_t *m_tag_information = (nfc_tag_mf0_ntag_information_t *)tag_buffer->buffer;
         uint8_t uuid[7];
         ret_code_t err_code = utils_rand_bytes(uuid, sizeof(uuid));
         if (err_code == NRF_SUCCESS) {
             uuid[0] = 04; // fixed
-            m_tag_information->memory[0][0] = uuid[0]; 
+            m_tag_information->memory[0][0] = uuid[0];
             m_tag_information->memory[0][1] = uuid[1];
             m_tag_information->memory[0][2] = uuid[2];
             // BCC 0 is always equal to UID0 ⊕ UID 1 ⊕ UID 2 ⊕ 0x88

fw/application/src/app/chameleon/port/tag_helper.h

@@ -1,10 +1,10 @@
 #ifndef TAG_HELPER_H
 #define TAG_HELPER_H
 
-#include "tag_base_type.h"
 #include "nfc_14a.h"
+#include "nfc_mf0_ntag.h"
 #include "nfc_mf1.h"
-#include "nfc_ntag.h"
+#include "tag_base_type.h"
 
 #define TAG_TYPE_MAX 9
 #define TAG_TYPE_HF_MAX 8
@@ -25,7 +25,7 @@ typedef enum {
 
 extern const tag_specific_type_t hf_tag_specific_types[];
 
-const tag_specific_type_name_t* tag_helper_get_tag_type_name(tag_specific_type_t tag_type);
+const tag_specific_type_name_t *tag_helper_get_tag_type_name(tag_specific_type_t tag_type);
 const nfc_tag_14a_coll_res_reference_t *tag_helper_get_active_coll_res_ref();
 tag_specific_type_t tag_helper_get_active_tag_type();
 void tag_helper_format_uid(char *buff, uint8_t *uid, uint8_t uid_len);
@@ -39,5 +39,4 @@ uint8_t *tag_helper_get_active_tag_memory_data();
 
 void tag_helper_generate_uid();
 
-
 #endif