Commit cf0fc5f8 authored by MagoKimbra's avatar MagoKimbra

Fix

parent 3b8fe81c
...@@ -2273,7 +2273,7 @@ ...@@ -2273,7 +2273,7 @@
#undef SDSS #undef SDSS
#define SDSS 10 #define SDSS 10
#define SDCARDDETECT 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 SDCARDDETECT 14 #define SD_DETECT_PIN 14
#define KILL_PIN -1 #define KILL_PIN -1
#elif ENABLED(SPARK_FULL_GRAPHICS) #elif ENABLED(SPARK_FULL_GRAPHICS)
......
...@@ -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_ms(250); HAL::delayMilliseconds(250);
#define TEMP_MIN_ROUTINE(NR) \ #define TEMP_MIN_ROUTINE(NR) \
minttemp[NR] = HEATER_ ## NR ## _MINTEMP; \ minttemp[NR] = HEATER_ ## NR ## _MINTEMP; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment