1、增加UART2接收功能，数据传输协议格式为：帧头+命令码+数据长度+数据内容+累加校验和+帧尾

帧头固定为0xAA和0x55，命令码1字节，数据长度1字节，数据内容长度可变，有数据长度字段决定，累加校验1字节，对命令码、数据长度和数据内容所有字节进行累加求和，取低8位作为校验值，帧尾固定为0x55和0xAA
（命令码，及对应操作指南见串口协议说明）
2、根据Mac地址取反得到SN
3、更新表盘及相关的代码，目前表盘中显示星期指针的指向有偏差，仍在调账中
4、设置时间时，分步骤：1）串口收到时间信息，2）停止时间读取，3）设置时间，4）等待1.5s后再继续读取时间

application/aem_watch/src/application/settings/aem_about_watch.c

@@ -146,7 +146,15 @@ static void create_about_ui(void)
     ascii_conversion(str);
     s_ui->mac = aem_double_label_create(s_ui->bg1, res_manager_get_string_from_id(ID_KEY_SETTINGS_WATCH_MAC), str);
 
-    s_ui->sn = aem_double_label_create(s_ui->bg1, res_manager_get_string_from_id(ID_KEY_SETTINGS_WATCH_SN), "NULL");
+#ifndef CONFIG_SIMULATOR
+    // 对Mac地址取反得到SN
+    sprintf(str, "%02x%02x%02x%02x%02x%02x", 0xFF - mac_str[0], 0xFF - mac_str[1], 0xFF - mac_str[2], 0xFF - mac_str[3], 0xFF - mac_str[4], 0xFF - mac_str[5]);
+#else
+    sprintf(str, "%2s%2s%2s%2s%2s%2s", "50", "41", "32", "23", "14", "05");
+#endif
+
+    ascii_conversion(str);
+    s_ui->sn = aem_double_label_create(s_ui->bg1, res_manager_get_string_from_id(ID_KEY_SETTINGS_WATCH_SN), str);
 
     s_ui->fcc_id = aem_double_label_create(s_ui->bg1, "FCC ID", "2BMQY2024");
 

application/aem_watch/src/user_cfg/device_info_cfg.h

@@ -5,7 +5,7 @@
 #define __DEVICE_INFO_CONFIG_H__
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
-#define MICRO_VERSION 2
+#define MICRO_VERSION 3
 #define DEVICE_ID "CJ01"//3085
 #define DEVICE_NAME "Catsights"//"3085S WATCH"
 #define DEVICE_NAME_UI "Catsights"//"3085S WATCH"

thirdparty/lib/aem/adapter/def_settings/aem_adapter_def_settings.c

@@ -26,20 +26,22 @@ const static aem_language_table_t s_aem_language_table[] =
 #ifdef CONFIG_BOARD_ATS3085S4_DEV_WATCH_EXT_NOR
 // 预置表盘，文件不可删除，默认表盘为此数组第一个表盘
 const static uint32_t s_inside_wf[] = {
-    79,
+    1221,//79,
 };
 // 预置表盘，文件可删除
 const static uint32_t s_outside_wf[] = {
-    80,
+    1223,
+    1224,//80,
 };
 #else
 // 预置表盘，文件不可删除，默认表盘为此数组第一个表盘
 const static uint32_t s_inside_wf[] = {
-    79,
+    1221,//79,
 };
 // 预置表盘，文件可删除
 const static uint32_t s_outside_wf[] = {
-    80,
+    1223,
+    1224,//80,
 };
 #endif
 

thirdparty/lib/aem/adapter/peripheral/aem_adapter_dev.c

@@ -29,6 +29,7 @@
 
 #ifndef CONFIG_SIMULATOR
 #include <drivers/power_supply.h>
+#include <drivers/hrtimer.h>
 #endif
 
 static uint8_t s_brightness_value = 0;
@@ -149,6 +150,26 @@ static uint8_t get_charge_status(void)
 #endif
     return status;
 }
