CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2973 from thinkyhead/fix_splash_url

Browse Source 
Remove references to marlinfirmware.org
This commit is contained in:
Scott Lahteine 2016-02-17 17:05:06 -08:00
commit 8eaba020fb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin_main.cpp
View File

@ -74,7 +74,7 @@
* - http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes * - http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes
* *
* Help us document these G-codes online: * Help us document these G-codes online:
* - http://marlinfirmware.org/index.php/G-Code * - https://github.com/MarlinFirmware/Marlin/wiki/G-Code-in-Marlin
* - http://reprap.org/wiki/G-code * - http://reprap.org/wiki/G-code
* *
* ----------------- * -----------------

6
Marlin/ultralcd_implementation_hitachi_HD44780.h
View File

@ -414,6 +414,7 @@ char lcd_print(char* str) {
unsigned lcd_print(char c) { return charset_mapper(c); } unsigned lcd_print(char c) { return charset_mapper(c); }
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
void lcd_erase_line(int line) { void lcd_erase_line(int line) {
lcd.setCursor(0, 3); lcd.setCursor(0, 3);
for (int i = 0; i < LCD_WIDTH; i++) for (int i = 0; i < LCD_WIDTH; i++)
@ -486,18 +487,21 @@ unsigned lcd_print(char c) { return charset_mapper(c); }
lcd.setCursor(TEXT_SCREEN_LOGO_SHIFT, 1); lcd_printPGM(PSTR("|Marlin|")); lcd.setCursor(TEXT_SCREEN_LOGO_SHIFT, 1); lcd_printPGM(PSTR("|Marlin|"));
lcd.setCursor(TEXT_SCREEN_LOGO_SHIFT, 2); lcd.print('\x02'); lcd_printPGM(PSTR( "------" )); lcd.print('\x03'); lcd.setCursor(TEXT_SCREEN_LOGO_SHIFT, 2); lcd.print('\x02'); lcd_printPGM(PSTR( "------" )); lcd.print('\x03');
lcd_scroll(0, 3, PSTR("marlinfirmware.org"), LCD_WIDTH, 3000); delay(2000);
#ifdef STRING_SPLASH_LINE1 #ifdef STRING_SPLASH_LINE1
lcd_erase_line(3); lcd_erase_line(3);
lcd_scroll(0, 3, PSTR(STRING_SPLASH_LINE1), LCD_WIDTH, 1000); lcd_scroll(0, 3, PSTR(STRING_SPLASH_LINE1), LCD_WIDTH, 1000);
#endif #endif
#ifdef STRING_SPLASH_LINE2 #ifdef STRING_SPLASH_LINE2
lcd_erase_line(3); lcd_erase_line(3);
lcd_scroll(0, 3, PSTR(STRING_SPLASH_LINE2), LCD_WIDTH, 1000); lcd_scroll(0, 3, PSTR(STRING_SPLASH_LINE2), LCD_WIDTH, 1000);
#endif #endif
} }
#endif // SHOW_BOOTSCREEN #endif // SHOW_BOOTSCREEN
/* /*
Possible status screens: Possible status screens:
16x2 |000/000 B000/000| 16x2 |000/000 B000/000|