关闭日志记录功能
This commit is contained in:
ipason
parent
e2eecec819
commit
3d5d788934
@ -141,7 +141,9 @@ void bs_test_task(void* arg)
|
||||
|
||||
/* 读取测试结果 */
|
||||
flux_test_result_get();
|
||||
#if LOG_RECORD_ENABLE
|
||||
WRITE_LOG_TO_SD("测试结果获取中");
|
||||
#endif
|
||||
lv_label_set_text_fmt(ui_pageHome_labelBSInfo,"%s %s",test_rate[testCount],test_info[3]);
|
||||
|
||||
/* 等待2s进行结果获取 */
|
||||
@ -158,17 +160,23 @@ void bs_test_task(void* arg)
|
||||
{
|
||||
/* 测试结果正常，进行下一挡位测试 */
|
||||
testCount++;
|
||||
#if LOG_RECORD_ENABLE
|
||||
WRITE_LOG_TO_SD("测试结果正常，进行下一挡位测试");
|
||||
#endif
|
||||
|
||||
}else{
|
||||
#if LOG_RECORD_ENABLE
|
||||
WRITE_LOG_TO_SD("测试结果异常，再次测试?");
|
||||
#endif
|
||||
/* 测试失败，重复上一次测试 */
|
||||
lv_label_set_text_fmt(ui_pageHome_labelBSInfo,"%s %s",test_rate[testCount],"retry");
|
||||
retest_count++;
|
||||
if(retest_count == 2)
|
||||
{
|
||||
lv_label_set_text_fmt(ui_pageHome_labelBSInfo,"%s %s",test_rate[testCount],"failed");
|
||||
#if LOG_RECORD_ENABLE
|
||||
WRITE_LOG_TO_SD("测试失败 进行下一档测试，暂时放弃该挡位");
|
||||
#endif
|
||||
/* 当前挡位失败，进行下一挡位测试 */
|
||||
retest_count = 0;
|
||||
testCount++;
|
||||
@ -176,7 +184,9 @@ void bs_test_task(void* arg)
|
||||
}
|
||||
if (testCount == 6)
|
||||
{
|
||||
#if LOG_RECORD_ENABLE
|
||||
WRITE_LOG_TO_SD("测试结束");
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -184,8 +194,9 @@ void bs_test_task(void* arg)
|
||||
sd_append_bs_data();
|
||||
|
||||
lv_label_set_text_fmt(ui_pageHome_labelBSInfo,"%s",test_info[4]);
|
||||
|
||||
#if LOG_RECORD_ENABLE
|
||||
WRITE_LOG_TO_SD("测试结束 任务回收");
|
||||
#endif
|
||||
/* 任务测试完毕 删除任务 */
|
||||
lv_label_set_text(ui_pageHome_labelStartTest1,"Start Test BS");
|
||||
lv_label_set_text(ui_pageHome_labelBSInfo,"wait for test");
|
||||
|
||||
@ -55,7 +55,7 @@ extern "C" {
|
||||
#define NOM_RESULT_FILE_HEADER "timestamp,timeStr,is_nom,device type,stage,rate,volume\n"
|
||||
|
||||
/* 配置是否选择记录数据到SD卡内 */
|
||||
#define LOG_RECORD_ENABLE (1)
|
||||
#define LOG_RECORD_ENABLE (0)
|
||||
|
||||
/* SD卡读写引脚编号 */
|
||||
#define CONFIG_EXAMPLE_PIN_CLK (14)
|
||||
|
||||
@ -180,8 +180,7 @@ void uart1_echoTask(void* arg)
|
||||
int len = uart_read_bytes(ECHO_UART_PORT_NUM1, data, (BUF_SIZE - 1), 20 / portTICK_PERIOD_MS);
|
||||
|
||||
// Write data back to the UART
|
||||
//uart_write_bytes(ECHO_UART_PORT_NUM1, (const char *) data, len);
|
||||
#if 1
|
||||
//uart_write_bytes(ECHO_UART_PORT_NUM1, (const char *) data, len);
|
||||
if (len) /** */
|
||||
{
|
||||
data[len] = '\0';
|
||||
@ -230,9 +229,9 @@ void uart1_echoTask(void* arg)
|
||||
/* 若当前是NOM模式，直接刷新结果在Nom的界面 */
|
||||
RefreshResult();
|
||||
}else{
|
||||
#endif
|
||||
#if LOG_RECORD_ENABLE
|
||||
WRITE_LOG_TO_SD("判断当前测试模式为BS模式");
|
||||
|
||||
#endif
|
||||
/* 获取当前测试挡位 */
|
||||
current_stage = lv_spinbox_get_value(ui_pageHome_spinboxStageBS)-1;
|
||||
device_type = lv_dropdown_get_selected(ui_pageHome_DropdownTestTypeBS);
|
||||
@ -262,21 +261,26 @@ void uart1_echoTask(void* arg)
|
||||
char str[100];
|
||||
sprintf(str,"current=%2f,rateVolume=%.2f,up=%.2f,down=%.2f",sdData.flux_test_result.current_test_result,stage_rate_volume,stage_rate_volume*1.15,stage_rate_volume*0.85);
|
||||
//printf("%s\n",str);
|
||||
#if LOG_RECORD_ENABLE
|
||||
WRITE_LOG_TO_SD(str);
|
||||
|
||||
#endif
|
||||
if((sdData.flux_test_result.current_test_result > stage_rate_volume * 1.15)|(sdData.flux_test_result.current_test_result < stage_rate_volume * 0.85))
|
||||
{
|
||||
/* 测试结果不合格，刷新结果为X */
|
||||
xEventGroupClearBits(g_bs_test_event_group,g_bs_test_event_group_bits[currentTestRate]);
|
||||
is_test_result_right = false;
|
||||
#if LOG_RECORD_ENABLE
|
||||
ESP_LOGI("FLUX_TEST_START","测试结果不合格");
|
||||
WRITE_LOG_TO_SD("测试结果不合格");
|
||||
#endif
|
||||
}else{
|
||||
/* 测试合格*/
|
||||
xEventGroupSetBits(g_bs_test_event_group,g_bs_test_event_group_bits[currentTestRate]);
|
||||
is_test_result_right = true;
|
||||
#if LOG_RECORD_ENABLE
|
||||
ESP_LOGI("FLUX_TEST_START","测试结果合格");
|
||||
WRITE_LOG_TO_SD("测试结果合格");
|
||||
#endif
|
||||
}
|
||||
#if 1
|
||||
/* 根据当前BS测试阶段刷新结果 */
|
||||
@ -288,10 +292,14 @@ void uart1_echoTask(void* arg)
|
||||
if (is_test_result_right == false)
|
||||
{
|
||||
lv_obj_set_style_text_color(ui_pageHome_LabelRate15Result, lv_color_hex(0xFF0000), LV_PART_MAIN | LV_STATE_DEFAULT);
|
||||
#if LOG_RECORD_ENABLE
|
||||
WRITE_LOG_TO_SD("15BPM 测试结果不合格 修改字体颜色为红色");
|
||||
#endif
|
||||
}else{
|
||||
lv_obj_set_style_text_color(ui_pageHome_LabelRate15Result, lv_color_hex(0x00FF00), LV_PART_MAIN | LV_STATE_DEFAULT);
|
||||
#if LOG_RECORD_ENABLE
|
||||
WRITE_LOG_TO_SD("15BPM 测试结果合格 修改字体颜色为绿色");
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
case BS_RATE_20BPM:
|
||||
@ -573,10 +581,14 @@ esp_err_t ModbusRTU_Send_0x05(uint32_t ADDR,bool enable)
|
||||
if (res == -1)
|
||||
{
|
||||
return ESP_FAIL;
|
||||
#if LOG_RECORD_ENABLE
|
||||
WRITE_LOG_TO_SD("05指令数据发送失败。");
|
||||
ESP_LOGI("uart_write_bytes", "uart_write_bytes fail");
|
||||
#endif
|
||||
}
|
||||
#if LOG_RECORD_ENABLE
|
||||
WRITE_LOG_TO_SD("05指令数据发送成功。");
|
||||
#endif
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ static void create_bs_test_result_file(void)
|
||||
{
|
||||
FILE *nm_result_f;
|
||||
FILE *log_f;
|
||||
|
||||
#if LOG_RECORD_ENABLE
|
||||
sd_current_fileIndex_get();
|
||||
|
||||
/* 根据新获得的索引值创建日志文件及测试记录文件 */
|
||||
@ -57,13 +57,15 @@ static void create_bs_test_result_file(void)
|
||||
fclose(bs_result_f);
|
||||
|
||||
printf(" 当前的任务名称是： %s",pcTaskGetName(NULL));
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
extern "C" void app_main(void)
|
||||
{
|
||||
#if LOG_RECORD_ENABLE
|
||||
/*初始化SD卡*/
|
||||
flux_sd_init();
|
||||
#endif
|
||||
//sntp_init();
|
||||
/* Initialize the display interface */
|
||||
initialize_display_and_touch();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user