Parcourir la source

Fix line-endings, formatting, whitespace

Followup to #12770
Scott Lahteine il y a 5 ans
Parent
révision
371d9a1acf

+ 1
- 1
Marlin/Configuration_adv.h Voir le fichier

@@ -841,7 +841,7 @@
841 841
   #define STATUS_HOTEND_ANIM          // Use a second bitmap to indicate hotend heating
842 842
   #define STATUS_BED_ANIM             // Use a second bitmap to indicate bed heating
843 843
   //#define STATUS_ALT_BED_BITMAP     // Use the alternative bed bitmap
844
-  //#define STATUS_ALT_FAN_BITMAP     // Use the alternate fan bitmap
844
+  //#define STATUS_ALT_FAN_BITMAP     // Use the alternative fan bitmap
845 845
   //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
846 846
   //#define STATUS_HEAT_PERCENT       // Show heating in a progress bar
847 847
 

+ 1
- 1
Marlin/src/module/configuration_store.cpp Voir le fichier

@@ -488,7 +488,7 @@ void MarlinSettings::postprocess() {
488 488
           EEPROM_WRITE(dummy);
489 489
         #endif
490 490
       #else
491
-        const float planner_max_jerk[XYZE] = { float(DEFAULT_EJERK) };	
491
+        const float planner_max_jerk[XYZE] = { float(DEFAULT_EJERK) };
492 492
         EEPROM_WRITE(planner_max_jerk);
493 493
       #endif
494 494
 

+ 1
- 1
Marlin/src/pins/pins.h Voir le fichier

@@ -101,7 +101,7 @@
101 101
 #elif MB(MKS_BASE)
102 102
   #include "pins_MKS_BASE.h"          // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
103 103
 #elif MB(MKS_BASE_14)
104
-  #include "pins_MKS_BASE_14.h"       // ATmega2560                                 env:megaatmega2560 
104
+  #include "pins_MKS_BASE_14.h"       // ATmega2560                                 env:megaatmega2560
105 105
 #elif MB(MKS_BASE_15)
106 106
   #include "pins_MKS_BASE_15.h"       // ATmega1280, ATmega2560                     env:megaatmega1280 env:megaatmega2560
107 107
 #elif MB(MKS_BASE_HEROIC)

+ 1
- 1
Marlin/src/pins/pins_DUPLICATOR_I3_PLUS.h Voir le fichier

@@ -141,7 +141,7 @@
141 141
  * ##################################
142 142
  *
143 143
  * @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
144
- * 
144
+ *
145 145
  *  == Y-endstop ==                            == Z-endstop ==                 == Bed temperature ==
146 146
  *
147 147
  *        1  2                                       1  2                               1  2

+ 176
- 204
Marlin/src/pins/pins_MKS_BASE_14.h Voir le fichier

@@ -1,204 +1,176 @@
1
-/**
2
- * Marlin 3D Printer Firmware
3
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
- *
5
- * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
- *
8
- * This program is free software: you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License as published by
10
- * the Free Software Foundation, either version 3 of the License, or
11
- * (at your option) any later version.
12
- *
13
- * This program is distributed in the hope that it will be useful,
14
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
- * GNU General Public License for more details.
17
- *
18
- * You should have received a copy of the GNU General Public License
19
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
- *
21
- */
22
-
23
-/**
24
- *  MKS BASE v1.4 
25
- */
26
-
27
-#if HOTENDS > 2 || E_STEPPERS > 2
28
-  #error "MKS BASE 1.4 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
29
-#endif
30
-
31
-#define BOARD_NAME "MKS BASE 1.4"
32
-
33
-//
34
-// Heaters / Fans
35
-//
36
-#define MOSFET_D_PIN              7   // PH4 ** Pin16 ** PWM7   //E1
37
-#define FAN_PIN                   9   // PH6 ** Pin18 ** PWM9
38
-// Other Mods
39
-#define CASE_LIGHT_PIN           11   // PB5 ** Pin24 ** PWM11
40
-#define SERVO3_PIN               12   // PB6 ** Pin25 ** D12
41
-#define PS_ON_PIN                 2   // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
42
-#define FILWIDTH_PIN             15   // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
43
-#define FIL_RUNOUT_PIN           19   // Z+ // PD2 ** Pin45 ** USART1_RX
44
-
45
-
46
-//
47
-// M3/M4/M5 - Spindle/Laser Control
48
-//
49
-#define SPINDLE_LASER_PWM_PIN     2   // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
50
-#define SPINDLE_LASER_ENABLE_PIN 15   // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
51
-#define SPINDLE_DIR_PIN          19   // Z+ // PD2 ** Pin45 ** USART1_RX
52
-
53
-/**
54
- * Microstepping pins
55
- */
56
-#define X_MS1_PIN                 5  // PE3 ** Pin5  ** PWM5
57
-#define X_MS2_PIN                 6  // PH3 ** Pin15 ** PWM6
58
-#define Y_MS1_PIN                59  // PF5 ** Pin92 ** A5
59
-#define Y_MS2_PIN                58  // PF4 ** Pin93 ** A4
60
-#define Z_MS1_PIN                22  // PA0 ** Pin78 ** D22
61
-#define Z_MS2_PIN                39  // PG2 ** Pin70 ** D39
62
-#define E0_MS1_PIN               64  // PK2 ** Pin87 ** A10
63
-#define E0_MS2_PIN               63  // PK1 ** Pin88 ** A9
64
-#define E1_MS1_PIN               57  // PF3 ** Pin94 ** A3
65
-#define E1_MS2_PIN                4  // PG5 ** Pin1  ** PWM4
66
-
67
-#include "pins_RAMPS.h"
68
-
69
-  /*****************************************/
70
- /* Available connectors on MKS BASE v1.4 */
71
-/*****************************************/
72
-
73
-/*
74
- *******
75
- * GND *
76
- *******   E0
77
- *  10 *
78
- *******
79
- * GND *
80
- *******   E1
81
- *  7  *
82
- *******
83
- * GND *
84
- *******   FAN
85
- *  9  *
86
- *******
87
-10 // PB4 ** Pin23 ** PWM10
88
-7  // PH4 ** Pin16 ** PWM7
89
-9  // PH6 ** Pin18 ** PWM9
90
- *******
91
- * GND *
92
- *******   Heat Bed
93
- *  8  *
94
- *******
95
-8  // PH5 ** Pin17 ** PWM8
96
- **********
97
- * 12-24V *
98
- **********   Power
99
- *  GND   *
100
- **********
101
-XS3 Connector
102
- *****************
103
- * 65 * GND * 5V *
104
- *****************
105
- * 66 * GND * 5V *
106
- *****************
107
-65 // PK3 ** Pin86 ** A11
108
-66 // PK4 ** Pin85 ** A12
109
-Servos Connector
110
- *****************
111
- * 11 * GND * 5V *
112
- *****************
113
- * 12 * GND * 5V *
114
- *****************
115
-11 // PB5 ** Pin24 ** PWM11 
116
-12 // PB6 ** Pin25 ** PWM12
117
-ICSP
118
- *****************
119
- * 5V * 51 * GND *
120
- *****************
121
- * 50 * 52 * RST *
122
- *****************
123
-50 // PB3 ** Pin22 ** SPI_MISO  
124
-51 // PB2 ** Pin21 ** SPI_MOSI  
125
-52 // PB1 ** Pin20 ** SPI_SCK
126
-XS6/AUX-1 Connector
127
- **********************
128
- * 5V * GND * NC * 20 *
129
- **********************
130
- * 50 *  51 * 52 * 21 *
131
- **********************
132
-50 // PB3 ** Pin22 ** SPI_MISO  
133
-51 // PB2 ** Pin21 ** SPI_MOSI  
134
-52 // PB1 ** Pin20 ** SPI_SCK
135
-20 // PD1 ** Pin44 ** I2C_SDA 
136
-21 // PD0 ** Pin43 ** I2C_SCL
137
-Temperature
138
- **********************************
139
- * GND * 69 * GND * 68 * GND * 68 *
140
- **********************************
141
-69 // PK7 ** Pin82 ** A15
142
-68 // PK6 ** Pin83 ** A14 
143
-67 // PK5 ** Pin84 ** A13
144
-Limit Switches
145
- ************
146
- *  2 * GND * X+
147
- ************
148
- *  3 * GND * X-
149
- ************
150
- * 15 * GND * Y+
151
- ************
152
- * 14 * GND * Y-
153
- ************
154
- * 19 * GND * Z+
155
- ************
156
- * 18 * GND * Z-
157
- ************
158
-2  // PE4 ** Pin6  ** PWM2       **X+
159
-3  // PE5 ** Pin7  ** PWM3       **X-
160
-15 // PJ0 ** Pin63 ** USART3_RX  **Y+
161
-14 // PJ1 ** Pin64 ** USART3_TX  **Y-
162
-19 // PD2 ** Pin45 ** USART1_RX  **Z+
163
-18 // PD3 ** Pin46 ** USART1_TX  **Z-
164
-EXP1
165
- ************
166
- *  37 * 35 *
167
- ************
168
- *  17 * 16 *
169
- ************
170
- *  23 * 25 *
171
- ************
172
- *  27 * 29 *
173
- ************
174
- * GND * 5V *
175
- ************
176
-37 // PC0 ** Pin53 ** D37
177
-35 // PC2 ** Pin55 ** D35
178
-17 // PH0 ** Pin12 ** USART2_RX
179
-16 // PH1 ** Pin13 ** USART2_TX
180
-23 // PA1 ** Pin77 ** D23
181
-25 // PA3 ** Pin75 ** D25
182
-27 // PA5 ** Pin73 ** D27
183
-29 // PA7 ** Pin71 ** D29
184
-EXP2
185
- ************
186
- *  50 * 52 *
187
- ************
188
- *  31 * 53 *
189
- ************
190
- *  33 * 51 *
191
- ************
192
- *  49 * 41 *
193
- ************
194
- * GND * NC *
195
- ************
196
-50 // PB3 ** Pin22 ** SPI_MISO
197
-52 // PB1 ** Pin20 ** SPI_SCK
198
-31 // PC6 ** Pin59 ** D31
199
-53 // PB0 ** Pin19 ** SPI_SS
200
-33 // PC4 ** Pin57 ** D33
201
-51 // PB2 ** Pin21 ** SPI_MOSI
202
-49 // PL0 ** Pin35 ** D49
203
-41 // PG0 ** Pin51 ** D41
204
-*/
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+/**
24
+ * MKS BASE v1.4
25
+ */
26
+
27
+#if HOTENDS > 2 || E_STEPPERS > 2
28
+  #error "MKS BASE 1.4 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
29
+#endif
30
+
31
+#define BOARD_NAME "MKS BASE 1.4"
32
+
33
+//
34
+// Heaters / Fans
35
+//
36
+#define MOSFET_D_PIN              7   // PH4 ** Pin16 ** PWM7   //E1
37
+#define FAN_PIN                   9   // PH6 ** Pin18 ** PWM9
38
+
39
+// Other Mods
40
+#define CASE_LIGHT_PIN           11   // PB5 ** Pin24 ** PWM11
41
+#define SERVO3_PIN               12   // PB6 ** Pin25 ** D12
42
+#define PS_ON_PIN                 2   // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
43
+#define FILWIDTH_PIN             15   // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
44
+#define FIL_RUNOUT_PIN           19   // Z+ // PD2 ** Pin45 ** USART1_RX
45
+
46
+//
47
+// M3/M4/M5 - Spindle/Laser Control
48
+//
49
+#define SPINDLE_LASER_PWM_PIN     2   // X+ // PE4 ** Pin6  ** PWM2       **MUST BE HARDWARE PWM
50
+#define SPINDLE_LASER_ENABLE_PIN 15   // Y+ // PJ0 ** Pin63 ** USART3_RX  **Pin should have a pullup!
51
+#define SPINDLE_DIR_PIN          19   // Z+ // PD2 ** Pin45 ** USART1_RX
52
+
53
+//
54
+// Microstepping pins
55
+//
56
+#define X_MS1_PIN                 5   // PE3 ** Pin5  ** PWM5
57
+#define X_MS2_PIN                 6   // PH3 ** Pin15 ** PWM6
58
+#define Y_MS1_PIN                59   // PF5 ** Pin92 ** A5
59
+#define Y_MS2_PIN                58   // PF4 ** Pin93 ** A4
60
+#define Z_MS1_PIN                22   // PA0 ** Pin78 ** D22
61
+#define Z_MS2_PIN                39   // PG2 ** Pin70 ** D39
62
+#define E0_MS1_PIN               64   // PK2 ** Pin87 ** A10
63
+#define E0_MS2_PIN               63   // PK1 ** Pin88 ** A9
64
+#define E1_MS1_PIN               57   // PF3 ** Pin94 ** A3
65
+#define E1_MS2_PIN                4   // PG5 ** Pin1  ** PWM4
66
+
67
+#include "pins_RAMPS.h"
68
+
69
+/*
70
+  Available connectors on MKS BASE v1.4
71
+
72
+   =======
73
+   | GND |
74
+   |-----|   E0
75
+   |  10 |                (10)  PB4 ** Pin23 ** PWM10
76
+   |-----|
77
+   | GND |
78
+   |-----|   E1
79
+   |  7  |                ( 7)  PH4 ** Pin16 ** PWM7
80
+   |-----|
81
+   | GND |
82
+   |-----|   FAN
83
+   |  9  |                ( 9)  PH6 ** Pin18 ** PWM9
84
+   =======
85
+
86
+   =======
87
+   | GND |
88
+   |-----|   Heated Bed
89
+   |  8  |                ( 8)  PH5 ** Pin17 ** PWM8
90
+   =======
91
+
92
+   ==========
93
+   | 12-24V |
94
+   |--------|   Power
95
+   |  GND   |
96
+   ==========
97
+
98
+  XS3 Connector
99
+   =================
100
+   | 65 | GND | 5V |      (65)  PK3 ** Pin86 ** A11
101
+   |----|-----|----|
102
+   | 66 | GND | 5V |      (66)  PK4 ** Pin85 ** A12
103
+   =================
104
+
105
+  Servos Connector
106
+   =================
107
+   | 11 | GND | 5V |      (11)  PB5 ** Pin24 ** PWM11
108
+   |----|-----|----|
109
+   | 12 | GND | 5V |      (12)  PB6 ** Pin25 ** PWM12
110
+   =================
111
+
112
+  ICSP
113
+   =================
114
+   | 5V | 51 | GND |      (51)  PB2 ** Pin21 ** SPI_MOSI
115
+   |----|----|-----|
116
+   | 50 | 52 | RST |      (50)  PB3 ** Pin22 ** SPI_MISO
117
+   =================      (52)  PB1 ** Pin20 ** SPI_SCK
118
+
119
+  XS6/AUX-1 Connector
120
+   ======================
121
+   | 5V | GND | NC | 20 | (20)  PD1 ** Pin44 ** I2C_SDA
122
+   |----|-----|----|----|
123
+   | 50 |  51 | 52 | 21 | (50)  PB3 ** Pin22 ** SPI_MISO
124
+   ====================== (51)  PB2 ** Pin21 ** SPI_MOSI
125
+                          (52)  PB1 ** Pin20 ** SPI_SCK
126
+                          (21)  PD0 ** Pin43 ** I2C_SCL
127
+
128
+  Temperature
129
+   ==================================
130
+   | GND | 69 | GND | 68 | GND | 67 |
131
+   ==================================
132
+                          (69)  PK7 ** Pin82 ** A15
133
+                          (68)  PK6 ** Pin83 ** A14
134
+                          (67)  PK5 ** Pin84 ** A13
135
+
136
+  Limit Switches
137
+   ============
138
+   |  2 | GND | X+        ( 2)  PE4 ** Pin6  ** PWM2
139
+   |----|-----|
140
+   |  3 | GND | X-        ( 3)  PE5 ** Pin7  ** PWM3
141
+   |----|-----|
142
+   | 15 | GND | Y+        (15)  PJ0 ** Pin63 ** USART3_RX
143
+   |----|-----|
144
+   | 14 | GND | Y-        (14)  PJ1 ** Pin64 ** USART3_TX
145
+   |----|-----|
146
+   | 19 | GND | Z+        (19)  PD2 ** Pin45 ** USART1_RX
147
+   |----|-----|
148
+   | 18 | GND | Z-        (18)  PD3 ** Pin46 ** USART1_TX
149
+   ============
150
+
151
+  EXP1
152
+   ============
153
+   |  37 | 35 |           (37)  PC0 ** Pin53 ** D37
154
+   |-----|----|           (35)  PC2 ** Pin55 ** D35
155
+   |  17 | 16 |           (17)  PH0 ** Pin12 ** USART2_RX
156
+   |-----|----|           (16)  PH1 ** Pin13 ** USART2_TX
157
+   |  23 | 25 |           (23)  PA1 ** Pin77 ** D23
158
+   |-----|----|           (25)  PA3 ** Pin75 ** D25
159
+   |  27 | 29 |           (27)  PA5 ** Pin73 ** D27
160
+   |-----|----|           (29)  PA7 ** Pin71 ** D29
161
+   | GND | 5V |
162
+   ============
163
+
164
+  EXP2
165
+   ============
166
+   |  50 | 52 |           (50)  PB3 ** Pin22 ** SPI_MISO
167
+   |-----|----|           (52)  PB1 ** Pin20 ** SPI_SCK
168
+   |  31 | 53 |           (31)  PC6 ** Pin59 ** D31
169
+   |-----|----|           (53)  PB0 ** Pin19 ** SPI_SS
170
+   |  33 | 51 |           (33)  PC4 ** Pin57 ** D33
171
+   |-----|----|           (51)  PB2 ** Pin21 ** SPI_MOSI
172
+   |  49 | 41 |           (49)  PL0 ** Pin35 ** D49
173
+   |-----|----|           (41)  PG0 ** Pin51 ** D41
174
+   | GND | NC |
175
+   ============
176
+*/

Chargement…
Annuler
Enregistrer