From d983d4eb51505479177fcff86b438a0986eae3ce Mon Sep 17 00:00:00 2001 From: YuXifeng <2860280851@qq.com> Date: Sun, 27 Apr 2025 13:02:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E5=8D=A1=E7=89=87=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/rfid_rc522/include/rc522.h | 3 +++ components/rfid_rc522/src/rc522_picc.c | 14 ++++++++++++++ main/rfid_rc522/memory_dump.c | 15 +++++++++++++-- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/components/rfid_rc522/include/rc522.h b/components/rfid_rc522/include/rc522.h index b88a73b..03271ca 100644 --- a/components/rfid_rc522/include/rc522.h +++ b/components/rfid_rc522/include/rc522.h @@ -21,6 +21,9 @@ esp_err_t rc522_pause(rc522_handle_t rc522); 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); + #ifdef __cplusplus } #endif diff --git a/components/rfid_rc522/src/rc522_picc.c b/components/rfid_rc522/src/rc522_picc.c index 08543e3..d5ad3ba 100644 --- a/components/rfid_rc522/src/rc522_picc.c +++ b/components/rfid_rc522/src/rc522_picc.c @@ -744,6 +744,20 @@ esp_err_t rc522_picc_set_state( return ret; } +rc522_picc_t *rc522_get_picc(rc522_handle_t rc522) +{ + if (rc522 == NULL) { + return NULL; + } + + return &(rc522->picc); +} +esp_err_t rc522_get_picc_state(rc522_handle_t rc522) +{ + RC522_CHECK(rc522 == NULL); + + return rc522->picc.state; +} rc522_picc_type_t rc522_picc_get_type(const rc522_picc_t *picc) { diff --git a/main/rfid_rc522/memory_dump.c b/main/rfid_rc522/memory_dump.c index a6b86a1..841fd2a 100644 --- a/main/rfid_rc522/memory_dump.c +++ b/main/rfid_rc522/memory_dump.c @@ -243,6 +243,9 @@ static void on_picc_state_changed(void *arg, esp_event_base_t base, int32_t even void rfid_rc522_task(void *pvParameter) { + + rc522_picc_t *picc; + rc522_spi_create(&driver_config, &driver); rc522_driver_install(driver); @@ -251,12 +254,20 @@ void rfid_rc522_task(void *pvParameter) }; rc522_create(&scanner_config, &scanner); - rc522_register_events(scanner, RC522_EVENT_PICC_STATE_CHANGED, on_picc_state_changed, NULL); + // rc522_register_events(scanner, RC522_EVENT_PICC_STATE_CHANGED, on_picc_state_changed, NULL); rc522_start(scanner); while (1) { - vTaskDelay(1000 / portTICK_PERIOD_MS); + if (rc522_get_picc_state(scanner) == RC522_PICC_STATE_ACTIVE || + rc522_get_picc_state(scanner) == RC522_PICC_STATE_ACTIVE_H) { + ESP_LOGI(TAG,"The IC card exists"); + picc = rc522_get_picc(scanner); + rc522_picc_print(picc); + } else if (rc522_get_picc_state(scanner) == RC522_PICC_STATE_IDLE) { + ESP_LOGI(TAG,"The IC card does not exist"); + } + vTaskDelay(2000 / portTICK_PERIOD_MS); } }