Skip to content

Commit 8e25845

Browse files
author
dasaki
committed
cleanup
1 parent 5e6d998 commit 8e25845

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

ReflowController/ReflowController.ino

+4-3
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ uint8_t zxLoopDelay = 0;
137137

138138
// calibrate zero crossing: how many timerIsr happen within one zero crossing
139139
#define zxCalibrationLoops 128
140-
#define zxPerSecCalibrationTime 4000
140+
#define zxPerSecCalibrationTime 2000
141141

142142
struct {
143143
volatile uint8_t iterations;
@@ -636,7 +636,6 @@ void loop(void)
636636
PID.SetControllerDirection(REVERSE);
637637
PID.SetTunings(fanPID.Kp, fanPID.Ki, fanPID.Kd);
638638
Setpoint = idleTemp;
639-
640639
}
641640

642641
if (Input < (idleTemp + 5)) {
@@ -660,7 +659,9 @@ void loop(void)
660659
// PIDTune.setpoint = 210.0; // is private inside PIDTune
661660

662661
if (val != 0) {
663-
currentState = CoolDown;
662+
toggleAutoTune();
663+
Setpoint = idleTemp;
664+
Output = 0;
664665
}
665666

666667
if (currentState != Tune) { // we're done, set the tuning parameters

ReflowController/UI.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void displaySplash() {
8585
// splash screen
8686
tft.setCursor(2, 30);
8787
tft.setTextSize(2);
88-
tft.print("Reflow");
88+
tft.print("nanoReflow");
8989
tft.setCursor(tft.width()-120, 48);
9090
tft.print("Controller");
9191
tft.setTextSize(1);
@@ -745,12 +745,14 @@ void updateProcessDisplay() {
745745
alignRightPrefix((int)heaterValue);
746746
tft.print((int)heaterValue);
747747
tft.print('%');
748-
748+
#ifdef WITH_FAN
749749
tft.print(" \x2a");
750750
alignRightPrefix((int)fanValue);
751751
tft.print((int)fanValue);
752752
tft.print('%');
753-
753+
#else
754+
tft.print(" ");
755+
#endif
754756
tft.print(" \x12 "); // alternative: \x7f
755757
printDouble(rampRate);
756758
tft.print("\367C/s ");

ReflowController/config.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#ifndef CONFIG_H
22
#define CONFIG_H
33

4-
//#define ALWAYS_FIRST_RUN
4+
//#define ALWAYS_FIRST_RUN // force resett to factory settings at startup
55
//#define FAKE_HW 1
6-
#define PIDTUNE 1 // autotune wouldn't fit in the 28k available on my arduino pro micro.
6+
//#define PIDTUNE 1 // autotune wouldn't fit in the 28k available on my arduino pro micro.
77
#define WITH_BEEPER // Enables Beeper
88
//#define WITH_FAN // Enables Lid opening Servo (not yet implemented)
99
//#define WITH_SERVO // Enables Lid opening Servo (not yet implemented)

0 commit comments

Comments
 (0)