Merge branch 'feature/ota-ready-factory-baseline' of https://git.talkingq.com/chenjintao/banban into feature/ota-ready-factory-baseline

docs/OTA_READY_FACTORY_BASELINE.md

@@ -70,7 +70,7 @@ ota_ready_hxgnss_fs576
 - `customer_fs.bin`：从原 256 KiB LittleFS 中提取全部 14 个音频文件，以 4096 字节块、
   144 个块重新生成 576 KiB LittleFS；
 - 新文件系统镜像 SHA-256：
-  `45350804d65fc6ded24caf9b215b71e89f9160d10d4998c5d57d4f4496d6000d`。
+  `51ad32f8196aeab36a62ed436ac65f495ce204436f8ef57efccafc87313b0d3c`。
 
 ### 3.2 运行身份
 

ql-application/threadx/interface/custom_app/nfc.c

@@ -3,8 +3,9 @@
 #include <string.h>
 #include "ql_rtos.h"
 #include "ql_application.h"
-#include "ql_audio.h"
+#include "ql_audio.h"
-#include "ql_iic.h"
+#include "ql_dev.h"
+#include "ql_iic.h"
 #include "ql_gpio.h"
 #include "app_inc.h"
 #include "ql_fs.h"
@@ -48,6 +49,7 @@ static volatile u32 g_nfc_tx_mode_deadline = 0;
 #define NFC_TYPE2_READ_SIZE         16
 #define NFC_TYPE2_MEMORY_SIZE       160
 #define NFC_TYPE2_NDEF_OFFSET       16
+#define NFC_IMEI_DIGITS             15
 
 #define NFC_IRQ_TX                  0x40
 #define NFC_IRQ_RX                  0x20
@@ -173,6 +175,7 @@ static void nfc_type2_build_ndef(void)
 {
     char device_id[32] = {0};
     char serial_number[32] = {0};
+    char imei[32] = {0};
     char json[128];
     int json_len;
     u8 *ndef;
@@ -184,10 +187,17 @@ static void nfc_type2_build_ndef(void)
     if (hal_os_get_device_sn(serial_number) != 0) {
         strcpy(serial_number, "unknown");
     }
+    if (ql_dev_get_imei(imei, sizeof(imei)) != QL_DEV_SUCCESS ||
+        imei[0] == '\0') {
+        strcpy(imei, "unknown");
+    } else {
+        imei[NFC_IMEI_DIGITS] = '\0';
+    }
 
     json_len = snprintf(json, sizeof(json),
-                        "{\"device_id\":\"%s\",\"serial_number\":\"%s\"}",
+                        "{\"device_id\":\"%s\",\"serial_number\":\"%s\","
-                        device_id, serial_number);
+                        "\"imei\":\"%s\"}",
+                        device_id, serial_number, imei);
     if (json_len < 0) {
         json_len = 0;
     } else if (json_len >= (int)sizeof(json)) {

tools/verify_ota_ready_baseline.py

@@ -42,7 +42,7 @@ EXPECTED = {
 }
 FBF_HEADER_ALLOWANCE = 8192
 MINIMUM_SYSTEM_MARGIN = 64 * 1024
-EXPECTED_FS_SHA256 = "45350804d65fc6ded24caf9b215b71e89f9160d10d4998c5d57d4f4496d6000d"
+EXPECTED_FS_SHA256 = "51ad32f8196aeab36a62ed436ac65f495ce204436f8ef57efccafc87313b0d3c"
 
 
 def fail(message: str) -> None: