diff --git a/application/samples/wifi/ohos_connect/hilink_adapt/product/device_profile.h b/application/samples/wifi/ohos_connect/hilink_adapt/product/device_profile.h index 71e9bd9..dc1641c 100755 --- a/application/samples/wifi/ohos_connect/hilink_adapt/product/device_profile.h +++ b/application/samples/wifi/ohos_connect/hilink_adapt/product/device_profile.h @@ -30,7 +30,7 @@ extern "C" { #define DEVICE_HIVERSION "1.0.0" /* 设备固件版本号 */ -#define FIRMWARE_VER "1.0.9" +#define FIRMWARE_VER "1.0.10" /* 设备硬件版本号 */ #define HARDWARE_VER "1.0.0" /* 设备软件版本号 */ diff --git a/application/ws63/user_main/spotlight/spotlight_main.c b/application/ws63/user_main/spotlight/spotlight_main.c index 83225d7..9e7ea36 100755 --- a/application/ws63/user_main/spotlight/spotlight_main.c +++ b/application/ws63/user_main/spotlight/spotlight_main.c @@ -380,8 +380,8 @@ static void init_fade_ctx(void) // 设置默认更新间隔 fade_ctx.update_interval = FADE_INTERVAL_MIN; - fade_ctx.current_brightness = g_device_control.brightness_local; - fade_ctx.current_cct = g_device_control.cct_local; + // fade_ctx.current_brightness = g_device_control.brightness_local; + // fade_ctx.current_cct = g_device_control.cct_local; } // 初始化呼吸灯控制 @@ -735,8 +735,8 @@ void read_device_data(void) data.control.read_done = false; g_device_control = data.control; // fastboot的时候就已经亮起来了,所以当前测温直接变为目标值 - fade_ctx.current_brightness = g_device_control.brightness_local; - fade_ctx.current_cct = g_device_control.cct_local; + // fade_ctx.current_brightness = g_device_control.brightness_local; + // fade_ctx.current_cct = g_device_control.cct_local; lab_exit: #endif g_device_control.read_done = true; @@ -885,20 +885,15 @@ int set_light(light_ctrl_source_e source, cancel_current_light_fade(); } // 如果打开灯,则需要手动将前置状态设置为关闭的样子,这样子后面计算渐变才能正常计算 - if (APP_OPEN_LIGHT == source) { + if (APP_OPEN_LIGHT == source || DEV_POWER_ON == source) { g_device_control.on = true; // fade_ctx.current_brightness = 0; brightness_local_target = g_device_control.brightness_local; - if (g_device_control.colourMode == COLOUR_MODE_DUAL) { - fade_ctx.current_cct = g_device_control.cct_local; - cct_local_target = g_device_control.cct_local; - } else { - fade_ctx.current_cct = SINGLE_COLOUR_CCT_LOCAL; - cct_local_target = SINGLE_COLOUR_CCT_LOCAL; - } - } - else if (DEV_POWER_ON == source) { - if (g_device_control.colourMode == COLOUR_MODE_SINGLE) { + // 色温不进行变化,只改变亮度 + fade_ctx.current_cct = g_device_control.cct_local; + cct_local_target = g_device_control.cct_local; + + if (g_device_control.colourMode != COLOUR_MODE_DUAL) { fade_ctx.current_cct = SINGLE_COLOUR_CCT_LOCAL; cct_local_target = SINGLE_COLOUR_CCT_LOCAL; } diff --git a/bootloader/flashboot_ws63/startup/main.c b/bootloader/flashboot_ws63/startup/main.c index 0f0d447..c256e9f 100755 --- a/bootloader/flashboot_ws63/startup/main.c +++ b/bootloader/flashboot_ws63/startup/main.c @@ -649,7 +649,7 @@ static void dump_io_level(void) } -#define FASTBOOT_PWM 1 //CONFIG_PWM_USING_V151 +#define FASTBOOT_PWM 0 //CONFIG_PWM_USING_V151 #if FASTBOOT_PWM diff --git a/output/SR_light-LPT262_hilink-20250808-1.0.10.fwpkg b/output/SR_light-LPT262_hilink-20250808-1.0.10.fwpkg new file mode 100644 index 0000000..9cc2fa3 Binary files /dev/null and b/output/SR_light-LPT262_hilink-20250808-1.0.10.fwpkg differ diff --git a/output/package(SR_light-LPT262_hilink-20250808-1.0.10).zip b/output/package(SR_light-LPT262_hilink-20250808-1.0.10).zip new file mode 100644 index 0000000..2322dba Binary files /dev/null and b/output/package(SR_light-LPT262_hilink-20250808-1.0.10).zip differ