Browse Source
Merge pull request #9729 from Bob-the-Kuhn/U8G-compile-error-2.0.x
[2.0.x] Move #include <U8glib.h> in ultralcd_st7920_u8glib_rrd_AVR.cpp (fix bug introduced in PR #9624)
pull/1/head
Bob-the-Kuhn
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
1 deletions
-
Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
|
|
@ -24,7 +24,6 @@ |
|
|
// file u8g_dev_st7920_128x64_HAL.cpp for the HAL version.
|
|
|
// file u8g_dev_st7920_128x64_HAL.cpp for the HAL version.
|
|
|
|
|
|
|
|
|
#include "../../inc/MarlinConfig.h" |
|
|
#include "../../inc/MarlinConfig.h" |
|
|
#include <U8glib.h> |
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(U8GLIB_ST7920) |
|
|
#if ENABLED(U8GLIB_ST7920) |
|
|
|
|
|
|
|
|
@ -41,6 +40,8 @@ |
|
|
#define LCD_PIXEL_WIDTH 128 |
|
|
#define LCD_PIXEL_WIDTH 128 |
|
|
#define LCD_PIXEL_HEIGHT 64 |
|
|
#define LCD_PIXEL_HEIGHT 64 |
|
|
|
|
|
|
|
|
|
|
|
#include <U8glib.h> |
|
|
|
|
|
|
|
|
//set optimization so ARDUINO optimizes this file
|
|
|
//set optimization so ARDUINO optimizes this file
|
|
|
#pragma GCC optimize (3) |
|
|
#pragma GCC optimize (3) |
|
|
|
|
|
|
|
|
|
