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
50207a4d
Commit
50207a4d
authored
8 years ago
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into nextime
parents
5657ebd9
bcea222f
Pipeline
#66
skipped
Changes
2
Pipelines
1
Hide 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 @
50207a4d
...
...
@@ -73,7 +73,7 @@
#define TEMP_SENSOR_2 0
#define TEMP_SENSOR_3 0
#define TEMP_SENSOR_BED 0
#define TEMP_SENSOR_CHAMBER 0
// NOT USED FOR NOW!!!
#define TEMP_SENSOR_CHAMBER 0
#define TEMP_SENSOR_COOLER 40
//These 2 defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
...
...
This diff is collapsed.
Click to expand it.
MK/module/MK_Main.cpp
View file @
50207a4d
...
...
@@ -3008,7 +3008,7 @@ inline void wait_heater(bool no_wait_for_cooling = true) {
now
=
millis
();
if
(
ELAPSED
(
now
,
next_temp_ms
))
{
//Print temp & remaining time every 1s while waiting
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
();
#endif
#if TEMP_RESIDENCY_TIME > 0
...
...
@@ -3083,7 +3083,7 @@ inline void wait_bed(bool no_wait_for_cooling = true) {
now
=
millis
();
if
(
ELAPSED
(
now
,
next_temp_ms
))
{
//Print Temp Reading every 1 second while heating up.
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
();
#endif
#if TEMP_BED_RESIDENCY_TIME > 0
...
...
@@ -4867,7 +4867,7 @@ inline void gcode_G92() {
current_position
[
i
]
=
v
;
if
(
i
==
E_AXIS
)
{
plan_set_e_position
(
v
);
plan_set_e_position
(
v
);
}
else
{
position_shift
[
i
]
+=
v
-
p
;
// Offset the coordinate space
...
...
This diff is collapsed.
Click to expand it.
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