Cons-n-Stuff/Solder-Plate
1
0
Fork 0
mirror of https://github.com/arwidcool/Solder-Plate.git synced 2025-02-17 19:09:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from arwidcool/reflow-in-millis

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

25
src/main.cpp
View File

@ -29,7 +29,10 @@ LEDS leds = LEDS();
ArduPID PID;
OledDisplay oled = OledDisplay();
TemperatureController temperatureController ;
TFT_Display tftDisplay ;
TemperatureController temperatureController;
TFT_Display tftDisplay ;
@ -91,7 +94,7 @@ void loop()
{
Serial.println("State changed from " + String(STATE_STR(state)) + " to " + String(STATE_STR(newState)));
// State changed from state to newState (user input or wifi input needs to be above here)
if (newState == PREHEAT) {
if (newState == ReflowProcessState::PREHEAT) {
tftDisplay.init(&chosenReflowProfile);
chosenReflowProfile.start();
@ -112,20 +115,12 @@ void loop()
if (step.state != newState)
{
reflowProcessState.set(step.state);
if (step.state == ReflowProcessState::DONE)
{
pidController.stop();
}
}
}
if (state == DONE)
{
// TODO: BUZZER
pidController.stop();
reflowProcessState.set(USER_INPUT);
}
// if (step.state == ReflowProcessState::DONE) {
// profile.start();
// return;
// }
// Serial.print(String(STATE_STR(step.state)) + " " + String(step.duration) + " " + String(step.targetTempAtEnd) + " " + String(profile.getTargetTemp())+"\r");
}

1
src/reflow.h
View File

@ -187,6 +187,7 @@ public:
uint32_t elapsedMS = timer.elapsed();
uint16_t startTimeMS = startTimes[STEPINDEX(reflowStep())] * 1000;
return (elapsedMS - startTimeMS) / 1000;
}
void toBuffer(uint8_t *b)