增加认证状态标志、增加区块读写函数接口

This commit is contained in:
YuXifeng 2025-04-27 17:58:11 +08:00
parent 400ca87b38
commit c16ad6c0de
7 changed files with 174 additions and 12 deletions

View File

@ -24,6 +24,9 @@ esp_err_t rc522_destroy(rc522_handle_t rc522);
esp_err_t rc522_get_picc_state(rc522_handle_t rc522);
rc522_picc_t *rc522_get_picc(rc522_handle_t rc522);
esp_err_t rc522_set_auth_state(rc522_handle_t rc522,bool is_authenticated);
bool rc522_get_auth_state(rc522_handle_t rc522);
#ifdef __cplusplus
}
#endif

View File

@ -40,6 +40,8 @@ struct rc522
rc522_state_t state; /*<! Current state */
rc522_picc_t picc;
EventGroupHandle_t bits;
bool is_authenticated; /*<! Flag to indicate if the RC522 is authenticated */
};
typedef struct

View File

@ -759,6 +759,17 @@ esp_err_t rc522_get_picc_state(rc522_handle_t rc522)
return rc522->picc.state;
}
esp_err_t rc522_set_auth_state(rc522_handle_t rc522,bool is_authenticated)
{
rc522->is_authenticated = is_authenticated;
return ESP_OK;
}
bool rc522_get_auth_state(rc522_handle_t rc522)
{
return rc522->is_authenticated;
}
rc522_picc_type_t rc522_picc_get_type(const rc522_picc_t *picc)
{
RC522_CHECK(picc == NULL);

View File

@ -10,7 +10,7 @@ file(GLOB PORT_GUI "GUI/lvgl_task.c" "GUI/custom/*.c" "GUI/generated/*.c" "GUI/g
file(GLOB PORT_USB "usb_serial_task.c" )
endif()
file(GLOB RFID_SRCS "rfid_rc522/memory_dump.c")
file(GLOB RFID_SRCS "rfid_rc522/*.c")
idf_component_register(SRCS "main.c" "Receiver.c" "flasher_tool.c"
${PORT_SRCS}

View File

@ -4,6 +4,7 @@
#include "rc522.h"
#include "driver/rc522_spi.h"
#include "picc/rc522_mifare.h"
#include "mifare_M1.h"
static const char *TAG = "rc522-memory-dump-example";
@ -129,9 +130,9 @@ static esp_err_t dump_memory(rc522_handle_t scanner, rc522_picc_t *picc)
do {
rc522_mifare_sector_desc_t sector;
ESP_RETURN_ON_ERROR(rc522_mifare_get_sector_desc(sector_index, &sector), TAG, "");
if (sector_index == 0 || sector_index == 1 || sector_index == 2) {
ESP_RETURN_ON_ERROR(rc522_mifare_auth_sector(scanner, picc, &sector, &key_b), TAG, "");
} else
// if (sector_index == 0 || sector_index == 1 || sector_index == 2) {
// ESP_RETURN_ON_ERROR(rc522_mifare_auth_sector(scanner, picc, &sector, &key_b), TAG, "");
// } else
{
ESP_RETURN_ON_ERROR(rc522_mifare_auth_sector(scanner, picc, &sector, &key), TAG, "");
}
@ -173,20 +174,20 @@ static esp_err_t read_write(rc522_handle_t scanner, rc522_picc_t *picc)
};
rc522_mifare_key_t key_b = {
.type = RC522_MIFARE_KEY_B,
.value = { 0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xF0 },
.value = { 0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF },
// .value = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
};
rc522_mifare_sector_desc_t sector;
sector.index = 3;
sector.index = 9;
// rc522_mifare_get_sector_desc(7, &sector); // 获取第5扇区信息
// 鉴权
ESP_RETURN_ON_ERROR(rc522_mifare_auth(scanner, picc, sector.index, &key_a), TAG, "auth fail");
// ESP_RETURN_ON_ERROR(rc522_mifare_auth(scanner, picc, sector.index, &key_a), TAG, "auth fail");
ESP_RETURN_ON_ERROR(rc522_mifare_read(scanner, picc, sector.index, read_buffer), TAG, "read fail");
dump_block_buffer(read_buffer);
// ESP_RETURN_ON_ERROR(rc522_mifare_read(scanner, picc, sector.index, read_buffer), TAG, "read fail");
// dump_block_buffer(read_buffer);
// 鉴权
ESP_RETURN_ON_ERROR(rc522_mifare_auth(scanner, picc, sector.index, &key_b), TAG, "auth fail");
@ -195,10 +196,10 @@ static esp_err_t read_write(rc522_handle_t scanner, rc522_picc_t *picc)
dump_block_buffer(read_buffer);
// ESP_RETURN_ON_ERROR(rc522_mifare_write(scanner, picc, sector.index, write_buffer), TAG, "write fail");
ESP_RETURN_ON_ERROR(rc522_mifare_write(scanner, picc, sector.index, write_buffer), TAG, "write fail");
// ESP_RETURN_ON_ERROR(rc522_mifare_read(scanner, picc, sector.index, read_buffer), TAG, "read fail");
// dump_block_buffer(read_buffer);
ESP_RETURN_ON_ERROR(rc522_mifare_read(scanner, picc, sector.index, read_buffer), TAG, "read fail");
dump_block_buffer(read_buffer);
return ESP_OK;
}
@ -257,6 +258,18 @@ void rfid_rc522_task(void *pvParameter)
// rc522_register_events(scanner, RC522_EVENT_PICC_STATE_CHANGED, on_picc_state_changed, NULL);
rc522_start(scanner);
rc522_mifare_key_t key_b = {
.type = RC522_MIFARE_KEY_B,
.value = { 0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF },
// .value = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
};
uint8_t read_buffer[RC522_MIFARE_BLOCK_SIZE*4];
// uint8_t write_buffer[RC522_MIFARE_BLOCK_SIZE] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0xFF ,0x07 ,0x80 ,0x69 ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0x00};
rc522_mifare_sector_desc_t sector_0;
rc522_mifare_sector_desc_t sector_2;
rc522_mifare_get_sector_desc(0, &sector_0);
rc522_mifare_get_sector_desc(2, &sector_2);
esp_err_t ret;
while (1)
{
if (rc522_get_picc_state(scanner) == RC522_PICC_STATE_ACTIVE ||
@ -264,6 +277,22 @@ void rfid_rc522_task(void *pvParameter)
ESP_LOGI(TAG,"The IC card exists");
picc = rc522_get_picc(scanner);
rc522_picc_print(picc);
ret = rc522_read_sector(scanner,sector_2,key_b,&read_buffer[0]);
if (ret == ESP_OK) {
dump_block_buffer(&read_buffer[0]);
dump_block_buffer(&read_buffer[16]);
dump_block_buffer(&read_buffer[32]);
dump_block_buffer(&read_buffer[48]);
read_buffer[0 + 15] += 1;
ret = rc522_write_block(scanner,sector_2,0,key_b,&read_buffer[0]);
}
if (rc522_mifare_deauth(scanner, rc522_get_picc(scanner)) != ESP_OK) {
ESP_LOGW(TAG, "Deauth failed");
} else {
rc522_set_auth_state(scanner,false);
}
} else if (rc522_get_picc_state(scanner) == RC522_PICC_STATE_IDLE) {
ESP_LOGI(TAG,"The IC card does not exist");
}

View File

@ -0,0 +1,11 @@
#ifndef MIFARE_M1_H
#define MIFARE_M1_H
#include <esp_check.h>
#include "rc522.h"
#include "picc/rc522_mifare.h"
esp_err_t rc522_read_sector(rc522_handle_t rc522, rc522_mifare_sector_desc_t sector, rc522_mifare_key_t key,uint8_t *data);
esp_err_t rc522_write_block(rc522_handle_t rc522, rc522_mifare_sector_desc_t sector, uint8_t Offset, rc522_mifare_key_t key,uint8_t data[RC522_MIFARE_BLOCK_SIZE]);
esp_err_t rc522_set_key(rc522_handle_t rc522, rc522_mifare_sector_desc_t sector, rc522_mifare_key_t old_key, rc522_mifare_key_t new_key);
#endif

View File

@ -0,0 +1,106 @@
#include <esp_log.h>
#include <esp_check.h>
#include <string.h>
#include "rc522.h"
#include "driver/rc522_spi.h"
#include "picc/rc522_mifare.h"
static const char *TAG = "M1-Control";
#define RC522_MIFARE_BLOCK_SIZE 16 // 每个数据块的大小
static esp_err_t read_write(rc522_handle_t scanner, rc522_picc_t *picc)
{
uint8_t read_buffer[RC522_MIFARE_BLOCK_SIZE];
// uint8_t write_buffer[RC522_MIFARE_BLOCK_SIZE] = {0x01 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0xFF ,0x07 ,0x80 ,0x69 ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xF0};
uint8_t write_buffer[RC522_MIFARE_BLOCK_SIZE] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0xFF ,0x07 ,0x80 ,0x69 ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xF0};
rc522_mifare_key_t key_a = {
.type = RC522_MIFARE_KEY_A,
.value = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
// .value = { RC522_MIFARE_KEY_VALUE_DEFAULT },
};
rc522_mifare_key_t key_b = {
.type = RC522_MIFARE_KEY_B,
.value = { 0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xF0 },
// .value = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
};
rc522_mifare_sector_desc_t sector;
sector.index = 3;
// rc522_mifare_get_sector_desc(7, &sector); // 获取第5扇区信息
// 鉴权
// ESP_RETURN_ON_ERROR(rc522_mifare_auth(scanner, picc, sector.index, &key_a), TAG, "auth fail");
// ESP_RETURN_ON_ERROR(rc522_mifare_read(scanner, picc, sector.index, read_buffer), TAG, "read fail");
// dump_block_buffer(read_buffer);
// // 鉴权
// ESP_RETURN_ON_ERROR(rc522_mifare_auth(scanner, picc, sector.index, &key_b), TAG, "auth fail");
// ESP_RETURN_ON_ERROR(rc522_mifare_read(scanner, picc, sector.index, read_buffer), TAG, "read fail");
// dump_block_buffer(read_buffer);
// ESP_RETURN_ON_ERROR(rc522_mifare_write(scanner, picc, sector.index, write_buffer), TAG, "write fail");
// ESP_RETURN_ON_ERROR(rc522_mifare_read(scanner, picc, sector.index, read_buffer), TAG, "read fail");
// dump_block_buffer(read_buffer);
return ESP_OK;
}
esp_err_t rc522_read_sector(rc522_handle_t rc522, rc522_mifare_sector_desc_t sector, rc522_mifare_key_t key,uint8_t *data)
{
esp_err_t ret;
if (rc522_get_auth_state(rc522) == false) {
ESP_RETURN_ON_ERROR(rc522_mifare_auth(rc522, rc522_get_picc(rc522), sector.block_0_address, &key), TAG, "auth fail");
rc522_set_auth_state(rc522,true);
}
ESP_RETURN_ON_ERROR(rc522_mifare_read(rc522, rc522_get_picc(rc522), sector.block_0_address, &data[0]), TAG, "read fail");
ESP_RETURN_ON_ERROR(rc522_mifare_read(rc522, rc522_get_picc(rc522), sector.block_0_address + 1, &data[16]), TAG, "read fail");
ESP_RETURN_ON_ERROR(rc522_mifare_read(rc522, rc522_get_picc(rc522), sector.block_0_address + 2, &data[32]), TAG, "read fail");
ESP_RETURN_ON_ERROR(rc522_mifare_read(rc522, rc522_get_picc(rc522), sector.block_0_address + 3, &data[48]), TAG, "read fail");
return ESP_OK;
}
esp_err_t rc522_write_block(rc522_handle_t rc522, rc522_mifare_sector_desc_t sector, uint8_t Offset, rc522_mifare_key_t key,uint8_t data[RC522_MIFARE_BLOCK_SIZE])
{
esp_err_t ret;
if (Offset > 2) return ESP_FAIL;
ESP_LOGI(TAG,"sector.block_0_address + Offset:%d",sector.block_0_address + Offset);
if (rc522_get_auth_state(rc522) == false) {
ESP_RETURN_ON_ERROR(rc522_mifare_auth(rc522, rc522_get_picc(rc522), sector.block_0_address, &key), TAG, "auth fail");
rc522_set_auth_state(rc522,true);
}
ESP_RETURN_ON_ERROR(rc522_mifare_write(rc522, rc522_get_picc(rc522), sector.block_0_address + Offset, data), TAG, "write fail");
return ESP_OK;
}
esp_err_t rc522_set_key(rc522_handle_t rc522, rc522_mifare_sector_desc_t sector, rc522_mifare_key_t old_key, rc522_mifare_key_t new_key)
{
esp_err_t ret;
uint8_t data[RC522_MIFARE_BLOCK_SIZE];
ESP_RETURN_ON_ERROR(rc522_mifare_auth(rc522, rc522_get_picc(rc522), sector.block_0_address + 3, &old_key), TAG, "auth fail");
ESP_RETURN_ON_ERROR(rc522_mifare_read(rc522, rc522_get_picc(rc522), sector.block_0_address + 3, &data[0]), TAG, "read fail");
if (new_key.type == RC522_MIFARE_KEY_A) {
memcpy(&data[0],&new_key.value[0],6);
} else {
memcpy(&data[10],&new_key.value[0],6);
}
ESP_RETURN_ON_ERROR(rc522_mifare_write(rc522, rc522_get_picc(rc522), sector.block_0_address + 3, data), TAG, "write fail");
return ESP_OK;
}