Update - compile-configs - _UBL -IS

classicrocker883 · Sep 10, 2024 · a1e8326 · a1e8326
1 parent 298e0f7
commit a1e8326
Showing 1 changed file with 102 additions and 100 deletions.
diff --git a/.github/workflows/compile-configs.yml b/.github/workflows/compile-configs.yml
@@ -177,7 +177,6 @@ jobs:
       matrix:
         chip: [GD32,N32]
         plr: [true,false]
-        inshape: [true,false]
         temp: [true,false]
         tjc: [true,false]
         t13: [true,false]
@@ -212,12 +211,11 @@ jobs:
       run: |
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
         if ($PLR); then PLTMP=-PLR; else PLTMP=; fi;
-        if ($IS); then TP=false; ISTMP=-IS; else ISTMP=; fi;
-        if ($TP); then IS=false; TPTMP=-MPC; else TPTMP=; fi;
+        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 ($BMP); then MPTMP=_BMP; else MPTMP=; fi;
-        echo "filename=${DTMP}Aquila_${AVTMP}${TTMP}${MPTMP}_UBL-ProUI-EX${PLTMP}${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
+        echo "filename=${DTMP}Aquila_${AVTMP}${TTMP}${MPTMP}_UBL-ProUI-EX${PLTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
         > Marlin/Version.h
@@ -228,19 +226,15 @@ jobs:
         if ($PLR); then PLMP='\/\/'; PRMP=; else PLMP=; PRMP='\/\/'; fi;
         sed -i "s/.*#define PROUI_ITEM_PLR/${PRMP}#define PROUI_ITEM_PLR/" Marlin/Configuration.h
         sed -i "s/.*#define POWER_LOSS_RECOVERY/${PRMP}#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
-        if ($IS); then ISTEMP='\/\/'; STEMP=; else ISTEMP=; 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
-        sed -i "s/.*#define NONLINEAR_EXTRUSION/${PRMP}${STEMP}#define NONLINEAR_EXTRUSION/" Marlin/Configuration_adv.h
-        sed -i "s/.*#define MARLIN_SMALL_BUILD/${PRMP}${STEMP}#define MARLIN_SMALL_BUILD/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define NONLINEAR_EXTRUSION/${PRMP}#define NONLINEAR_EXTRUSION/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define MARLIN_SMALL_BUILD/${PRMP}#define MARLIN_SMALL_BUILD/" 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
         sed -i "s/.*#define PREHEAT_2_LABEL/${PTEMP}#define PREHEAT_2_LABEL/" Marlin/Configuration.h
         sed -i "s/.*#define USE_GRID_MESHVIEWER 1/${PTEMP}#define USE_GRID_MESHVIEWER 1/" Marlin/Configuration.h
         sed -i "s/.*#define CAPABILITIES_REPORT/${PTEMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
