diff --git a/Core/Src/yunhorn_sts_presence_rss.c b/Core/Src/yunhorn_sts_presence_rss.c index c0a7dc4..804a288 100644 --- a/Core/Src/yunhorn_sts_presence_rss.c +++ b/Core/Src/yunhorn_sts_presence_rss.c @@ -534,7 +534,7 @@ int sts_presence_rss_fall_rise_detection(void) motion_count = motion_count%DEFAULT_MOTION_DATASET_LEN; // get all required number of motion data - sts_fall_rising_detected_result = STS_PRESENCE_NORMAL; + //sts_fall_rising_detected_result = STS_PRESENCE_NORMAL; if ((sts_presence_fall_detection == TRUE)&& (motion_count>10)) STS_YunhornCheckStandardDeviation(); @@ -583,12 +583,12 @@ int sts_presence_rss_fall_rise_detection(void) #define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) ) #endif -//#ifdef LOG_RSS +#ifdef LOG_RSS APP_LOG(TS_OFF, VLEVEL_H,"\r\nSensor at Ceiling Height: %u mm\r\n",(uint16_t)sts_sensor_install_height); APP_LOG(TS_OFF, VLEVEL_H,"\r\n|Motion Distance Zone| ##### |Height cm|\r\n"); uint8_t kk = (uint8_t)(sts_sensor_install_height/400+1); -#if 0 + APP_LOG(TS_OFF, VLEVEL_L,"\r\n|-----------Ceiling-------Sensor---V-----|\r\n"); for (uint8_t k=0; k<=kk; k++) { @@ -602,26 +602,24 @@ int sts_presence_rss_fall_rise_detection(void) } } APP_LOG(TS_OFF, VLEVEL_L,"\r\n|-----------Floor Ground-----------^-----|\r\n"); + #endif -//#endif +#ifdef LOG_RSS average_distance = (1000.0f*average_distance)/average_result; // in meters average_score = (1000.0f*average_score)/average_result; sts_presence_rss_distance = average_distance; sts_presence_rss_score = average_score; if (average_score) //if (average_score !=0) //if (sts_rss_result) { -#ifdef LOG_RSS + APP_LOG(TS_OFF, VLEVEL_L,"\r\n######## Motion: %u Distance=%u mm, Score=%u Average_result=%u out of %u \r\n", (uint8_t)sts_rss_result,(int) average_distance, (int)(average_score), (int)average_result, (int)iterations); -#endif -#ifdef LOG_RSS for (uint8_t j=0; j<5; j++) { APP_LOG(TS_OFF, VLEVEL_M,"\r\n######## Motion: %u Distance=%u mm, Score=%u Average_result=%u out of %u \r\n", (uint8_t)sts_rss_result,(int) average_distance, (int)(average_score), (int)average_result, (int)iterations); } -#endif } - +#endif bool deactivated = acc_detector_presence_deactivate(handle);