Browse Source

Clean up trailing whitespace

pull/1/head
Scott Lahteine 7 years ago
parent
commit
c46de340b7
  1. 2
      Marlin/src/HAL/HAL_DUE/fastio_Due.h
  2. 4
      Marlin/src/HAL/HAL_LPC1768/SoftwareSPI.cpp
  3. 2
      Marlin/src/config/examples/BQ/Hephestos_2/_Bootscreen.h
  4. 2
      Marlin/src/config/examples/Cartesio/_Bootscreen.h
  5. 2
      Marlin/src/config/examples/MakerParts/_Bootscreen.h
  6. 2
      Marlin/src/config/examples/gCreate/gMax1.5+/_Bootscreen.h
  7. 2
      Marlin/src/feature/pause.cpp
  8. 2
      frameworks/CMSIS/LPC1768/lib/chanfs/ff.c
  9. 2
      frameworks/CMSIS/LPC1768/lib/usb/cdcuser.h
  10. 2
      frameworks/CMSIS/LPC1768/lib/usb/mscuser.h
  11. 4
      frameworks/CMSIS/LPC1768/lib/usb/usbcfg.h
  12. 2
      frameworks/CMSIS/LPC1768/lib/usb/usbcore.h
  13. 2
      frameworks/CMSIS/LPC1768/lib/usb/usbdesc.h
  14. 2
      frameworks/CMSIS/LPC1768/lib/usb/usbreg.h
  15. 2
      frameworks/CMSIS/LPC1768/lib/usb/usbuser.h

2
Marlin/src/HAL/HAL_DUE/fastio_Due.h

@ -89,7 +89,7 @@
#define _SET_OUTPUT(IO) do{ pmc_enable_periph_clk(g_APinDescription[IO].ulPeripheralId); \ #define _SET_OUTPUT(IO) do{ pmc_enable_periph_clk(g_APinDescription[IO].ulPeripheralId); \
PIO_Configure(g_APinDescription[IO].pPort, _READ(IO) ? PIO_OUTPUT_1 : PIO_OUTPUT_0, \ PIO_Configure(g_APinDescription[IO].pPort, _READ(IO) ? PIO_OUTPUT_1 : PIO_OUTPUT_0, \
g_APinDescription[IO].ulPin, g_APinDescription[IO].ulPinConfiguration); \ g_APinDescription[IO].ulPin, g_APinDescription[IO].ulPinConfiguration); \
g_pinStatus[IO] = (g_pinStatus[IO] & 0xF0) | PIN_STATUS_DIGITAL_OUTPUT;\ g_pinStatus[IO] = (g_pinStatus[IO] & 0xF0) | PIN_STATUS_DIGITAL_OUTPUT;\
}while(0) }while(0)
/// set pin as input with pullup mode /// set pin as input with pullup mode

4
Marlin/src/HAL/HAL_LPC1768/SoftwareSPI.cpp

@ -58,7 +58,7 @@ uint8_t swSpiTransfer(uint8_t b, uint8_t spi_speed, pin_t sck_pin, pin_t miso_pi
WRITE(mosi_pin, LOW); WRITE(mosi_pin, LOW);
WRITE(sck_pin, HIGH); WRITE(sck_pin, HIGH);
b <<= 1; b <<= 1;
if (miso_pin >= 0) if (miso_pin >= 0)
@ -76,7 +76,7 @@ uint8_t swSpiTransfer(uint8_t b, uint8_t spi_speed, pin_t sck_pin, pin_t miso_pi
for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++) for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); j++)
WRITE(sck_pin, HIGH); WRITE(sck_pin, HIGH);
b <<= 1; b <<= 1;
if (miso_pin >= 0) if (miso_pin >= 0)

2
Marlin/src/config/examples/BQ/Hephestos_2/_Bootscreen.h

@ -97,5 +97,5 @@ const unsigned char custom_start_bmp[] PROGMEM = {
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000, B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000, B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000, B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000 B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000
}; };

2
Marlin/src/config/examples/Cartesio/_Bootscreen.h

@ -97,5 +97,5 @@ const unsigned char custom_start_bmp[] PROGMEM = {
B00000000,B00000000,B00011111,B11111111,B11111111,B11110000,B00000000,B00000000, B00000000,B00000000,B00011111,B11111111,B11111111,B11110000,B00000000,B00000000,
B00000000,B00000000,B00000111,B11111111,B11111111,B10000000,B00000000,B00000000, B00000000,B00000000,B00000111,B11111111,B11111111,B10000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B01111111,B11111000,B00000000,B00000000,B00000000, B00000000,B00000000,B00000000,B01111111,B11111000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000 B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000
}; };

2
Marlin/src/config/examples/MakerParts/_Bootscreen.h

