diff --git a/.github/workflows/compile-configs-HC32.yml b/.github/workflows/compile-configs-HC32.yml index 0d9952dc91..9743030fa9 100644 --- a/.github/workflows/compile-configs-HC32.yml +++ b/.github/workflows/compile-configs-HC32.yml @@ -55,9 +55,9 @@ jobs: cp configurations/Voxelab\ Aquila\ HC32/Configuration_advDNP.h Marlin/Configuration_adv.h cp configurations/Voxelab\ Aquila\ HC32/Version.h Marlin/Version.h sed -i "s/default_envs =.*/default_envs = HC32F460C_aquila_101/" platformio.ini - if ($IS); then TEMP=; else TEMP='\/\/'; fi; - sed -i "s/.*#define INPUT_SHAPING_X/${TEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h - sed -i "s/.*#define INPUT_SHAPING_Y/${TEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h + if ($IS); then STEMP=; else STEMP='\/\/'; fi; + sed -i "s/.*#define INPUT_SHAPING_X/${STEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h + sed -i "s/.*#define INPUT_SHAPING_Y/${STEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h sed -i "s/.*#define INPUT_SHAPING_Z/${STEMP}#define INPUT_SHAPING_Z/" Marlin/Configuration_adv.h if ($TP); then PTEMP='\/\/'; MTEMP=; else PTEMP=; MTEMP='\/\/'; fi; sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h @@ -287,9 +287,9 @@ jobs: cp configurations/Voxelab\ Aquila\ HC32/Configuration_advUBL.h Marlin/Configuration_adv.h cp configurations/Voxelab\ Aquila\ HC32/Version.h Marlin/Version.h sed -i "s/default_envs =.*/default_envs = HC32F460C_aquila_101/" platformio.ini - if ($IS); then TEMP=; fi; - sed -i "s/.*#define INPUT_SHAPING_X/${TEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h - sed -i "s/.*#define INPUT_SHAPING_Y/${TEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h + if ($IS); then STEMP=; fi; + sed -i "s/.*#define INPUT_SHAPING_X/${STEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h + sed -i "s/.*#define INPUT_SHAPING_Y/${STEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h sed -i "s/.*#define INPUT_SHAPING_Z/${STEMP}#define INPUT_SHAPING_Z/" Marlin/Configuration_adv.h pio run mkdir temp @@ -355,9 +355,9 @@ jobs: cp configurations/Voxelab\ Aquila\ HC32/Configuration_advBLT.h Marlin/Configuration_adv.h cp configurations/Voxelab\ Aquila\ HC32/Version.h Marlin/Version.h sed -i "s/default_envs =.*/default_envs = HC32F460C_aquila_101/" platformio.ini - if ($IS); then TEMP=; else TEMP='\/\/'; fi; - sed -i "s/.*#define INPUT_SHAPING_X/${TEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h - sed -i "s/.*#define INPUT_SHAPING_Y/${TEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h + if ($IS); then STEMP=; else STEMP='\/\/'; fi; + sed -i "s/.*#define INPUT_SHAPING_X/${STEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h + sed -i "s/.*#define INPUT_SHAPING_Y/${STEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h sed -i "s/.*#define INPUT_SHAPING_Z/${STEMP}#define INPUT_SHAPING_Z/" Marlin/Configuration_adv.h pio run mkdir temp @@ -378,3 +378,89 @@ jobs: asset_path: temp/build.bin asset_name: ${{ steps.build_configs.outputs.filename }} asset_content_type: application/x-binary + Build-C2-NoProbe: # CR10 LCD C2 MM/Default + name: Build C2 NoProbe Files + runs-on: ubuntu-latest + strategy: + matrix: + chip: [GD32,N32] + abl: [MM,Default] + temp: [true,false] + inshape: [true,false] + steps: + - uses: actions/checkout@v4 + - name: Setup node + uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Cache pip + 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@v4 + with: + path: ~/.platformio + key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.10' + - 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 + id: build_configs + run: | + if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi; + if ($TP); then TPTMP=-MPC; else TPTMP=; fi; + if ($IS); then ISTMP=-IS; else ISTMP=; fi; + > Marlin/Configuration.h + > Marlin/Configuration_adv.h + > Marlin/Version.h + if [ "$ABL" = Default ]; then + cp configurations/Voxelab\ Aquila\ HC32/C2/Default-NP/Configuration.h Marlin/Configuration.h + cp configurations/Voxelab\ Aquila\ HC32/C2/Default-NP/Configuration_adv.h Marlin/Configuration_adv.h + cp configurations/Voxelab\ Aquila\ HC32/C2/Default-NP/Version.h Marlin/Version.h + elif [ "$ABL" = MM ]; then + cp configurations/Voxelab\ Aquila\ HC32/C2/MM/Configuration.h Marlin/Configuration.h + cp configurations/Voxelab\ Aquila\ HC32/C2/MM/Configuration_adv.h Marlin/Configuration_adv.h + cp configurations/Voxelab\ Aquila\ HC32/C2/MM/Version.h Marlin/Version.h + fi; + echo "filename=C2-Aquila_${AVTMP}_${ABL}${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT + sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini + if ($IS); then STEMP=; else STEMP='\/\/'; fi; + sed -i "s/.*#define INPUT_SHAPING_X/${STEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h + sed -i "s/.*#define INPUT_SHAPING_Y/${STEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h + sed -i "s/.*#define INPUT_SHAPING_Z/${STEMP}#define INPUT_SHAPING_Z/" Marlin/Configuration_adv.h + if ($TP); then PTEMP='\/\/'; MTEMP=; else PTEMP=; MTEMP='\/\/'; fi; + sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h + sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h + pio run + mkdir temp + mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin + env: + AQUILA_VER: ${{ matrix.chip }} + ABL: ${{ matrix.abl }} + TP: ${{ matrix.temp }} + IS: ${{ matrix.inshape }} + - name: Get release + id: get_release + uses: bruceadams/get-release@v1.3.2 + env: + GITHUB_TOKEN: ${{ github.token }} + - name: Upload Release Asset + uses: tanyagray/action-upload-release-asset@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.get_release.outputs.upload_url }} + asset_path: temp/build.bin + asset_name: ${{ steps.build_configs.outputs.filename }} + asset_content_type: application/x-binary \ No newline at end of file diff --git a/configurations/Voxelab Aquila HC32/C2/Default-NP/Configuration.h b/configurations/Voxelab Aquila HC32/C2/Default-NP/Configuration.h index c1abeff407..b54635be9b 100644 --- a/configurations/Voxelab Aquila HC32/C2/Default-NP/Configuration.h +++ b/configurations/Voxelab Aquila HC32/C2/Default-NP/Configuration.h @@ -22,7 +22,7 @@ #pragma once // Edited by classicrocker883 for ProUI -// https://github.com/classicrocker883/MriscocProUI +// https://github.com/classicrocker883/MRiscoCProUI // Created from Mriscoc's Professional Firmware // https://github.com/mriscoc/Ender3V2S1 @@ -2746,7 +2746,7 @@ // // Set this option if CLOCKWISE causes values to DECREASE // -#define REVERSE_ENCODER_DIRECTION //Aquila enable -- Ender disable +//#define REVERSE_ENCODER_DIRECTION //Aquila enable -- Ender disable // // This option reverses the encoder direction for navigating LCD menus. @@ -3451,13 +3451,13 @@ // // DWIN / DACAI LCD 4.3" 480x272 -#define DWIN_LCD_PROUI // Pro UI by MRiscoC +//#define DWIN_LCD_PROUI // Pro UI by MRiscoC //#define DACAI_DISPLAY //#define TJC_DISPLAY #if ENABLED(DWIN_LCD_PROUI) // Professional firmware features: - #define PROUI_EX 1 // Extended UI features (15152 bytes of flash) + //#define PROUI_EX 1 // Extended UI features (15152 bytes of flash) //#define CV_LASER_MODULE #define HAS_GCODE_PREVIEW 1 #define DISABLE_TUNING_GRAPH 0// Temp plot graph - PID/MPC Tuning (1624 bytes of flash) @@ -3500,7 +3500,7 @@ // 2.4" 128x64 LCD // -//#define CR10_STOCKDISPLAY //For Ender-3 / Aquila C2 blue/white monochrome LCD +#define CR10_STOCKDISPLAY //For Ender-3 / Aquila C2 blue/white monochrome LCD #if ENABLED(CR10_STOCKDISPLAY) //BTT_SKR_MINI_E3 #define RET6_12864_LCD #endif diff --git a/configurations/Voxelab Aquila HC32/C2/Default-NP/Configuration_adv.h b/configurations/Voxelab Aquila HC32/C2/Default-NP/Configuration_adv.h index 5d0a95dee3..c49f6c1159 100644 --- a/configurations/Voxelab Aquila HC32/C2/Default-NP/Configuration_adv.h +++ b/configurations/Voxelab Aquila HC32/C2/Default-NP/Configuration_adv.h @@ -22,7 +22,7 @@ #pragma once // Edited by classicrocker883 for ProUI -// https://github.com/classicrocker883/MriscocProUI +// https://github.com/classicrocker883/MRiscoCProUI // Created by configs generator for Professional firmware // https://github.com/mriscoc/Ender3V2S1 @@ -2258,7 +2258,7 @@ * LCD Backlight Timeout * Requires a display with a controllable backlight */ -#define LCD_BACKLIGHT_TIMEOUT_MINS 10 // (minutes) Timeout before turning off the backlight +//#define LCD_BACKLIGHT_TIMEOUT_MINS 10 // (minutes) Timeout before turning off the backlight #if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS) #define EDITABLE_DISPLAY_TIMEOUT // Edit sleep / backlight timeout with M255 S and a menu item @@ -3949,7 +3949,7 @@ #define CAPABILITIES_REPORT #if ENABLED(CAPABILITIES_REPORT) // Include capabilities in M115 output - #define EXTENDED_CAPABILITIES_REPORT // (1000 bytes of flash) + //#define EXTENDED_CAPABILITIES_REPORT // (1000 bytes of flash) #if ENABLED(EXTENDED_CAPABILITIES_REPORT) #define M115_GEOMETRY_REPORT // (448 bytes of flash) MRiscoC Enabled #endif diff --git a/configurations/Voxelab Aquila HC32/C2/MM/Configuration.h b/configurations/Voxelab Aquila HC32/C2/MM/Configuration.h index ee482feea5..759c466e23 100644 --- a/configurations/Voxelab Aquila HC32/C2/MM/Configuration.h +++ b/configurations/Voxelab Aquila HC32/C2/MM/Configuration.h @@ -22,7 +22,7 @@ #pragma once // Edited by classicrocker883 for ProUI -// https://github.com/classicrocker883/MriscocProUI +// https://github.com/classicrocker883/MRiscoCProUI // Created from Mriscoc's Professional Firmware // https://github.com/mriscoc/Ender3V2S1 @@ -2746,7 +2746,7 @@ // // Set this option if CLOCKWISE causes values to DECREASE // -#define REVERSE_ENCODER_DIRECTION //Aquila enable -- Ender disable +//#define REVERSE_ENCODER_DIRECTION //Aquila enable -- Ender disable // // This option reverses the encoder direction for navigating LCD menus. @@ -3451,7 +3451,7 @@ // // DWIN / DACAI LCD 4.3" 480x272 -#define DWIN_LCD_PROUI // Pro UI by MRiscoC +//#define DWIN_LCD_PROUI // Pro UI by MRiscoC //#define DACAI_DISPLAY //#define TJC_DISPLAY @@ -3500,7 +3500,7 @@ // 2.4" 128x64 LCD // -//#define CR10_STOCKDISPLAY //For Ender-3 / Aquila C2 blue/white monochrome LCD +#define CR10_STOCKDISPLAY //For Ender-3 / Aquila C2 blue/white monochrome LCD #if ENABLED(CR10_STOCKDISPLAY) //BTT_SKR_MINI_E3 #define RET6_12864_LCD #endif diff --git a/configurations/Voxelab Aquila HC32/C2/MM/Configuration_adv.h b/configurations/Voxelab Aquila HC32/C2/MM/Configuration_adv.h index 5d0a95dee3..c49f6c1159 100644 --- a/configurations/Voxelab Aquila HC32/C2/MM/Configuration_adv.h +++ b/configurations/Voxelab Aquila HC32/C2/MM/Configuration_adv.h @@ -22,7 +22,7 @@ #pragma once // Edited by classicrocker883 for ProUI -// https://github.com/classicrocker883/MriscocProUI +// https://github.com/classicrocker883/MRiscoCProUI // Created by configs generator for Professional firmware // https://github.com/mriscoc/Ender3V2S1 @@ -2258,7 +2258,7 @@ * LCD Backlight Timeout * Requires a display with a controllable backlight */ -#define LCD_BACKLIGHT_TIMEOUT_MINS 10 // (minutes) Timeout before turning off the backlight +//#define LCD_BACKLIGHT_TIMEOUT_MINS 10 // (minutes) Timeout before turning off the backlight #if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS) #define EDITABLE_DISPLAY_TIMEOUT // Edit sleep / backlight timeout with M255 S and a menu item @@ -3949,7 +3949,7 @@ #define CAPABILITIES_REPORT #if ENABLED(CAPABILITIES_REPORT) // Include capabilities in M115 output - #define EXTENDED_CAPABILITIES_REPORT // (1000 bytes of flash) + //#define EXTENDED_CAPABILITIES_REPORT // (1000 bytes of flash) #if ENABLED(EXTENDED_CAPABILITIES_REPORT) #define M115_GEOMETRY_REPORT // (448 bytes of flash) MRiscoC Enabled #endif