From b276e39ee952e0a58f95ef6f6945675dd45b4fb0 Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Thu, 23 May 2024 01:32:42 -0400 Subject: [PATCH] Update - compile-configs - rename BMP remove LCD, add icon for inputshapingZ --- .github/workflows/compile-configs.yml | 250 ++++---------------- .github/workflows/compile-configs_Ender.yml | 40 ++-- Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 3 +- Marlin/src/inc/SanityCheck.h | 14 +- Marlin/src/lcd/e3v2/proui/dwinui.h | 1 + 5 files changed, 70 insertions(+), 238 deletions(-) diff --git a/.github/workflows/compile-configs.yml b/.github/workflows/compile-configs.yml index 1c7cac1415..3576bc7c29 100644 --- a/.github/workflows/compile-configs.yml +++ b/.github/workflows/compile-configs.yml @@ -185,7 +185,7 @@ jobs: temp: [true,false] tjc: [true,false] t13: [true,false] - mp: [true,false] + bmp: [true,false] steps: - uses: actions/checkout@v4 - name: Setup node @@ -221,7 +221,7 @@ jobs: if ($TP); then TPTMP=-MPC; else TPTMP=; fi; if ($TJC); then DTMP=TJC-; else DTMP=; fi; if ($T13); then TTMP=_SPRT13; else TTMP=; fi; - if ($MP); then MPTMP=_MP; else MPTMP=; fi; + if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; echo "filename=${DTMP}Aquila_${AVTMP}${TTMP}${MPTMP}_UBL-ProUI-EX${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h @@ -242,14 +242,14 @@ jobs: sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h if ($T13); then THMP="13"; TMMP='\/\/'; else THMP="1"; TMMP=; fi; sed -i "s/.*#define TEMP_SENSOR_0 1/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; + if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; + if ($BMP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; pio run mkdir temp mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin @@ -258,7 +258,7 @@ jobs: TP: ${{ matrix.temp }} TJC: ${{ matrix.tjc }} T13: ${{ matrix.t13 }} - MP: ${{ matrix.mp }} + BMP: ${{ matrix.bmp }} - name: Get release id: get_release uses: bruceadams/get-release@v1.3.2 @@ -281,7 +281,7 @@ jobs: chip: [GD32,N32] tjc: [true,false] t13: [true,false] - mp: [true,false] + bmp: [true,false] steps: - uses: actions/checkout@v4 - name: Setup node @@ -316,7 +316,7 @@ jobs: if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi; if ($TJC); then DTMP=TJC-; else DTMP=; fi; if ($T13); then TTMP=_SPRT13; else TTMP=; fi; - if ($MP); then MPTMP=_MP; else MPTMP=; fi; + if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; echo "filename=${DTMP}Aquila_${AVTMP}${TTMP}${MPTMP}_UBL-ProUI-EX-PLR$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h @@ -335,14 +335,14 @@ jobs: if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi; sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; + if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; + if ($BMP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; pio run mkdir temp mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin @@ -350,7 +350,7 @@ jobs: AQUILA_VER: ${{ matrix.chip }} TJC: ${{ matrix.tjc }} T13: ${{ matrix.t13 }} - MP: ${{ matrix.mp }} + BMP: ${{ matrix.bmp }} - name: Get release id: get_release uses: bruceadams/get-release@v1.3.2 @@ -452,7 +452,7 @@ jobs: temp: [true,false] inshape: [true,false] tjc: [true,false] - mp: [true,false] + bmp: [true,false] steps: - uses: actions/checkout@v4 - name: Setup node @@ -488,7 +488,7 @@ jobs: if ($TP); then TPTMP=-MPC; else TPTMP=; fi; if ($IS); then ISTMP=-IS; else ISTMP=; fi; if ($TJC); then DTMP=TJC-; else DTMP=; fi; - if ($MP); then MPTMP=_MP; else MPTMP=; fi; + if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; echo "filename=${DTMP}Aquila_${AVTMP}${MPTMP}_UBL${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h @@ -518,14 +518,14 @@ jobs: if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi; sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; + if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; + if ($BMP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; pio run mkdir temp mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin @@ -534,7 +534,7 @@ jobs: TP: ${{ matrix.temp }} IS: ${{ matrix.inshape }} TJC: ${{ matrix.tjc }} - MP: ${{ matrix.mp }} + BMP: ${{ matrix.bmp }} - name: Get release id: get_release uses: bruceadams/get-release@v1.3.2 @@ -557,7 +557,7 @@ jobs: chip: [GD32,N32] temp: [true,false] tjc: [true,false] - mp: [true,false] + bmp: [true,false] steps: - uses: actions/checkout@v4 - name: Setup node @@ -592,7 +592,7 @@ jobs: if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi; if ($TP); then TPTMP=-MPC; else TPTMP=; fi; if ($TJC); then DTMP=TJC-; else DTMP=; fi; - if ($MP); then MPTMP=_MP; else MPTMP=; fi; + if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; echo "filename=${DTMP}Aquila_${AVTMP}${MPTMP}_BLT-ProUI-EX${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h @@ -609,14 +609,14 @@ jobs: if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi; sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; + if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; + if ($BMP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; pio run mkdir temp mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin @@ -624,7 +624,7 @@ jobs: AQUILA_VER: ${{ matrix.chip }} TP: ${{ matrix.temp }} TJC: ${{ matrix.tjc }} - MP: ${{ matrix.mp }} + BMP: ${{ matrix.bmp }} - name: Get release id: get_release uses: bruceadams/get-release@v1.3.2 @@ -648,7 +648,7 @@ jobs: temp: [true,false] inshape: [true,false] tjc: [true,false] - mp: [true,false] + bmp: [true,false] steps: - uses: actions/checkout@v4 - name: Setup node @@ -684,7 +684,7 @@ jobs: if ($TP); then TPTMP=-MPC; else TPTMP=; fi; if ($IS); then ISTMP=-IS; else ISTMP=; fi; if ($TJC); then DTMP=TJC-; else DTMP=; fi; - if ($MP); then MPTMP=_MP; else MPTMP=; fi; + if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; echo "filename=${DTMP}Aquila_${AVTMP}${MPTMP}_BLT${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h @@ -703,14 +703,14 @@ jobs: if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi; sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; + if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; + if ($BMP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; pio run mkdir temp mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin @@ -719,7 +719,7 @@ jobs: TP: ${{ matrix.temp }} IS: ${{ matrix.inshape }} TJC: ${{ matrix.tjc }} - MP: ${{ matrix.mp }} + BMP: ${{ matrix.bmp }} - name: Get release id: get_release uses: bruceadams/get-release@v1.3.2 @@ -897,174 +897,6 @@ jobs: asset_path: temp/build.bin asset_name: ${{ steps.build_configs.outputs.filename }} asset_content_type: application/x-binary - Build-LCD-Probe-A: # CR10 LCD w/Probe - name: Build LCD Probe MPC Files A - runs-on: ubuntu-latest - strategy: - matrix: - chip: [GD32,N32] - mp: [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 ($MP); then MPTMP=_MP; else MPTMP=; fi; - > Marlin/Configuration.h - > Marlin/Configuration_adv.h - > Marlin/Version.h - cp configurations/Voxelab\ Aquila/BLT/Configuration.h Marlin/Configuration.h - cp configurations/Voxelab\ Aquila/BLT/Configuration_adv.h Marlin/Configuration_adv.h - cp configurations/Voxelab\ Aquila/BLT/Version.h Marlin/Version.h - echo "filename=C2-Aquila_${AVTMP}${MPTMP}_BLT$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT - sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini - sed -i "s/.*#define DWIN_LCD_PROUI/\/\/#define DWIN_LCD_PROUI/" Marlin/Configuration.h - sed -i "s/.*#define CR10_STOCKDISPLAY/#define CR10_STOCKDISPLAY/" Marlin/Configuration.h - sed -i "s/.*#define LCD_BACKLIGHT_TIMEOUT_MINS.*/\/\/#define LCD_BACKLIGHT_TIMEOUT_MINS/" Marlin/Configuration_adv.h - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; - sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h - sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h - sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h - sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h - sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h - sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; - pio run - mkdir temp - mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin - env: - AQUILA_VER: ${{ matrix.chip }} - MP: ${{ matrix.mp }} - - 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 - Build-LCD-NoProbe-A: # CR10 LCD MM/Default - name: Build LCD NoProbe Files A - 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/Default-NP/Configuration.h Marlin/Configuration.h - cp configurations/Voxelab\ Aquila/Default-NP/Configuration_adv.h Marlin/Configuration_adv.h - cp configurations/Voxelab\ Aquila/Default-NP/Version.h Marlin/Version.h - elif [ "$ABL" = MM ]; then - cp configurations/Voxelab\ Aquila/MM/Configuration.h Marlin/Configuration.h - cp configurations/Voxelab\ Aquila/MM/Configuration_adv.h Marlin/Configuration_adv.h - cp configurations/Voxelab\ Aquila/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 - sed -i "s/.*#define DWIN_LCD_PROUI/\/\/#define DWIN_LCD_PROUI/" Marlin/Configuration.h - sed -i "s/.*#define CR10_STOCKDISPLAY/#define CR10_STOCKDISPLAY/" Marlin/Configuration.h - sed -i "s/.*#define LCD_BACKLIGHT_TIMEOUT_MINS.*/\/\/#define LCD_BACKLIGHT_TIMEOUT_MINS/" 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 - 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 Build-Default-A4: # Default ProUI for Aquila 427 name: Build Default Files A4 runs-on: ubuntu-latest @@ -1245,7 +1077,7 @@ jobs: inshape: [true,false] tjc: [true,false] t13: [true,false] - mp: [true,false] + bmp: [true,false] steps: - uses: actions/checkout@v4 - name: Setup node @@ -1282,7 +1114,7 @@ jobs: if ($IS); then ISTMP=-IS; else ISTMP=; fi; if ($TJC); then DTMP=TJC-; else DTMP=; fi; if ($T13); then TTMP=_SPRT13; else TTMP=; fi; - if ($MP); then MPTMP=_MP; else MPTMP=; fi; + if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; echo "filename=${DTMP}Aquila_${AVTMP}${TTMP}${MPTMP}_UBL-ProUI-EX${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h @@ -1304,14 +1136,14 @@ jobs: sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h if ($T13); then THMP="13"; else THMP="1"; fi; sed -i "s/.*#define TEMP_SENSOR_0 1/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; + if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; + if ($BMP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; pio run mkdir temp mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin @@ -1321,7 +1153,7 @@ jobs: IS: ${{ matrix.inshape }} TJC: ${{ matrix.tjc }} T13: ${{ matrix.t13 }} - MP: ${{ matrix.mp }} + BMP: ${{ matrix.bmp }} - name: Get release id: get_release uses: bruceadams/get-release@v1.3.2 @@ -1345,7 +1177,7 @@ jobs: temp: [true,false] inshape: [true,false] tjc: [true,false] - mp: [true,false] + bmp: [true,false] steps: - uses: actions/checkout@v4 - name: Setup node @@ -1381,7 +1213,7 @@ jobs: if ($TP); then TPTMP=-MPC; else TPTMP=; fi; if ($IS); then ISTMP=-IS; else ISTMP=; fi; if ($TJC); then DTMP=TJC-; else DTMP=; fi; - if ($MP); then MPTMP=_MP; else MPTMP=; fi; + if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; echo "filename=${DTMP}Aquila_${AVTMP}${MPTMP}_BLT-ProUI-EX${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h @@ -1401,14 +1233,14 @@ jobs: if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi; sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; + if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; + if ($BMP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; pio run mkdir temp mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin @@ -1417,7 +1249,7 @@ jobs: TP: ${{ matrix.temp }} IS: ${{ matrix.inshape }} TJC: ${{ matrix.tjc }} - MP: ${{ matrix.mp }} + BMP: ${{ matrix.bmp }} - name: Get release id: get_release uses: bruceadams/get-release@v1.3.2 @@ -1518,7 +1350,7 @@ jobs: abl: [UBL,BLT] temp: [true,false] inshape: [true,false] - mp: [true,false] + bmp: [true,false] steps: - uses: actions/checkout@v4 - name: Setup node @@ -1553,7 +1385,7 @@ jobs: if [ "$AQUILA_VER" = 427 ]; then AVTMP="427"; DBORD='CREALITY_V427'; else AVTMP="422"; DBORD='CREALITY_V422'; fi; if ($TP); then TPTMP=-MPC; else TPTMP=; fi; if ($IS); then ISTMP=-IS; else ISTMP=; fi; - if ($MP); then MPTMP=_MP; else MPTMP=; fi; + if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; echo "filename=C2-Aquila_${AVTMP}${MPTMP}_${ABL}${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h @@ -1571,6 +1403,7 @@ jobs: fi; sed -i "s/default_envs =.*/default_envs = STM32F103RE_creality/" platformio.ini sed -i "s/.*#define MOTHERBOARD BOARD_.*/#define MOTHERBOARD BOARD_${DBORD}/" Marlin/Configuration.h + sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/\/\/#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h sed -i "s/.*#define DWIN_LCD_PROUI/\/\/#define DWIN_LCD_PROUI/" Marlin/Configuration.h sed -i "s/.*#define CR10_STOCKDISPLAY/#define CR10_STOCKDISPLAY/" Marlin/Configuration.h sed -i "s/.*#define LCD_BACKLIGHT_TIMEOUT_MINS.*/\/\/#define LCD_BACKLIGHT_TIMEOUT_MINS/" Marlin/Configuration_adv.h @@ -1581,14 +1414,14 @@ jobs: 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 - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; + if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; + if ($BMP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; pio run mkdir temp mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin @@ -1597,7 +1430,7 @@ jobs: ABL: ${{ matrix.abl }} TP: ${{ matrix.temp }} IS: ${{ matrix.inshape }} - MP: ${{ matrix.mp }} + BMP: ${{ matrix.bmp }} - name: Get release id: get_release uses: bruceadams/get-release@v1.3.2 @@ -1670,6 +1503,7 @@ jobs: echo "filename=C2-Aquila_${AVTMP}_${ABL}${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT sed -i "s/default_envs =.*/default_envs = STM32F103RE_creality/" platformio.ini sed -i "s/.*#define MOTHERBOARD BOARD_.*/#define MOTHERBOARD BOARD_${DBORD}/" Marlin/Configuration.h + sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/\/\/#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h sed -i "s/.*#define DWIN_LCD_PROUI/\/\/#define DWIN_LCD_PROUI/" Marlin/Configuration.h sed -i "s/.*#define CR10_STOCKDISPLAY/#define CR10_STOCKDISPLAY/" Marlin/Configuration.h sed -i "s/.*#define LCD_BACKLIGHT_TIMEOUT_MINS.*/\/\/#define LCD_BACKLIGHT_TIMEOUT_MINS/" Marlin/Configuration_adv.h diff --git a/.github/workflows/compile-configs_Ender.yml b/.github/workflows/compile-configs_Ender.yml index 2c50259fb0..d94219a452 100644 --- a/.github/workflows/compile-configs_Ender.yml +++ b/.github/workflows/compile-configs_Ender.yml @@ -177,7 +177,7 @@ jobs: inshape: [true,false] tjc: [true,false] t13: [true,false] - mp: [true,false] + bmp: [true,false] steps: - uses: actions/checkout@v4 - name: Setup node @@ -213,7 +213,7 @@ jobs: if ($IS); then ISTMP=-IS; else ISTMP=; fi; if ($TJC); then DTMP=TJC-; else DTMP=; fi; if ($T13); then TTMP=_SPRT13; else TTMP=; fi - if ($MP); then MPTMP=_MP; else MPTMP=; fi; + if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; echo "filename=${DTMP}Ender${TTMP}${MPTMP}_GD32_UBL-ProUI-EX${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h @@ -233,14 +233,14 @@ jobs: sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h if ($T13); then THMP="13"; else THMP="1"; fi; sed -i "s/^#define TEMP_SENSOR_0 1/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; + if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; + if ($BMP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; pio run mkdir temp mv .pio/build/GD32F303RE_creality_maple/*.bin temp/build.bin @@ -249,7 +249,7 @@ jobs: IS: ${{ matrix.inshape }} TJC: ${{ matrix.tjc }} T13: ${{ matrix.t13 }} - MP: ${{ matrix.mp }} + BMP: ${{ matrix.bmp }} - name: Get release id: get_release uses: bruceadams/get-release@v1.3.2 @@ -362,7 +362,7 @@ jobs: temp: [true,false] inshape: [true,false] tjc: [true,false] - mp: [true,false] + bmp: [true,false] steps: - uses: actions/checkout@v4 - name: Setup node @@ -397,7 +397,7 @@ jobs: if ($TP); then TPTMP=-MPC; else TPTMP=; fi; if ($IS); then ISTMP=-IS; else ISTMP=; fi; if ($TJC); then DTMP=TJC-; else DTMP=; fi; - if ($MP); then MPTMP=_MP; else MPTMP=; fi; + if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; echo "filename=${DTMP}Ender${MPTMP}_GD32_BLT-ProUI-EX${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h @@ -415,14 +415,14 @@ jobs: sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h if ($TJC); then TJEMP=; else TJEMP='\/\/'; fi; sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; + if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; + if ($BMP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; pio run mkdir temp mv .pio/build/GD32F303RE_creality_maple/*.bin temp/build.bin @@ -430,7 +430,7 @@ jobs: TP: ${{ matrix.temp }} IS: ${{ matrix.inshape }} TJC: ${{ matrix.tjc }} - MP: ${{ matrix.mp }} + BMP: ${{ matrix.bmp }} - name: Get release id: get_release uses: bruceadams/get-release@v1.3.2 @@ -623,7 +623,7 @@ jobs: inshape: [true,false] tjc: [true,false] t13: [true,false] - mp: [true,false] + bmp: [true,false] steps: - uses: actions/checkout@v4 - name: Setup node @@ -660,7 +660,7 @@ jobs: if ($IS); then ISTMP=-IS; else ISTMP=; fi; if ($TJC); then DTMP=TJC-; else DTMP=; fi; if ($T13); then TTMP=_SPRT13; else TTMP=; fi - if ($MP); then MPTMP=_MP; else MPTMP=; fi; + if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; echo "filename=${DTMP}Ender${TTMP}${MPTMP}_${EVTMP}_UBL-ProUI-EX${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h @@ -681,14 +681,14 @@ jobs: sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h if ($T13); then THMP="13"; else THMP="1"; fi; sed -i "s/^#define TEMP_SENSOR_0 1/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; + if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; + if ($BMP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; pio run mkdir temp mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin @@ -698,7 +698,7 @@ jobs: IS: ${{ matrix.inshape }} TJC: ${{ matrix.tjc }} T13: ${{ matrix.t13 }} - MP: ${{ matrix.mp }} + BMP: ${{ matrix.bmp }} - name: Get release id: get_release uses: bruceadams/get-release@v1.3.2 @@ -722,7 +722,7 @@ jobs: temp: [true,false] inshape: [true,false] tjc: [true,false] - mp: [true,false] + bmp: [true,false] steps: - uses: actions/checkout@v4 - name: Setup node @@ -758,7 +758,7 @@ jobs: if ($TP); then TPTMP=-MPC; else TPTMP=; fi; if ($IS); then ISTMP=-IS; else ISTMP=; fi; if ($TJC); then DTMP=TJC-; else DTMP=; fi; - if ($MP); then MPTMP=_MP; else MPTMP=; fi; + if ($BMP); then MPTMP=_BMP; else MPTMP=; fi; echo "filename=${DTMP}Ender_${EVTMP}_BLT-ProUI-EX${ISTMP}${TPTMP}${MPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT > Marlin/Configuration.h > Marlin/Configuration_adv.h @@ -777,14 +777,14 @@ jobs: sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h if ($TJC); then TJEMP=; else TJEMP='\/\/'; fi; sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h - if ($MP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; + if ($BMP); then MPDEMP=; MPEMP='\/\/'; MPHS="LOW"; else MPDEMP='\/\/'; MPEMP=; MPHS="HIGH"; fi; sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/${MPDEMP}#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE ${MPHS}/" Marlin/Configuration.h sed -i "s/.*#define BLTOUCH/${MPEMP}#define BLTOUCH/" Marlin/Configuration.h sed -i "s/.*#define BIQU_MICROPROBE_V2/${MPDEMP}#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h sed -i "s/.*#define PROBE_ENABLE_DISABLE/${MPDEMP}#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h - if ($MP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; + if ($BMP); then sed -i -e "/.*#define BIQU_MICROPROBE_V2.*/a#define NO_MICROPROBE_WARNING" Marlin/Configuration.h; fi; pio run mkdir temp mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin @@ -793,7 +793,7 @@ jobs: TP: ${{ matrix.temp }} IS: ${{ matrix.inshape }} TJC: ${{ matrix.tjc }} - MP: ${{ matrix.mp }} + BMP: ${{ matrix.bmp }} - name: Get release id: get_release uses: bruceadams/get-release@v1.3.2 diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp index a7ccfe875c..c856c5c11f 100644 --- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp +++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp @@ -413,6 +413,7 @@ void unified_bed_leveling::G29() { ExtUI::onMeshUpdate(x, x, z_values[x][x]); ExtUI::onMeshUpdate(x, x2, z_values[x][x2]); #elif ENABLED(DWIN_LCD_PROUI) + DWIN_MeshUpdate(x, x, z_values[x][x]); DWIN_MeshUpdate(x, x2, z_values[x][x2]); #endif } @@ -1708,7 +1709,7 @@ void unified_bed_leveling::smart_mesh_fill() { // the point being extrapolated. Then extrapolate the mesh point from WLSF. #if ANY(PROUI_EX, PROUI_GRID_PNTS) - static_assert((GRID_LIMIT) <= 16, "GRID_MAX_POINTS_Y too big"); + static_assert((GRID_LIMIT) <= 9, "GRID_MAX_POINTS_Y too big"); #else static_assert((GRID_MAX_POINTS_Y) <= 16, "GRID_MAX_POINTS_Y too big"); #endif diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 707cc25648..266f640b91 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -1507,6 +1507,9 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i #ifdef Z_AFTER_PROBING static_assert(Z_AFTER_PROBING >= 0, "Probes require Z_AFTER_PROBING >= 0."); #endif + #ifdef Z_AFTER_HOMING + static_assert(Z_AFTER_HOMING >= 5, "Z_AFTER_HOMING must be >= 5."); + #endif #if DISABLED(DWIN_LCD_PROUI) #if MULTIPLE_PROBING > 0 || EXTRA_PROBING > 0 @@ -1743,20 +1746,13 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i #endif /** - * Make sure Z_CLEARANCE_FOR_HOMING is below Z_MAX_POS + * Make sure Z_CLEARANCE_FOR_HOMING is below Z_MAX_POS and above or equal to 2 */ #if HAS_Z_AXIS && !PROUI_EX static_assert(Z_CLEARANCE_FOR_HOMING <= Z_MAX_POS, "Z_CLEARANCE_FOR_HOMING must be smaller than or equal to Z_MAX_POS."); #endif - -/** - * Make sure Z_AFTER_HOMING or Z_POST_CLEARANCE is greater than or equal to 5 - */ -#ifdef Z_AFTER_HOMING - static_assert(Z_AFTER_HOMING >= 5, "Z_AFTER_HOMING must be greater than or equal to 5."); -#endif #ifdef Z_CLEARANCE_FOR_HOMING - static_assert(Z_CLEARANCE_FOR_HOMING >= 5, "Z_CLEARANCE_FOR_HOMING must be greater than or equal to 5."); + static_assert(Z_CLEARANCE_FOR_HOMING >= 2, "Z_CLEARANCE_FOR_HOMING must be >= 2."); #endif // Check Safe Bed Leveling settings diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.h b/Marlin/src/lcd/e3v2/proui/dwinui.h index a4dd8924bb..1805cefdf9 100644 --- a/Marlin/src/lcd/e3v2/proui/dwinui.h +++ b/Marlin/src/lcd/e3v2/proui/dwinui.h @@ -124,6 +124,7 @@ #define ICON_SetPreheat10 ICON_SetCustomPreheat #define ICON_ShapingX ICON_MoveX #define ICON_ShapingY ICON_MoveY +#define ICON_ShapingZ ICON_MoveZ #define ICON_Sound ICON_Cool #define ICON_TBSetup ICON_Contact #define ICON_TMCSet ICON_PrintSize