Skip to content

Commit e31aba7

Browse files
Version 2.02
- Prevent going into the bake menu when there is a TC error - Set FAN to Off by default in settings - Fixed some incorrect comments - Made TC error more visible on menu screen
1 parent 29f8a3f commit e31aba7

File tree

2 files changed

+38
-15
lines changed

2 files changed

+38
-15
lines changed

Code/README.rst

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,44 @@ Reflow Master V1 and Reflow Master V2
88
Reflow Master V2 HISTORY:
99
-------------------------
1010

11-
- 19/12/2020 v2.00 - Initial release.
11+
- 19/12/2020 v2.00
12+
- Initial release.
1213
- 20/12/2020 v2.01
1314
- Increased max bake time to 3 hours
1415
- Added long press for Bake Time & Temp adjustment to quickly change values, clamped at max, so it won't loop
1516
- Forgot to hookup minBakeTemp, minBakeTime, maxBakeTemp, maxBakeTemp variables to buttons
1617
- Oven was not turned off correctly after the bake ended
18+
- 20/12/2020 v2.02
19+
- Prevent going into the bake menu when there is a TC error
20+
- Set FAN to Off by default in settings
21+
- Fixed some incorrect comments
22+
- Made TC error more visible on menu screen
1723

1824

1925
Reflow Master V1 HISTORY:
2026
-------------------------
2127

22-
- 01/08/2018 v1.0 - Initial release.
23-
- 13/08/2018 v1.01 - Settings UI button now change to show SELECT or CHANGE depending on what is selected
24-
- 27/08/2018 v1.02 - Added tangents to the curve for ESP32 support, Improved graph curves, fixed some UI glitches, made end graph time value be the end profile time
25-
- 28/08/2018 v1.03 - Added some graph smoothing
28+
- 01/08/2018 v1.0
29+
- Initial release.
30+
- 13/08/2018 v1.01
31+
- Settings UI button now change to show SELECT or CHANGE depending on what is selected
32+
- 27/08/2018 v1.02
33+
- Added tangents to the curve for ESP32 support, Improved graph curves, fixed some UI glitches, made end graph time value be the end profile time
34+
- 28/08/2018 v1.03
35+
- Added some graph smoothing
2636
- 20/05/2019 v1.04
2737
- Increased max curve to support profiles up to 8mins
2838
- Added fan on time after reflow for cooldown settings
2939
- Added extra profile for Ju Feng Medium temp paste
30-
- 09/07/2019 v1.05 - Fixed some bugs, Thanks Tablatronix!
31-
- 16/09/2019 v1.06 - Fixed probe offset temp not changing in settings
40+
- 09/07/2019 v1.05
41+
- Fixed some bugs, Thanks Tablatronix!
42+
- 16/09/2019 v1.06
43+
- Fixed probe offset temp not changing in settings
3244
- 02/07/2020 v1.07
3345
- Cleaned up some Fan control and tracking code
3446
- Cleaned up some debug messages
35-
- 13/07/2020 v1.08 - Fixed bug in DEBUG mode
47+
- 13/07/2020 v1.08
48+
- Fixed bug in DEBUG mode
3649

3750

3851
Open Source License

Code/Reflow_Master_v2/Reflow_Master_v2.ino

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
- Increased max bake time to 3 hours
3737
- Added long press for Bake Time & Temp to quickly change values, clamped at max, so it won't loop
3838
- Oven was not turned off correctly after the bake ended
39+
20/12/2020 v2.02 - Prevent going into the Bake menu when there is a thermocouple error
40+
- Set FAN to Off by default
41+
- Fixed some incorrect comments
42+
- Made TC error more visible
3943
4044
---------------------------------------------------------------------------
4145
*/
@@ -107,7 +111,7 @@
107111
// Save data struct
108112
typedef struct {
109113
boolean valid = false;
110-
boolean useFan = true;
114+
boolean useFan = false;
111115
int fanTimeAfterReflow = 60;
112116
byte paste = 0;
113117
float power = 1;
@@ -139,9 +143,10 @@ enum states {
139143
ABORT = 99
140144
} state;
141145

142-
const String ver = "2.01";
146+
const String ver = "2.02";
143147
bool newSettings = false;
144148

149+
// TC variables
145150
long nextTempRead;
146151
long nextTempAvgRead;
147152
int avgReadCount = 0;
@@ -157,9 +162,10 @@ byte currentBakeTimeCounter = 0;
157162
int lastTempDirection = 0;
158163
long minBakeTime = 600; // 10 mins in seconds
159164
long maxBakeTime = 10800; // 3 hours in seconds
160-
float minBakeTemp = 45; // 10 mins in seconds
161-
float maxBakeTemp = 100; // 2 hours in seconds
165+
float minBakeTemp = 45; // 45 Degrees C
166+
float maxBakeTemp = 100; // 100 Degrees C
162167

168+
// Current index in the settings screen
163169
byte settings_pointer = 0;
164170

165171
// Initialise an array to hold 5 profiles
@@ -497,7 +503,7 @@ void loop()
497503
tft.fillRect( 0, tft.height() / 2 - 10, 320, 37, BLACK );
498504
}
499505
tcWasError = true;
500-
tft.setTextColor( RED, BLACK );
506+
tft.setTextColor( WHITE, RED );
501507
tft.setTextSize(3);
502508
int third = tft.width() / 4;
503509
println_Center( tft, " TC ERROR: #" + String( tcError ) + " ", tft.width() / 2, ( tft.height() / 2 ) + 12 );
@@ -1699,7 +1705,7 @@ void SetDefaults()
16991705
set.fanTimeAfterReflow = 60;
17001706
set.power = 1;
17011707
set.paste = 0;
1702-
set.useFan = true;
1708+
set.useFan = false;
17031709
set.lookAhead = 7;
17041710
set.lookAheadWarm = 7;
17051711
set.startFullBlast = false;
@@ -2065,7 +2071,11 @@ void button1Press()
20652071

20662072
if ( state == MENU )
20672073
{
2068-
ShowBakeMenu( true );
2074+
// Only allow reflow start if there is no TC error
2075+
if ( tcError == 0 )
2076+
ShowBakeMenu( true );
2077+
else
2078+
Buzzer( 100, 250 );
20692079
}
20702080
else if ( state == SETTINGS ) // leaving settings so save
20712081
{

0 commit comments

Comments
 (0)