From 5bbffe4c23d48464ce2265989f19fb7ab7787624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=5F666?= <13089258+pony-six-hundred-and-sixty-six@user.noreply.gitee.com> Date: Sat, 18 Jan 2025 15:39:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86flash=20=E5=87=BA?= =?UTF-8?q?=E5=8E=82=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/src/bsp_flash.c | 8 ++++---- bsp/src/bsp_nt26k.c | 2 +- bsp/src/bsp_rtc.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bsp/src/bsp_flash.c b/bsp/src/bsp_flash.c index 325e8e6..c0cf5a2 100644 --- a/bsp/src/bsp_flash.c +++ b/bsp/src/bsp_flash.c @@ -144,7 +144,7 @@ int Get_IotImei (char *buf, rt_size_t len) if ((*(rt_uint8_t *)FLASH_IOT_IMEI_ADDR != 0xE3) && (*(rt_uint8_t *)FLASH_IOT_IMEI_ADDR != 0x39)) { char imei_buf[FLASH_IOT_IMEI_LEN]={0}; - Flash_Read(FLASH_IOT_IMEI_ADDR, imei_buf, len); + Flash_Read(FLASH_IOT_IMEI_ADDR, (rt_uint8_t *)&imei_buf[0], len); LOG_D ("read imei: %s", imei_buf); rt_memcpy(buf, imei_buf, len); return 0; @@ -166,7 +166,7 @@ int Get_IotImsi (char *buf, rt_size_t len) if ((*(rt_uint8_t *)FLASH_IOT_IMSI_ADDR != 0xE3) && (*(rt_uint8_t *)FLASH_IOT_IMSI_ADDR != 0x39)) { char imsi_buf[FLASH_IOT_IMSI_LEN]={0}; - Flash_Read(FLASH_IOT_IMSI_ADDR, imsi_buf, len); + Flash_Read(FLASH_IOT_IMSI_ADDR, (rt_uint8_t *)imsi_buf, len); LOG_D ("read imsi: %s", imsi_buf); rt_memcpy(buf, imsi_buf, len); @@ -189,7 +189,7 @@ int Get_IotIccid (char *buf, rt_size_t len) if ((*(rt_uint8_t *)FLASH_IOT_ICCID_ADDR != 0xE3) && (*(rt_uint8_t *)FLASH_IOT_ICCID_ADDR != 0x39)) { char iccid_buf[FLASH_IOT_ICCID_LEN]={0}; - Flash_Read(FLASH_IOT_ICCID_ADDR, iccid_buf, len); + Flash_Read(FLASH_IOT_ICCID_ADDR, (rt_uint8_t *)iccid_buf, len); LOG_D ("read iccid: %s", iccid_buf); rt_memcpy(buf, iccid_buf, len); return 0; @@ -797,7 +797,7 @@ int BSP_Flash_Init (void) LOG_D ("Flash_Set_Sever_Data error!"); } - Flash_SetProductTimeLimit (2025, 1, 15, 13, 50, 20, kFactoryTimeId); + Flash_SetProductTimeLimit (2025, 1, 19, 13, 50, 20, kFactoryTimeId); Set_ExpirationTime (MAX_EXPIRATION_DAYS); sci.hw_ver = SYS_HW_VERSION; diff --git a/bsp/src/bsp_nt26k.c b/bsp/src/bsp_nt26k.c index 8113797..e6afc90 100644 --- a/bsp/src/bsp_nt26k.c +++ b/bsp/src/bsp_nt26k.c @@ -1536,7 +1536,7 @@ static void Nt26k_Life_Thread_Entry(void *parameter) if (result != RT_EOK) { LOG_D("重连网络失败,等待%d s后重连\n",delay_n * 5); - + rt_thread_mdelay(delay_n * 5000); delay_n++; if (delay_n >= 66)//大于3小时的重连都不行,则重启设备 diff --git a/bsp/src/bsp_rtc.c b/bsp/src/bsp_rtc.c index f10d3c8..a9a2f8b 100644 --- a/bsp/src/bsp_rtc.c +++ b/bsp/src/bsp_rtc.c @@ -8,7 +8,7 @@ #define LOG_LVL LOG_LVL_DBG // 该模块对应的日志输出级别。不定义时,默认:调试级别 #include -#define RTC_FIRST_INIT_VALUE (0x1319) +#define RTC_FIRST_INIT_VALUE (0x1318) TsRtcDateTime RtcDateTime;