增加接口,读取卡片状态
This commit is contained in:
parent
2f08a875a6
commit
d983d4eb51
@ -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_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
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -744,6 +744,20 @@ esp_err_t rc522_picc_set_state(
|
|||||||
|
|
||||||
return ret;
|
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)
|
rc522_picc_type_t rc522_picc_get_type(const rc522_picc_t *picc)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -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)
|
void rfid_rc522_task(void *pvParameter)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
rc522_picc_t *picc;
|
||||||
|
|
||||||
rc522_spi_create(&driver_config, &driver);
|
rc522_spi_create(&driver_config, &driver);
|
||||||
rc522_driver_install(driver);
|
rc522_driver_install(driver);
|
||||||
|
|
||||||
@ -251,12 +254,20 @@ void rfid_rc522_task(void *pvParameter)
|
|||||||
};
|
};
|
||||||
|
|
||||||
rc522_create(&scanner_config, &scanner);
|
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);
|
rc522_start(scanner);
|
||||||
|
|
||||||
while (1)
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user