+
+static uint8_t cnt_1s = 0;
+#ifndef CONFIG_SIMULATOR
+static struct hrtimer g_wait_for_set_time;
+static void htimer_fun(struct hrtimer *ttimer, void *expiry_fn_arg)
+{
+	if (cnt_1s > 0)
+    {
+        cnt_1s--;
+    }
+}
+static void htimer_wait_for_set_time(unsigned int ms)
+{
+	hrtimer_init(&g_wait_for_set_time, htimer_fun, NULL);
+	hrtimer_start(&g_wait_for_set_time, 1000*ms, 1000*ms);
+}
+#endif
+extern uint8_t bySetHour;
+extern uint16_t wSetYear;
+extern uint8_t bySetTimeStep;
 extern uint8_t read_time_data[7];
 static uint8_t get_rtc_time(aem_time_t *time)
 {
@@ -175,13 +196,47 @@ static uint8_t get_rtc_time(aem_time_t *time)
         //time->second = rtc_time.tm_sec;
         //time->ms = rtc_time.tm_ms;
 
-        time->year = read_time_data[6] + 2000;
-	    time->month = read_time_data[5];
-        time->wday = read_time_data[4];
-        time->day = read_time_data[3];
-        time->hour = read_time_data[2];
-        time->min = read_time_data[1];
-        time->second = read_time_data[0];
+    #ifndef CONFIG_SIMULATOR  
+        if (bySetTimeStep == 1)
+        { 
+            cnt_1s = 255;
+            //k_msleep(3000);  //延时1.5s跳转画面，保证时间或日期能够更新 
+            bySetTimeStep = 2;  
+        }
+        else if (bySetTimeStep == 3)
+        {
+            if (cnt_1s == 255)
+            { 
+                cnt_1s = 2; 
+                //k_msleep(2000);  //延时1.5s跳转画面，保证时间或日期能够更新 
+                if (hrtimer_is_running(&g_wait_for_set_time))
+                {
+                    hrtimer_restart(&g_wait_for_set_time);
+                }
+                else
+                    htimer_wait_for_set_time(750);
+            }
+
+            if (cnt_1s == 0)
+            {
+                hrtimer_stop(&g_wait_for_set_time);
+
+                if (bySetTimeStep == 3)  //防止bySetTimeStep在其他地方被修改
+                    bySetTimeStep = 0;
+            }
+        }
+    #endif    
+        if (bySetTimeStep == 0)
+        {
+            time->year = read_time_data[6] + 2000;
+            time->month = read_time_data[5];
+            time->wday = read_time_data[4];
+            time->day = read_time_data[3];
+            time->hour = read_time_data[2];
+            time->min = read_time_data[1];
+            time->second = read_time_data[0];
+        }
+
     }
 #elif defined(CONFIG_SIMULATOR)
     SYSTEMTIME lt;

thirdparty/lib/aem/config/aem_project.h

@@ -4,7 +4,7 @@
 #pragma warning(error : 4013)
 #endif
 #define AEM_VERSION "BL_Develop_NOR"
-#define BUILD_TIME "202501201132"
+#define BUILD_TIME "202502131230"
 #define AEM_GUI_FWK_LIB_VER "2.0.0.0"
 #define APP_DOWNLOAD_URL "https://customer.com"
 #define AEM_APP_TRANS_ANIMATION 1

thirdparty/lib/aem/include/framework/system/include/aem_time.h

@@ -153,4 +153,10 @@ uint8_t aem_get_month_len(uint16_t year, uint8_t month);
  */
 uint8_t aem_get_next_leap_year(uint16_t cur_year);
 
+/**
+ * @brief 获取12小时制下的时
+ * @param[in] hour  24小时制下的时
+ * @retval 返回12小时制下的时
+ */
+uint8_t aem_get_12_huor_mode_value(uint8_t hour);
 #endif

zephyr/drivers/input/sd8563_timer_acts.c

@@ -80,6 +80,7 @@ extern uint8_t bySetWeekday;
 extern uint16_t wSetYear;
 extern uint8_t bySetMonth;
 extern uint8_t bySetDay;
+extern uint8_t bySetTimeStep;
 
 #include <drivers/hrtimer.h>
 #if 1
