From 028cc48b17aa7cb307a81944168d420a4089d9df Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Sat, 13 Apr 2024 22:50:02 +0800 Subject: [PATCH] ADD LAYDOWN CONTENTS IN UPLINK MESSAGE --- Core/Src/yunhorn_sts_presence_sensor.c | 36 ++++++++++++++++---------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/Core/Src/yunhorn_sts_presence_sensor.c b/Core/Src/yunhorn_sts_presence_sensor.c index 35610c7..92b5da9 100644 --- a/Core/Src/yunhorn_sts_presence_sensor.c +++ b/Core/Src/yunhorn_sts_presence_sensor.c @@ -141,6 +141,14 @@ void STS_FallDetection_LampBarProcess(void) switch (sts_fall_rising_detected_result) { case STS_PRESENCE_LAYDOWN: + sts_lamp_bar_color = STS_YELLOW; + sts_status_color = STS_YELLOW; + sts_rss_result = STS_RESULT_MOTION; + STS_Lamp_Bar_Set_STS_RGB_Color(sts_lamp_bar_color, luminance_level); + + buf[i++] = (uint8_t)sts_lamp_bar_color; + buf[i++] = (uint8_t)sts_work_mode; + buf[i++] = (uint8_t)sts_fall_rising_detected_result; break; case STS_PRESENCE_FALL: @@ -286,23 +294,23 @@ void STS_PRESENCE_SENSOR_Prepare_Send_Data(void) sts_o7_sensorData.event_stop_time = event_stop_time; } -void STS_PRESENCE_SENSOR_Read(STS_OO_SensorStatusDataTypeDef *o6_data) +void STS_PRESENCE_SENSOR_Read(STS_OO_SensorStatusDataTypeDef *oo_data) { - o6_data->lamp_bar_color = (uint8_t)sts_o7_sensorData.lamp_bar_color; - o6_data->workmode = (uint8_t)sts_o7_sensorData.workmode; + oo_data->lamp_bar_color = (uint8_t)sts_o7_sensorData.lamp_bar_color; + oo_data->workmode = (uint8_t)sts_o7_sensorData.workmode; - o6_data->state_sensor1_on_off = (uint8_t)sts_o7_sensorData.state_sensor1_on_off; - o6_data->state_sensor2_on_off = (uint8_t)sts_o7_sensorData.state_sensor2_on_off; - o6_data->state_sensor3_on_off = (uint8_t)sts_o7_sensorData.state_sensor3_on_off; - o6_data->state_sensor4_on_off = (uint8_t)sts_o7_sensorData.state_sensor4_on_off; - o6_data->rss_presence_distance = (uint16_t)sts_o7_sensorData.rss_presence_distance; - o6_data->rss_presence_score = (uint16_t)sts_o7_sensorData.rss_presence_score; - o6_data->event_start_time = (uint32_t)sts_o7_sensorData.event_start_time; - o6_data->event_stop_time = (uint32_t)sts_o7_sensorData.event_stop_time; - o6_data->overtime = (uint8_t)sts_o7_sensorData.overtime; + oo_data->state_sensor1_on_off = (uint8_t)sts_o7_sensorData.state_sensor1_on_off; + oo_data->state_sensor2_on_off = (uint8_t)sts_o7_sensorData.state_sensor2_on_off; + oo_data->state_sensor3_on_off = (uint8_t)sts_o7_sensorData.state_sensor3_on_off; + oo_data->state_sensor4_on_off = (uint8_t)sts_o7_sensorData.state_sensor4_on_off; + oo_data->rss_presence_distance = (uint16_t)sts_o7_sensorData.rss_presence_distance; + oo_data->rss_presence_score = (uint16_t)sts_o7_sensorData.rss_presence_score; + oo_data->event_start_time = (uint32_t)sts_o7_sensorData.event_start_time; + oo_data->event_stop_time = (uint32_t)sts_o7_sensorData.event_stop_time; + oo_data->overtime = (uint8_t)sts_o7_sensorData.overtime; - o6_data->battery_Pct = (uint8_t)sts_o7_sensorData.battery_Pct; - o6_data->dutycycletimelevel = (uint8_t)sts_o7_sensorData.dutycycletimelevel; + oo_data->battery_Pct = (uint8_t)sts_o7_sensorData.battery_Pct; + oo_data->dutycycletimelevel = (uint8_t)sts_o7_sensorData.dutycycletimelevel; }