Fix line-endings, formatting, whitespace

Followup to #12770
6 years ago · 371d9a1acf
5 changed files with 180 additions and 208 deletions
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@ -841,7 +841,7 @@
  #define STATUS_HOTEND_ANIM          // Use a second bitmap to indicate hotend heating
  #define STATUS_BED_ANIM             // Use a second bitmap to indicate bed heating
  //#define STATUS_ALT_BED_BITMAP     // Use the alternative bed bitmap
-  //#define STATUS_ALT_FAN_BITMAP     // Use the alternate fan bitmap
+  //#define STATUS_ALT_FAN_BITMAP     // Use the alternative fan bitmap
  //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
  //#define STATUS_HEAT_PERCENT       // Show heating in a progress bar

--- a/Marlin/src/pins/pins_MKS_BASE_14.h
+++ b/Marlin/src/pins/pins_MKS_BASE_14.h
@ -35,6 +35,7 @@
 //
 #define MOSFET_D_PIN              7   // PH4 ** Pin16 ** PWM7   //E1
 #define FAN_PIN                   9   // PH6 ** Pin18 ** PWM9
+
 // Other Mods
 #define CASE_LIGHT_PIN           11   // PB5 ** Pin24 ** PWM11
 #define SERVO3_PIN               12   // PB6 ** Pin25 ** D12
@ -42,7 +43,6 @@
 #define FILWIDTH_PIN             15   // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
 #define FIL_RUNOUT_PIN           19   // Z+ // PD2 ** Pin45 ** USART1_RX

-
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
@ -50,9 +50,9 @@
 #define SPINDLE_LASER_ENABLE_PIN 15   // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
 #define SPINDLE_DIR_PIN          19   // Z+ // PD2 ** Pin45 ** USART1_RX

-/**
- * Microstepping pins
- */
+//
+// Microstepping pins
+//
 #define X_MS1_PIN                 5   // PE3 ** Pin5  ** PWM5
 #define X_MS2_PIN                 6   // PH3 ** Pin15 ** PWM6
 #define Y_MS1_PIN                59   // PF5 ** Pin92 ** A5
@ -66,139 +66,111 @@

 #include "pins_RAMPS.h"

