sundp
/
O7
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

RM2_1 #2

Merged
sundp merged 208 commits from RM2_1 into master 2024-09-13 09:16:14 +08:00
Conversation 0 Commits 208 Files Changed 112 +18 -13
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3feaffc5c2 - Show all commits

3
Core/Inc/yunhorn_sts_sensors.h
View File

@ -213,7 +213,8 @@ enum sts_presence_fall_detection_type {
STS_PRESENCE_RISING, STS_PRESENCE_RISING,
STS_PRESENCE_LAYDOWN, STS_PRESENCE_LAYDOWN,
STS_PRESENCE_UNCONSCIOUS, STS_PRESENCE_UNCONSCIOUS,
STS_PRESENCE_STAYSTILL STS_PRESENCE_STAYSTILL,
STS_PRESENCE_NO_MOVEMENT
}; };
enum sts_sensor_result_t { enum sts_sensor_result_t {

28
Core/Src/yunhorn_sts_process.c
View File

@ -952,28 +952,32 @@ void OnSensor3BStateChanged(void)
switch (sts_fall_rising_detected_result) switch (sts_fall_rising_detected_result)
{ {
case STS_PRESENCE_NONE: case STS_PRESENCE_NONE:
sts_o7_sensorData.event_sensor3_motion_stop_time = sensor_event_time.Seconds; sts_o7_sensorData.event_sensor3_motion_stop_time = sensor_event_time.Seconds;
break; break;
case STS_PRESENCE_FALL: case STS_PRESENCE_FALL:
if (motion_in_hs_zone[0][motion_detected_count]) if (motion_in_hs_zone[0][motion_detected_count]) {
sts_o7_sensorData.event_sensor3_fall_start_time = sensor_event_time.Seconds; sts_o7_sensorData.event_sensor3_fall_start_time = sensor_event_time.Seconds;
sts_o7_sensorData.event_sensor3_fall_duration = 0; sts_o7_sensorData.event_sensor3_fall_duration = 0;
break; }
break;
case STS_PRESENCE_RISING: case STS_PRESENCE_RISING:
break; break;
case STS_PRESENCE_LAYDOWN: case STS_PRESENCE_LAYDOWN:
case STS_PRESENCE_UNCONSCIOUS: case STS_PRESENCE_UNCONSCIOUS:
sts_o7_sensorData.fall_laydown_duration = 0; sts_o7_sensorData.fall_laydown_duration = 0;
break; break;
case STS_PRESENCE_STAYSTILL:
case STS_PRESENCE_STAYSTILL:
case STS_PRESENCE_NO_MOVEMENT:
break;
break;
default: default:
break; break;
} }