João Brázio
9 years ago
No known key found for this signature in database
GPG Key ID: F62CFD37DFFDB540
5 changed files with
12 additions and
8 deletions
-
Marlin/dogm_lcd_implementation.h
-
Marlin/planner.cpp
-
Marlin/stepper.cpp
-
Marlin/temperature.cpp
-
Marlin/ultralcd_st7920_u8glib_rrd.h
|
@ -474,6 +474,9 @@ static void lcd_implementation_mark_as_selected(uint8_t row, bool isSelected) { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
static void lcd_implementation_drawmenu_generic(bool isSelected, uint8_t row, const char* pstr, char pre_char, char post_char) { |
|
|
static void lcd_implementation_drawmenu_generic(bool isSelected, uint8_t row, const char* pstr, char pre_char, char post_char) { |
|
|
|
|
|
UNUSED(pstr); |
|
|
|
|
|
UNUSED(pre_char); |
|
|
|
|
|
|
|
|
char c; |
|
|
char c; |
|
|
uint8_t n = LCD_WIDTH - 2; |
|
|
uint8_t n = LCD_WIDTH - 2; |
|
|
|
|
|
|
|
@ -564,6 +567,7 @@ void lcd_implementation_drawedit(const char* pstr, const char* value=NULL) { |
|
|
#if ENABLED(SDSUPPORT) |
|
|
#if ENABLED(SDSUPPORT) |
|
|
|
|
|
|
|
|
static void _drawmenu_sd(bool isSelected, uint8_t row, const char* pstr, const char* filename, char* const longFilename, bool isDir) { |
|
|
static void _drawmenu_sd(bool isSelected, uint8_t row, const char* pstr, const char* filename, char* const longFilename, bool isDir) { |
|
|
|
|
|
UNUSED(pstr); |
|
|
char c; |
|
|
char c; |
|
|
uint8_t n = LCD_WIDTH - 1; |
|
|
uint8_t n = LCD_WIDTH - 1; |
|
|
|
|
|
|
|
|
|
@ -1057,7 +1057,7 @@ void Planner::check_axes_activity() { |
|
|
// This leads to an enormous number of advance steps due to a huge e_acceleration.
|
|
|
// This leads to an enormous number of advance steps due to a huge e_acceleration.
|
|
|
// The math is correct, but you don't want a retract move done with advance!
|
|
|
// The math is correct, but you don't want a retract move done with advance!
|
|
|
// So this situation is filtered out here.
|
|
|
// So this situation is filtered out here.
|
|
|
if (!bse || (!bsx && !bsy && !bsz) || stepper.get_advance_k() == 0 || bse == allsteps) { |
|
|
if (!bse || (!bsx && !bsy && !bsz) || stepper.get_advance_k() == 0 || (uint32_t) bse == allsteps) { |
|
|
block->use_advance_lead = false; |
|
|
block->use_advance_lead = false; |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
|
@ -998,7 +998,7 @@ void Stepper::digipot_init() { |
|
|
|
|
|
|
|
|
SPI.begin(); |
|
|
SPI.begin(); |
|
|
pinMode(DIGIPOTSS_PIN, OUTPUT); |
|
|
pinMode(DIGIPOTSS_PIN, OUTPUT); |
|
|
for (int i = 0; i < COUNT(digipot_motor_current); i++) { |
|
|
for (uint8_t i = 0; i < COUNT(digipot_motor_current); i++) { |
|
|
//digitalPotWrite(digipot_ch[i], digipot_motor_current[i]);
|
|
|
//digitalPotWrite(digipot_ch[i], digipot_motor_current[i]);
|
|
|
digipot_current(i, digipot_motor_current[i]); |
|
|
digipot_current(i, digipot_motor_current[i]); |
|
|
} |
|
|
} |
|
|
|
@ -462,7 +462,7 @@ int Temperature::getHeaterPower(int heater) { |
|
|
EXTRUDER_3_AUTO_FAN_PIN == EXTRUDER_2_AUTO_FAN_PIN ? 2 : 3 |
|
|
EXTRUDER_3_AUTO_FAN_PIN == EXTRUDER_2_AUTO_FAN_PIN ? 2 : 3 |
|
|
}; |
|
|
}; |
|
|
uint8_t fanState = 0; |
|
|
uint8_t fanState = 0; |
|
|
for (int f = 0; f <= HOTENDS; f++) { |
|
|
for (int f = 0; f < HOTENDS; f++) { |
|
|
if (current_temperature[f] > EXTRUDER_AUTO_FAN_TEMPERATURE) |
|
|
if (current_temperature[f] > EXTRUDER_AUTO_FAN_TEMPERATURE) |
|
|
SBI(fanState, fanBit[f]); |
|
|
SBI(fanState, fanBit[f]); |
|
|
} |
|
|
} |
|
|
|
@ -135,7 +135,7 @@ u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi = {u8g_dev_rrd_st7920_128x64_fn, &u8g |
|
|
|
|
|
|
|
|
class U8GLIB_ST7920_128X64_RRD : public U8GLIB { |
|
|
class U8GLIB_ST7920_128X64_RRD : public U8GLIB { |
|
|
public: |
|
|
public: |
|
|
U8GLIB_ST7920_128X64_RRD(uint8_t dummy) : U8GLIB(&u8g_dev_st7920_128x64_rrd_sw_spi) {} |
|
|
U8GLIB_ST7920_128X64_RRD(uint8_t dummy) : U8GLIB(&u8g_dev_st7920_128x64_rrd_sw_spi) { UNUSED(dummy); } |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|