@ -77,5 +77,5 @@ const unsigned char custom_start_bmp[] PROGMEM = {
B00000000,B00001111,B11111111,B10000000,B00000000,B00001111,B10000000,B11111100,B00001111,B11011111,B00001111,B11000001,B11110000,B00001111,B11111000,B01111100, B00000000,B00001111,B11111111,B10000000,B00000000,B00001111,B10000000,B11111100,B00001111,B11011111,B00001111,B11000001,B11110000,B00001111,B11111000,B01111100,
B00000000,B00000111,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000, B00000000,B00000111,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000011,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000, B00000000,B00000011,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000 B00000000,B00000000,B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000
}; };

2
Marlin/src/config/examples/gCreate/gMax1.5+/_Bootscreen.h

@ -97,5 +97,5 @@ const unsigned char custom_start_bmp[] PROGMEM = {
B00000110,B00011110,B01000000,B00010000,B00010000,B00000000,B00000000,B00010000,B00000101,B11001000,B00001001,B11001000,B00001011,B10000001, B00000110,B00011110,B01000000,B00010000,B00010000,B00000000,B00000000,B00010000,B00000101,B11001000,B00001001,B11001000,B00001011,B10000001,
B00000110,B00000000,B01000000,B00100000,B00010000,B00000000,B00000000,B00001111,B11111000,B10001111,B11110000,B10001111,B11111001,B00000001, B00000110,B00000000,B01000000,B00100000,B00010000,B00000000,B00000000,B00001111,B11111000,B10001111,B11110000,B10001111,B11111001,B00000001,
B00000011,B10000000,B00000000,B00100000,B00110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001, B00000011,B10000000,B00000000,B00100000,B00110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,
B00000001,B11111111,B11111111,B11111111,B11100000,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111 B00000001,B11111111,B11111111,B11111111,B11100000,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111
}; };

2
Marlin/src/feature/pause.cpp

