From 86199b822e3f78706a7d48d2be4177b77778e621 Mon Sep 17 00:00:00 2001 From: lmx Date: Wed, 3 Dec 2025 10:44:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E4=B8=BB=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=8E=BB=E8=BF=9E=E6=8E=A5=E5=85=B6=E4=BB=96=E8=93=9D=E7=89=99?= =?UTF-8?q?=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 6 ++---- .../RFID/include/CPU_CARD.h | 0 .../RFID/include/MIFARE.h | 0 .../RFID/include/NTAG.h | 0 .../RFID/include/READER.h | 0 .../RFID/include/READER_REG.h | 0 .../RFID/include/rfid_main.h | 0 .../RFID/reader/CPU_CARD.c | 0 .../RFID/reader/MIFARE.c | 0 .../RFID/reader/NTAG.c | 0 .../RFID/reader/READER.c | 0 .../RFID/rfid_event.c | 5 +++-- .../RFID/rfid_hal.c | 0 .../RFID/rfid_hal.h | 0 .../ble_handler/ble_handler.c} | 2 +- .../ble_handler/ble_test.c | 0 .../ble_handler/client_handler.c | 2 +- .../ble_handler/example/example.c | 0 .../nvs}/nvs.c | 0 .../nvs}/nvs.h | 0 .../task_func.c} | 19 +++++++++++-------- .../task_func.h} | 0 .../xtell.h | 0 .../xtell_app_main.c | 0 24 files changed, 18 insertions(+), 16 deletions(-) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/include/CPU_CARD.h (100%) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/include/MIFARE.h (100%) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/include/NTAG.h (100%) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/include/READER.h (100%) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/include/READER_REG.h (100%) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/include/rfid_main.h (100%) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/reader/CPU_CARD.c (100%) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/reader/MIFARE.c (100%) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/reader/NTAG.c (100%) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/reader/READER.c (100%) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/rfid_event.c (98%) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/rfid_hal.c (100%) rename apps/earphone/{remote_control => xtell_remote_control}/RFID/rfid_hal.h (100%) rename apps/earphone/{remote_control/ble_handler/xtell_handler.c => xtell_remote_control/ble_handler/ble_handler.c} (99%) rename apps/earphone/{remote_control => xtell_remote_control}/ble_handler/ble_test.c (100%) rename apps/earphone/{remote_control => xtell_remote_control}/ble_handler/client_handler.c (99%) rename apps/earphone/{remote_control => xtell_remote_control}/ble_handler/example/example.c (100%) rename apps/earphone/{remote_control => xtell_remote_control/nvs}/nvs.c (100%) rename apps/earphone/{remote_control => xtell_remote_control/nvs}/nvs.h (100%) rename apps/earphone/{remote_control/RC_app_main.c => xtell_remote_control/task_func.c} (95%) rename apps/earphone/{remote_control/RC_app_main.h => xtell_remote_control/task_func.h} (100%) rename apps/earphone/{remote_control/ble_handler => xtell_remote_control}/xtell.h (100%) rename apps/earphone/{remote_control/ble_handler => xtell_remote_control}/xtell_app_main.c (100%) diff --git a/Makefile b/Makefile index 9ffb8a1..d952e3f 100644 --- a/Makefile +++ b/Makefile @@ -245,8 +245,7 @@ INCLUDES := \ -Iinclude_lib/media/aispeech/enc/include \ -Icpu/br28/audio_hearing \ -Iinclude_lib/media/cvp \ - -Iapps/earphone/xtell_Sensor \ - -Iapps/earphone/remote_control/ \ + -Iapps/earphone/xtell_remote_control \ -I$(SYS_INC_DIR) \ @@ -616,8 +615,7 @@ c_SRC_FILES := \ # 定义需要自动搜索 .c 文件的目录列表 C_SRC_DIRS := \ - apps/earphone/remote_control \ - apps/earphone/xtell_Sensor \ + apps/earphone/xtell_remote_control \ # 使用 shell 的 find 命令递归查找所有 .c 文件 # foreach 遍历 C_SRC_DIRS 中的每一个目录 diff --git a/apps/earphone/remote_control/RFID/include/CPU_CARD.h b/apps/earphone/xtell_remote_control/RFID/include/CPU_CARD.h similarity index 100% rename from apps/earphone/remote_control/RFID/include/CPU_CARD.h rename to apps/earphone/xtell_remote_control/RFID/include/CPU_CARD.h diff --git a/apps/earphone/remote_control/RFID/include/MIFARE.h b/apps/earphone/xtell_remote_control/RFID/include/MIFARE.h similarity index 100% rename from apps/earphone/remote_control/RFID/include/MIFARE.h rename to apps/earphone/xtell_remote_control/RFID/include/MIFARE.h diff --git a/apps/earphone/remote_control/RFID/include/NTAG.h b/apps/earphone/xtell_remote_control/RFID/include/NTAG.h similarity index 100% rename from apps/earphone/remote_control/RFID/include/NTAG.h rename to apps/earphone/xtell_remote_control/RFID/include/NTAG.h diff --git a/apps/earphone/remote_control/RFID/include/READER.h b/apps/earphone/xtell_remote_control/RFID/include/READER.h similarity index 100% rename from apps/earphone/remote_control/RFID/include/READER.h rename to apps/earphone/xtell_remote_control/RFID/include/READER.h diff --git a/apps/earphone/remote_control/RFID/include/READER_REG.h b/apps/earphone/xtell_remote_control/RFID/include/READER_REG.h similarity index 100% rename from apps/earphone/remote_control/RFID/include/READER_REG.h rename to apps/earphone/xtell_remote_control/RFID/include/READER_REG.h diff --git a/apps/earphone/remote_control/RFID/include/rfid_main.h b/apps/earphone/xtell_remote_control/RFID/include/rfid_main.h similarity index 100% rename from apps/earphone/remote_control/RFID/include/rfid_main.h rename to apps/earphone/xtell_remote_control/RFID/include/rfid_main.h diff --git a/apps/earphone/remote_control/RFID/reader/CPU_CARD.c b/apps/earphone/xtell_remote_control/RFID/reader/CPU_CARD.c similarity index 100% rename from apps/earphone/remote_control/RFID/reader/CPU_CARD.c rename to apps/earphone/xtell_remote_control/RFID/reader/CPU_CARD.c diff --git a/apps/earphone/remote_control/RFID/reader/MIFARE.c b/apps/earphone/xtell_remote_control/RFID/reader/MIFARE.c similarity index 100% rename from apps/earphone/remote_control/RFID/reader/MIFARE.c rename to apps/earphone/xtell_remote_control/RFID/reader/MIFARE.c diff --git a/apps/earphone/remote_control/RFID/reader/NTAG.c b/apps/earphone/xtell_remote_control/RFID/reader/NTAG.c similarity index 100% rename from apps/earphone/remote_control/RFID/reader/NTAG.c rename to apps/earphone/xtell_remote_control/RFID/reader/NTAG.c diff --git a/apps/earphone/remote_control/RFID/reader/READER.c b/apps/earphone/xtell_remote_control/RFID/reader/READER.c similarity index 100% rename from apps/earphone/remote_control/RFID/reader/READER.c rename to apps/earphone/xtell_remote_control/RFID/reader/READER.c diff --git a/apps/earphone/remote_control/RFID/rfid_event.c b/apps/earphone/xtell_remote_control/RFID/rfid_event.c similarity index 98% rename from apps/earphone/remote_control/RFID/rfid_event.c rename to apps/earphone/xtell_remote_control/RFID/rfid_event.c index f33a88b..9e43ddf 100644 --- a/apps/earphone/remote_control/RFID/rfid_event.c +++ b/apps/earphone/xtell_remote_control/RFID/rfid_event.c @@ -24,7 +24,7 @@ /** - * @brief 处理Type A卡片事件。 + * @brief 处理Type A卡片事件。uid：8位数组 * @details * 该函数执行ISO/IEC 14443 Type A卡片的完整激活流程，包括： * 1. 初始化读卡器以支持Type A协议。 @@ -34,7 +34,7 @@ * 5. 操作结束后关闭RF场。 * @return 无。 */ -void TYPE_A_EVENT(void) +void TYPE_A_EVENT(char* uid) { unsigned char result; int i; @@ -75,6 +75,7 @@ void TYPE_A_EVENT(void) xlog("-> UID = "); for (i = 0; i < PICC_A.UID_Length; i++) { + uid[i] = PICC_A.UID[i]; xlog("%02X", PICC_A.UID[i]); } xlog("\r\n"); diff --git a/apps/earphone/remote_control/RFID/rfid_hal.c b/apps/earphone/xtell_remote_control/RFID/rfid_hal.c similarity index 100% rename from apps/earphone/remote_control/RFID/rfid_hal.c rename to apps/earphone/xtell_remote_control/RFID/rfid_hal.c diff --git a/apps/earphone/remote_control/RFID/rfid_hal.h b/apps/earphone/xtell_remote_control/RFID/rfid_hal.h similarity index 100% rename from apps/earphone/remote_control/RFID/rfid_hal.h rename to apps/earphone/xtell_remote_control/RFID/rfid_hal.h diff --git a/apps/earphone/remote_control/ble_handler/xtell_handler.c b/apps/earphone/xtell_remote_control/ble_handler/ble_handler.c similarity index 99% rename from apps/earphone/remote_control/ble_handler/xtell_handler.c rename to apps/earphone/xtell_remote_control/ble_handler/ble_handler.c index 8112d86..4a12ca8 100644 --- a/apps/earphone/remote_control/ble_handler/xtell_handler.c +++ b/apps/earphone/xtell_remote_control/ble_handler/ble_handler.c @@ -45,7 +45,7 @@ #include "default_event_handler.h" #include "debug.h" #include "system/event.h" -#include "../remote_control/nvs.h" +#include "../nvs/nvs.h" #if (JL_EARPHONE_APP_EN) #include "rcsp_adv_bluetooth.h" #endif diff --git a/apps/earphone/remote_control/ble_handler/ble_test.c b/apps/earphone/xtell_remote_control/ble_handler/ble_test.c similarity index 100% rename from apps/earphone/remote_control/ble_handler/ble_test.c rename to apps/earphone/xtell_remote_control/ble_handler/ble_test.c diff --git a/apps/earphone/remote_control/ble_handler/client_handler.c b/apps/earphone/xtell_remote_control/ble_handler/client_handler.c similarity index 99% rename from apps/earphone/remote_control/ble_handler/client_handler.c rename to apps/earphone/xtell_remote_control/ble_handler/client_handler.c index 879a2ca..25dcfcb 100644 --- a/apps/earphone/remote_control/ble_handler/client_handler.c +++ b/apps/earphone/xtell_remote_control/ble_handler/client_handler.c @@ -300,7 +300,7 @@ static const char *const phy_result[] = { // PHY速率类型字符串 }; // --- 接口操作结构体 --- -static const struct ble_client_operation_t client_operation = { +const struct ble_client_operation_t client_operation = { .scan_enable = bt_ble_scan_enable, .disconnect = ble_disconnect, .get_buffer_vaild = get_buffer_vaild_len, diff --git a/apps/earphone/remote_control/ble_handler/example/example.c b/apps/earphone/xtell_remote_control/ble_handler/example/example.c similarity index 100% rename from apps/earphone/remote_control/ble_handler/example/example.c rename to apps/earphone/xtell_remote_control/ble_handler/example/example.c diff --git a/apps/earphone/remote_control/nvs.c b/apps/earphone/xtell_remote_control/nvs/nvs.c similarity index 100% rename from apps/earphone/remote_control/nvs.c rename to apps/earphone/xtell_remote_control/nvs/nvs.c diff --git a/apps/earphone/remote_control/nvs.h b/apps/earphone/xtell_remote_control/nvs/nvs.h similarity index 100% rename from apps/earphone/remote_control/nvs.h rename to apps/earphone/xtell_remote_control/nvs/nvs.h diff --git a/apps/earphone/remote_control/RC_app_main.c b/apps/earphone/xtell_remote_control/task_func.c similarity index 95% rename from apps/earphone/remote_control/RC_app_main.c rename to apps/earphone/xtell_remote_control/task_func.c index c13c4a2..39608e5 100644 --- a/apps/earphone/remote_control/RC_app_main.c +++ b/apps/earphone/xtell_remote_control/task_func.c @@ -1,5 +1,5 @@ -#include "RC_app_main.h" -#include "nvs.h" +#include "task_func.h" +#include "./nvs/nvs.h" #include "timer.h" #include "system/includes.h" @@ -21,7 +21,7 @@ // 外部函数声明 // ================================================================================= extern void TYPE_V_EVENT(char* uid); - +extern void TYPE_A_EVENT(char* uid); // ================================================================================= // 静态函数声明 @@ -41,7 +41,7 @@ static void rc_ble_state_set_disconnected(void); static RC_Context_t g_rc_context; // 全局上下文实例 static u16 g_rfid_timer_id = 0; // RFID 定时器ID static u16 g_ble_timer_id = 0; // BLE 定时器ID - +extern const struct ble_client_operation_t client_operation; // ================================================================================= // 核心回调函数 (Core Callback Handlers) @@ -54,8 +54,11 @@ void rc_rfid_callback_handler(void *priv) { u8 uid[UID_LENGTH] = {0}; - TYPE_V_EVENT((char *)uid); - + //读id卡 + // TYPE_V_EVENT((char *)uid); + TYPE_A_EVENT((char *)uid); + + //是否有rfid卡靠近 u8 is_new_data = 0; for (int i = 0; i < UID_LENGTH; i++) { if (uid[i] != 0x00) { @@ -65,7 +68,7 @@ void rc_rfid_callback_handler(void *priv) } if (!is_new_data) { - return; + return; //没有rfid卡靠近，返回 } rc_log("New RFID card detected.\n"); @@ -73,7 +76,7 @@ void rc_rfid_callback_handler(void *priv) RFID_Device_Type_t device_type = get_rfid_device_type(uid); switch (device_type) { - case RFID_DEVICE_TYPE_MAIN_BOARD: + case RFID_DEVICE_TYPE_MAIN_BOARD: //船主板上的rfid卡 rc_log("Device is Main Board. Storing MAC...\n"); if (ble_hid_is_connected()) { // 先停止扫描和连接尝试，实现断开 diff --git a/apps/earphone/remote_control/RC_app_main.h b/apps/earphone/xtell_remote_control/task_func.h similarity index 100% rename from apps/earphone/remote_control/RC_app_main.h rename to apps/earphone/xtell_remote_control/task_func.h diff --git a/apps/earphone/remote_control/ble_handler/xtell.h b/apps/earphone/xtell_remote_control/xtell.h similarity index 100% rename from apps/earphone/remote_control/ble_handler/xtell.h rename to apps/earphone/xtell_remote_control/xtell.h diff --git a/apps/earphone/remote_control/ble_handler/xtell_app_main.c b/apps/earphone/xtell_remote_control/xtell_app_main.c similarity index 100% rename from apps/earphone/remote_control/ble_handler/xtell_app_main.c rename to apps/earphone/xtell_remote_control/xtell_app_main.c