Diff: main.cpp

Revision:

8:208d965a3bd2

Parent:

7:f4e248182d31

Child:

9:95fdcdc0977e

--- a/main.cpp	Mon Apr 20 21:58:36 2020 +0000
+++ b/main.cpp	Thu Apr 23 17:05:36 2020 +0000
@@ -9,56 +9,35 @@
 #include "ventilator.h"
 
 
-// ******************************
-//      OBJECT CONSTRUCTION
-// ******************************
-
-Ticker ticker_int_10us; // Ticker interrupt
-
-
-// ******************************
-//      GLOBAL VARIABLES
-// ******************************
-
-
+int main(void) {
+    
+    System_Initialize();
 
-// ******************************
-//      FUNCTION DECLARATION
-// ******************************
-void Ticker_ISR(void); // ISR that is called when the timer reaches the set value
-
-
-int main(void) {
-    Buttons_Initialize();
-    ticker_int_10us.attach(&Ticker_ISR, 0.01);
-    Nextion_Interface_Initialize();
-    Pressure_Sensors_Initialize();
-    Stepper_Driver_Init();
-    
     while(1){     
          Stepper_Driver_State_Machine();
-         
          Nextion_Encoder_Interaction();
          
          if(read_pressure_sensors_flag){
              Pressure_Sensors_Read();
+             Calculate_Flow_From_Pressure();
+             Calculate_Volume_From_Flow();
              read_pressure_sensors_flag = 0;
          }
- /*        
+         
          if((stepper_driver_state != Stepper_Inspiration_Finish) && 
             (stepper_driver_state != Stepper_Expiration_Finish)){
+            /* Display sensed values if necessary */    
             if(pressure_sensor_display_update_flag){
-                Nextion_Update_Sensor_Values();
-                pressure_sensor_display_update_flag = 0;
+               Nextion_Update_Sensor_Values();
+               pressure_sensor_display_update_flag = 0;
             }
-            
+            /* Plot sensed values if necessary */
             if(pressure_sensor_waveform_update_flag){
                 Nextion_Update_Waveform_Values();
                 pressure_sensor_waveform_update_flag = 0;
-            }
+            }  
                  
-         }
- */        
+         }      
     }
   
     return 0;
@@ -66,21 +45,9 @@
 
 
 
-// Ticker Interrupt Service Routine
-void Ticker_ISR(void){
-   
-    static uint8_t conta_10ms = 0;
-    
-    Encoder_Read();
-    Button_Debounce();
-    
-    conta_10ms++;
-    
-    if(conta_10ms == 10){
-        conta_10ms = 0;
-        read_pressure_sensors_flag = 1;
-        pressure_sensor_display_update_flag = 1;
-        pressure_sensor_waveform_update_flag = 1;
-    }
-    
-}  
+  
+
+
+
+
+