@ -488,7 +488,7 @@ void resume_print(const float &load_length/*=0*/, const float &purge_length/*=AD
#endif #endif
// If resume_position is negative // If resume_position is negative
if (resume_position[E_AXIS] < 0) do_pause_e_move(resume_position[E_AXIS], PAUSE_PARK_RETRACT_FEEDRATE); if (resume_position[E_AXIS] < 0) do_pause_e_move(resume_position[E_AXIS], PAUSE_PARK_RETRACT_FEEDRATE);
// Move XY to starting position, then Z // Move XY to starting position, then Z
do_blocking_move_to_xy(resume_position[X_AXIS], resume_position[Y_AXIS], NOZZLE_PARK_XY_FEEDRATE); do_blocking_move_to_xy(resume_position[X_AXIS], resume_position[Y_AXIS], NOZZLE_PARK_XY_FEEDRATE);

2
frameworks/CMSIS/LPC1768/lib/chanfs/ff.c

@ -2053,7 +2053,7 @@ FRESULT load_xdir ( /* FR_INT_ERR: invalid entry block */
/* exFAT: Load the object's directory entry block */ /* exFAT: Load the object's directory entry block */
/*------------------------------------------------*/ /*------------------------------------------------*/
static static
FRESULT load_obj_xdir ( FRESULT load_obj_xdir (
DIR* dp, /* Blank directory object to be used to access containing direcotry */ DIR* dp, /* Blank directory object to be used to access containing direcotry */
const FFOBJID* obj /* Object with its containing directory information */ const FFOBJID* obj /* Object with its containing directory information */
) )

2
frameworks/CMSIS/LPC1768/lib/usb/cdcuser.h

@ -10,7 +10,7 @@
* warranties of fitness for purpose, satisfactory quality and * warranties of fitness for purpose, satisfactory quality and
* noninfringement. Keil extends you a royalty-free right to reproduce * noninfringement. Keil extends you a royalty-free right to reproduce
* and distribute executable files created using this software for use * and distribute executable files created using this software for use
* on NXP Semiconductors LPC microcontroller devices only. Nothing else * on NXP Semiconductors LPC microcontroller devices only. Nothing else
* gives you the right to use this software. * gives you the right to use this software.
* *
* Copyright (c) 2009 Keil - An ARM Company. All rights reserved. * Copyright (c) 2009 Keil - An ARM Company. All rights reserved.

2
frameworks/CMSIS/LPC1768/lib/usb/mscuser.h

@ -10,7 +10,7 @@
* warranties of fitness for purpose, satisfactory quality and * warranties of fitness for purpose, satisfactory quality and
* noninfringement. Keil extends you a royalty-free right to reproduce * noninfringement. Keil extends you a royalty-free right to reproduce
* and distribute executable files created using this software for use * and distribute executable files created using this software for use
* on NXP Semiconductors LPC family microcontroller devices only. Nothing * on NXP Semiconductors LPC family microcontroller devices only. Nothing
* else gives you the right to use this software. * else gives you the right to use this software.
* *
* Copyright (c) 2005-2009 Keil Software. * Copyright (c) 2005-2009 Keil Software.

4
frameworks/CMSIS/LPC1768/lib/usb/usbcfg.h

@ -10,7 +10,7 @@
* warranties of fitness for purpose, satisfactory quality and * warranties of fitness for purpose, satisfactory quality and
* noninfringement. Keil extends you a royalty-free right to reproduce * noninfringement. Keil extends you a royalty-free right to reproduce
* and distribute executable files created using this software for use * and distribute executable files created using this software for use
* on NXP Semiconductors LPC family microcontroller devices only. Nothing * on NXP Semiconductors LPC family microcontroller devices only. Nothing
* else gives you the right to use this software. * else gives you the right to use this software.
* *
* Copyright (c) 2009 Keil - An ARM Company. All rights reserved. * Copyright (c) 2009 Keil - An ARM Company. All rights reserved.
@ -151,7 +151,7 @@
// <o10> Control Interface Number <0-255> // <o10> Control Interface Number <0-255>
// <o11> Bulk Interface Number <0-255> // <o11> Bulk Interface Number <0-255>
// <o12> Max Communication Device Buffer Size // <o12> Max Communication Device Buffer Size
// <8=> 8 Bytes <16=> 16 Bytes <32=> 32 Bytes <64=> 64 Bytes // <8=> 8 Bytes <16=> 16 Bytes <32=> 32 Bytes <64=> 64 Bytes
// </e> // </e>
// </e> // </e>
*/ */

2
frameworks/CMSIS/LPC1768/lib/usb/usbcore.h

@ -10,7 +10,7 @@
* warranties of fitness for purpose, satisfactory quality and * warranties of fitness for purpose, satisfactory quality and
* noninfringement. Keil extends you a royalty-free right to reproduce * noninfringement. Keil extends you a royalty-free right to reproduce
* and distribute executable files created using this software for use * and distribute executable files created using this software for use
* on NXP Semiconductors LPC microcontroller devices only. Nothing else * on NXP Semiconductors LPC microcontroller devices only. Nothing else
* gives you the right to use this software. * gives you the right to use this software.
* *
* Copyright (c) 2009 Keil - An ARM Company. All rights reserved. * Copyright (c) 2009 Keil - An ARM Company. All rights reserved.

2
frameworks/CMSIS/LPC1768/lib/usb/usbdesc.h

@ -10,7 +10,7 @@
* warranties of fitness for purpose, satisfactory quality and * warranties of fitness for purpose, satisfactory quality and
* noninfringement. Keil extends you a royalty-free right to reproduce * noninfringement. Keil extends you a royalty-free right to reproduce
* and distribute executable files created using this software for use * and distribute executable files created using this software for use
* on NXP Semiconductors LPC microcontroller devices only. Nothing else * on NXP Semiconductors LPC microcontroller devices only. Nothing else
* gives you the right to use this software. * gives you the right to use this software.
* *
* Copyright (c) 2009 Keil - An ARM Company. All rights reserved. * Copyright (c) 2009 Keil - An ARM Company. All rights reserved.

2
frameworks/CMSIS/LPC1768/lib/usb/usbreg.h

@ -10,7 +10,7 @@
* warranties of fitness for purpose, satisfactory quality and * warranties of fitness for purpose, satisfactory quality and
* noninfringement. Keil extends you a royalty-free right to reproduce * noninfringement. Keil extends you a royalty-free right to reproduce
* and distribute executable files created using this software for use * and distribute executable files created using this software for use
* on NXP Semiconductors LPC family microcontroller devices only. Nothing * on NXP Semiconductors LPC family microcontroller devices only. Nothing
* else gives you the right to use this software. * else gives you the right to use this software.
* *
* Copyright (c) 2009 Keil - An ARM Company. All rights reserved. * Copyright (c) 2009 Keil - An ARM Company. All rights reserved.

2
frameworks/CMSIS/LPC1768/lib/usb/usbuser.h

@ -10,7 +10,7 @@
* warranties of fitness for purpose, satisfactory quality and * warranties of fitness for purpose, satisfactory quality and
* noninfringement. Keil extends you a royalty-free right to reproduce * noninfringement. Keil extends you a royalty-free right to reproduce
* and distribute executable files created using this software for use * and distribute executable files created using this software for use
* on NXP Semiconductors LPC family microcontroller devices only. Nothing * on NXP Semiconductors LPC family microcontroller devices only. Nothing
* else gives you the right to use this software. * else gives you the right to use this software.
* *
* Copyright (c) 2009 Keil - An ARM Company. All rights reserved. * Copyright (c) 2009 Keil - An ARM Company. All rights reserved.

Loading…
Cancel
Save