Browse Source

Clean up trailing whitespace

Scott Lahteine 5 years ago
parent
commit
6453b82a5e

+ 2
- 2
Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp View File

106
   #ifdef ACTION_ON_RESUME
106
   #ifdef ACTION_ON_RESUME
107
     SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
107
     SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
108
   #endif
108
   #endif
109
-  
109
+
110
   ui.reset_status();
110
   ui.reset_status();
111
 }
111
 }
112
 
112
 
114
  * M25: Pause SD Print
114
  * M25: Pause SD Print
115
  */
115
  */
116
 void GcodeSuite::M25() {
116
 void GcodeSuite::M25() {
117
-  
117
+
118
   // Set initial pause flag to prevent more commands from landing in the queue while we try to pause
118
   // Set initial pause flag to prevent more commands from landing in the queue while we try to pause
119
   #if ENABLED(SDSUPPORT)
119
   #if ENABLED(SDSUPPORT)
120
     if (IS_SD_PRINTING()) { card.pauseSDPrint(); }
120
     if (IS_SD_PRINTING()) { card.pauseSDPrint(); }

+ 1
- 1
Marlin/src/lcd/menu/menu_main.cpp View File

135
     #endif // !HAS_ENCODER_WHEEL && SDSUPPORT
135
     #endif // !HAS_ENCODER_WHEEL && SDSUPPORT
136
 
136
 
137
     MENU_ITEM(function, MSG_RESUME_PRINT, lcd_resume);
137
     MENU_ITEM(function, MSG_RESUME_PRINT, lcd_resume);
138
-    
138
+
139
     MENU_ITEM(submenu, MSG_MOTION, menu_motion);
139
     MENU_ITEM(submenu, MSG_MOTION, menu_motion);
140
     MENU_ITEM(submenu, MSG_TEMPERATURE, menu_temperature);
140
     MENU_ITEM(submenu, MSG_TEMPERATURE, menu_temperature);
141
   }
141
   }

+ 9
- 9
Marlin/src/pins/pins_ADSK.h View File

97
 #define X_STEP_PIN          2
97
 #define X_STEP_PIN          2
98
 #define X_DIR_PIN           5
98
 #define X_DIR_PIN           5
99
 #define X_ENABLE_PIN        8
99
 #define X_ENABLE_PIN        8
100
-    
100
+
101
 #define Y_STEP_PIN          3
101
 #define Y_STEP_PIN          3
102
 #define Y_DIR_PIN           6
102
 #define Y_DIR_PIN           6
103
 #define Y_ENABLE_PIN        8
103
 #define Y_ENABLE_PIN        8
137
    * The next LCD pins RS,D4,D5,D6,D7 have internal pull-ups to 5V and as result the 5V will be on these pins.
137
    * The next LCD pins RS,D4,D5,D6,D7 have internal pull-ups to 5V and as result the 5V will be on these pins.
138
    * Luckily these internal pull-ups have really high resistance and adding 33K pull-down resistors will create
138
    * Luckily these internal pull-ups have really high resistance and adding 33K pull-down resistors will create
139
    * simple voltage divider that will bring the voltage down just slightly bellow 3.3V.
139
    * simple voltage divider that will bring the voltage down just slightly bellow 3.3V.
140
-   * 
140
+   *
141
    * This LCD also has buttons that connected to the same ADC pin with different voltage divider combinations.
141
    * This LCD also has buttons that connected to the same ADC pin with different voltage divider combinations.
142
    * On the LCD panel there is internal pull-up resistor of the 4.7K connected to 5V.
142
    * On the LCD panel there is internal pull-up resistor of the 4.7K connected to 5V.
143
    * Connecting another 4.7K pull-down resistor between ADC pin and the GND
143
    * Connecting another 4.7K pull-down resistor between ADC pin and the GND
144
    *   will result in scaled values for voltage dividers and will bring them down to be always below 3.3V.
144
    *   will result in scaled values for voltage dividers and will bring them down to be always below 3.3V.
