Browse Source

🎨 Strip trailing whitespace

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
parent
commit
42eb2347d4
  1. 2
      Marlin/Configuration.h
  2. 2
      Marlin/src/lcd/dogm/marlinui_DOGM.cpp
  3. 2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py
  4. 4
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py
  5. 2
      Marlin/src/lcd/language/language_hu.h
  6. 2
      Marlin/src/lcd/lcdprint.cpp
  7. 2
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
  8. 2
      Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h

2
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. // MKS MINI12864 V3 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight.
// //
//#define MKS_MINI_12864_V3 //#define MKS_MINI_12864_V3
// //

2
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)) { if (mark_as_selected(row, style & SS_INVERT)) {
pixel_len_t n = LCD_PIXEL_WIDTH; // pixel width of string allowed pixel_len_t n = LCD_PIXEL_WIDTH; // pixel width of string allowed
const int plen = pstr ? calculateWidth(pstr) : 0, const int plen = pstr ? calculateWidth(pstr) : 0,
vlen = vstr ? utf8_strlen(vstr) : 0; vlen = vstr ? utf8_strlen(vstr) : 0;
if (style & SS_CENTER) { if (style & SS_CENTER) {

2
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() args = parser.parse_args()
varname = os.path.splitext(os.path.basename(args.input))[0]; varname = os.path.splitext(os.path.basename(args.input))[0];
with open(args.input, "rb") as in_file: with open(args.input, "rb") as in_file:
data = in_file.read() data = in_file.read()
if args.deflate: if args.deflate:

4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py

@ -29,13 +29,13 @@ class WriteSource:
self.mode = mode self.mode = mode
self.offset = 8 self.offset = 8
self.byte = 0 self.byte = 0
def finish_byte(self): def finish_byte(self):
if self.offset != 8: if self.offset != 8:
self.values.append(self.byte) self.values.append(self.byte)
self.offset = 8 self.offset = 8
self.byte = 0 self.byte = 0
def add_bits_to_byte(self, value, size = 1): def add_bits_to_byte(self, value, size = 1):
self.offset -= size self.offset -= size
self.byte = self.byte | value << self.offset self.byte = self.byte | value << self.offset

2
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_CALIBRATION_FAILED = _UxGT("Kalibrálási hiba");
PROGMEM Language_Str MSG_DRIVER_BACKWARD = _UxGT(" meghajtók hátra"); 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_SD_CARD = _UxGT("SD Kártya");
PROGMEM Language_Str MSG_USB_DISK = _UxGT("USB Lemez"); PROGMEM Language_Str MSG_USB_DISK = _UxGT("USB Lemez");
} }

2
Marlin/src/lcd/lcdprint.cpp

@ -86,7 +86,7 @@ int calculateWidth(PGM_P const pstr) {
const uint8_t prop = 2; const uint8_t prop = 2;
uint8_t *p = (uint8_t*)pstr; uint8_t *p = (uint8_t*)pstr;
int n = 0; int n = 0;
do { do {
wchar_t ch; wchar_t ch;
p = get_utf8_value_cb(p, read_byte_rom, &ch); p = get_utf8_value_cb(p, read_byte_rom, &ch);

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h

@ -332,7 +332,7 @@
#ifndef BEEPER_PIN #ifndef BEEPER_PIN
#define BEEPER_PIN -1 #define BEEPER_PIN -1
#endif #endif
#elif ENABLED(MKS_MINI_12864_V3) #elif ENABLED(MKS_MINI_12864_V3)
#define DOGLCD_CS PD13 #define DOGLCD_CS PD13
#define DOGLCD_A0 PC6 #define DOGLCD_A0 PC6

2
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h

@ -346,7 +346,7 @@
// Required for MKS_MINI_12864 with this board // Required for MKS_MINI_12864 with this board
//#define MKS_LCD12864B //#define MKS_LCD12864B
//#undef SHOW_BOOTSCREEN //#undef SHOW_BOOTSCREEN
#elif ENABLED(MKS_MINI_12864_V3) #elif ENABLED(MKS_MINI_12864_V3)
#define DOGLCD_CS PD13 #define DOGLCD_CS PD13
#define DOGLCD_A0 PC6 #define DOGLCD_A0 PC6

Loading…
Cancel
Save