Skip to content

Commit

Permalink
Update - configs
Browse files Browse the repository at this point in the history
  • Loading branch information
classicrocker883 committed Jun 8, 2024
1 parent 1433a78 commit ba41329
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3,826 deletions.
110 changes: 2 additions & 108 deletions .github/workflows/compile-configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ jobs:
> Marlin/Configuration.h
> Marlin/Configuration_adv.h
> Marlin/Version.h
cp configurations/Voxelab\ Aquila/UBL/ConfigurationPro.h Marlin/Configuration.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
Expand Down Expand Up @@ -321,7 +321,7 @@ jobs:
> Marlin/Configuration.h
> Marlin/Configuration_adv.h
> Marlin/Version.h
cp configurations/Voxelab\ Aquila/UBL/ConfigurationPro.h Marlin/Configuration.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
Expand Down Expand Up @@ -443,112 +443,6 @@ jobs:
asset_path: temp/build.bin
asset_name: ${{ steps.build_configs.outputs.filename }}
asset_content_type: application/x-binary
Build-UBL-A: # UBL for Aquila
name: Build UBL Files A
runs-on: ubuntu-latest
strategy:
matrix:
chip: [GD32,N32]
temp: [true,false]
inshape: [true,false]
tjc: [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
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;
if ($TJC); then DTMP=TJC-; else DTMP=; 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
> 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
if ($IS); then STEMP=; ITEMP='\/\/'; else STEMP='\/\/'; ITEMP=; 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 CAPABILITIES_REPORT/${ITEMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
sed -i "s/.*#define NOZZLE_CLEAN_FEATURE/${ITEMP}#define NOZZLE_CLEAN_FEATURE/" Marlin/Configuration.h
sed -i "s/.*#define USE_GRID_MESHVIEWER 1/${ITEMP}#define USE_GRID_MESHVIEWER 1/" Marlin/Configuration.h
sed -i "s/.*#define SHOW_SPEED_IND/${ITEMP}#define SHOW_SPEED_IND/" Marlin/Configuration.h
if [[ $IS == true && $AQUILA_VER == "N32" ]]; then
sed -i "s/.*#define G26_MESH_VALIDATION/\/\/#define G26_MESH_VALIDATION/" Marlin/Configuration.h
sed -i "s/.*#define HAS_ESDIAG 1/\/\/#define HAS_ESDIAG 1/" Marlin/Configuration.h
fi;
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 G26_MESH_VALIDATION/${PTEMP}#define G26_MESH_VALIDATION/" Marlin/Configuration.h
sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PTEMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
sed -i "s/.*#define CAPABILITIES_REPORT/${PTEMP}#define CAPABILITIES_REPORT/" 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 ($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 ($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
env:
AQUILA_VER: ${{ matrix.chip }}
TP: ${{ matrix.temp }}
IS: ${{ matrix.inshape }}
TJC: ${{ matrix.tjc }}
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-BLT-EX-A: # BLTouch EX for Aquila
name: Build BLT EX Files A
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion configurations/Andrew427/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -1610,7 +1610,7 @@
* | [-] |
* O-- FRONT --+
*/
#define NOZZLE_TO_PROBE_OFFSET { -45.0, -9.0, -0.05 }
#define NOZZLE_TO_PROBE_OFFSET { -45.0, -9.0, -0.60 }

// Enable and set to use a specific tool for probing. Disable to allow any tool.
//#define PROBING_TOOL 0
Expand Down
12 changes: 6 additions & 6 deletions configurations/Voxelab Aquila/UBL/Configuration.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** Aquila UBL ProUI
/** Aquila UBL ProUI-EX
* Marlin 3D Printer Firmware
* Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
Expand Down Expand Up @@ -2131,7 +2131,7 @@
/**
* Enable the G26 Mesh Validation Pattern tool.
*/
#define G26_MESH_VALIDATION
//#define G26_MESH_VALIDATION
#if ENABLED(G26_MESH_VALIDATION)
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for G26.
Expand Down Expand Up @@ -2409,7 +2409,7 @@
// When enabled Marlin will send a busy status message to the host
// every couple of seconds when it can't accept commands.
//
#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages
//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages
#define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113.
#define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating

Expand Down Expand Up @@ -2517,7 +2517,7 @@
*
* Caveats: The ending Z should be the same as starting Z.
*/
#define NOZZLE_CLEAN_FEATURE
//#define NOZZLE_CLEAN_FEATURE

#if ENABLED(NOZZLE_CLEAN_FEATURE)
#define NOZZLE_CLEAN_PATTERN_LINE // Provide 'G12 P0' - a simple linear cleaning pattern
Expand Down Expand Up @@ -3455,12 +3455,12 @@

#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)
#define HAS_ESDIAG 1 // View End-stop switch continuity (560 bytes of flash)
#define HAS_CGCODE 1 // Extra Gcode options (3320 bytes of flash)
//#define HAS_CGCODE 1 // Extra Gcode options (3320 bytes of flash)
//#define HAS_LOCKSCREEN 1 // Simple lockscreen as to not accidentally change something (568 bytes of flash)
#define USE_GRID_MESHVIEWER 1 // Enable two mesh graph types : one (1560 bytes of flash)
#define HAS_CUSTOM_COLORS 1 // Able to change display colors (2040 bytes of flash)
Expand Down
Loading

0 comments on commit ba41329

Please sign in to comment.