From 563142e25e29bc02309c5e1b6267a00632dfea65 Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Tue, 13 Aug 2024 05:55:54 -0400 Subject: [PATCH] Update - HC32 configs - remove HAS_GCODE_PREVIEW --- .github/workflows/compile-configs-HC32.yml | 51 +++++++++---------- Marlin/Configuration.h | 2 +- .../C2/Default/Configuration.h | 2 +- .../Voxelab Aquila HC32/C2/MM/Configuration.h | 2 +- .../Voxelab Aquila HC32/ConfigurationBLT.h | 2 +- .../Voxelab Aquila HC32/ConfigurationDNP.h | 2 +- .../Voxelab Aquila HC32/ConfigurationMM.h | 2 +- .../Voxelab Aquila HC32/ConfigurationUBL.h | 2 +- 8 files changed, 32 insertions(+), 33 deletions(-) diff --git a/.github/workflows/compile-configs-HC32.yml b/.github/workflows/compile-configs-HC32.yml index df657945ff..dbbf31b901 100644 --- a/.github/workflows/compile-configs-HC32.yml +++ b/.github/workflows/compile-configs-HC32.yml @@ -16,25 +16,25 @@ jobs: temp: [true,false] inshape: [true,false] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: node-version: 16 - name: Cache pip - uses: actions/cache@v3.3.2 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - name: Cache PlatformIO - uses: actions/cache@v3.3.2 + uses: actions/cache@v4 with: path: ~/.platformio key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Install PlatformIO @@ -47,7 +47,7 @@ jobs: run: | if ($TP); then TPTMP=-MPC; else TPTMP=; fi; if ($IS); then ISTMP=-IS; else ISTMP=; fi; - echo "filename=HC32_Default${ISTMP}${TPTMP}.bin" >> $GITHUB_OUTPUT + echo "filename=HC32_Default${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h > Marlin/Version.h @@ -90,25 +90,25 @@ jobs: temp: [true,false] inshape: [true,false] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: node-version: 16 - name: Cache pip - uses: actions/cache@v3.3.2 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - name: Cache PlatformIO - uses: actions/cache@v3.3.2 + uses: actions/cache@v4 with: path: ~/.platformio key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Install PlatformIO @@ -121,7 +121,7 @@ jobs: run: | if ($TP); then TPTMP=-MPC; else TPTMP=; fi; if ($IS); then ISTMP=-IS; else ISTMP=; fi; - echo "filename=HC32_MM-ProUI-EX${ISTMP}${TPTMP}.bin" >> $GITHUB_OUTPUT + echo "filename=HC32_MM-ProUI-EX${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h > Marlin/Version.h @@ -173,25 +173,25 @@ jobs: pro: [true,false] bmp: [true,false] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: node-version: 16 - name: Cache pip - uses: actions/cache@v3.3.2 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - name: Cache PlatformIO - uses: actions/cache@v3.3.2 + uses: actions/cache@v4 with: path: ~/.platformio key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Install PlatformIO @@ -205,7 +205,7 @@ jobs: if ($TP); then TPTMP=-MPC; else TPTMP=; fi; if ($PRO); then PRTMP=; else PRTMP=-ProUI-EX; fi; if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; - echo "filename=HC32${MPTMP}_UBL${PRTMP}${TPTMP}.bin" >> $GITHUB_OUTPUT + echo "filename=HC32${MPTMP}_UBL${PRTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h > Marlin/Version.h @@ -261,25 +261,25 @@ jobs: inshape: [true] bmp: [true,false] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: node-version: 16 - name: Cache pip - uses: actions/cache@v3.3.2 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - name: Cache PlatformIO - uses: actions/cache@v3.3.2 + uses: actions/cache@v4 with: path: ~/.platformio key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Install PlatformIO @@ -292,7 +292,7 @@ jobs: run: | if ($IS); then ISTMP=-IS; fi; if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; - echo "filename=HC32${MPTMP}_UBL${ISTMP}.bin" >> $GITHUB_OUTPUT + echo "filename=HC32${MPTMP}_UBL${ISTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h > Marlin/Version.h @@ -340,25 +340,25 @@ jobs: inshape: [true,false] bmp: [true,false] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: node-version: 16 - name: Cache pip - uses: actions/cache@v3.3.2 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - name: Cache PlatformIO - uses: actions/cache@v3.3.2 + uses: actions/cache@v4 with: path: ~/.platformio key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Install PlatformIO @@ -371,7 +371,7 @@ jobs: run: | if ($IS); then ISTMP=-IS; else ISTMP=; fi; if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; - echo "filename=HC32${MPTMP}_BLT-ProUI-EX${ISTMP}.bin" >> $GITHUB_OUTPUT + echo "filename=HC32${MPTMP}_BLT-ProUI-EX${ISTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h > Marlin/Version.h @@ -444,7 +444,6 @@ jobs: - name: Install PlatformIO run: | python3 -m pip install --upgrade pip - pip install --upgrade pip pip install --upgrade wheel pip install --upgrade platformio - name: Run PlatformIO diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d1920d8171..8f7630cc61 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -3469,7 +3469,7 @@ // Professional firmware features: #define PROUI_EX 1 // Extended UI features (15152 bytes of flash) //#define CV_LASER_MODULE - #define HAS_GCODE_PREVIEW 1 + //#define HAS_GCODE_PREVIEW 1 #define DISABLE_TUNING_GRAPH 0// Temp plot graph - PID/MPC Tuning (1624 bytes of flash) #define HAS_ESDIAG 1 // View End-stop switch continuity (560 bytes of flash) //#define HAS_CGCODE 1 // Extra Gcode options (3320 bytes of flash) diff --git a/configurations/Voxelab Aquila HC32/C2/Default/Configuration.h b/configurations/Voxelab Aquila HC32/C2/Default/Configuration.h index a176c31f5b..3cdc0c5be5 100644 --- a/configurations/Voxelab Aquila HC32/C2/Default/Configuration.h +++ b/configurations/Voxelab Aquila HC32/C2/Default/Configuration.h @@ -3469,7 +3469,7 @@ // Professional firmware features: //#define PROUI_EX 1 // Extended UI features (15152 bytes of flash) //#define CV_LASER_MODULE - #define HAS_GCODE_PREVIEW 1 + //#define HAS_GCODE_PREVIEW 1 #define DISABLE_TUNING_GRAPH 0// Temp plot graph - PID/MPC Tuning (1624 bytes of flash) #define HAS_ESDIAG 1 // View End-stop switch continuity (560 bytes of flash) #define HAS_CGCODE 1 // Extra Gcode options (3320 bytes of flash) diff --git a/configurations/Voxelab Aquila HC32/C2/MM/Configuration.h b/configurations/Voxelab Aquila HC32/C2/MM/Configuration.h index cdaab6513c..fe315fd6b5 100644 --- a/configurations/Voxelab Aquila HC32/C2/MM/Configuration.h +++ b/configurations/Voxelab Aquila HC32/C2/MM/Configuration.h @@ -3469,7 +3469,7 @@ // Professional firmware features: #define PROUI_EX 1 // Extended UI features (15152 bytes of flash) //#define CV_LASER_MODULE - #define HAS_GCODE_PREVIEW 1 + //#define HAS_GCODE_PREVIEW 1 #define DISABLE_TUNING_GRAPH 0// Temp plot graph - PID/MPC Tuning (1624 bytes of flash) #define HAS_ESDIAG 1 // View End-stop switch continuity (560 bytes of flash) #define HAS_CGCODE 1 // Extra Gcode options (3320 bytes of flash) diff --git a/configurations/Voxelab Aquila HC32/ConfigurationBLT.h b/configurations/Voxelab Aquila HC32/ConfigurationBLT.h index 52cb465200..1802031a4f 100644 --- a/configurations/Voxelab Aquila HC32/ConfigurationBLT.h +++ b/configurations/Voxelab Aquila HC32/ConfigurationBLT.h @@ -3469,7 +3469,7 @@ // Professional firmware features: #define PROUI_EX 1 // Extended UI features (15152 bytes of flash) //#define CV_LASER_MODULE - #define HAS_GCODE_PREVIEW 1 + //#define HAS_GCODE_PREVIEW 1 #define DISABLE_TUNING_GRAPH 0// Temp plot graph - PID/MPC Tuning (1624 bytes of flash) #define HAS_ESDIAG 1 // View End-stop switch continuity (560 bytes of flash) #define HAS_CGCODE 1 // Extra Gcode options (3320 bytes of flash) diff --git a/configurations/Voxelab Aquila HC32/ConfigurationDNP.h b/configurations/Voxelab Aquila HC32/ConfigurationDNP.h index cc53cf39a9..c2a42a6a5d 100644 --- a/configurations/Voxelab Aquila HC32/ConfigurationDNP.h +++ b/configurations/Voxelab Aquila HC32/ConfigurationDNP.h @@ -3469,7 +3469,7 @@ // Professional firmware features: //#define PROUI_EX 1 // Extended UI features (15152 bytes of flash) //#define CV_LASER_MODULE - #define HAS_GCODE_PREVIEW 1 + //#define HAS_GCODE_PREVIEW 1 #define DISABLE_TUNING_GRAPH 0// Temp plot graph - PID/MPC Tuning (1624 bytes of flash) #define HAS_ESDIAG 1 // View End-stop switch continuity (560 bytes of flash) #define HAS_CGCODE 1 // Extra Gcode options (3320 bytes of flash) diff --git a/configurations/Voxelab Aquila HC32/ConfigurationMM.h b/configurations/Voxelab Aquila HC32/ConfigurationMM.h index 26104a83e8..6011feb668 100644 --- a/configurations/Voxelab Aquila HC32/ConfigurationMM.h +++ b/configurations/Voxelab Aquila HC32/ConfigurationMM.h @@ -3469,7 +3469,7 @@ // Professional firmware features: #define PROUI_EX 1 // Extended UI features (15152 bytes of flash) //#define CV_LASER_MODULE - #define HAS_GCODE_PREVIEW 1 + //#define HAS_GCODE_PREVIEW 1 #define DISABLE_TUNING_GRAPH 0// Temp plot graph - PID/MPC Tuning (1624 bytes of flash) #define HAS_ESDIAG 1 // View End-stop switch continuity (560 bytes of flash) #define HAS_CGCODE 1 // Extra Gcode options (3320 bytes of flash) diff --git a/configurations/Voxelab Aquila HC32/ConfigurationUBL.h b/configurations/Voxelab Aquila HC32/ConfigurationUBL.h index e4fe326155..a4451e5b8f 100644 --- a/configurations/Voxelab Aquila HC32/ConfigurationUBL.h +++ b/configurations/Voxelab Aquila HC32/ConfigurationUBL.h @@ -3469,7 +3469,7 @@ // Professional firmware features: #define PROUI_EX 1 // Extended UI features (15152 bytes of flash) //#define CV_LASER_MODULE - #define HAS_GCODE_PREVIEW 1 + //#define HAS_GCODE_PREVIEW 1 #define DISABLE_TUNING_GRAPH 0// Temp plot graph - PID/MPC Tuning (1624 bytes of flash) #define HAS_ESDIAG 1 // View End-stop switch continuity (560 bytes of flash) //#define HAS_CGCODE 1 // Extra Gcode options (3320 bytes of flash)