diff --git a/components/FluxUart/FluxUart.c b/components/FluxUart/FluxUart.c index 83c520b..aeae823 100644 --- a/components/FluxUart/FluxUart.c +++ b/components/FluxUart/FluxUart.c @@ -297,7 +297,25 @@ esp_err_t ModbusRTU_Send_0x10(uart_port_t uart_num, struct ModbusRTU_Frame2Reg * esp_err_t RefreshResult(void) { /*根据呼吸频率、总计体积、积分时间计算单次呼吸流量值*/ - FluxMachineData.breathTimes = FluxMachineData.time/60.0*lv_spinbox_get_value(ui_pageHome_spinboxRate); + //FluxMachineData.breathTimes = FluxMachineData.time/60.0*lv_spinbox_get_value(ui_pageHome_spinboxRate); + + switch (lv_dropdown_get_selected(ui_pageFluxRead_dropdownPulseTimes)) + { + case 0: + FluxMachineData.breathTimes = 10; + break; + + case 1: + FluxMachineData.breathTimes = 20; + break; + + case 2: + FluxMachineData.breathTimes = 30; + break; + + default: + break; + } /*获取当前测试流量*/ float breathVolume = FluxMachineData.cumulativeVolume/FluxMachineData.breathTimes;