jarvis/FluxDC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

测试没有触发任何bug的程序

Browse Source
This commit is contained in:
jarvis 2025-03-25 10:22:43 +08:00
parent 1ee43d05b5
commit 2be5520593
4 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/FluxUI/ui_events.c
View File

@ -180,12 +180,28 @@ void on_buttonStartTest_clicked(lv_event_t * e)
/*下发积分时间*/ /*下发积分时间*/
comulateTimeSend(); comulateTimeSend();
/*使用0306报文格式*/
uint8_t bytes[4];
float time = (float)lv_spinbox_get_value(ui_pageFluxRead_spinboxTime);
memcpy(bytes, &time, 4);
/*下发命令*/
flux_frame.ADDR = FLUX_ADDR;
flux_frame.FUNC = FLUX_FUNC_SET_SINGLE;
flux_frame.DATA[0] = 0x00;
flux_frame.DATA[1] = 0x02;
flux_frame.DATA[2] = bytes[3];
flux_frame.DATA[3] = bytes[2];
ESP_ERROR_CHECK(ModbusRTU_Send_0306(ECHO_UART_PORT_NUM1,&flux_frame));
timeS = lv_spinbox_get_value(ui_pageFluxRead_spinboxTime); timeS = lv_spinbox_get_value(ui_pageFluxRead_spinboxTime);
/*下发启动测试指令*/ /*下发启动测试指令*/
FLUX_TEST_START; FLUX_TEST_START;
#if 0 #if 1
lv_label_set_text(ui_pageHome_labelStartTest,"Testing..."); lv_label_set_text(ui_pageHome_labelStartTest,"Testing...");
vTaskDelay(timeS*1000/portTICK_PERIOD_MS); vTaskDelay(timeS*1000/portTICK_PERIOD_MS);
@ -372,8 +388,22 @@ void on_spinboxTime_valueChanged(lv_event_t * e)
ESP_ERROR_CHECK(ModbusRTU_Send_0x10(ECHO_UART_PORT_NUM1,&flux_frame2Reg)); ESP_ERROR_CHECK(ModbusRTU_Send_0x10(ECHO_UART_PORT_NUM1,&flux_frame2Reg));
#elif 1 #elif 1
/*根据当前频率进行时间调节*/ /*使用0306报文格式*/
comulateTimeSend(); uint8_t bytes[4];
float time = (float)lv_spinbox_get_value(ui_pageFluxRead_spinboxTime);
memcpy(bytes, &time, 4);
/*下发命令*/
flux_frame.ADDR = FLUX_ADDR;
flux_frame.FUNC = FLUX_FUNC_SET_SINGLE;
flux_frame.DATA[0] = 0x00;
flux_frame.DATA[1] = 0x02;
flux_frame.DATA[2] = bytes[3];
flux_frame.DATA[3] = bytes[2];
ESP_ERROR_CHECK(ModbusRTU_Send_0306(ECHO_UART_PORT_NUM1,&flux_frame));
#endif #endif
} }

6
components/FluxUart/FluxUart.c
View File

@ -147,16 +147,17 @@ void uart1_echoTask(void* arg)
{ {
data[len] = '\0'; data[len] = '\0';
ESP_LOGI(TAG, "Recv str: %s", (char *) data); //ESP_LOGI(TAG, "Recv str: %s", (char *) data);
for(int i=0;i<len;i++) for(int i=0;i<len;i++)
ESP_LOGI(TAG, "data[%d]:%02X", i, data[i]); ESP_LOGI(TAG, "data[%d]:%02X", i, data[i]);
/*检查测试是否完成*/ /*检查测试是否完成*/
if ((data[20] == 0x01)&&(data[1]==0x03)) if ((data[20] == 0x01)&&(data[1]==0x03)&&data[4]==FLUX_MODE_TIMER)
{ {
/*测试已完成*/ /*测试已完成*/
lv_obj_add_state(ui_pageFluxRead_checkboxUnfinished,LV_STATE_CHECKED); lv_obj_add_state(ui_pageFluxRead_checkboxUnfinished,LV_STATE_CHECKED);
/* 解析数据*/ /* 解析数据*/
#if 0
/*获取当前工作模式*/ /*获取当前工作模式*/
FluxMachineData.workMode = (enum FluxMachineWorkMode)data[4]; FluxMachineData.workMode = (enum FluxMachineWorkMode)data[4];
switch (FluxMachineData.workMode) switch (FluxMachineData.workMode)
@ -181,6 +182,7 @@ void uart1_echoTask(void* arg)
lv_label_set_text(ui_pageFluxRead_labelWorkMode,"Error"); lv_label_set_text(ui_pageFluxRead_labelWorkMode,"Error");
break; break;
} }
#endif
/*获取定时模式的时间*/ /*获取定时模式的时间*/
bytes[0] = data[10]; bytes[0] = data[10];

2
components/FluxUart/FluxUart.h
View File

@ -43,7 +43,7 @@ extern "C" {
#define FLUX_FUNC_SET_SINGLE 0x06 #define FLUX_FUNC_SET_SINGLE 0x06
#define FLUX_TEST_START ESP_ERROR_CHECK(ModbusRTU_Send_0306(ECHO_UART_PORT_NUM1,&flux_frame)); #define FLUX_TEST_START ESP_ERROR_CHECK(ModbusRTU_Send_0306(ECHO_UART_PORT_NUM1,&flux_frame_start));
/* Modbus-RTU frame format */ /* Modbus-RTU frame format */
/* All data from the wet flow meter are two bytes long */ /* All data from the wet flow meter are two bytes long */

3
main/main.cpp
View File

@ -80,10 +80,13 @@ extern "C" void app_main(void)
/*初始上电后需要自动触发的一些小事件来更新界面界面元素*/ /*初始上电后需要自动触发的一些小事件来更新界面界面元素*/
lv_textarea_set_text(ui_pageDebug_textAreaContent,""); lv_textarea_set_text(ui_pageDebug_textAreaContent,"");
#if 1
lv_event_send(ui_pageSetting_dropdownDeviceType,LV_EVENT_VALUE_CHANGED,NULL); lv_event_send(ui_pageSetting_dropdownDeviceType,LV_EVENT_VALUE_CHANGED,NULL);
lv_event_send(ui_pageHome_spinboxStage,LV_EVENT_VALUE_CHANGED,NULL); lv_event_send(ui_pageHome_spinboxStage,LV_EVENT_VALUE_CHANGED,NULL);
lv_event_send(ui_pageHome_spinboxRate,LV_EVENT_VALUE_CHANGED,NULL); lv_event_send(ui_pageHome_spinboxRate,LV_EVENT_VALUE_CHANGED,NULL);
#endif
lv_label_set_text(ui_pageHome_labelResultCompare,""); lv_label_set_text(ui_pageHome_labelResultCompare,"");
lv_label_set_text(ui_pageHome_labelTestResult,"-"); lv_label_set_text(ui_pageHome_labelTestResult,"-");