Cleanups for UBL / ultralcd.cpp

Marlin/ubl_G29.cpp

@@ -45,7 +45,7 @@
     void lcd_mesh_edit_setup(float initial);
     float lcd_mesh_edit();
     void lcd_z_offset_edit_setup(float);
-    #ifdef DOGLCD
+    #if ENABLED(DOGLCD)
       extern void _lcd_ubl_output_map_lcd();
     #endif
     float lcd_z_offset_edit();
@@ -1575,7 +1575,7 @@
       SERIAL_ECHOLNPGM("Done Editing Mesh");
 
       if (ubl_lcd_map_control) {
-        #ifdef DOGLCD
+        #if ENABLED(DOGLCD)
         lcd_goto_screen(_lcd_ubl_output_map_lcd);
         #endif
       }

Marlin/ultralcd.cpp

@@ -2075,7 +2075,7 @@ void kill_screen(const char* lcd_msg) {
       enqueue_and_echo_command(ubl_lcd_gcode);
     }
 
-  #ifdef DOGLCD
+  #if ENABLED(DOGLCD)
 
     /**
      * UBL LCD "radar" map data
@@ -2086,8 +2086,8 @@ void kill_screen(const char* lcd_msg) {
     #define MAP_MAX_PIXELS_Y        49
 
     void _lcd_ubl_plot_drawing_prep() {
-      uint8_t i, j, x_offset, y_offset, x_map_pixels, y_map_pixels;
-      uint8_t pixels_per_X_mesh_pnt, pixels_per_Y_mesh_pnt, inverted_y;
+      uint8_t i, j, x_offset, y_offset, x_map_pixels, y_map_pixels,
+              pixels_per_X_mesh_pnt, pixels_per_Y_mesh_pnt, inverted_y;
 
       /*********************************************************/
       /************ Scale the box pixels appropriately *********/
@@ -2147,11 +2147,11 @@ void kill_screen(const char* lcd_msg) {
 
       // Print plot position
       u8g.setPrintPos(5, 64);
-      lcd_print("(");
+      lcd_print('(');
       u8g.print(x_plot);
-      lcd_print(",");
+      lcd_print(',');
       u8g.print(y_plot);
-      lcd_print(")");
+      lcd_print(')');
 
       // Show the location value
       u8g.setPrintPos(74, 64);