3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 13:56:24 +00:00
Code Issues Releases Wiki Activity

Clean up whitespace

Browse Source
This commit is contained in:
Scott Lahteine 2020-04-06 15:39:34 -05:00
parent 293a0997c9
commit d6badb77a4
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Configuration_adv.h
View File

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

2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
View File

@ -149,7 +149,7 @@
#define CLCD_SPI_CS BTN_EN1 #define CLCD_SPI_CS BTN_EN1
#define CLCD_MOD_RESET BTN_EN2 #define CLCD_MOD_RESET BTN_EN2
#if MB(EINSY_RAMBO, EINSY_RETRO) && DISABLED(SDSUPPORT) #if MB(EINSY_RAMBO, EINSY_RETRO) && DISABLED(SDSUPPORT)
#define CLCD_SPI_EXTRA_CS SDSS #define CLCD_SPI_EXTRA_CS SDSS
#endif #endif

2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp
View File

@ -39,7 +39,7 @@ void PreheatMenu::onRedraw(draw_mode_t what) {
#define GRID_ROWS 3 #define GRID_ROWS 3
#define GRID_COLS 2 #define GRID_COLS 2
if (what & FOREGROUND) { if (what & FOREGROUND) {
CommandProcessor cmd; CommandProcessor cmd;
cmd.cmd(COLOR_RGB(bg_text_enabled)) cmd.cmd(COLOR_RGB(bg_text_enabled))

2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h
View File

@ -129,7 +129,7 @@ namespace Theme {
#if ENABLED(TOUCH_UI_ROYAL_THEME) #if ENABLED(TOUCH_UI_ROYAL_THEME)
constexpr uint32_t x_axis = hsl_to_rgb(0, 1.00, 0.26); constexpr uint32_t x_axis = hsl_to_rgb(0, 1.00, 0.26);
constexpr uint32_t y_axis = hsl_to_rgb(120, 1.00, 0.13); constexpr uint32_t y_axis = hsl_to_rgb(120, 1.00, 0.13);
constexpr uint32_t z_axis = hsl_to_rgb(240, 1.00, 0.10); constexpr uint32_t z_axis = hsl_to_rgb(240, 1.00, 0.10);
#else #else
constexpr uint32_t x_axis = hsl_to_rgb(0, 1.00, 0.5); constexpr uint32_t x_axis = hsl_to_rgb(0, 1.00, 0.5);
constexpr uint32_t y_axis = hsl_to_rgb(120, 1.00, 0.37); constexpr uint32_t y_axis = hsl_to_rgb(120, 1.00, 0.37);

2
Marlin/src/lcd/extui/ui_api.h
View File

@ -141,7 +141,7 @@ namespace ExtUI {
void setMeshPoint(const xy_uint8_t &pos, const float zval); void setMeshPoint(const xy_uint8_t &pos, const float zval);
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval); void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval);
inline void onMeshUpdate(const xy_int8_t &pos, const float zval) { onMeshUpdate(pos.x, pos.y, zval); } inline void onMeshUpdate(const xy_int8_t &pos, const float zval) { onMeshUpdate(pos.x, pos.y, zval); }
typedef enum : unsigned char { PROBE_START, PROBE_FINISH } probe_state_t; typedef enum : unsigned char { PROBE_START, PROBE_FINISH } probe_state_t;
void onMeshUpdate(const int8_t xpos, const int8_t ypos, probe_state_t state); void onMeshUpdate(const int8_t xpos, const int8_t ypos, probe_state_t state);
inline void onMeshUpdate(const xy_int8_t &pos, probe_state_t state) { onMeshUpdate(pos.x, pos.y, state); } inline void onMeshUpdate(const xy_int8_t &pos, probe_state_t state) { onMeshUpdate(pos.x, pos.y, state); }