-  /*****************************************/
- /* Available connectors on MKS BASE v1.4 */
-/*****************************************/
-
 /*
- *******
- * GND *
- *******   E0
- *  10 *
- *******
- * GND *
- *******   E1
- *  7  *
- *******
- * GND *
- *******   FAN
- *  9  *
- *******
-10 // PB4 ** Pin23 ** PWM10
-7  // PH4 ** Pin16 ** PWM7
-9  // PH6 ** Pin18 ** PWM9
- *******
- * GND *
- *******   Heat Bed
- *  8  *
- *******
-8  // PH5 ** Pin17 ** PWM8
- **********
- * 12-24V *
- **********   Power
- *  GND   *
- **********
-XS3 Connector
- *****************
- * 65 * GND * 5V *
- *****************
- * 66 * GND * 5V *
- *****************
-65 // PK3 ** Pin86 ** A11
-66 // PK4 ** Pin85 ** A12
-Servos Connector
- *****************
- * 11 * GND * 5V *
- *****************
- * 12 * GND * 5V *
- *****************
-11 // PB5 ** Pin24 ** PWM11 
-12 // PB6 ** Pin25 ** PWM12
-ICSP
- *****************
- * 5V * 51 * GND *
- *****************
- * 50 * 52 * RST *
- *****************
-50 // PB3 ** Pin22 ** SPI_MISO  
-51 // PB2 ** Pin21 ** SPI_MOSI  
-52 // PB1 ** Pin20 ** SPI_SCK
-XS6/AUX-1 Connector
- **********************
- * 5V * GND * NC * 20 *
- **********************
- * 50 *  51 * 52 * 21 *
- **********************
-50 // PB3 ** Pin22 ** SPI_MISO  
-51 // PB2 ** Pin21 ** SPI_MOSI  
-52 // PB1 ** Pin20 ** SPI_SCK
-20 // PD1 ** Pin44 ** I2C_SDA 
-21 // PD0 ** Pin43 ** I2C_SCL
-Temperature
- **********************************
- * GND * 69 * GND * 68 * GND * 68 *
- **********************************
-69 // PK7 ** Pin82 ** A15
-68 // PK6 ** Pin83 ** A14 
-67 // PK5 ** Pin84 ** A13
-Limit Switches
- ************
- *  2 * GND * X+
- ************
- *  3 * GND * X-
- ************
- * 15 * GND * Y+
- ************
- * 14 * GND * Y-
- ************
- * 19 * GND * Z+
- ************
- * 18 * GND * Z-
- ************
-2  // PE4 ** Pin6  ** PWM2       **X+
-3  // PE5 ** Pin7  ** PWM3       **X-
-15 // PJ0 ** Pin63 ** USART3_RX  **Y+
-14 // PJ1 ** Pin64 ** USART3_TX  **Y-
-19 // PD2 ** Pin45 ** USART1_RX  **Z+
-18 // PD3 ** Pin46 ** USART1_TX  **Z-
-EXP1
- ************
- *  37 * 35 *
- ************
- *  17 * 16 *
- ************
- *  23 * 25 *
- ************
- *  27 * 29 *
- ************
- * GND * 5V *
- ************
-37 // PC0 ** Pin53 ** D37
-35 // PC2 ** Pin55 ** D35
-17 // PH0 ** Pin12 ** USART2_RX
-16 // PH1 ** Pin13 ** USART2_TX
-23 // PA1 ** Pin77 ** D23
-25 // PA3 ** Pin75 ** D25
-27 // PA5 ** Pin73 ** D27
-29 // PA7 ** Pin71 ** D29
-EXP2
- ************
- *  50 * 52 *
- ************
- *  31 * 53 *
- ************
- *  33 * 51 *
- ************
- *  49 * 41 *
- ************
- * GND * NC *
- ************
-50 // PB3 ** Pin22 ** SPI_MISO
-52 // PB1 ** Pin20 ** SPI_SCK
-31 // PC6 ** Pin59 ** D31
-53 // PB0 ** Pin19 ** SPI_SS
-33 // PC4 ** Pin57 ** D33
-51 // PB2 ** Pin21 ** SPI_MOSI
-49 // PL0 ** Pin35 ** D49
-41 // PG0 ** Pin51 ** D41
+  Available connectors on MKS BASE v1.4
+
+   =======
+   | GND |
+   |-----|   E0
+   |  10 |                (10)  PB4 ** Pin23 ** PWM10
+   |-----|
+   | GND |
+   |-----|   E1
+   |  7  |                ( 7)  PH4 ** Pin16 ** PWM7
+   |-----|
+   | GND |
+   |-----|   FAN
+   |  9  |                ( 9)  PH6 ** Pin18 ** PWM9
+   =======
+
+   =======
+   | GND |
+   |-----|   Heated Bed
+   |  8  |                ( 8)  PH5 ** Pin17 ** PWM8
+   =======
+
+   ==========
+   | 12-24V |
+   |--------|   Power
+   |  GND   |
+   ==========
+
+  XS3 Connector
+   =================
+   | 65 | GND | 5V |      (65)  PK3 ** Pin86 ** A11
+   |----|-----|----|
+   | 66 | GND | 5V |      (66)  PK4 ** Pin85 ** A12
+   =================
+
+  Servos Connector
+   =================
+   | 11 | GND | 5V |      (11)  PB5 ** Pin24 ** PWM11
+   |----|-----|----|
+   | 12 | GND | 5V |      (12)  PB6 ** Pin25 ** PWM12
+   =================
+
+  ICSP
+   =================
+   | 5V | 51 | GND |      (51)  PB2 ** Pin21 ** SPI_MOSI
+   |----|----|-----|
+   | 50 | 52 | RST |      (50)  PB3 ** Pin22 ** SPI_MISO
+   =================      (52)  PB1 ** Pin20 ** SPI_SCK
+
+  XS6/AUX-1 Connector
+   ======================
+   | 5V | GND | NC | 20 | (20)  PD1 ** Pin44 ** I2C_SDA
+   |----|-----|----|----|
+   | 50 |  51 | 52 | 21 | (50)  PB3 ** Pin22 ** SPI_MISO
+   ====================== (51)  PB2 ** Pin21 ** SPI_MOSI
+                          (52)  PB1 ** Pin20 ** SPI_SCK
+                          (21)  PD0 ** Pin43 ** I2C_SCL
+
+  Temperature
+   ==================================
+   | GND | 69 | GND | 68 | GND | 67 |
+   ==================================
+                          (69)  PK7 ** Pin82 ** A15
+                          (68)  PK6 ** Pin83 ** A14
+                          (67)  PK5 ** Pin84 ** A13
+
+  Limit Switches
+   ============
+   |  2 | GND | X+        ( 2)  PE4 ** Pin6  ** PWM2
+   |----|-----|
+   |  3 | GND | X-        ( 3)  PE5 ** Pin7  ** PWM3
+   |----|-----|
+   | 15 | GND | Y+        (15)  PJ0 ** Pin63 ** USART3_RX
+   |----|-----|
+   | 14 | GND | Y-        (14)  PJ1 ** Pin64 ** USART3_TX
+   |----|-----|
+   | 19 | GND | Z+        (19)  PD2 ** Pin45 ** USART1_RX
+   |----|-----|
+   | 18 | GND | Z-        (18)  PD3 ** Pin46 ** USART1_TX
+   ============
+
+  EXP1
+   ============
+   |  37 | 35 |           (37)  PC0 ** Pin53 ** D37
+   |-----|----|           (35)  PC2 ** Pin55 ** D35
+   |  17 | 16 |           (17)  PH0 ** Pin12 ** USART2_RX
+   |-----|----|           (16)  PH1 ** Pin13 ** USART2_TX
+   |  23 | 25 |           (23)  PA1 ** Pin77 ** D23
+   |-----|----|           (25)  PA3 ** Pin75 ** D25
+   |  27 | 29 |           (27)  PA5 ** Pin73 ** D27
+   |-----|----|           (29)  PA7 ** Pin71 ** D29
+   | GND | 5V |
+   ============
+
+  EXP2
+   ============
+   |  50 | 52 |           (50)  PB3 ** Pin22 ** SPI_MISO
+   |-----|----|           (52)  PB1 ** Pin20 ** SPI_SCK
+   |  31 | 53 |           (31)  PC6 ** Pin59 ** D31
+   |-----|----|           (53)  PB0 ** Pin19 ** SPI_SS
+   |  33 | 51 |           (33)  PC4 ** Pin57 ** D33
+   |-----|----|           (51)  PB2 ** Pin21 ** SPI_MOSI
+   |  49 | 41 |           (49)  PL0 ** Pin35 ** D49
+   |-----|----|           (41)  PG0 ** Pin51 ** D41
+   | GND | NC |
+   ============
 */