浏览代码

Clean up whitespace

Scott Lahteine 5 年前
父节点
当前提交
d6badb77a4

+ 0
- 4
Marlin/Configuration_adv.h 查看文件

340
  *
340
  *
341
  * The fan turns on automatically whenever any driver is enabled and turns
341
  * The fan turns on automatically whenever any driver is enabled and turns
342
  * off (or reduces to idle speed) shortly after drivers are turned off.
342
  * off (or reduces to idle speed) shortly after drivers are turned off.
343
- *
344
  */
343
  */
345
 //#define USE_CONTROLLER_FAN
344
 //#define USE_CONTROLLER_FAN
346
 #if ENABLED(USE_CONTROLLER_FAN)
345
 #if ENABLED(USE_CONTROLLER_FAN)
1060
    * during SD printing. If the recovery file is found at boot time, present
1059
    * during SD printing. If the recovery file is found at boot time, present
1061
    * an option on the LCD screen to continue the print from the last-known
1060
    * an option on the LCD screen to continue the print from the last-known
1062
    * point in the file.
1061
    * point in the file.
1063
-   *
1064
-   * If the machine reboots when resuming a print you may need to replace or
1065
-   * reformat the SD card. (Bad sectors delay startup triggering the watchdog.)
1066
    */
1062
    */
1067
   //#define POWER_LOSS_RECOVERY
1063
   //#define POWER_LOSS_RECOVERY
1068
   #if ENABLED(POWER_LOSS_RECOVERY)
1064
   #if ENABLED(POWER_LOSS_RECOVERY)

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h 查看文件

149
 
149
 
150
   #define CLCD_SPI_CS                    BTN_EN1
150
   #define CLCD_SPI_CS                    BTN_EN1
151
   #define CLCD_MOD_RESET                 BTN_EN2
151
   #define CLCD_MOD_RESET                 BTN_EN2
152
-  
152
+
153
   #if MB(EINSY_RAMBO, EINSY_RETRO) && DISABLED(SDSUPPORT)
153
   #if MB(EINSY_RAMBO, EINSY_RETRO) && DISABLED(SDSUPPORT)
154
     #define CLCD_SPI_EXTRA_CS            SDSS
154
     #define CLCD_SPI_EXTRA_CS            SDSS
155
   #endif
155
   #endif

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp 查看文件

39
 
39
 
40
   #define GRID_ROWS 3
40
   #define GRID_ROWS 3
41
   #define GRID_COLS 2
41
   #define GRID_COLS 2
42
-    
42
+
43
   if (what & FOREGROUND) {
43
   if (what & FOREGROUND) {
44
     CommandProcessor cmd;
44
     CommandProcessor cmd;
45
     cmd.cmd(COLOR_RGB(bg_text_enabled))
45
     cmd.cmd(COLOR_RGB(bg_text_enabled))

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h 查看文件

129
   #if ENABLED(TOUCH_UI_ROYAL_THEME)
129
   #if ENABLED(TOUCH_UI_ROYAL_THEME)
130
     constexpr uint32_t x_axis               = hsl_to_rgb(0,   1.00, 0.26);
130
     constexpr uint32_t x_axis               = hsl_to_rgb(0,   1.00, 0.26);
131
     constexpr uint32_t y_axis               = hsl_to_rgb(120, 1.00, 0.13);
131
     constexpr uint32_t y_axis               = hsl_to_rgb(120, 1.00, 0.13);
132
-    constexpr uint32_t z_axis               = hsl_to_rgb(240, 1.00, 0.10); 
132
+    constexpr uint32_t z_axis               = hsl_to_rgb(240, 1.00, 0.10);
133
   #else
133
   #else
134
     constexpr uint32_t x_axis               = hsl_to_rgb(0,   1.00, 0.5);
134
     constexpr uint32_t x_axis               = hsl_to_rgb(0,   1.00, 0.5);
135
     constexpr uint32_t y_axis               = hsl_to_rgb(120, 1.00, 0.37);
135
     constexpr uint32_t y_axis               = hsl_to_rgb(120, 1.00, 0.37);

+ 1
- 1
Marlin/src/lcd/extui/ui_api.h 查看文件

141
       void setMeshPoint(const xy_uint8_t &pos, const float zval);
141
       void setMeshPoint(const xy_uint8_t &pos, const float zval);
142
       void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval);
142
       void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval);
143
       inline void onMeshUpdate(const xy_int8_t &pos, const float zval) { onMeshUpdate(pos.x, pos.y, zval); }
143
       inline void onMeshUpdate(const xy_int8_t &pos, const float zval) { onMeshUpdate(pos.x, pos.y, zval); }
144
-      
144
+
145
       typedef enum : unsigned char { PROBE_START, PROBE_FINISH } probe_state_t;
145
       typedef enum : unsigned char { PROBE_START, PROBE_FINISH } probe_state_t;
146
       void onMeshUpdate(const int8_t xpos, const int8_t ypos, probe_state_t state);
146
       void onMeshUpdate(const int8_t xpos, const int8_t ypos, probe_state_t state);
147
       inline void onMeshUpdate(const xy_int8_t &pos, probe_state_t state) { onMeshUpdate(pos.x, pos.y, state); }
147
       inline void onMeshUpdate(const xy_int8_t &pos, probe_state_t state) { onMeshUpdate(pos.x, pos.y, state); }

正在加载...
取消
保存