From 84bd8d24dd43f442e5f4c2776ebeaebf14f690ba Mon Sep 17 00:00:00 2001 From: wlkmanist Date: Mon, 22 Apr 2024 00:08:25 +0300 Subject: [PATCH 1/6] pins: Add unnecessary pins defenitions for stock Voxelab Aquila board Used old Voxelab Marlin sources. Does not brake anything, but provides more info about this board for enthusiasts. Signed-off-by: wlkmanist --- Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h b/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h index c0d9c87baa..84d0c8f4b0 100644 --- a/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h +++ b/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h @@ -27,11 +27,22 @@ * Uses CREALITY V4 (STM32F103RE / STM32F103RC) board pin assignments */ -#define BOARD_INFO_NAME "Aquila v1.0.1" +#ifndef BOARD_INFO_NAME + #define BOARD_INFO_NAME "Aquila v1.0.1" +#endif #ifndef DEFAULT_MACHINE_NAME #define DEFAULT_MACHINE_NAME "Aquila" #endif -#define NO_MAPLE_WARNING // Disable warning when compiling with Maple env +#define NO_MAPLE_WARNING // Disable warning when compiling with Maple env + +// +// Power Loss Detection +// +//#ifndef POWER_LOSS_PIN +// #define POWER_LOSS_PIN PA15 // PWRDET +//#endif + +//#define LED PA3 #include "../stm32f1/pins_CREALITY_V4.h" From 35aee95652ab0917ae2ccbb795e6356e84eeda56 Mon Sep 17 00:00:00 2001 From: wlkmanist Date: Mon, 22 Apr 2024 02:00:21 +0300 Subject: [PATCH 2/6] pins: Add schematics for some ports for Voxelab Aquila pins header Signed-off-by: wlkmanist --- Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h | 39 ++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h b/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h index 84d0c8f4b0..7bce997ee7 100644 --- a/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h +++ b/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h @@ -45,4 +45,43 @@ //#define LED PA3 +/** Debug port + * ----- + * | 1 | VCC + * | 2 | PA13 + * | 3 | PA14 + * | 4 | GND + * ----- + */ + +/** + * RET6 12864 LCD (Board) + * ------ + * PC6 | 1 2 | PB2 + * PB10 | 3 4 | PB11 + * PB14 5 6 | PB13 + * PB12 | 7 8 | PB15 + * GND | 9 10 | +5V + * ------ + * + * DWIN LCD Display + * ------ + * NC | 1 2 | NC + * B | 3 4 | A + * EN 5 6 | BEEP + * RX | 7 8 | TX + * GND | 9 10 | VCC (+5V) + * ------ + */ + +/** BL Touch + * ----- + * | 1 | PB1 + * 2 | GND + * | 3 | PB0 + * 4 | +5V + * | 5 | GND + * ----- + */ + #include "../stm32f1/pins_CREALITY_V4.h" From 277a2c2ca70e864162fdf2a6733587e73a062910 Mon Sep 17 00:00:00 2001 From: Andrew <18502096+classicrocker883@users.noreply.github.com> Date: Sun, 5 May 2024 23:45:20 -0400 Subject: [PATCH 3/6] Update pins_VOXELAB_AQUILA.h --- Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h | 52 +++++++------------- 1 file changed, 17 insertions(+), 35 deletions(-) diff --git a/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h b/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h index 7bce997ee7..a33eeb6dec 100644 --- a/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h +++ b/Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h @@ -45,43 +45,25 @@ //#define LED PA3 -/** Debug port - * ----- - * | 1 | VCC - * | 2 | PA13 - * | 3 | PA14 - * | 4 | GND - * ----- - */ - /** - * RET6 12864 LCD (Board) - * ------ - * PC6 | 1 2 | PB2 - * PB10 | 3 4 | PB11 - * PB14 5 6 | PB13 - * PB12 | 7 8 | PB15 - * GND | 9 10 | +5V - * ------ + * RET6 12864 LCD (Board) DWIN LCD Display + * ------ ------ + * PC6 | 1 2 | PB2 NC | 1 2 | NC + * PB10 | 3 4 | PB11 B | 3 4 | A + * PB14 5 6 | PB13 EN 5 6 | BEEP + * PB12 | 7 8 | PB15 RX | 7 8 | TX + * GND | 9 10 | +5V GND | 9 10 | VCC (+5V) + * ------ ------ * - * DWIN LCD Display - * ------ - * NC | 1 2 | NC - * B | 3 4 | A - * EN 5 6 | BEEP - * RX | 7 8 | TX - * GND | 9 10 | VCC (+5V) - * ------ - */ - -/** BL Touch - * ----- - * | 1 | PB1 - * 2 | GND - * | 3 | PB0 - * 4 | +5V - * | 5 | GND - * ----- + * + * BL-Touch Debug port + * ----- ----- + * | 1 | PB1 | 1 | VCC + * 2 | GND | 2 | PA13 + * | 3 | PB0 | 3 | PA14 + * 4 | +5V | 4 | GND + * | 5 | GND ----- + * ----- */ #include "../stm32f1/pins_CREALITY_V4.h" From 81ec1c000f00a9c6d5c2fc57dc5a75e345775e3b Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Thu, 2 Jan 2025 04:06:25 -0500 Subject: [PATCH 4/6] Update - check-pr.yml --- .github/workflows/check-pr.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml index 347cfd3933..afe5c568f5 100644 --- a/.github/workflows/check-pr.yml +++ b/.github/workflows/check-pr.yml @@ -8,6 +8,8 @@ name: PR Bad Target on: pull_request_target: types: [opened] + branches: + - 2024-* jobs: bad_target: @@ -17,9 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Close invalid PR - if: ${{ github.event.pull_request.base.ref != '2024-December' }} - uses: superbrothers/close-pull-request@v3.1.2 + - uses: superbrothers/close-pull-request@v3.1.2 with: comment: > Thanks for your contribution! From fccc1a522ec44b724efc38df798988755ca1a843 Mon Sep 17 00:00:00 2001 From: Andrew <18502096+classicrocker883@users.noreply.github.com> Date: Sun, 31 Aug 2025 02:18:38 -0400 Subject: [PATCH 5/6] Update check-pr.yml 2025 --- .github/workflows/check-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml index 596d5ed0f7..1b278e0b81 100644 --- a/.github/workflows/check-pr.yml +++ b/.github/workflows/check-pr.yml @@ -9,7 +9,7 @@ on: pull_request_target: types: [opened] branches: - - 2024-* + - 2025-* jobs: bad_target: From fe822763411c42bde9782d32c4990982ce75e51a Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 24 Sep 2025 01:42:10 -0400 Subject: [PATCH 6/6] update pioutil.py unwarm --- Marlin/src/HAL/shared/backtrace/unwarm.cpp | 4 ++-- Marlin/src/HAL/shared/backtrace/unwarm_arm.cpp | 7 ++++++- buildroot/share/PlatformIO/scripts/pioutil.py | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Marlin/src/HAL/shared/backtrace/unwarm.cpp b/Marlin/src/HAL/shared/backtrace/unwarm.cpp index 823f54c157..3f85ec0593 100644 --- a/Marlin/src/HAL/shared/backtrace/unwarm.cpp +++ b/Marlin/src/HAL/shared/backtrace/unwarm.cpp @@ -112,7 +112,7 @@ bool UnwReportRetAddr(UnwState * const state, uint32_t addr) { // Check if name descriptor is valid if ((v & 0xFFFFFF00) == 0xFF000000 && (v & 0xFF) > 1) { // Assume the name was found! - entry.name = ((const char*)pf) - 4 - (v & 0xFF); + entry.name = reinterpret_cast(pf) - 4 - (v & 0xFF); entry.function = pf; break; } @@ -125,7 +125,7 @@ bool UnwReportRetAddr(UnwState * const state, uint32_t addr) { /* Cast away const from reportData. * The const is only to prevent the unw module modifying the data. */ - return state->cb->report((void *)state->reportData, &entry); + return state->cb->report(const_cast(state->reportData), &entry); } /** diff --git a/Marlin/src/HAL/shared/backtrace/unwarm_arm.cpp b/Marlin/src/HAL/shared/backtrace/unwarm_arm.cpp index e4d67c0b44..f372f9b232 100644 --- a/Marlin/src/HAL/shared/backtrace/unwarm_arm.cpp +++ b/Marlin/src/HAL/shared/backtrace/unwarm_arm.cpp @@ -238,7 +238,12 @@ UnwResult UnwStartArm(UnwState * const state) { case 1: /* logical right */ if (!regShift && shiftDist == 0) shiftDist = 32; - op2val = state->regData[rm].v >> shiftDist; + if (shiftDist >= 32) { + op2val = 0; + } + else { + op2val = state->regData[rm].v >> shiftDist; + } break; case 2: /* arithmetic right */ diff --git a/buildroot/share/PlatformIO/scripts/pioutil.py b/buildroot/share/PlatformIO/scripts/pioutil.py index f824106e80..3a1cfa3d42 100644 --- a/buildroot/share/PlatformIO/scripts/pioutil.py +++ b/buildroot/share/PlatformIO/scripts/pioutil.py @@ -6,7 +6,9 @@ # Make sure 'vscode init' is not the current command def is_pio_build(): - if "IsCleanTarget" in dir(env) and env.IsCleanTarget(): return False + if "IsCleanTarget" in dir(env): + if env.IsCleanTarget(): + return False return not env.IsIntegrationDump() def get_pio_version():