Merge branch 'master' into reflow-in-millis

src/main.cpp

@@ -16,6 +16,7 @@
 
 
 
+
 #define MOSTFET_PIN 17
 
 double currentTemp = 0;
@@ -33,6 +34,12 @@ TFT_Display tftDisplay ;
 
 TemperatureController temperatureController;
 
+TFT_Display tftDisplay ;
+
+
+
+
+
 void setup()
 {
 
@@ -89,12 +96,7 @@ void loop()
     // State changed from state to newState (user input or wifi input needs to be above here)
     if (newState == ReflowProcessState::PREHEAT) {
 
-
-      // Initalize the TFT
       tftDisplay.init(&chosenReflowProfile);
-      
-
-      //Start the reflow profile after tft to make sure the timer is accurate
       chosenReflowProfile.start();
       // Start the PID
       pidController.start();
@@ -121,11 +123,4 @@ void loop()
   }
  
 
-  if (state == DONE)
-  {
-    // TODO: BUZZER
-    pidController.stop();
-    reflowProcessState.set(USER_INPUT);
-  }
-
 }

src/reflow.h

@@ -168,6 +168,8 @@ public:
         return curStep.calcTempAtPercentage(startTemp, percentage);
     }
 
+    
+
     /**
      * @brief Get the Target Temp At Process Percentage.
      * @param processPercentage a number between 0 and 1. 0 is the start of the process, 1 is the end of the process