From 5f8591528e7c5faf97a28447248e31c229d772e0 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <github@thinkyhead.com> Date: Wed, 23 May 2018 23:47:16 -0500 Subject: [PATCH] Remove #pragmas that don't help c files --- Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_shared_hw_spi.cpp | 3 --- Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp | 3 --- Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_hw_spi.cpp | 3 --- Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp | 3 --- .../src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp | 3 --- .../src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp | 3 --- Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_sw_spi.cpp | 3 --- Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp | 3 --- Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp | 3 --- Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp | 3 --- Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp | 3 --- Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp | 3 --- Marlin/src/lcd/lcdprint_u8g.cpp | 3 --- Marlin/src/lcd/ultralcd_impl_DOGM.h | 3 --- 14 files changed, 42 deletions(-) diff --git a/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_shared_hw_spi.cpp b/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_shared_hw_spi.cpp index 7c91f746c61..0dab3bb412f 100644 --- a/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_shared_hw_spi.cpp +++ b/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_shared_hw_spi.cpp @@ -62,10 +62,7 @@ #if ENABLED(DOGLCD) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop #include "../../Marlin.h" diff --git a/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp b/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp index 3466d8b1c3a..df33f9db626 100644 --- a/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp +++ b/Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_st7920_sw_spi.cpp @@ -59,10 +59,7 @@ #if ENABLED(DOGLCD) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop #include <Arduino.h> #include "../Delay.h" diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_hw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_hw_spi.cpp index d1100c4b90d..9cd913f7431 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_hw_spi.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_hw_spi.cpp @@ -60,10 +60,7 @@ #if ENABLED(DOGLCD) //#include <inttypes.h> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop #define SPI_FULL_SPEED 0 #define SPI_HALF_SPEED 1 diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp index 0ed2b2ec2dc..06399d39472 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp @@ -81,10 +81,7 @@ #if ENABLED(DOGLCD) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop #define I2C_SLA (0x3C*2) //#define I2C_CMD_MODE 0x080 diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp index 537da9763af..c61fa4a8cef 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp @@ -60,10 +60,7 @@ #if ENABLED(DOGLCD) //#include <inttypes.h> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop #include "../Delay.h" #define SPI_FULL_SPEED 0 diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp index 32a0ec66fd8..700ed594632 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp @@ -59,10 +59,7 @@ #if ENABLED(DOGLCD) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop #include "SoftwareSPI.h" #include "../Delay.h" diff --git a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_sw_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_sw_spi.cpp index 476e1424012..533ebda37ce 100644 --- a/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_sw_spi.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_sw_spi.cpp @@ -59,10 +59,7 @@ #if ENABLED(DOGLCD) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop #include "SoftwareSPI.h" #define SPI_SPEED 2 // About 2 MHz diff --git a/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp b/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp index af1a8819fca..3249068299e 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp @@ -69,10 +69,7 @@ #if ENABLED(DOGLCD) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop #include "HAL_LCD_com_defines.h" #define WIDTH 128 diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp index 3273fc7dc39..fda5a79c9e4 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp @@ -57,10 +57,7 @@ #if ENABLED(DOGLCD) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop #include "HAL_LCD_com_defines.h" diff --git a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp index 774a709463c..86a9fd110b8 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp @@ -57,10 +57,7 @@ #if ENABLED(DOGLCD) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop #include "HAL_LCD_com_defines.h" diff --git a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp index 36427a80400..e58bb34fae9 100644 --- a/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp +++ b/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp @@ -61,10 +61,7 @@ #if ENABLED(DOGLCD) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop #include "HAL_LCD_com_defines.h" diff --git a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp index 3448eac11e9..71f61a08c33 100644 --- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp +++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp @@ -42,10 +42,7 @@ #define LCD_PIXEL_WIDTH 128 #define LCD_PIXEL_HEIGHT 64 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop //set optimization so ARDUINO optimizes this file #pragma GCC optimize (3) diff --git a/Marlin/src/lcd/lcdprint_u8g.cpp b/Marlin/src/lcd/lcdprint_u8g.cpp index 2a1c44b8c94..37ddd4f0887 100644 --- a/Marlin/src/lcd/lcdprint_u8g.cpp +++ b/Marlin/src/lcd/lcdprint_u8g.cpp @@ -11,10 +11,7 @@ #if ENABLED(DOGLCD) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop extern U8GLIB *pu8g; #define _lcd_write(a) pu8g->print(a) #define _lcd_setcursor(col, row) pu8g->setPrintPos((col), (row)); diff --git a/Marlin/src/lcd/ultralcd_impl_DOGM.h b/Marlin/src/lcd/ultralcd_impl_DOGM.h index 436b16f56e5..06d8342e926 100644 --- a/Marlin/src/lcd/ultralcd_impl_DOGM.h +++ b/Marlin/src/lcd/ultralcd_impl_DOGM.h @@ -58,10 +58,7 @@ #include "../libs/duration_t.h" #endif -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" #include <U8glib.h> -#pragma GCC diagnostic pop #include "fontutils.h" #include "u8g_fontutf8.h"