145
-   * 
145
+   *
146
    * For 2004 LCD to work with 3.3V board like Arduino DUE the next required:
146
    * For 2004 LCD to work with 3.3V board like Arduino DUE the next required:
147
    * Pull-down resistors of 33K between each of LCD pins RS,D4,D5,D6,D7 and the GND.
147
    * Pull-down resistors of 33K between each of LCD pins RS,D4,D5,D6,D7 and the GND.
148
    * Pull-down resistor of 4.7K between ADC_KEYPAD_PIN and the GND
148
    * Pull-down resistor of 4.7K between ADC_KEYPAD_PIN and the GND
149
-   * 
149
+   *
150
    * All these modifications will still work with 5V based boards but require proper scaled ADC values
150
    * All these modifications will still work with 5V based boards but require proper scaled ADC values
151
    */
151
    */
152
 
152
 
167
   #define LCD_PINS_D7      19
167
   #define LCD_PINS_D7      19
168
   #define ADC_KEYPAD_PIN    6   //60 // Analog pin 6, Digital pin 60
168
   #define ADC_KEYPAD_PIN    6   //60 // Analog pin 6, Digital pin 60
169
 
169
 
170
-  /** 
170
+  /**
171
    * The below defines will scale all the values to work properly on both
171
    * The below defines will scale all the values to work properly on both
172
    * 5V (Mega) and 3.3V (DUE) boards with all pull-up resistors added for 3.3V
172
    * 5V (Mega) and 3.3V (DUE) boards with all pull-up resistors added for 3.3V
173
    */
173
    */
175
   #define ADC_BUTTONS_VALUE_SCALE         (5.0/AREF_VOLTS) // The LCD module pullup voltage is 5.0V but ADC reference voltage is 3.3V
175
   #define ADC_BUTTONS_VALUE_SCALE         (5.0/AREF_VOLTS) // The LCD module pullup voltage is 5.0V but ADC reference voltage is 3.3V
176
 
176
 
177
   #define ADC_BUTTONS_R_PULLDOWN          4.7  // Moves voltage down to be bellow 3.3V instead of 5V
177
   #define ADC_BUTTONS_R_PULLDOWN          4.7  // Moves voltage down to be bellow 3.3V instead of 5V
178
-  // the resistors values will be scaled because of 4.7K pulldown parallel resistor 
178
+  // the resistors values will be scaled because of 4.7K pulldown parallel resistor
179
   #define _ADC_BUTTONS_R_SCALED(R)        ((R) * (ADC_BUTTONS_R_PULLDOWN) / ((R) + ADC_BUTTONS_R_PULLDOWN))
179
   #define _ADC_BUTTONS_R_SCALED(R)        ((R) * (ADC_BUTTONS_R_PULLDOWN) / ((R) + ADC_BUTTONS_R_PULLDOWN))
180
 
180
 
181
   // buttons pullup resistor
181
   // buttons pullup resistor
191
 
191
 
192
 /**
192
 /**
193
  * RJ45 8 pins extruder connector
193
  * RJ45 8 pins extruder connector
194
- * 
194
+ *
195
  * 1 - GND (Please do not connect to the same GND as extruder heater to prevent ground offset voltage)
195
  * 1 - GND (Please do not connect to the same GND as extruder heater to prevent ground offset voltage)
196
  * 2 - thermistor
196
  * 2 - thermistor
197
  * 3 - SERVO PWM
197
  * 3 - SERVO PWM
200
  * 6 - FAN (extruder cooling)
200
  * 6 - FAN (extruder cooling)
201
  * 7 - Probe signal
201
  * 7 - Probe signal
202
  * 8 - 5V
202
  * 8 - 5V
203
- * 
203
+ *
204
  * Standard ethernet pairs: 1&2, 3&6, 4&5, 7&8
204
  * Standard ethernet pairs: 1&2, 3&6, 4&5, 7&8
205
  * Use CAT7 cable to have all pairs shielded
205
  * Use CAT7 cable to have all pairs shielded
206
- * 
206
+ *
207
  */
207
  */

Loading…
Cancel
Save