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

wip with debug message printed

This commit is contained in:
Yunhorn 2025-04-21 20:14:48 +08:00
parent bba7df30ef
commit 157949c433
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Core/Src/yunhorn_sts_presence_rss.c
View File

@ -396,7 +396,7 @@ static void print_current_configuration(acc_detector_presence_configuration_t pr
float sts_run_f_intra_frame_weight = sts_run_filter.intra_frame_weight; float sts_run_f_intra_frame_weight = sts_run_filter.intra_frame_weight;
float sts_run_f_output_time_const = sts_run_filter.output_time_const; float sts_run_f_output_time_const = sts_run_filter.output_time_const;
APP_LOG(TS_OFF, VLEVEL_H, "\r\nWork_mode:%2d Start: %4d (mm) Length: %4d (mm) Threshold: %4d (*) Gain= %2d (%) UpdateRate=%4d Profile= %d \r\n", APP_LOG(TS_OFF, VLEVEL_M, "\r\nWork_mode:%2d Start: %4d (mm) Length: %4d (mm) Threshold: %4d (*) Gain= %2d (%) UpdateRate=%4d Profile= %d \r\n",
sts_work_mode, (int)(1000.0*sts_run_start), (int)(1000.0*sts_run_length), (int)(1000.0*sts_run_threshold), sts_work_mode, (int)(1000.0*sts_run_start), (int)(1000.0*sts_run_length), (int)(1000.0*sts_run_threshold),
(int)(100.0*sts_run_gain),(int)sts_run_update_rate, (int)sts_run_profile); (int)(100.0*sts_run_gain),(int)sts_run_update_rate, (int)sts_run_profile);
@ -410,9 +410,9 @@ static void print_result(acc_detector_presence_result_t result)
{ {
if (result.presence_detected) if (result.presence_detected)
{ {
//uint32_t detected_zone = (uint32_t)((float)(result.presence_distance - DEFAULT_START_M) / (float)DEFAULT_ZONE_LENGTH); uint32_t detected_zone = (uint32_t)((float)(result.presence_distance - DEFAULT_START_M) / (float)DEFAULT_ZONE_LENGTH);
// 2024-08-05 // 2024-08-05
uint32_t detected_zone = (uint32_t)((float)(result.presence_distance) / (float)DEFAULT_ZONE_LENGTH); //uint32_t detected_zone = (uint32_t)((float)(result.presence_distance) / (float)DEFAULT_ZONE_LENGTH);
APP_LOG(TS_OFF, VLEVEL_M,"Motion in zone: %u, distance: %d, score: %d\n", (unsigned int)detected_zone, APP_LOG(TS_OFF, VLEVEL_M,"Motion in zone: %u, distance: %d, score: %d\n", (unsigned int)detected_zone,
(int)(result.presence_distance * 1000.0f), (int)(result.presence_distance * 1000.0f),
(int)(result.presence_score * 1000.0f)); (int)(result.presence_score * 1000.0f));
@ -628,7 +628,7 @@ int sts_presence_rss_fall_rise_detection(void)
} }
bool deactivated = false; bool deactivated = false;
bool success = true; bool success = true;
const int iterations = (DEFAULT_UPDATE_RATE_PRESENCE+1); const int iterations = (DEFAULT_UPDATE_RATE_PRESENCE);
acc_detector_presence_result_t result; acc_detector_presence_result_t result;
uint8_t average_result = 0; uint8_t average_result = 0;
float average_distance =0.0f; float average_distance =0.0f;
@ -665,7 +665,7 @@ int sts_presence_rss_fall_rise_detection(void)
//print_result(result); //print_result(result);
if (result.presence_detected) if (result.presence_detected)
{ {
//print_result(result); print_result(result);
average_result++; average_result++;
average_distance += result.presence_distance; average_distance += result.presence_distance;
average_score += result.presence_score; average_score += result.presence_score;
@ -804,9 +804,9 @@ int sts_presence_rss_fall_rise_detection(void)
} }
average_distance = (1000.0f*average_distance)/average_result; // in meters average_distance = (float)(1000.0f*average_distance)/(float)average_result; // in meters
average_score = (1000.0f*average_score)/average_result; average_score = (float)(1000.0f*average_score)/(float)average_result;
APP_LOG(TS_OFF, VLEVEL_H, "\r\nAverage Distance: %d (mm) Score: %d \r\n",(int)average_distance, (int)average_score); APP_LOG(TS_OFF, VLEVEL_M, "\r\nAverage Distance: %d (mm) Score: %d \r\n",(int)average_distance, (int)average_score);
sts_presence_rss_distance = average_distance; sts_presence_rss_distance = average_distance;
sts_presence_rss_score = average_score; sts_presence_rss_score = average_score;
// uint8_t pre_sts_rss_result = (average_result > (DEFAULT_UPDATE_RATE_PRESENCE/5))? 1: 0; // uint8_t pre_sts_rss_result = (average_result > (DEFAULT_UPDATE_RATE_PRESENCE/5))? 1: 0;

BIN
STM32CubeIDE/Release/STS_O7.bin
View File

Binary file not shown.