@@ -88,7 +89,9 @@ static void timer_acts_handler(struct k_work *work)
 {
 	static struct acts_timer_data *external_rtc = &timer_acts_ddata;
 
-    if ((bySetHour != 0xff) || (wSetYear != 0xff))
+    if (((bySetHour != 0xff) || (wSetYear != 0xff))
+	    && ((bySetTimeStep == 0) || (bySetTimeStep == 2))
+		)
 	{
 		hrtimer_stop(&g_rtc_ht_read);
 
@@ -112,6 +115,11 @@ static void timer_acts_handler(struct k_work *work)
 		bySetMonth = 0xff;
 		bySetDay = 0xff;
 
+		if (bySetTimeStep)
+		{
+			bySetTimeStep = 3;  //设置完成
+		}
+
 		return;
 	}
 
@@ -374,7 +382,7 @@ static void _sd8563_set_time(const struct device *i2c_dev,
 		read_time_data[2] = set_hour;//(set_hour / 10) * 16  + set_hour % 10;  //DEC TO BCD CODE
 		read_time_data[4] = set_week % 7;//0:Sun. 1:Mon. 2:Tue. 3:Wed. 4:Thu. 5:Fri. 6:Sat.
 	}
-	else if (set_year != 0xFF)
+	if (set_year != 0xFF)
 	{	
 		if (set_year >= 2000)
 		{

zephyr/drivers/serial/CMakeLists.txt

@@ -3,4 +3,5 @@
 zephyr_library()
 zephyr_library_sources_ifdef(CONFIG_UART_ACTS uart_acts.c)
 zephyr_library_sources_ifdef(CONFIG_UART_RTT_DRIVER uart_rtt.c)
+zephyr_library_sources_ifdef(CONFIG_UART_ACTS uart2_rec.c)
 zephyr_library_sources_ifdef(CONFIG_USB_CDC_ACM ${ZEPHYR_BASE}/misc/empty_file.c)

zephyr/drivers/serial/uart2_rec.c

@@ -0,0 +1,290 @@
+/*
+ * Copyright (c) 2025 Wingcool Technology Co., Ltd
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <soc.h>
+#include <board.h>
+#include <device.h>
+#include <drivers/uart.h>
+#include <aem_core_if.h>
+#include <logging/log.h>
+//#include <gps/gps.h>
+
+LOG_MODULE_REGISTER(uart2_rec, LOG_LEVEL_INF);
+#define CONFIG_UART2_REC_DEV_NAME "uart2_rec"
+#define UART2_REC_DEV_NAME CONFIG_UART_2_NAME
+
+#define UART_FIFO_MAX 256
+#define REC_DATA_BUFFER_SIZE 256
+#define PRODUCT_INFO_SIZE 64
+#define WRITE_KEY_SIZE 160
+
+// 定义命令
+#define DEVICE_ID_CMD      0xB1
+#define PROJECT_ID_CMD     0xB2
+#define WRITE_KEY_CMD      0xB3
+#define IS_KEY_INSIDE_CMD  0xB4
+#define SET_TIME_CMD       0xC1
+// 定义帧头和帧尾
+#define FRAME_HEADER1 0xAA
+#define FRAME_HEADER2 0x55
+#define FRAME_TAIL1 0x55
+#define FRAME_TAIL2 0xAA
+
+struct uart2_rec_data {
+	const struct device *uart_gpio_dev;
+	uint8_t rec_data[REC_DATA_BUFFER_SIZE];
+	//gps_notify_t notify;
+};
+
+static struct uart2_rec_data uart2_rec_data;
+uint8_t bySetTimeStep = 0;
+
+extern uint8_t bySetHour;
+extern uint8_t bySetMinute;
+extern uint8_t bySetWeekday;
+extern uint16_t wSetYear;
+extern uint8_t bySetMonth;
+extern uint8_t bySetDay;
+
+extern void uart2_poll_out_ch(int c); // UART2发送一个字节
+extern bool aem_read_aem_key_record(aem_key_w_record_t *record); // 读取AEM KEY记录
+extern bool aem_defender_factory_write_key(uint8_t * data, uint16_t len); // 写入KEY
+extern uint16_t aem_factory_get_product_info(uint8_t *data, uint16_t in_len); // 获取产品信息
+
+// 计算累加和校验值
+//1 字节，对命令码、数据长度和数据内容的所有字节进行累加求和，取低8位作为校验值，用于检测数据在传输过程中是否出错
+uint8_t calculate_checksum(uint8_t cmd, uint8_t *data, uint8_t data_len) 
+{
+    uint8_t checksum = cmd + data_len;
+    for (uint8_t i = 0; i < data_len; i++) {
+        checksum += data[i];
+    }
+    return checksum;
+}
+
+// 发送一帧数据
+void send_frame(uint8_t cmd, uint8_t *data, uint8_t data_len) 
+{
+    uint8_t checksum = calculate_checksum(cmd, data, data_len);
+    // 发送帧头
+    uart2_poll_out_ch(FRAME_HEADER1);
+    uart2_poll_out_ch(FRAME_HEADER2);
+    // 发送命令码
+    uart2_poll_out_ch(cmd);
+    // 发送数据长度
+    uart2_poll_out_ch(data_len);
+    // 发送数据内容
+    for (uint8_t i = 0; i < data_len; i++) {
+        uart2_poll_out_ch(data[i]);
+    }
+    // 发送累加和校验值
+    uart2_poll_out_ch(checksum);
+    // 发送帧尾
+    uart2_poll_out_ch(FRAME_TAIL1);
+    uart2_poll_out_ch(FRAME_TAIL2);
+}
+
+
+// 检查一帧数据是否正确
+bool check_receive_frame(uint8_t *data) 
+{
+    uint8_t calculated_checksum;
+	uint8_t data_len = data[3];
+
+    // 帧头
+    if (data[0] != FRAME_HEADER1)
+	{
+		return false; // 帧头错误
+	}
+    if (data[1] != FRAME_HEADER2)
+	{
+		return false; // 帧头错误
+	}
+	
+    // 计算本地累加和校验值
+	calculated_checksum = calculate_checksum(data[2], data + 4, data_len);
+	
+    if (data[data_len + 4] != calculated_checksum) {
+        return false; // 累加和校验错误
+    }
+    // 读取帧尾
+    if (data[data_len + 5] != FRAME_TAIL1 || data[data_len + 6] != FRAME_TAIL2) {
+        return false; // 帧尾错误
+    }
+    return true; // 接收成功
+}
+
+static uint8_t byAACnt = 2;
+static bool bReceiveFrameDone = false;
+static void uart_fifo_callback(const struct device *dev, void *user_data)
+{
+	uint8_t rx_buff[UART_FIFO_MAX];
+	uint8_t tx_buff[UART_FIFO_MAX];
+	int read_size;
+	static uint8_t cnt;
+	aem_key_w_record_t *key_record = NULL;
+
+	printk("uart_fifo_callback start\n");
+
+	uart_irq_update(dev);
+	if (uart_irq_rx_ready(dev)) {
+		read_size = uart_fifo_read(dev, rx_buff, UART_FIFO_MAX);
+		printk("read_size: %d\n", read_size);
+		if (read_size == UART_FIFO_MAX)
+			printk("uart fifo buffer overflow\n");
+
+		for (int i = 0; i < read_size; i++) 
+		{
+			switch (rx_buff[i]) {
+			case FRAME_HEADER1:
+				byAACnt++;
+			    if (byAACnt > 2)
+				{
+					byAACnt = 1;
+					cnt = 0;
+					bReceiveFrameDone = false;
+				}
+				else if (byAACnt == 2)
+				{
+					bReceiveFrameDone = true;
+				}
+				uart2_rec_data.rec_data[cnt++] = rx_buff[i];
+				break;
+			
+			default:
+				uart2_rec_data.rec_data[cnt++] = rx_buff[i];
+
+				/* protection data cannot exceed boundary */
+				if (cnt >= REC_DATA_BUFFER_SIZE)
+					cnt--;
+				break;
+			}
+		}	
+
+		if (bReceiveFrameDone && check_receive_frame(uart2_rec_data.rec_data))
+		{
+			printk("receive frame success\n");
+
+			switch (uart2_rec_data.rec_data[2]) 
+			{
+				case DEVICE_ID_CMD:
+					aem_factory_get_product_info(tx_buff, PRODUCT_INFO_SIZE);
+					send_frame(PROJECT_ID_CMD, tx_buff, PRODUCT_INFO_SIZE);
+					break;
+
+				case PROJECT_ID_CMD:
+					tx_buff[0] = 0x0F;
+					tx_buff[1] = 0x6B;
+					tx_buff[2] = 0x3B;
+					tx_buff[3] = 0xD8;
+					send_frame(PROJECT_ID_CMD, tx_buff, 4);
+					break;
+
+				case WRITE_KEY_CMD:
+					//uart_fifo_fill(dev,rx_buff,read_size);
+					
+					tx_buff[0] = 0;
+					if (aem_defender_factory_write_key(uart2_rec_data.rec_data, WRITE_KEY_SIZE))
+					{
+						tx_buff[0] = 0xAA;
+					}
+
+					send_frame(WRITE_KEY_CMD, tx_buff, 1);
+					break;
+
+				case IS_KEY_INSIDE_CMD:
+				    tx_buff[0] = 0;
+					aem_read_aem_key_record(key_record);
+					if (key_record != NULL)
+					{
+						if (key_record->is_pass)
+							tx_buff[0] = 0xAA;
+					}
+
+					send_frame(IS_KEY_INSIDE_CMD, tx_buff, 1);
+					break;
+
+				case SET_TIME_CMD:
+					bySetMinute = uart2_rec_data.rec_data[4];
+					bySetHour = uart2_rec_data.rec_data[5];
+					bySetDay = uart2_rec_data.rec_data[6];
+					bySetWeekday = uart2_rec_data.rec_data[7];
+					bySetMonth = uart2_rec_data.rec_data[8];
+					wSetYear = uart2_rec_data.rec_data[9];
+					bySetTimeStep = 1;
+					send_frame(SET_TIME_CMD, tx_buff, 0);
+					break;
+
+				default:
+					break;
+			}
+		}
+	}
+}
+
+/*
+static void uart2_rec_enable(const struct device *dev)
+{
+	struct uart2_rec_data *data = (struct uart2_rec_data *)dev->data;
+
+	printk("uart2_rec_enable\n");
+
+	uart_irq_rx_enable(data->uart_gpio_dev);
+}
+
+static void uart2_rec_disable(const struct device *dev)
+{
+	struct uart2_rec_data *data = (struct uart2_rec_data *)dev->data;
+	
+	printk("uart2_rec_disable\n");
+	uart_irq_rx_disable(data->uart_gpio_dev);
+
+}
+
+static void uart2_rec_register_notify(const struct device *dev, gps_notify_t notify)
+{
+	printk("uart2_rec_register_notify\n");
+	struct uart2_rec_data *data = (struct uart2_rec_data *)dev->data;
+
+	data->notify = notify;
+}
+
+static void uart2_rec_unregister_notify(const struct device *dev, gps_notify_t notify)
+{
+	struct uart2_rec_data *data = (struct uart2_rec_data *)dev->data;
+
+	data->notify = NULL;
+}
+
+static const struct gps_dev_driver_api uart2_rec_api = {
+	.enable = uart2_rec_enable,
+	.disable = uart2_rec_disable,
+	.inquiry = NULL,
+	.register_notify = uart2_rec_register_notify,
+	.unregister_notify = uart2_rec_unregister_notify,
+};
+*/
+static int uart2_rec_init(const struct device *dev)
+{
+	struct uart2_rec_data *data = (struct uart2_rec_data *)dev->data;
+
+	printk("uart2_rec_init\n");
+
+	data->uart_gpio_dev = device_get_binding(UART2_REC_DEV_NAME);
+	if (data->uart_gpio_dev == NULL) {
+		printk("Couldn't find uart2\n");
+		return -ENODEV;
+	}
+
+	uart_irq_callback_set(data->uart_gpio_dev, uart_fifo_callback);
+	
+	uart_irq_rx_enable(data->uart_gpio_dev);
+
+	return 0;
+}
+
+#if IS_ENABLED(CONFIG_UART_ACTS)
+DEVICE_DEFINE(uart2_rec, CONFIG_UART2_REC_DEV_NAME, &uart2_rec_init, NULL, &uart2_rec_data, NULL, POST_KERNEL, 60, NULL);
+#endif