diff --git a/Core/Src/yunhorn_sts_presence_rss.c b/Core/Src/yunhorn_sts_presence_rss.c index 78eb799..56c96da 100644 --- a/Core/Src/yunhorn_sts_presence_rss.c +++ b/Core/Src/yunhorn_sts_presence_rss.c @@ -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_output_time_const = sts_run_filter.output_time_const; - 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", + 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", 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); @@ -806,7 +806,7 @@ int sts_presence_rss_fall_rise_detection(void) average_distance = (1000.0f*average_distance)/average_result; // in meters average_score = (1000.0f*average_score)/average_result; - APP_LOG(TS_OFF, VLEVEL_M, "\r\nAverage Distance: %d (mm) Score: %d \r\n",(int)average_distance, (int)average_score); + APP_LOG(TS_OFF, VLEVEL_H, "\r\nAverage Distance: %d (mm) Score: %d \r\n",(int)average_distance, (int)average_score); sts_presence_rss_distance = average_distance; sts_presence_rss_score = average_score; // uint8_t pre_sts_rss_result = (average_result > (DEFAULT_UPDATE_RATE_PRESENCE/5))? 1: 0; diff --git a/Core/Src/yunhorn_sts_process.c b/Core/Src/yunhorn_sts_process.c index bdae9c9..ff33fdf 100644 --- a/Core/Src/yunhorn_sts_process.c +++ b/Core/Src/yunhorn_sts_process.c @@ -766,7 +766,7 @@ void STS_PRESENCE_SENSOR_NVM_CFG(void) //sts_presence_rss_config.default_config_update_flag = (uint8_t) sts_rss_config_updated_flag; sts_rss_config_updated_flag = (uint8_t)(sts_cfg_nvm.p[RSS_CFG_UPDATE_FLAG]); - APP_LOG(TS_ON, VLEVEL_M, "\r\n##### Reboot --- with NVM CFG'ED RSS flag =%02x \r\n", sts_rss_config_updated_flag); + APP_LOG(TS_ON, VLEVEL_H, "\r\n##### Reboot --- with NVM CFG'ED RSS flag =%02x \r\n", sts_rss_config_updated_flag); } void STS_PRESENCE_SENSOR_NVM_CFG_SIMPLE(void) @@ -945,7 +945,7 @@ void STS_PRESENCE_SENSOR_Prepare_Send_Data(STS_OO_SensorStatusDataTypeDef *senso */ void STS_PRESENCE_SENSOR_Init(void) { - APP_LOG(TS_ON, VLEVEL_M, "##### YunHorn SmarToilets(r) Presence Sensor Started\r\n"); + APP_LOG(TS_ON, VLEVEL_H, "##### YunHorn SmarToilets(r) Presence Sensor Started\r\n"); sts_o7_sensorData.workmode = (uint8_t)sts_work_mode; //STS_DUAL_MODE; sts_o7_sensorData.lamp_bar_color = (uint8_t)STS_GREEN; diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 1758234..b3f876b 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -579,8 +579,8 @@ void LoRaWAN_Init(void) /* USER CODE END LoRaWAN_Init_LV */ /* USER CODE BEGIN LoRaWAN_Init_1 */ - APP_LOG(TS_OFF, VLEVEL_M, "\r\n\n\n##### YUNHORN_STS_SWV%d HWV:%d MTM:%d.%d R:%d.%d.%d####\r\n\n\n", - sts_version, sts_hardware_ver, sts_mtmcode1,sts_mtmcode2, MajorVer, MinorVer, SubMinorVer); + APP_LOG(TS_OFF, VLEVEL_M, "\r\n\n\n##### YUNHORN_STS_SWV:%d HWV:%d MTM:%d.%d %s R:%d.%d.%d####\r\n\n\n", + sts_version, sts_hardware_ver, sts_mtmcode1,sts_mtmcode2, YUNHORN_STS_PRD_STRING, MajorVer, MinorVer, SubMinorVer); /* Get LoRaWAN APP version*/ APP_LOG(TS_OFF, VLEVEL_M, "APPLICATION_VERSION: V%X.%X.%X\r\n", @@ -1096,11 +1096,11 @@ static void SendTxData(void) char colorshow[30]=""; strcpy(colorshow, (ich==0)?"":sts_lamp_color_code[ich]); - APP_LOG(TS_OFF, VLEVEL_L, + APP_LOG(TS_OFF, VLEVEL_H, "\r\n######| Color = %s%s | Mode = %5s |\r\n",(char *)colorshow, sts_lamp_color_code[icl], (char*)sts_work_mode_code[sts_work_mode]); if (sts_work_mode == STS_UNI_MODE) { - APP_LOG(TS_OFF, VLEVEL_L, + APP_LOG(TS_OFF, VLEVEL_H, "\r\n######| S1-Door | S2-SOS | S3-Motion| S4 |Distance(mm) | MotionScore| Unconscious | Over_Stay_(min) | Fall Detected|" "\r\n######| %s | %s | %d | %1d | %04d | %04d | %1d | %4d | %s |\r\n", sts_door_status_code[sensorData.state_sensor1_on_off], @@ -1111,21 +1111,21 @@ static void SendTxData(void) sensorData.unconscious_state, sensorData.over_stay_duration, sts_fall_mode_code[sensorData.fall_state]); } else if (sts_work_mode == STS_DUAL_MODE) { - APP_LOG(TS_OFF, VLEVEL_L, + APP_LOG(TS_OFF, VLEVEL_H, "\r\n######| S1-Door | S2-SOS | S3-Motion |\r\n" "\r\n######| %s | %s | %d |\r\n", sts_door_status_code[sensorData.state_sensor1_on_off], sts_sos_status_code[sensorData.state_sensor2_on_off], sensorData.state_sensor3_on_off); } else if (sts_work_mode == STS_RSS_MODE) { - APP_LOG(TS_OFF, VLEVEL_L, + APP_LOG(TS_OFF, VLEVEL_H, "\r\n######| S3-Motion |\r\n" "\r\n######| %d |\r\n",sensorData.state_sensor3_on_off); } else { - APP_LOG(TS_OFF, VLEVEL_M,"\r\n\n**************************************** UNKNOWN MODE \r\n"); + APP_LOG(TS_OFF, VLEVEL_H,"\r\n\n**************************************** UNKNOWN MODE \r\n"); } } else if (sensor_data_ready == 0) { - APP_LOG(TS_OFF, VLEVEL_M,"\r\n\n**************************************** SENSOR_DATA_READY =%u \r\n", sensor_data_ready); + APP_LOG(TS_OFF, VLEVEL_H,"\r\n\n**************************************** SENSOR_DATA_READY =%u \r\n", sensor_data_ready); } AppData.BufferSize = (uint8_t)(sts_service_mask > STS_SERVICE_MASK_L1? 0:i)&0xff;; @@ -3267,16 +3267,16 @@ uint32_t STS_Get_Date_Time_Stamp(void) static void STS_Show_STS_CFG_NVM(uint8_t * store_value, uint16_t store_size) { - APP_LOG(TS_OFF, VLEVEL_M, "\n-----------------------------------------------\n"); - APP_LOG(TS_OFF, VLEVEL_M, "\n00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15\n"); + APP_LOG(TS_OFF, VLEVEL_H, "\n-----------------------------------------------\n"); + APP_LOG(TS_OFF, VLEVEL_H, "\n00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15\n"); for (uint16_t i=0; i< store_size; i++) { if (i%16==0) APP_LOG(TS_OFF, VLEVEL_M, "\n"); - APP_LOG(TS_OFF, VLEVEL_M, "%02X ", store_value[i]); + APP_LOG(TS_OFF, VLEVEL_H, "%02X ", store_value[i]); } - APP_LOG(TS_OFF, VLEVEL_M, "\n\r"); - APP_LOG(TS_OFF, VLEVEL_M, "\n###############################################\n\r"); + APP_LOG(TS_OFF, VLEVEL_H, "\n\r"); + APP_LOG(TS_OFF, VLEVEL_H, "\n###############################################\n\r"); } diff --git a/STM32CubeIDE/Release/STS_O7.bin b/STM32CubeIDE/Release/STS_O7.bin index d1d7d0f..0f79fd7 100644 Binary files a/STM32CubeIDE/Release/STS_O7.bin and b/STM32CubeIDE/Release/STS_O7.bin differ