zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

The safe_delay() is now globaly accessible

Browse source
This commit is contained in:
João Brázio 2016-07-14 21:40:11 +01:00
parent 9a00108cb6
commit a8758619ec
4 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Marlin.h
View file

@ -389,4 +389,6 @@ void calculate_volumetric_multipliers();
#endif #endif
#endif #endif
void safe_delay(uint16_t del);
#endif //MARLIN_H #endif //MARLIN_H

2
Marlin/Marlin_main.cpp
View file

@ -946,7 +946,7 @@ void setup() {
lcd_init(); lcd_init();
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
#if ENABLED(DOGLCD) #if ENABLED(DOGLCD)
delay(BOOTSCREEN_TIMEOUT); safe_delay(BOOTSCREEN_TIMEOUT);
#elif ENABLED(ULTRA_LCD) #elif ENABLED(ULTRA_LCD)
bootscreen(); bootscreen();
lcd_init(); lcd_init();

9
Marlin/ultralcd_implementation_hitachi_HD44780.h
View file

@ -443,15 +443,6 @@ unsigned lcd_print(char c) { return charset_mapper(c); }
lcd.setCursor(indent, 2); lcd.print('\x02'); lcd_printPGM(PSTR( "------" )); lcd.print('\x03'); lcd.setCursor(indent, 2); lcd.print('\x02'); lcd_printPGM(PSTR( "------" )); lcd.print('\x03');
} }
void safe_delay(uint16_t del){
while (del > 50) {
del -= 50;
delay(50);
thermalManager.manage_heater();
}
delay(del);
}
void bootscreen() { void bootscreen() {
byte top_left[8] = { byte top_left[8] = {
B00000, B00000,

33
Marlin/utility.cpp Normal file
View file

@ -0,0 +1,33 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include "Marlin.h"
#include "temperature.h"
void safe_delay(uint16_t ms) {
while (ms > 50) {
ms -= 50;
delay(50);
thermalManager.manage_heater();
}
delay(ms);
}