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
cf0fc5f8
Commit
cf0fc5f8
authored
Mar 04, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
parent
3b8fe81c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
Pins.h
MK/Pins.h
+2
-2
temperature.cpp
MK/module/temperature/temperature.cpp
+2
-2
No files found.
MK/Pins.h
View file @
cf0fc5f8
...
@@ -2273,7 +2273,7 @@
...
@@ -2273,7 +2273,7 @@
#undef SDSS
#undef SDSS
#define SDSS 10
#define SDSS 10
#define SD
CARDDETECT
14
#define SD
_DETECT_PIN
14
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define LCD_PINS_RS 46
#define LCD_PINS_RS 46
...
@@ -2292,7 +2292,7 @@
...
@@ -2292,7 +2292,7 @@
#define BTN_ENC 48
#define BTN_ENC 48
#define BEEPER 41
#define BEEPER 41
#define LCD_SDSS 10
#define LCD_SDSS 10
#define SD
CARDDETECT
14
#define SD
_DETECT_PIN
14
#define KILL_PIN -1
#define KILL_PIN -1
#elif ENABLED(SPARK_FULL_GRAPHICS)
#elif ENABLED(SPARK_FULL_GRAPHICS)
...
...
MK/module/temperature/temperature.cpp
View file @
cf0fc5f8
...
@@ -764,7 +764,7 @@ static float analog2temp(int raw, uint8_t h) {
...
@@ -764,7 +764,7 @@ static float analog2temp(int raw, uint8_t h) {
}
}
#if ENABLED(HEATER_0_USES_MAX6675)
#if ENABLED(HEATER_0_USES_MAX6675)
if
(
h
==
0
)
return
0.25
*
raw
;
if
(
h
==
0
)
return
(
float
)
raw
/
4.0
;
#endif
#endif
if
(
heater_ttbl_map
[
h
]
!=
NULL
)
{
if
(
heater_ttbl_map
[
h
]
!=
NULL
)
{
...
@@ -1084,7 +1084,7 @@ void tp_init() {
...
@@ -1084,7 +1084,7 @@ void tp_init() {
BITSET
(
TIMSK0
,
OCIE0B
);
BITSET
(
TIMSK0
,
OCIE0B
);
// Wait for temperature measurement to settle
// Wait for temperature measurement to settle
delay_m
s
(
250
);
HAL
::
delayMillisecond
s
(
250
);
#define TEMP_MIN_ROUTINE(NR) \
#define TEMP_MIN_ROUTINE(NR) \
minttemp[NR] = HEATER_ ## NR ## _MINTEMP; \
minttemp[NR] = HEATER_ ## NR ## _MINTEMP; \
...
...
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