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
aa275606
Commit
aa275606
authored
Dec 30, 2014
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix manage inactivity
parent
eb09f322
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
19 deletions
+19
-19
Marlin.h
MarlinKimbra/Marlin.h
+1
-1
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+2
-2
language.h
MarlinKimbra/language.h
+16
-16
No files found.
MarlinKimbra/Marlin.h
View file @
aa275606
...
@@ -103,7 +103,7 @@ FORCE_INLINE void serialprintPGM(const char *str)
...
@@ -103,7 +103,7 @@ FORCE_INLINE void serialprintPGM(const char *str)
void
get_command
();
void
get_command
();
void
process_commands
();
void
process_commands
();
void
manage_inactivity
();
void
manage_inactivity
(
bool
ignore_stepper_queue
=
false
);
#if defined(DUAL_X_CARRIAGE) && defined(X_ENABLE_PIN) && X_ENABLE_PIN > -1 \
#if defined(DUAL_X_CARRIAGE) && defined(X_ENABLE_PIN) && X_ENABLE_PIN > -1 \
&& defined(X2_ENABLE_PIN) && X2_ENABLE_PIN > -1
&& defined(X2_ENABLE_PIN) && X2_ENABLE_PIN > -1
...
...
MarlinKimbra/Marlin_main.cpp
View file @
aa275606
...
@@ -4904,7 +4904,7 @@ Sigma_Exit:
...
@@ -4904,7 +4904,7 @@ Sigma_Exit:
while
(
!
lcd_clicked
()){
while
(
!
lcd_clicked
()){
cnt
++
;
cnt
++
;
manage_heater
();
manage_heater
();
manage_inactivity
();
manage_inactivity
(
true
);
lcd_update
();
lcd_update
();
if
(
cnt
==
0
)
if
(
cnt
==
0
)
{
{
...
@@ -5779,7 +5779,7 @@ void handle_status_leds(void)
...
@@ -5779,7 +5779,7 @@ void handle_status_leds(void)
}
}
#endif // TEMP_STAT_LEDS
#endif // TEMP_STAT_LEDS
void
manage_inactivity
(
)
void
manage_inactivity
(
bool
ignore_stepper_queue
/*=false*/
)
//default argument set in Marlin.h
{
{
#if defined(KILL_PIN) && KILL_PIN > -1
#if defined(KILL_PIN) && KILL_PIN > -1
...
...
MarlinKimbra/language.h
View file @
aa275606
...
@@ -28,26 +28,26 @@
...
@@ -28,26 +28,26 @@
#define PROTOCOL_VERSION "1.0"
#define PROTOCOL_VERSION "1.0"
#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
#define MACHINE_NAME "Ultimaker"
#define MACHINE_NAME "Ultimaker"
#define FIRMWARE_URL "http://firmware.ultimaker.com"
#define FIRMWARE_URL "http://firmware.ultimaker.com"
#elif MB(RUMBA)
#elif MB(RUMBA)
#define MACHINE_NAME "Rumba"
#define MACHINE_NAME "Rumba"
#define FIRMWARE_URL "https://github.com/MagoKimbra/MarlinKimbra"
#define FIRMWARE_URL "https://github.com/MagoKimbra/MarlinKimbra"
#elif MB(3DRAG)
#elif MB(3DRAG)
#define MACHINE_NAME "3Drag"
#define MACHINE_NAME "3Drag"
#define FIRMWARE_URL "http://3dprint.elettronicain.it/"
#define FIRMWARE_URL "http://3dprint.elettronicain.it/"
#elif MB(5DPRINT)
#elif MB(5DPRINT)
#define MACHINE_NAME "Makibox"
#define MACHINE_NAME "Makibox"
#define FIRMWARE_URL "https://github.com/MagoKimbra/MarlinKimbra"
#define FIRMWARE_URL "https://github.com/MagoKimbra/MarlinKimbra"
#elif MB(SAV_MKI)
#elif MB(SAV_MKI)
#define MACHINE_NAME "SAV MkI"
#define MACHINE_NAME "SAV MkI"
#define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
#define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
#else
#else
#ifdef CUSTOM_MENDEL_NAME
#ifdef CUSTOM_MENDEL_NAME
#define MACHINE_NAME CUSTOM_MENDEL_NAME
#define MACHINE_NAME CUSTOM_MENDEL_NAME
#else
#else
#define MACHINE_NAME "Prusa"
#define MACHINE_NAME "Prusa"
#endif
#endif
// Default firmware set to Prusa/Mendel
// Default firmware set to Prusa/Mendel
#define FIRMWARE_URL "https://github.com/MagoKimbra/MarlinKimbra"
#define FIRMWARE_URL "https://github.com/MagoKimbra/MarlinKimbra"
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
#ifndef MACHINE_UUID
#ifndef MACHINE_UUID
#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
#endif
#endif
...
...
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