-        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PLMP}${ISTEMP}${PTEMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
+        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PLMP}${PTEMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
         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
@@ -260,7 +254,6 @@ jobs:
       env:
         AQUILA_VER: ${{ matrix.chip }}
         PLR: ${{ matrix.plr }}
-        IS: ${{ matrix.inshape }}
         TP: ${{ matrix.temp }}
         TJC: ${{ matrix.tjc }}
         T13: ${{ matrix.t13 }}
@@ -279,94 +272,103 @@ jobs:
         asset_path: temp/build.bin
         asset_name: ${{ steps.build_configs.outputs.filename }}
         asset_content_type: application/x-binary
-  # Build-UBL-EX-PLR-A:            # UBL EX PLR for Aquila
-  #   name: Build UBL EX PLR Files A
-  #   runs-on: ubuntu-latest
-  #   strategy:
-  #     matrix:
-  #       chip: [GD32,N32]
-  #       tjc: [true,false]
-  #       t13: [true,false]
-  #       bmp: [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 wheel platformio
-  #   - name: Run PlatformIO
-  #     id: build_configs
-  #     run: |
-  #       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 ($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
-  #       > Marlin/Version.h
-  #       cp configurations/Voxelab\ Aquila/UBL/Configuration.h Marlin/Configuration.h
-  #       cp configurations/Voxelab\ Aquila/UBL/Configuration_adv.h Marlin/Configuration_adv.h
-  #       cp configurations/Voxelab\ Aquila/UBL/Version.h Marlin/Version.h
-  #       sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
-  #       sed -i "s/.*#define HAS_CUSTOM_COLORS 1/\/\/#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
-  #       sed -i "s/.*#define PROUI_ITEM_PLR/#define PROUI_ITEM_PLR/" Marlin/Configuration.h
-  #       sed -i "s/.*#define POWER_LOSS_RECOVERY/#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
-  #       sed -i "s/.*#define NO_HOME_OFFSETS/#define NO_HOME_OFFSETS/" Marlin/Configuration_adv.h
-  #       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 ($T13); then THMP="13"; DSMP="424.9"; else THMP="1"; DSMP="98"; fi;
-  #       sed -i "s/^#define TEMP_SENSOR_0.*/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
-  #       sed -i "s/.*#define DEFAULT_AXIS_STEPS_PER_UNIT.*/#define DEFAULT_AXIS_STEPS_PER_UNIT { 80,80,400,${DSMP} }/" Marlin/Configuration.h
-  #       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
-  #       pio run
-  #       mkdir temp
-  #       mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
-  #     env:
-  #       AQUILA_VER: ${{ matrix.chip }}
-  #       TJC: ${{ matrix.tjc }}
-  #       T13: ${{ matrix.t13 }}
-  #       BMP: ${{ matrix.bmp }}
-  #   - name: Get release
-  #     id: get_release
-  #     uses: bruceadams/[email protected]
-  #     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-UBL-EX-IS-A:            # UBL EX IS for Aquila
+    name: Build UBL EX IS Files A
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        chip: [GD32,N32]
+        plr: [true,false]
+        tjc: [true,false]
+        t13: [true,false]
+        bmp: [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 wheel platformio
+    - name: Run PlatformIO
+      id: build_configs
+      run: |
+        if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
+        if ($PLR); then PLTMP=-PLR; else PLTMP=; fi;
+        if ($TJC); then DTMP=TJC-; else DTMP=; fi;
+        if ($T13); then TTMP=_SPRT13; else TTMP=; fi;
+        if ($BMP); then MPTMP=_BMP; else MPTMP=; fi;
+        echo "filename=${DTMP}Aquila_${AVTMP}${TTMP}${MPTMP}_UBL-ProUI-EX${PLTMP}-IS$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
+        > Marlin/Configuration.h
+        > Marlin/Configuration_adv.h
+        > Marlin/Version.h
+        cp configurations/Voxelab\ Aquila/UBL/Configuration.h Marlin/Configuration.h
+        cp configurations/Voxelab\ Aquila/UBL/Configuration_adv.h Marlin/Configuration_adv.h
+        cp configurations/Voxelab\ Aquila/UBL/Version.h Marlin/Version.h
+        sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
+        sed -i "s/.*#define NONLINEAR_EXTRUSION/#define NONLINEAR_EXTRUSION/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define MARLIN_SMALL_BUILD/#define MARLIN_SMALL_BUILD/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/\/\/#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
+        sed -i "s/.*#define NO_HOME_OFFSETS/#define NO_HOME_OFFSETS/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define INPUT_SHAPING_X/#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define INPUT_SHAPING_Y/#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define INPUT_SHAPING_Z/#define INPUT_SHAPING_Z/" Marlin/Configuration_adv.h
+        if ($PLR); then PRMP=; else PRMP='\/\/'; fi;
+        sed -i "s/.*#define PROUI_ITEM_PLR/${PRMP}#define PROUI_ITEM_PLR/" Marlin/Configuration.h
+        sed -i "s/.*#define POWER_LOSS_RECOVERY/${PRMP}#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
+        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 ($T13); then THMP="13"; DSMP="424.9"; else THMP="1"; DSMP="98"; fi;
+        sed -i "s/^#define TEMP_SENSOR_0.*/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
+        sed -i "s/.*#define DEFAULT_AXIS_STEPS_PER_UNIT.*/#define DEFAULT_AXIS_STEPS_PER_UNIT { 80,80,400,${DSMP} }/" Marlin/Configuration.h
+        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
+        pio run
+        mkdir temp
+        mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
+      env:
+        AQUILA_VER: ${{ matrix.chip }}
+        PLR: ${{ matrix.plr }}
+        TJC: ${{ matrix.tjc }}
+        T13: ${{ matrix.t13 }}
+        BMP: ${{ matrix.bmp }}
+    - name: Get release
+      id: get_release
+      uses: bruceadams/[email protected]
+      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-UBL-EX-IND-A:            # UBL EX for Aquila X3/S2
     name: Build UBL EX IND Files A
     runs-on: ubuntu-latest