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
0e92523f
Commit
0e92523f
authored
Mar 31, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
parent
60e4ec15
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
4 deletions
+7
-4
Configuration.h
MarlinKimbra/Configuration.h
+1
-1
Marlin.h
MarlinKimbra/Marlin.h
+4
-0
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+1
-0
dogm_lcd_implementation.h
MarlinKimbra/dogm_lcd_implementation.h
+0
-1
language.h
MarlinKimbra/language.h
+1
-1
temperature.h
MarlinKimbra/temperature.h
+0
-1
No files found.
MarlinKimbra/Configuration.h
View file @
0e92523f
...
@@ -161,7 +161,7 @@
...
@@ -161,7 +161,7 @@
// 1010 is Pt1000 with 1k pullup (non standard)
// 1010 is Pt1000 with 1k pullup (non standard)
// 147 is Pt100 with 4k7 pullup
// 147 is Pt100 with 4k7 pullup
// 110 is Pt100 with 1k pullup (non standard)
// 110 is Pt100 with 1k pullup (non standard)
// 998 and 999 are Dummy Tables. They will ALWAYS read 25
°
C or the temperature defined below.
// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below.
// Use it for Testing or Development purposes. NEVER for production machine.
// Use it for Testing or Development purposes. NEVER for production machine.
// #define DUMMY_THERMISTOR_998_VALUE 25
// #define DUMMY_THERMISTOR_998_VALUE 25
// #define DUMMY_THERMISTOR_999_VALUE 100
// #define DUMMY_THERMISTOR_999_VALUE 100
...
...
MarlinKimbra/Marlin.h
View file @
0e92523f
...
@@ -309,6 +309,10 @@ extern int fanSpeed;
...
@@ -309,6 +309,10 @@ extern int fanSpeed;
extern
unsigned
long
power_consumption_hour
;
//holds the power consumption per hour as accurately measured
extern
unsigned
long
power_consumption_hour
;
//holds the power consumption per hour as accurately measured
#endif
#endif
#ifdef IDLE_OOZING_PREVENT
extern
bool
idleoozing_enabled
;
#endif
#ifdef FWRETRACT
#ifdef FWRETRACT
extern
bool
autoretract_enabled
;
extern
bool
autoretract_enabled
;
extern
bool
retracted
[
EXTRUDERS
];
extern
bool
retracted
[
EXTRUDERS
];
...
...
MarlinKimbra/Marlin_main.cpp
View file @
0e92523f
...
@@ -304,6 +304,7 @@ uint8_t debugLevel = 0;
...
@@ -304,6 +304,7 @@ uint8_t debugLevel = 0;
#endif
#endif
#ifdef IDLE_OOZING_PREVENT
#ifdef IDLE_OOZING_PREVENT
bool
idleoozing_enabled
=
true
;
bool
IDLE_OOZING_retracted
[
EXTRUDERS
]
=
ARRAY_BY_EXTRUDERS
(
false
,
false
,
false
,
false
);
bool
IDLE_OOZING_retracted
[
EXTRUDERS
]
=
ARRAY_BY_EXTRUDERS
(
false
,
false
,
false
,
false
);
#endif
#endif
...
...
MarlinKimbra/dogm_lcd_implementation.h
View file @
0e92523f
...
@@ -142,7 +142,6 @@ U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0
...
@@ -142,7 +142,6 @@ U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0
#include "utf_mapper.h"
#include "utf_mapper.h"
int
lcd_contrast
;
int
lcd_contrast
;
static
unsigned
char
blink
=
0
;
// Variable for visualization of fan rotation in GLCD
static
char
currentfont
=
0
;
static
char
currentfont
=
0
;
static
void
lcd_setFont
(
char
font_nr
)
{
static
void
lcd_setFont
(
char
font_nr
)
{
...
...
MarlinKimbra/language.h
View file @
0e92523f
...
@@ -231,4 +231,4 @@
...
@@ -231,4 +231,4 @@
#include "language_pt-br.h"
#include "language_pt-br.h"
#endif
#endif
#endif //__LANGUAGE_H
#endif //__LANGUAGE_H
MarlinKimbra/temperature.h
View file @
0e92523f
...
@@ -69,7 +69,6 @@ extern float current_temperature_bed;
...
@@ -69,7 +69,6 @@ extern float current_temperature_bed;
float
scalePID_d
(
float
d
);
float
scalePID_d
(
float
d
);
float
unscalePID_i
(
float
i
);
float
unscalePID_i
(
float
i
);
float
unscalePID_d
(
float
d
);
float
unscalePID_d
(
float
d
);
#endif
#endif
#ifdef PIDTEMPBED
#ifdef PIDTEMPBED
extern
float
bedKp
,
bedKi
,
bedKd
;
extern
float
bedKp
,
bedKi
,
bedKd
;
...
...
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