Bump to head

This commit is contained in:
InsanityAutomation
2019-07-05 17:06:08 -04:00
parent 04ab489264
commit 6b8b1892f9
1167 changed files with 95642 additions and 21850 deletions
@@ -1,9 +1,9 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
* 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
@@ -19,6 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#pragma once
/**
* Animated boot screen example
@@ -28,7 +29,6 @@
#define CUSTOM_BOOTSCREEN_FRAME_TIME 100 // (ms)
#define CUSTOM_BOOTSCREEN_BMPWIDTH 128
#define CUSTOM_BOOTSCREEN_TIMEOUT 2500 // (ms)
const unsigned char custom_start_bmp[] PROGMEM = {
B00011111,B11111111,B11111111,B11111111,B11111111,B11001111,B11111111,B11111111,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,