Browse Source

Init LCD ASAP for a nice UX

Andre Sklenar 7 years ago
parent
commit
5ab57ab2ad
1 changed files with 12 additions and 5 deletions
  1. 12 5
      Firmware/Marlin_main.cpp

+ 12 - 5
Firmware/Marlin_main.cpp

@@ -1003,6 +1003,9 @@ void factory_reset(char level, bool quiet)
 // are initialized by the main() routine provided by the Arduino framework.
 void setup()
 {
+    lcd_init();
+    lcd_print_at_PGM(0, 1, PSTR("   Original Prusa   "));
+    lcd_print_at_PGM(0, 2, PSTR("    3D  Printers    "));
 	setup_killpin();
 	setup_powerhold();
 	MYSERIAL.begin(BAUDRATE);
@@ -1052,7 +1055,7 @@ void setup()
 	SERIAL_ECHO(freeMemory());
 	SERIAL_ECHORPGM(MSG_PLANNER_BUFFER_BYTES);
 	SERIAL_ECHOLN((int)sizeof(block_t)*BLOCK_BUFFER_SIZE);
-	lcd_update_enable(false);
+	//lcd_update_enable(false); // why do we need this?? - andre
 	// loads data from EEPROM if available else uses defaults (and resets step acceleration rate)
 	Config_RetrieveSettings();
 	SdFatUtil::set_stack_guard(); //writes magic number at the end of static variables to protect against overwriting static memory by stack
@@ -1065,14 +1068,17 @@ void setup()
 	tmc2130_mode = silentMode?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL;
 #endif //HAVE_TMC2130_DRIVERS
 
+    
 	st_init();    // Initialize stepper, this enables interrupts!
+    
 	setup_photpin();
+    lcd_print_at_PGM(0, 1, PSTR("   Original Prusa   ")); // we need to do this again for some reason, no time to research
+    lcd_print_at_PGM(0, 2, PSTR("    3D  Printers    ")); 
 	servo_init();
 	// Reset the machine correction matrix.
 	// It does not make sense to load the correction matrix until the machine is homed.
 	world2machine_reset();
-
-	lcd_init();
+    
 	if (!READ(BTN_ENC))
 	{
 		_delay_ms(1000);
@@ -1138,8 +1144,9 @@ void setup()
 	}
 	else
 	{
-		_delay_ms(1000);  // wait 1sec to display the splash screen
+		//_delay_ms(1000);  // wait 1sec to display the splash screen // what's this and why do we need it?? - andre
 	}
+    
 
 
 
@@ -6770,4 +6777,4 @@ void serialecho_temperatures() {
 	SERIAL_PROTOCOLPGM(" B:");
 	SERIAL_PROTOCOL_F(degBed(), 1);
 	SERIAL_PROTOCOLLN("");
-}
+}