MarlinFirmware · thinkyhead · Dec 6, 2023 · Nov 25, 2023 · Nov 25, 2023 · Nov 27, 2023
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
diff --git a/Marlin/src/HAL/STM32F1/MarlinSerial.cpp b/Marlin/src/HAL/STM32F1/MarlinSerial.cpp
@@ -28,7 +28,11 @@
 
 // Copied from ~/.platformio/packages/framework-arduinoststm32-maple/STM32F1/system/libmaple/usart_private.h
 // Changed to handle Emergency Parser
-static __always_inline void my_usart_irq(ring_buffer *rb, ring_buffer *wb, usart_reg_map *regs, MSerialT &serial) {
+static
+#if MB(VOXELAB_AQUILA)
+inline
+#endif
+__always_inline void my_usart_irq(ring_buffer *rb, ring_buffer *wb, usart_reg_map *regs, MSerialT &serial) {
  /* Handle RXNEIE and TXEIE interrupts.
   * RXNE signifies availability of a byte in DR.
   *

diff --git a/Marlin/src/HAL/STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
@@ -80,7 +80,7 @@ typedef uint16_t hal_timer_t;
   //#define MF_TIMER_TEMP       4  // 2->4, Timer 2 for Stepper Current PWM
 #endif
 
-#if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE, MKS_ROBIN_E3D, MKS_ROBIN_E3)
+#if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE, MKS_ROBIN_E3D, MKS_ROBIN_E3, VOXELAB_AQUILA)
   // SKR Mini E3 boards use PA8 as FAN0_PIN, so TIMER 1 is used for Fan PWM.
   #ifdef STM32_HIGH_DENSITY
     #define MF_TIMER_SERVO0  8  // tone.cpp uses Timer 4

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
@@ -400,6 +400,7 @@
 #define BOARD_TRIGORILLA_V006         5068  // Trigorilla V0.0.6 (GD32F103RE)
 #define BOARD_KEDI_CONTROLLER_V1_2    5069  // EDUTRONICS Kedi Controller V1.2 (STM32F103RC)
 #define BOARD_MD_D301                 5070  // Mingda D2 DZ301 V1.0 (STM32F103ZE)
+#define BOARD_VOXELAB_AQUILA          5071  // Voxelab Aquila V1.0.0/V1.0.1 (GD32F103RC / N32G455RE / STM32F103RE)
 
 //
 // ARM Cortex-M4F
@@ -513,7 +514,7 @@
 //
 // HC32 ARM Cortex-M4
 //
-#define BOARD_AQUILA_V101             7200  // Aquila V1.0.1 as found in the Voxelab Aquila X2
+#define BOARD_AQUILA_V101             7200  // Voxelab Aquila V1.0.1/V1.0.2/V1.0.3 as found in the Voxelab Aquila X2 and C2
 
 //
 // Custom board

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
@@ -707,7 +707,7 @@
 /**
  * Maple environment
  */
-#ifdef __STM32F1__
+#if __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/common/encoder.h b/Marlin/src/lcd/e3v2/common/encoder.h
@@ -45,7 +45,7 @@ typedef enum {
   ENCODER_DIFF_ENTER = 3   // click
 } EncoderState;
 
-#define ENCODER_WAIT_MS 20
+#define ENCODER_WAIT_MS TERN(DWIN_LCD_PROUI, 10, 20)
 
 // Encoder initialization
 void encoderConfiguration();

diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
@@ -247,7 +247,8 @@ bool BedLevelTools::meshValidate() {
       // Draw value text on
       const uint8_t fs = DWINUI::fontWidth(meshfont);
       if (viewer_print_value) {
-        xy_uint_t offset { 0, cell_height_px / 2 - fs };
+        xy_uint_t offset;
+        offset.y = 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/lcd/e3v2/proui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
@@ -127,7 +127,7 @@ void dwinWriteToMem(uint8_t mem, uint16_t addr, uint16_t length, uint8_t *data)
     dwinWord(i, addr + indx); // start address of the data block
     ++i;
     for (uint8_t j = 0; j < i; ++j) { LCD_SERIAL.write(dwinSendBuf[j]); delayMicroseconds(1); }  // Buf header
-    for (uint16_t j = indx; j <= indx + to_send - 1; j++) LCD_SERIAL.write(*(data + j)); delayMicroseconds(1);  // write block of data
+    for (uint16_t j = indx; j <= indx + to_send - 1; j++) { LCD_SERIAL.write(*(data + j)); delayMicroseconds(1); } // write block of data
     for (uint8_t j = 0; j < 4; ++j) { LCD_SERIAL.write(dwinBufTail[j]); delayMicroseconds(1); }
     block++;
     pending -= to_send;

diff --git a/Marlin/src/lcd/e3v2/proui/menus.cpp b/Marlin/src/lcd/e3v2/proui/menus.cpp
@@ -107,7 +107,7 @@ void onDrawMenuItem(MenuItem* menuitem, int8_t line) {
   if (menuitem->icon) DWINUI::drawIcon(menuitem->icon, ICOX, MBASE(line) - 3);
   if (menuitem->frameid)
     dwinFrameAreaCopy(menuitem->frameid, menuitem->frame.left, menuitem->frame.top, menuitem->frame.right, menuitem->frame.bottom, LBLX, MBASE(line));
-  else if (menuitem->caption)
+  else
     DWINUI::drawString(LBLX, MBASE(line) - 1, menuitem->caption);
   dwinDrawHLine(hmiData.colorSplitLine, 16, MYPOS(line + 1), 240);
 }

diff --git a/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h b/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h
@@ -0,0 +1,37 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * FFP0173_Aquila_Main_Board_V1.0.1 (GD32F103RC / N32G455RE)
+ *
+ * Uses CREALITY V4 (STM32F103RE / STM32F103RC) board pin assignments
+ */
+
+#define BOARD_INFO_NAME      "Aquila v1.0.1"
+#ifndef DEFAULT_MACHINE_NAME
+  #define DEFAULT_MACHINE_NAME "Aquila"
+#endif
+
+#define NO_MAPLE_WARNING     // Disable warning when compiling with Maple env
+
+#include "../stm32f1/pins_CREALITY_V4.h"
diff --git a/Marlin/src/pins/hc32f4/pins_AQUILA_101.h b/Marlin/src/pins/hc32f4/pins_AQUILA_101.h
@@ -22,7 +22,7 @@
 #pragma once
 
 //
-// Voxelab Aquila V1.0.1 and V1.0.2 (HC32F460) as found in the Voxelab Aquila X2
+// Voxelab Aquila V1.0.1/V1.0.2/V1.0.3 (HC32F460) as found in the Voxelab Aquila X2 and C2
 //
 #include "env_validate.h"
 
@@ -152,7 +152,23 @@
 #define EXP1_07_PIN                         PB12  // EN2
 #define EXP1_08_PIN                         PB15  // EN1
 
-#if ANY(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#if ENABLED(CR10_STOCKDISPLAY) // LCD used for C2
+#undef LCD_SERIAL_PORT
+#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 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
+  #endif
+
+#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
@@ -700,7 +700,8 @@
   #include "stm32f1/pins_KEDI_CONTROLLER_V1_2.h"    // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #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
 //
 // ARM Cortex-M4F
 //

diff --git a/ini/hc32.ini b/ini/hc32.ini
@@ -80,7 +80,7 @@ extends = HC32F460_base
 board_build.ld_args.flash_size = 512K
 
 #
-# Aquila V1.0.1 Mainboard, as found in the Voxelab Aquila X2
+# Voxelab Aquila V1.0.1/V1.0.2/V1.0.3 as found in the Voxelab Aquila X2 & C2
 #
 [env:HC32F460C_aquila_101]
 extends = HC32F460C_base

diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
@@ -142,6 +142,33 @@ extends              = env:STM32F103RE_creality_maple
 board_build.address  = 0x08010000
 board_build.ldscript = crealityPro.ld
 
+#
+# Voxelab Aquila V1.0.1
+#
+#   GD32F103RC_voxelab_maple ........ GD32F103RCT6 with 256K
+#   N32G455RE_voxelab_maple ......... N32G455REL7 - cannot be flashed over 256K
+#
+[env:GD32F103RC_voxelab_maple]
+extends              = env:STM32F103RC_maple
+build_flags          = ${env:STM32F103RC_maple.build_flags} -DTEMP_TIMER_CHAN=4
+board_build.address  = 0x08007000
+board_build.ldscript = creality256k.ld
+extra_scripts        = ${env:STM32F103RC_maple.extra_scripts}
+                       buildroot/share/PlatformIO/scripts/custom_board.py
+debug_tool           = jlink
+upload_protocol      = jlink
+
+[env:N32G455RE_voxelab_maple]
+extends              = env:STM32F103RC_maple
+build_flags          = ${env:STM32F103RC_maple.build_flags} -DTEMP_TIMER_CHAN=4
+                       -DVOXELAB_N32
+board_build.address  = 0x08007000
+board_build.ldscript = creality256k.ld
+extra_scripts        = ${env:STM32F103RC_maple.extra_scripts}
+                       buildroot/share/PlatformIO/scripts/custom_board.py
+debug_tool           = jlink
+upload_protocol      = jlink
+
 #
 # BigTreeTech SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #