Commit 87ea23f7 authored by MagoKimbra's avatar MagoKimbra

Same fix

parent 800c174a
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
#define K1 0.95 //smoothing factor within the PID #define K1 0.95 //smoothing factor within the PID
#define PID_dT ((OVERSAMPLENR * 10.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine #define PID_dT ((OVERSAMPLENR * 10.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine
// HotEnd{HE0,HE1,HE2,HE3} // HotEnd{HE0,HE1,HE2,HE3}
#define DEFAULT_Kp {40,41,41,41} // Kp for E0, E1, E2, E3 #define DEFAULT_Kp {40,41,41,41} // Kp for E0, E1, E2, E3
#define DEFAULT_Ki {7,7,7,7} // Ki for E0, E1, E2, E3 #define DEFAULT_Ki {7,7,7,7} // Ki for E0, E1, E2, E3
#define DEFAULT_Kd {59,59,59,59} // Kd for E0, E1, E2, E3 #define DEFAULT_Kd {59,59,59,59} // Kd for E0, E1, E2, E3
...@@ -431,9 +431,9 @@ ...@@ -431,9 +431,9 @@
//#define SAV_3DLCD //#define SAV_3DLCD
#ifdef SAV_3DLCD #ifdef SAV_3DLCD
#define SR_LCD_2W_NL // Non latching 2 wire shiftregister #define SR_LCD_2W_NL // Non latching 2 wire shiftregister
#define NEWPANEL #define NEWPANEL
#define ULTIPANEL #define ULTIPANEL
#endif #endif
......
...@@ -2209,7 +2209,7 @@ void process_commands() ...@@ -2209,7 +2209,7 @@ void process_commands()
destination[X_AXIS] = round(Z_SAFE_HOMING_X_POINT - X_PROBE_OFFSET_FROM_EXTRUDER); destination[X_AXIS] = round(Z_SAFE_HOMING_X_POINT - X_PROBE_OFFSET_FROM_EXTRUDER);
destination[Y_AXIS] = round(Z_SAFE_HOMING_Y_POINT - Y_PROBE_OFFSET_FROM_EXTRUDER); destination[Y_AXIS] = round(Z_SAFE_HOMING_Y_POINT - Y_PROBE_OFFSET_FROM_EXTRUDER);
destination[Z_AXIS] = Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS) * (-1); // Set destination away from bed destination[Z_AXIS] = Z_RAISE_BEFORE_HOMING * home_dir(Z_AXIS) * (-1); // Set destination away from bed
feedrate = XY_TRAVEL_SPEED/60; feedrate = XY_TRAVEL_SPEED;
current_position[Z_AXIS] = 0; current_position[Z_AXIS] = 0;
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
......
...@@ -1339,7 +1339,6 @@ static void menu_action_setting_edit_bool(const char* pstr, bool* ptr) ...@@ -1339,7 +1339,6 @@ static void menu_action_setting_edit_bool(const char* pstr, bool* ptr)
void lcd_init() void lcd_init()
{ {
lcd_implementation_init(); lcd_implementation_init();
lcd_message_init();
#ifdef NEWPANEL #ifdef NEWPANEL
SET_INPUT(BTN_EN1); SET_INPUT(BTN_EN1);
......
...@@ -923,22 +923,5 @@ static uint8_t lcd_implementation_read_slow_buttons() ...@@ -923,22 +923,5 @@ static uint8_t lcd_implementation_read_slow_buttons()
} }
#endif #endif
static void lcd_message_init()
{
static String message[4];
message[0] = "MARLINKIMBRA V4.0";
message[1] = "By MagoKimbra";
message[2] = "magokimbra@hotmail";
message[3] = ".com";
lcd.clear();
for(int8_t i=0;i<4;i++){
lcd.setCursor(0,i);
lcd.print(message[i]);
}
delay(5000);
lcd.clear();
}
#endif//ULTRA_LCD_IMPLEMENTATION_HITACHI_HD44780_H #endif//ULTRA_LCD_IMPLEMENTATION_HITACHI_HD44780_H
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