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 dc1641c..9848d22 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.10" +#define FIRMWARE_VER "1.0.12" /* 设备硬件版本号 */ #define HARDWARE_VER "1.0.0" /* 设备软件版本号 */ diff --git a/application/ws63/user_main/spotlight/spotlight.h b/application/ws63/user_main/spotlight/spotlight.h index dd5730d..d7e8099 100755 --- a/application/ws63/user_main/spotlight/spotlight.h +++ b/application/ws63/user_main/spotlight/spotlight.h @@ -66,7 +66,7 @@ typedef struct __attribute__((packed, aligned(1))) { // 物模型同步需要 持久化维持 uint8_t on; // 开关状态 lightMode_e elightMode; - uint16_t brightness_local; // 当前亮度 (0-1000) + uint16_t brightness_local; // 当前亮度 (0-10000) uint16_t fade_time; // 渐变时长(s) uint16_t cct_local; // 当前色温 (2700-6500) uint8_t colourMode; // 色温模式 (0:单色温, 1:双色温) @@ -131,7 +131,8 @@ typedef struct __attribute__((packed, aligned(1))) { #define FADE_INTERVAL_MIN (10*1000) //us #define NORMAL_FADE_TIME 3 //s -#define PWM_DUTY_RATIO_MAX 20000 +#define PWM_DUTY_RATIO_MAX 10000 +#define BRINGHTNING2PWMDUTY(x) ((x) * 1) //呼吸灯定义 #define BREARTH_PERIOD (3*1000*1000) //呼吸灯周期(Us) diff --git a/application/ws63/user_main/spotlight/spotlight_main.c b/application/ws63/user_main/spotlight/spotlight_main.c index 9e7ea36..2cca2bd 100755 --- a/application/ws63/user_main/spotlight/spotlight_main.c +++ b/application/ws63/user_main/spotlight/spotlight_main.c @@ -478,13 +478,13 @@ static void stop_breath_timer(void) // 计算PWM占空比 void calculate_pwm_duty(device_control_t* pdevice_control) { // 如果开关关闭,则占空比为0 - uint32_t total_brightness_pwm = pdevice_control->brightness_local; + uint32_t total_brightness_pwm = BRINGHTNING2PWMDUTY(pdevice_control->brightness_local); // 计算色温比例 (0-10000) float cct_ratio = ((pdevice_control->cct_local - CCT_LOCAL_MIN) * 1.0) / CCT_RANGE; // 根据色温比例计算CW和WW的占空比 // 总亮度保持不变,只调整CW和WW的比例 - pdevice_control->duty_cw = (total_brightness_pwm * cct_ratio); + pdevice_control->duty_cw = total_brightness_pwm * cct_ratio + 0.5; pdevice_control->duty_ww = total_brightness_pwm - pdevice_control->duty_cw; } @@ -1278,11 +1278,11 @@ void handle_device_unbind(void) if (g_device_control.is_bound) { g_device_control.is_bound = false; g_device_control.power_on_cnt = 0; // 重置上电计数 - stop_spotlight_main_task(); + // stop_spotlight_main_task(); device_control_t tmp = DEFAULT_DEVICE_DATA;//恢复默认 - if (!g_reset_factory_flag) { - tmp.is_net_configured = g_device_control.is_net_configured; - } + // if (!g_reset_factory_flag) { + // tmp.is_net_configured = g_device_control.is_net_configured; + // } g_device_control = tmp; save_device_data(); } diff --git a/output/SR_light-LPT262_hilink-20250810-1.0.11.fwpkg b/output/SR_light-LPT262_hilink-20250810-1.0.11.fwpkg new file mode 100644 index 0000000..79c3acc Binary files /dev/null and b/output/SR_light-LPT262_hilink-20250810-1.0.11.fwpkg differ diff --git a/output/SR_light-LPT262_hilink-20250811-1.0.12.fwpkg b/output/SR_light-LPT262_hilink-20250811-1.0.12.fwpkg new file mode 100644 index 0000000..0852f4f Binary files /dev/null and b/output/SR_light-LPT262_hilink-20250811-1.0.12.fwpkg differ diff --git a/output/package(SR_light-LPT262_hilink-20250810-1.0.11).zip b/output/package(SR_light-LPT262_hilink-20250810-1.0.11).zip new file mode 100644 index 0000000..3b47d92 Binary files /dev/null and b/output/package(SR_light-LPT262_hilink-20250810-1.0.11).zip differ diff --git a/output/package(SR_light-LPT262_hilink-20250811-1.0.12).zip b/output/package(SR_light-LPT262_hilink-20250811-1.0.12).zip new file mode 100644 index 0000000..a512575 Binary files /dev/null and b/output/package(SR_light-LPT262_hilink-20250811-1.0.12).zip differ