🎨 Misc code and spacing cleanup

This commit is contained in:
Scott Lahteine
2021-08-21 18:00:55 -05:00
parent 0aa87af82f
commit dc5ae16861
24 changed files with 79 additions and 159 deletions

View File

@@ -390,9 +390,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
LOOP_L_N(y, PAGE_HEIGHT) {
uint32_t k = 0;
#if HAS_LCD_IO
buffer = (y & 1) ? bufferB : bufferA;
#endif
TERN_(HAS_LCD_IO, buffer = (y & 1) ? bufferB : bufferA);
for (uint16_t i = 0; i < (uint32_t)pb->width; i++) {
const uint8_t b = *(((uint8_t *)pb->buf) + i);
const uint16_t c = TEST(b, y) ? TFT_MARLINUI_COLOR : TFT_MARLINBG_COLOR;

View File

@@ -64,7 +64,7 @@ namespace ExtUI {
ScreenHandler.SetupConfirmAction(setUserConfirmed);
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_POPUP);
}
else if (ScreenHandler.getCurrentScreen() == DGUSLCD_SCREEN_POPUP ) {
else if (ScreenHandler.getCurrentScreen() == DGUSLCD_SCREEN_POPUP) {
ScreenHandler.SetupConfirmAction(nullptr);
ScreenHandler.PopToOldScreen();
}

View File

@@ -569,9 +569,7 @@ void menu_advanced_settings() {
SUBMENU(MSG_JERK, menu_advanced_jerk);
#elif HAS_JUNCTION_DEVIATION
EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.001f, 0.3f
#if ENABLED(LIN_ADVANCE)
, planner.recalculate_max_e_jerk
#endif
OPTARG(LIN_ADVANCE, planner.recalculate_max_e_jerk)
);
#endif

View File

@@ -192,9 +192,7 @@ void _lcd_ubl_edit_mesh() {
char ubl_lcd_gcode[20];
sprintf_P(ubl_lcd_gcode, PSTR("G28\nG26CPH%" PRIi16 TERN_(HAS_HEATED_BED, "B%" PRIi16))
, custom_hotend_temp
#if HAS_HEATED_BED
, custom_bed_temp
#endif
OPTARG(HAS_HEATED_BED, custom_bed_temp)
);
queue.inject(ubl_lcd_gcode);
}