Diff: nextion_interface.cpp

Revision:

10:b2d87404309a

Parent:

9:95fdcdc0977e

Child:

11:5cb7ae8bd831

--- a/nextion_interface.cpp	Sun Apr 26 08:50:12 2020 +0000
+++ b/nextion_interface.cpp	Mon Apr 27 19:52:02 2020 +0000
@@ -215,7 +215,7 @@
 }
 
 void Flow_Display_Update(void){
-    nextion_display.printf("t14.txt=\"%.3f\"", flow_lpm);
+    nextion_display.printf("t14.txt=\"%d\"", (int32_t)flow_lpm);
     nextion_display.printf("%c%c%c", 0xff, 0xff, 0xff);
 }
 
@@ -247,6 +247,8 @@
     
     if(y_pos <= VOLUME_WAVEFORM_Y0){
         y_pos = VOLUME_WAVEFORM_Y0 + 1;
+    }else if(y_pos >= (VOLUME_WAVEFORM_Y0 + VOLUME_WAVEFORM_HEIGHT)){
+        y_pos = VOLUME_WAVEFORM_Y0 + VOLUME_WAVEFORM_HEIGHT - 1;
     }
     
     nextion_display.printf("line %d,%d,%d,%d,%d",(x_pos - 1), prev_y_pos, x_pos, y_pos, GREEN);
@@ -262,7 +264,7 @@
     uint16_t x_pos, y_pos;
     uint16_t flow_scaled_value;
     
-    flow_scaled_value = 79 + (int16_t)(flow_lpm * FLOW_WAVEFORM_HEIGHT);
+    flow_scaled_value = 79 + (int16_t)flow_lpm;
     
     x_pos_counter++;
     
@@ -277,9 +279,9 @@
     
     
     if(y_pos <= FLOW_WAVEFORM_Y0){
-        y_pos = VOLUME_WAVEFORM_Y0 + 1;
+        y_pos = FLOW_WAVEFORM_Y0 + 1;
     }else if(y_pos >= (FLOW_WAVEFORM_Y0 + FLOW_WAVEFORM_HEIGHT)){
-        y_pos = VOLUME_WAVEFORM_Y0 + FLOW_WAVEFORM_HEIGHT - 1;
+        y_pos = FLOW_WAVEFORM_Y0 + FLOW_WAVEFORM_HEIGHT - 1;
     
     }
     
@@ -296,7 +298,7 @@
     uint16_t x_pos, y_pos;
     uint16_t pressure_02_scaled_value;
     
-    pressure_02_scaled_value = (uint16_t)(pressure_02_psi * PRESSURE_WAVEFORM_HEIGHT * 2) ;
+    pressure_02_scaled_value = (uint16_t)(pressure_02_psi * PRESSURE_WAVEFORM_HEIGHT) ;
     
     x_pos_counter++;