From 42eb2347d4c9cc64220322e10046ad275ec7a04e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 9 Jul 2021 22:24:43 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Strip=20trailing=20whitespace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Configuration.h | 2 +- Marlin/src/lcd/dogm/marlinui_DOGM.cpp | 2 +- .../extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py | 2 +- .../extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py | 4 ++-- Marlin/src/lcd/language/language_hu.h | 2 +- Marlin/src/lcd/lcdprint.cpp | 2 +- Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 2 +- Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d850ebe06f..b8589f316f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -2414,7 +2414,7 @@ // // MKS MINI12864 V3 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight. -// +// //#define MKS_MINI_12864_V3 // diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp index 726eb2cc39..f6ed227539 100644 --- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp +++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp @@ -370,7 +370,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop if (mark_as_selected(row, style & SS_INVERT)) { pixel_len_t n = LCD_PIXEL_WIDTH; // pixel width of string allowed - + const int plen = pstr ? calculateWidth(pstr) : 0, vlen = vstr ? utf8_strlen(vstr) : 0; if (style & SS_CENTER) { diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py index 25919c3c4d..6aa8947b98 100755 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py @@ -31,7 +31,7 @@ if __name__ == "__main__": args = parser.parse_args() varname = os.path.splitext(os.path.basename(args.input))[0]; - + with open(args.input, "rb") as in_file: data = in_file.read() if args.deflate: diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py index 5908f5bf17..74be574300 100755 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py @@ -29,13 +29,13 @@ class WriteSource: self.mode = mode self.offset = 8 self.byte = 0 - + def finish_byte(self): if self.offset != 8: self.values.append(self.byte) self.offset = 8 self.byte = 0 - + def add_bits_to_byte(self, value, size = 1): self.offset -= size self.byte = self.byte | value << self.offset diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index ebbc4b2df7..d4ff151f57 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -736,7 +736,7 @@ namespace Language_hu { PROGMEM Language_Str MSG_CALIBRATION_FAILED = _UxGT("Kalibrálási hiba"); PROGMEM Language_Str MSG_DRIVER_BACKWARD = _UxGT(" meghajtók hátra"); - + PROGMEM Language_Str MSG_SD_CARD = _UxGT("SD Kártya"); PROGMEM Language_Str MSG_USB_DISK = _UxGT("USB Lemez"); } diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp index c421ef1a03..eef27dbdb4 100644 --- a/Marlin/src/lcd/lcdprint.cpp +++ b/Marlin/src/lcd/lcdprint.cpp @@ -86,7 +86,7 @@ int calculateWidth(PGM_P const pstr) { const uint8_t prop = 2; uint8_t *p = (uint8_t*)pstr; int n = 0; - + do { wchar_t ch; p = get_utf8_value_cb(p, read_byte_rom, &ch); diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index 3c3e604f28..7bbc2b26da 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -332,7 +332,7 @@ #ifndef BEEPER_PIN #define BEEPER_PIN -1 #endif - + #elif ENABLED(MKS_MINI_12864_V3) #define DOGLCD_CS PD13 #define DOGLCD_A0 PC6 diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h index f967760c77..178e75ab7f 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h @@ -346,7 +346,7 @@ // Required for MKS_MINI_12864 with this board //#define MKS_LCD12864B //#undef SHOW_BOOTSCREEN - + #elif ENABLED(MKS_MINI_12864_V3) #define DOGLCD_CS PD13 #define DOGLCD_A0 PC6