From 0c89787e7781d8178e75d95d5ca48cbcb6cb5235 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: Fri, 21 Feb 2025 18:03:44 +0800 Subject: [PATCH] V1.1 --- applications/main.c | 6 +++--- applications/user_sys.h | 6 +++--- bsp/src/bsp_flash.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/applications/main.c b/applications/main.c index 9476d15..910aa2c 100644 --- a/applications/main.c +++ b/applications/main.c @@ -2,7 +2,7 @@ * @Author: mbw * @Date: 2024-10-23 17:14:16 * @LastEditors: mbw && 1600520629@qq.com - * @LastEditTime: 2025-02-21 14:45:55 + * @LastEditTime: 2025-02-21 15:41:41 * @FilePath: \ble_bjq_ch303rct6_ml307\applications\main.c * @Descrt_thread_ * @@ -177,8 +177,8 @@ int main(void) { // 计算出 到期时间对应的RTC秒数 Sensor_device.expiration_seconds = DateTime2Seconds(LimitTime.Struct.year, - LimitTime.Struct.month, LimitTime.Struct.day, LimitTime.Struct.hour, - LimitTime.Struct.minute, LimitTime.Struct.second); + LimitTime.Struct.month, LimitTime.Struct.day, LimitTime.Struct.hour, + LimitTime.Struct.minute, LimitTime.Struct.second); LOG_D("h308_expiration_time:%04d-%02d-%02d,%02d:%02d", LimitTime.Struct.year, LimitTime.Struct.month, LimitTime.Struct.day, LimitTime.Struct.hour, LimitTime.Struct.minute, LimitTime.Struct.second); diff --git a/applications/user_sys.h b/applications/user_sys.h index b2fc6a3..19854b0 100644 --- a/applications/user_sys.h +++ b/applications/user_sys.h @@ -18,12 +18,12 @@ #define MAX_EXPIRATION_DAYS (uint16_t)(365 * 5 + 30 * 3) -#define SYS_HW_VERSION (0X10U) +#define SYS_HW_VERSION (0X11U) #define SYS_SW_VERSION (0X11U) #define SYS_IOT_UPLOAD_CYCLE_MIN (0X003CU) // 高位在后，低位在前 #define SYS_IOT_RETRY (0X03U) #define SYS_TEMP_ALARM_THRESHOLD (0X32U) -#define SYS_ALARM_VALVE (0x0640U) +#define SYS_ALARM_VALVE (0x0640U)//1600 #define SYS_EMV_SWITCH (0X04U) #define SYS_RELAY_SWITCH (0X04U) #define SYS_ALARM_VALVE_MAX (0X30U) @@ -31,7 +31,7 @@ #define SYS_IOT_URL ("8.130.122.162") #define SYS_IOT_PORT ("7153") -#define K (3 * 1000) +#define K (5 * 1000) // 定义宏来打印编译时间和日期 #define COMPILE_TIME \ diff --git a/bsp/src/bsp_flash.c b/bsp/src/bsp_flash.c index 9c6f551..ded7599 100644 --- a/bsp/src/bsp_flash.c +++ b/bsp/src/bsp_flash.c @@ -725,8 +725,8 @@ void Flash_SetProductTimeLimit(rt_uint16_t year, rt_uint8_t mon, rt_uint8_t day, Flash_Write_ConfigInfo(page_buf); - TuFlashProductTimeLimitFrame ReadLimitTime; - Flash_GetProductTimeLimit(&ReadLimitTime, id); + // TuFlashProductTimeLimitFrame ReadLimitTime; + // Flash_GetProductTimeLimit(&ReadLimitTime, id); } void Set_ExpirationTime(rt_uint16_t days)