initial cleanup

MarlinFirmware · Nov 28, 2023 · 487f2c0 · 487f2c0
1 parent effab6d
commit 487f2c0
Show file tree

Hide file tree

Showing 8 changed files with 1,788 additions and 1,885 deletions.
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
diff --git a/Marlin/src/HAL/STM32F1/HAL_N32.cpp b/Marlin/src/HAL/STM32F1/HAL_N32.cpp
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
@@ -707,7 +707,7 @@
 /**
  * Maple environment
  */
-#if __STM32F1__ && DISABLED(NO_MAPLE_WARNING)
+#if defined(__STM32F1__) && DISABLED(NO_MAPLE_WARNING)
   #warning "Maple build environments are deprecated. Please use a non-Maple build environment. Report issues to the Marlin Firmware project."
 #endif
 

diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
@@ -247,8 +247,7 @@ bool BedLevelTools::meshValidate() {
       // Draw value text on
       const uint8_t fs = DWINUI::fontWidth(meshfont);
       if (viewer_print_value) {
-        xy_uint_t offset;
-        offset.y = cell_height_px / 2 - fs;
+        xy_uint_t offset { 0, cell_height_px / 2 - fs };
         if (isnan(bedlevel.z_values[x][y])) {  // undefined
           dwinDrawString(false, meshfont, COLOR_WHITE, COLOR_BG_BLUE, start_x_px + cell_width_px / 2 - 5, start_y_px + offset.y, F("X"));
         }

diff --git a/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h b/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -27,7 +27,7 @@
  * Uses CREALITY V4 (STM32F103RE / STM32F103RC) board pin assignments
  */
 
-#define BOARD_INFO_NAME      "Aquila v1.0.1"
+#define BOARD_INFO_NAME        "Aquila v1.0.1"
 #ifndef DEFAULT_MACHINE_NAME
   #define DEFAULT_MACHINE_NAME "Aquila"
 #endif

diff --git a/Marlin/src/pins/hc32f4/pins_AQUILA_101.h b/Marlin/src/pins/hc32f4/pins_AQUILA_101.h
@@ -152,23 +152,23 @@
 #define EXP1_07_PIN                         PB12  // EN2
 #define EXP1_08_PIN                         PB15  // EN1
 
-#if ENABLED(CR10_STOCKDISPLAY) // LCD used for C2
+#if ENABLED(CR10_STOCKDISPLAY)                    // LCD used for C2
 #undef LCD_SERIAL_PORT
-#define LCD_SERIAL_PORT 1
+#define LCD_SERIAL_PORT                        1
 
-  #define LCD_PINS_RS                       EXP1_07_PIN
-  #define LCD_PINS_EN                       EXP1_08_PIN
-  #define LCD_PINS_D4                       EXP1_06_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_EN                EXP1_08_PIN
+  #define LCD_PINS_D4                EXP1_06_PIN
 
-  #define BTN_ENC                           EXP1_02_PIN
-  #define BTN_EN1                           EXP1_03_PIN
-  #define BTN_EN2                           EXP1_05_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                    EXP1_05_PIN
 
   #ifndef HAS_PIN_27_BOARD
-    #define BEEPER_PIN                      EXP1_01_PIN
+    #define BEEPER_PIN               EXP1_01_PIN
   #endif
 
-#elif ANY(HAS_DWIN_E3V2, IS_DWIN_MARLINUI) // LCD used for X2
+#elif ANY(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)        // LCD used for X2
   /**
    * Display pinout (display side, so RX/TX are swapped)
    *

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
@@ -701,7 +701,8 @@
 #elif MB(MD_D301)
   #include "stm32f1/pins_MD_D301.h"                 // STM32F1                              env:mingda_d301 env:mingda_d301_maple
 #elif MB(VOXELAB_AQUILA)
-  #include "gd32f1/pins_VOXELAB_AQUILA.h"           // GD32F1, N32G4, STM32F1         env:GD32F103RC_voxelab_maple env:N32G455RE_voxelab_maple env:STM32F103RE_creality_maple env:STM32F103RE_creality
+  #include "gd32f1/pins_VOXELAB_AQUILA.h"           // GD32F1, N32G4, STM32F1               env:GD32F103RC_voxelab_maple env:N32G455RE_voxelab_maple env:STM32F103RE_creality_maple env:STM32F103RE_creality
+
 //
 // ARM Cortex-M4F
 //

diff --git a/buildroot/share/sublime/MarlinFirmware.sublime-project b/buildroot/share/sublime/MarlinFirmware.sublime-project
@@ -30,6 +30,7 @@
 		"ensure_newline_at_eof_on_save": true,
 		"tab_size": 2,
 		"translate_tabs_to_spaces": true,
-		"trim_trailing_white_space_on_save": true
+		"trim_trailing_white_space_on_save": true,
+		"uncrustify_config" : "${project_dir}/../extras/uncrustify.cfg"
 	}
 }