Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
5788c2e7
Commit
5788c2e7
authored
Jun 01, 2016
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into k40_noflow_nocooler
parents
691fbcfa
bcea222f
Pipeline
#65
skipped
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
Configuration_Temperature.h
MK/Configuration_Temperature.h
+1
-1
MK_Main.cpp
MK/module/MK_Main.cpp
+3
-3
No files found.
MK/Configuration_Temperature.h
View file @
5788c2e7
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
#define TEMP_SENSOR_2 0
#define TEMP_SENSOR_2 0
#define TEMP_SENSOR_3 0
#define TEMP_SENSOR_3 0
#define TEMP_SENSOR_BED 0
#define TEMP_SENSOR_BED 0
#define TEMP_SENSOR_CHAMBER 0
// NOT USED FOR NOW!!!
#define TEMP_SENSOR_CHAMBER 0
#define TEMP_SENSOR_COOLER 0
#define TEMP_SENSOR_COOLER 0
//These 2 defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
//These 2 defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
...
...
MK/module/MK_Main.cpp
View file @
5788c2e7
...
@@ -3008,7 +3008,7 @@ inline void wait_heater(bool no_wait_for_cooling = true) {
...
@@ -3008,7 +3008,7 @@ inline void wait_heater(bool no_wait_for_cooling = true) {
now
=
millis
();
now
=
millis
();
if
(
ELAPSED
(
now
,
next_temp_ms
))
{
//Print temp & remaining time every 1s while waiting
if
(
ELAPSED
(
now
,
next_temp_ms
))
{
//Print temp & remaining time every 1s while waiting
next_temp_ms
=
now
+
1000UL
;
next_temp_ms
=
now
+
1000UL
;
#if HAS(TEMP_
HOTEND) || HAS(TEMP_BED
)
#if HAS(TEMP_
0) || HAS(TEMP_BED) || ENABLED(HEATER_0_USES_MAX6675
)
print_heaterstates
();
print_heaterstates
();
#endif
#endif
#if TEMP_RESIDENCY_TIME > 0
#if TEMP_RESIDENCY_TIME > 0
...
@@ -3083,7 +3083,7 @@ inline void wait_bed(bool no_wait_for_cooling = true) {
...
@@ -3083,7 +3083,7 @@ inline void wait_bed(bool no_wait_for_cooling = true) {
now
=
millis
();
now
=
millis
();
if
(
ELAPSED
(
now
,
next_temp_ms
))
{
//Print Temp Reading every 1 second while heating up.
if
(
ELAPSED
(
now
,
next_temp_ms
))
{
//Print Temp Reading every 1 second while heating up.
next_temp_ms
=
now
+
1000UL
;
next_temp_ms
=
now
+
1000UL
;
#if HAS(TEMP_0) || HAS(TEMP_BED)
#if HAS(TEMP_0) || HAS(TEMP_BED)
|| ENABLED(HEATER_0_USES_MAX6675)
print_heaterstates
();
print_heaterstates
();
#endif
#endif
#if TEMP_BED_RESIDENCY_TIME > 0
#if TEMP_BED_RESIDENCY_TIME > 0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment