Cons-n-Stuff/Solder-Plate
1
0
Fork 0
mirror of https://github.com/arwidcool/Solder-Plate.git synced 2024-12-18 09:15:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into reflow-in-millis

Browse Source
This commit is contained in:
Andrea 2024-01-28 01:10:03 +00:00 committed by GitHub
commit 1cb29ecc13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.cpp
View File

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

2
src/reflow.h
View File

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