调试对KEY A和KEY B的修改

This commit is contained in:
YuXifeng 2025-04-25 17:56:01 +08:00
parent 9e8bcbe608
commit 74a31f1b40
2 changed files with 71 additions and 3 deletions

View File

@ -229,7 +229,7 @@ void app_main(void)
bits = xEventGroupWaitBits(System_eventGroup, EVENT_GET_BATTPERCENTAGE ,pdFALSE,pdFALSE,portMAX_DELAY); bits = xEventGroupWaitBits(System_eventGroup, EVENT_GET_BATTPERCENTAGE ,pdFALSE,pdFALSE,portMAX_DELAY);
if(bits&EVENT_GET_BATTPERCENTAGE) if(bits&EVENT_GET_BATTPERCENTAGE)
{ {
ESP_LOGI(TAG,"EVENT_GET_BATTPERCENTAGE"); // ESP_LOGI(TAG,"EVENT_GET_BATTPERCENTAGE");
lv_event_send(guider_ui.screen_label_1, LV_EVENT_CUSTOM_UPDATE, (void *)getBattPercentage()); lv_event_send(guider_ui.screen_label_1, LV_EVENT_CUSTOM_UPDATE, (void *)getBattPercentage());
xEventGroupClearBits(System_eventGroup,EVENT_GET_BATTPERCENTAGE); xEventGroupClearBits(System_eventGroup,EVENT_GET_BATTPERCENTAGE);
} }

View File

@ -98,13 +98,25 @@ static void dump_block(rc522_mifare_sector_block_t *block, uint8_t sector_index)
// Termination // Termination
DUMP("\n"); DUMP("\n");
} }
static void dump_block_buffer(uint8_t buffer[RC522_MIFARE_BLOCK_SIZE])
{
for (uint8_t i = 0; i < RC522_MIFARE_BLOCK_SIZE; i++) {
esp_log_write(ESP_LOG_INFO, TAG, "%02" RC522_X " ", buffer[i]);
}
esp_log_write(ESP_LOG_INFO, TAG, "\n");
}
static esp_err_t dump_memory(rc522_handle_t scanner, rc522_picc_t *picc) static esp_err_t dump_memory(rc522_handle_t scanner, rc522_picc_t *picc)
{ {
rc522_mifare_key_t key = { rc522_mifare_key_t key = {
.value = { RC522_MIFARE_KEY_VALUE_DEFAULT }, .value = { RC522_MIFARE_KEY_VALUE_DEFAULT },
}; };
rc522_mifare_key_t key_b = {
.type = RC522_MIFARE_KEY_B,
.value = { 0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xF0 },
};
rc522_mifare_desc_t mifare; rc522_mifare_desc_t mifare;
ESP_RETURN_ON_ERROR(rc522_mifare_get_desc(picc, &mifare), TAG, ""); ESP_RETURN_ON_ERROR(rc522_mifare_get_desc(picc, &mifare), TAG, "");
@ -117,7 +129,12 @@ static esp_err_t dump_memory(rc522_handle_t scanner, rc522_picc_t *picc)
do { do {
rc522_mifare_sector_desc_t sector; rc522_mifare_sector_desc_t sector;
ESP_RETURN_ON_ERROR(rc522_mifare_get_sector_desc(sector_index, &sector), TAG, ""); 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
{
ESP_RETURN_ON_ERROR(rc522_mifare_auth_sector(scanner, picc, &sector, &key), TAG, ""); ESP_RETURN_ON_ERROR(rc522_mifare_auth_sector(scanner, picc, &sector, &key), TAG, "");
}
rc522_mifare_sector_block_t trailer; rc522_mifare_sector_block_t trailer;
ESP_RETURN_ON_ERROR(rc522_mifare_read_sector_trailer_block(scanner, picc, &sector, &trailer), TAG, ""); ESP_RETURN_ON_ERROR(rc522_mifare_read_sector_trailer_block(scanner, picc, &sector, &trailer), TAG, "");
@ -144,6 +161,47 @@ static esp_err_t dump_memory(rc522_handle_t scanner, rc522_picc_t *picc)
return ESP_OK; return ESP_OK;
} }
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;
}
static void on_picc_state_changed(void *arg, esp_event_base_t base, int32_t event_id, void *data) static void on_picc_state_changed(void *arg, esp_event_base_t base, int32_t event_id, void *data)
{ {
@ -154,6 +212,9 @@ static void on_picc_state_changed(void *arg, esp_event_base_t base, int32_t even
return; return;
} }
rc522_picc_print(picc); rc522_picc_print(picc);
picc->type = RC522_PICC_TYPE_MIFARE_1K; picc->type = RC522_PICC_TYPE_MIFARE_1K;
if (!rc522_mifare_type_is_classic_compatible(picc->type)) { if (!rc522_mifare_type_is_classic_compatible(picc->type)) {
@ -168,6 +229,13 @@ static void on_picc_state_changed(void *arg, esp_event_base_t base, int32_t even
ESP_LOGE(TAG, "Memory dump failed"); ESP_LOGE(TAG, "Memory dump failed");
} }
if (read_write(scanner, picc) == ESP_OK) {
ESP_LOGI(TAG, "Read/Write success");
}
else {
ESP_LOGE(TAG, "Read/Write failed");
}
if (rc522_mifare_deauth(scanner, picc) != ESP_OK) { if (rc522_mifare_deauth(scanner, picc) != ESP_OK) {
ESP_LOGW(TAG, "Deauth failed"); ESP_LOGW(TAG, "Deauth failed");
} }