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
0b6d01a6
Commit
0b6d01a6
authored
Jun 05, 2016
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into k40_noflow_nocooler
parents
42740854
328ca582
Pipeline
#108
skipped
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
69 additions
and
65 deletions
+69
-65
MK_Main.cpp
MK/module/MK_Main.cpp
+66
-62
MK_Main.h
MK/module/MK_Main.h
+1
-1
printcounter.h
MK/module/printcounter/printcounter.h
+1
-1
cardreader.cpp
MK/module/sd/cardreader.cpp
+1
-1
No files found.
MK/module/MK_Main.cpp
View file @
0b6d01a6
...
@@ -3117,7 +3117,8 @@ inline void wait_heater(bool no_wait_for_cooling = true) {
...
@@ -3117,7 +3117,8 @@ inline void wait_heater(bool no_wait_for_cooling = true) {
KEEPALIVE_STATE
(
IN_HANDLER
);
KEEPALIVE_STATE
(
IN_HANDLER
);
}
}
inline
void
wait_bed
(
bool
no_wait_for_cooling
=
true
)
{
#if HAS(TEMP_BED)
inline
void
wait_bed
(
bool
no_wait_for_cooling
=
true
)
{
#if TEMP_BED_RESIDENCY_TIME > 0
#if TEMP_BED_RESIDENCY_TIME > 0
millis_t
residency_start_ms
=
0
;
millis_t
residency_start_ms
=
0
;
...
@@ -3187,7 +3188,8 @@ inline void wait_bed(bool no_wait_for_cooling = true) {
...
@@ -3187,7 +3188,8 @@ inline void wait_bed(bool no_wait_for_cooling = true) {
}
while
(
!
cancel_heatup
&&
TEMP_BED_CONDITIONS
);
}
while
(
!
cancel_heatup
&&
TEMP_BED_CONDITIONS
);
LCD_MESSAGEPGM
(
MSG_BED_DONE
);
LCD_MESSAGEPGM
(
MSG_BED_DONE
);
KEEPALIVE_STATE
(
IN_HANDLER
);
KEEPALIVE_STATE
(
IN_HANDLER
);
}
}
#endif // HAS(TEMP_BED)
#if HAS(TEMP_CHAMBER)
#if HAS(TEMP_CHAMBER)
inline
void
wait_chamber
(
bool
no_wait_for_heating
=
true
)
{
inline
void
wait_chamber
(
bool
no_wait_for_heating
=
true
)
{
...
@@ -7882,8 +7884,10 @@ inline void gcode_M503() {
...
@@ -7882,8 +7884,10 @@ inline void gcode_M503() {
setTargetHotend
(
old_target_temperature
[
e
],
e
);
setTargetHotend
(
old_target_temperature
[
e
],
e
);
wait_heater
();
wait_heater
();
}
}
#if HAS(TEMP_BED)
setTargetBed
(
old_target_temperature_bed
);
setTargetBed
(
old_target_temperature_bed
);
wait_bed
();
wait_bed
();
#endif
}
}
// Show load message
// Show load message
...
...
MK/module/MK_Main.h
View file @
0b6d01a6
...
@@ -121,7 +121,7 @@ inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); }
...
@@ -121,7 +121,7 @@ inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); }
extern
void
delay_ms
(
millis_t
ms
);
extern
void
delay_ms
(
millis_t
ms
);
#if ENABLED(FAST_PWM_FAN) || ENABLED(FAST_PWM_COOLER)
#if ENABLED(FAST_PWM_FAN) || ENABLED(FAST_PWM_COOLER)
void
setPwmFrequency
(
uint8_t
pin
,
uint8_
t
val
);
void
setPwmFrequency
(
uint8_t
pin
,
in
t
val
);
#endif
#endif
extern
float
homing_feedrate
[];
extern
float
homing_feedrate
[];
...
...
MK/module/printcounter/printcounter.h
View file @
0b6d01a6
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
* @brief Interval in seconds between SDCARD saves
* @brief Interval in seconds between SDCARD saves
* @details This const value defines what will be the time between each
* @details This const value defines what will be the time between each
*/
*/
const
uint32_t
saveInterval
=
SD_CFG_SECONDS
*
1000
;
const
uint32_t
saveInterval
=
(
uint16_t
)
SD_CFG_SECONDS
*
1000
;
/**
/**
* @brief Timestamp of the last call to deltaDuration()
* @brief Timestamp of the last call to deltaDuration()
...
...
MK/module/sd/cardreader.cpp
View file @
0b6d01a6
...
@@ -200,7 +200,7 @@ bool CardReader::selectFile(const char* filename, bool silent/*=false*/) {
...
@@ -200,7 +200,7 @@ bool CardReader::selectFile(const char* filename, bool silent/*=false*/) {
ECHO_EMV
(
SERIAL_SD_SIZE
,
file
.
fileSize
());
ECHO_EMV
(
SERIAL_SD_SIZE
,
file
.
fileSize
());
}
}
for
(
int
c
=
0
;
c
<
=
sizeof
(
fullName
);
c
++
)
for
(
int
c
=
0
;
c
<
sizeof
(
fullName
);
c
++
)
const_cast
<
char
&>
(
fullName
[
c
])
=
'\0'
;
const_cast
<
char
&>
(
fullName
[
c
])
=
'\0'
;
strncpy
(
fullName
,
filename
,
strlen
(
filename
));
strncpy
(
fullName
,
filename
,
strlen
(
filename
));
...
...
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