diff options
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c | 62 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c | 4 |
2 files changed, 2 insertions, 64 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c index 1f2c304e8..ab9a3dde5 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c @@ -412,12 +412,10 @@ uint16_t volt; bool WHS_Set_Blower_Control_Closed_Loop(double Q_value) { double current_dying_head_flow_Q = 0.0; - double tmp = 0.0; current_dying_head_flow_Q = get_CurrentQ(HEAD_FLOW_METER);//get_average_Q(HEAD_FLOW_METER); ReportWithPackageFilter(WasteFilter,"------------ current_dying_head_flow_Q =-----------------", __FILE__,__LINE__, current_dying_head_flow_Q, RpMessage, 0, 0); ReportWithPackageFilter(WasteFilter,"------------ SET_DYEING_HEAD_ORRIFFICE_SENSOR =-----------------", __FILE__,__LINE__, (int)(Q_value * 1000), RpMessage, (int)(current_dying_head_flow_Q * 1000), 0); - tmp = fabs((current_dying_head_flow_Q) - (Q_value)); if (IFS_Clearing_Suction == true) { @@ -454,66 +452,6 @@ bool WHS_Set_Blower_Control_Closed_Loop(double Q_value) } volt = getBlowerState(); WHS_Pid_Testing_Func(Q_value,current_dying_head_flow_Q); - //close_loop_time = 1; - if (0)//(tmp > 0.02) - { - //volt = g_MAX5805_device.CODE; - if (current_dying_head_flow_Q < Q_value) - { - if (( Q_value - current_dying_head_flow_Q) > 1) - { - /* increase blower voltage by large step: */ - ReportWithPackageFilter(WasteFilter,"------------ increase blower voltage by 100:-----------------", __FILE__,__LINE__, volt, RpMessage, STEP_100, 0); - SendLimitedBlowerControl(volt + STEP_100); - close_loop_time = 15; - } - else - { - if (( Q_value - current_dying_head_flow_Q) > 0.20) - { - /* increase blower voltage by small step: */ - ReportWithPackageFilter(WasteFilter,"------------ increase blower voltage by 10:-----------------", __FILE__,__LINE__, volt, RpMessage, STEP_10, 0); - SendLimitedBlowerControl(volt + STEP_10); - close_loop_time = 4; - } - else - { - /* increase blower voltage by small step: */ - ReportWithPackageFilter(WasteFilter,"------------ increase blower voltage by 1:-----------------", __FILE__,__LINE__, volt, RpMessage, STEP_1, 0); - SendLimitedBlowerControl(volt + STEP_1); - close_loop_time = 2; - } - } - } - else - { - if (( current_dying_head_flow_Q - Q_value) > 1) - { - /* decrease blower voltage by large step: */ - ReportWithPackageFilter(WasteFilter,"------------ decrease blower voltage by 100:-----------------", __FILE__,__LINE__, volt, RpMessage, STEP_100, 0); - SendLimitedBlowerControl(volt - STEP_100); - close_loop_time = 15; - } - else - { - if (( current_dying_head_flow_Q - Q_value) > 0.20) - { - /* decrease blower voltage by small step: */ - ReportWithPackageFilter(WasteFilter,"------------ decrease blower voltage by 10:-----------------", __FILE__,__LINE__, volt, RpMessage, STEP_10, 0); - SendLimitedBlowerControl(volt - STEP_10); - close_loop_time = 4; - } - else - { - /* decrease blower voltage by small step: */ - ReportWithPackageFilter(WasteFilter,"------------ decrease blower voltage by 1:-----------------", __FILE__,__LINE__, volt, RpMessage, STEP_1, 0); - SendLimitedBlowerControl(volt - STEP_1); - close_loop_time = 2; - } - } - } - } - //Report("------------ Blower Control :-----------------", __FILE__,Orf_zero_value[HEAD_FLOW_METER], (int)(current_dying_head_flow_Q*100), RpMessage, (int)(Q_value*100), 0); return OK; } diff --git a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c index b448a9801..389548f26 100644 --- a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c +++ b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c @@ -994,7 +994,7 @@ unsigned int USBCDCD_sendData(const unsigned char *_pBuff, unsigned int _length, unsigned int _timeout) { - int len = 0; + //int len = 0; uint8_t size[4]; size[3] = (_length>>24) & 0xFF; size[2] = (_length>>16) & 0xFF; @@ -1003,7 +1003,7 @@ unsigned int USBCDCD_sendData(const unsigned char *_pBuff, if (USB_Reinit ==true) return OK; - len = USBBufferWrite((tUSBBuffer *)&txBuffer, size, 4); + /*len = */USBBufferWrite((tUSBBuffer *)&txBuffer, size, 4); /*if (len == 0) { USBRingBufFlush(&(txBuffer.sPrivateData.sRingBuf)); |