Skip to content

Commit 7276ce9

Browse files
classicrocker883classicrocker883
committed
Update - compile-configs - C2, UBL-SKR
1 parent eddb161 commit 7276ce9

28 files changed

Lines changed: 288 additions & 56 deletions

‎.github/workflows/compile-configs.yml‎

Lines changed: 69 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -424,14 +424,30 @@ jobs:
424424
runs-on: ubuntu-latest
425425
strategy:
426426
matrix:
427-
chip: [V3_0,V2_0,V3_0_1]
428-
tjc: [true,false]
429-
t5: [true,false]
430-
t13: [true,false]
431-
bmp: [true,false]
427+
chip: [V3_0,V2_0,V3_0_1]
428+
inshape: [true,false]
429+
temp: [true,false]
430+
tjc: [true,false]
431+
t5: [true,false]
432+
t13: [true,false]
433+
bmp: [true,false]
432434
exclude:
433-
- t5: true
434-
t13: true
435+
- t5: true
436+
t13: true
437+
- chip: V2_0
438+
inshape: true
439+
- chip: V2_0
440+
temp: true
441+
- chip: V2_0
442+
inshape: true
443+
temp: true
444+
- chip: V3_0_1
445+
inshape: true
446+
- chip: V3_0_1
447+
temp: true
448+
- chip: V3_0_1
449+
inshape: true
450+
temp: true
435451
steps:
436452
- uses: actions/checkout@v6.0.0
437453
- name: Set up node
@@ -464,11 +480,13 @@ jobs:
464480
elif [ "$SKR" = V2_0 ]; then AVTMP=-V2; SKTMP="STM32F103RC"
465481
elif [ "$SKR" = V3_0_1 ]; then AVTMP=-V3-0-1; SKTMP="STM32F401RC"
466482
fi;
483+
if ($IS); then ISTMP=-IS; else ISTMP=; fi;
484+
if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
467485
if ($TJC); then DTMP=TJC-; else DTMP=; fi;
468486
if ($T5); then STMP=_SPDY5; else STMP=; fi;
469487
if ($T13); then TTMP=_SPRT13; else TTMP=; fi;
470488
if ($BMP); then MPTMP=_BMP; else MPTMP=; fi;
471-
echo "filename=${DTMP}Aquila_SKR-Mini-E3${AVTMP}${TTMP}${STMP}${MPTMP}_UBL-ProUI-EX$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
489+
echo "filename=${DTMP}Aquila_SKR-Mini-E3${AVTMP}${TTMP}${STMP}${MPTMP}_UBL-ProUI-EX${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
472490
> Marlin/Configuration.h
473491
> Marlin/Configuration_adv.h
474492
> Marlin/Version.h
@@ -491,6 +509,13 @@ jobs:
491509
if [ "$SKR" = V3_0 ]; then
492510
sed -i "s/.*#define EDITABLE_HOMING_FEEDRATE.*/#define EDITABLE_HOMING_FEEDRATE/" Marlin/Configuration.h
493511
fi;
512+
if ($IS); then STEMP=; else STEMP='\/\/'; fi;
513+
for axis in X Y Z; do
514+
sed -i "s/.*#define INPUT_SHAPING_${axis}/${STEMP}#define INPUT_SHAPING_${axis}/" Marlin/Configuration_adv.h
515+
done
516+
if ($TP); then PTEMP='\/\/'; MTEMP=; else PTEMP=; MTEMP='\/\/'; fi;
517+
sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
518+
sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
494519
if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
495520
sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
496521
sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
@@ -514,6 +539,8 @@ jobs:
514539
mv .pio/build/${SKTMP}_btt/*.bin temp/build.bin
515540
env:
516541
SKR: ${{ matrix.chip }}
542+
IS: ${{ matrix.inshape }}
543+
TP: ${{ matrix.temp }}
517544
TJC: ${{ matrix.tjc }}
518545
T5: ${{ matrix.t5 }}
519546
T13: ${{ matrix.t13 }}
@@ -537,9 +564,26 @@ jobs:
537564
runs-on: ubuntu-latest
538565
strategy:
539566
matrix:
540-
chip: [V3_0,V2_0,V3_0_1]
541-
tjc: [true,false]
542-
t5: [true,false]
567+
chip: [V3_0,V2_0,V3_0_1]
568+
inshape: [true,false]
569+
temp: [true,false]
570+
tjc: [true,false]
571+
t5: [true,false]
572+
exclude:
573+
- chip: V2_0
574+
inshape: true
575+
- chip: V2_0
576+
temp: true
577+
- chip: V2_0
578+
inshape: true
579+
temp: true
580+
- chip: V3_0_1
581+
inshape: true
582+
- chip: V3_0_1
583+
temp: true
584+
- chip: V3_0_1
585+
inshape: true
586+
temp: true
543587
steps:
544588
- uses: actions/checkout@v6.0.0
545589
- name: Set up node
@@ -572,9 +616,11 @@ jobs:
572616
elif [ "$SKR" = V2_0 ]; then AVTMP=-V2; SKTMP="STM32F103RC"
573617
elif [ "$SKR" = V3_0_1 ]; then AVTMP=-V3-0-1; SKTMP="STM32F401RC"
574618
fi;
575-
if ($TJC); then DTMP=TJC-; else DTMP=; fi;
576-
if ($T5); then STMP=_SPDY5; else STMP=; fi;
577-
echo "filename=${DTMP}Aquila_SKR-Mini-E3${AVTMP}${STMP}${TTMP}_MM-ProUI-EX$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
619+
if ($IS); then ISTMP=-IS; else ISTMP=; fi;
620+
if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
621+
if ($TJC); then DTMP=TJC-; else DTMP=; fi;
622+
if ($T5); then STMP=_SPDY5; else STMP=; fi;
623+
echo "filename=${DTMP}Aquila_SKR-Mini-E3${AVTMP}${STMP}${TTMP}_MM-ProUI-EX${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
578624
> Marlin/Configuration.h
579625
> Marlin/Configuration_adv.h
580626
> Marlin/Version.h
@@ -596,6 +642,13 @@ jobs:
596642
if [ "$SKR" = V3_0 ]; then
597643
sed -i "s/.*#define EDITABLE_HOMING_FEEDRATE.*/#define EDITABLE_HOMING_FEEDRATE/" Marlin/Configuration.h
598644
fi;
645+
if ($IS); then STEMP=; else STEMP='\/\/'; fi;
646+
for axis in X Y Z; do
647+
sed -i "s/.*#define INPUT_SHAPING_${axis}/${STEMP}#define INPUT_SHAPING_${axis}/" Marlin/Configuration_adv.h
648+
done
649+
if ($TP); then PTEMP='\/\/'; MTEMP=; else PTEMP=; MTEMP='\/\/'; fi;
650+
sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
651+
sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
599652
if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
600653
sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
601654
sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
@@ -606,6 +659,8 @@ jobs:
606659
mv .pio/build/${SKTMP}_btt/*.bin temp/build.bin
607660
env:
608661
SKR: ${{ matrix.chip }}
662+
IS: ${{ matrix.inshape }}
663+
TP: ${{ matrix.temp }}
609664
TJC: ${{ matrix.tjc }}
610665
T5: ${{ matrix.t5 }}
611666
- name: Get release

‎.github/workflows/compile-configs_C2.yml‎

Lines changed: 125 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,10 +344,119 @@ jobs:
344344
fi;
345345
sed -i "s/default_envs =.*/default_envs = STM32F103RE_creality/" platformio.ini
346346
sed -i "s/.*#define MOTHERBOARD BOARD_.*/#define MOTHERBOARD BOARD_${DBORD}/" Marlin/Configuration.h
347+
if ($IS); then STEMP=; else STEMP='\/\/'; fi;
348+
for axis in X Y Z; do
349+
sed -i "s/.*#define INPUT_SHAPING_${axis}/${STEMP}#define INPUT_SHAPING_${axis}/" Marlin/Configuration_adv.h
350+
done
351+
if ($TP); then PTEMP='\/\/'; MTEMP=; else PTEMP=; MTEMP='\/\/'; fi;
352+
sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
353+
sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
354+
case "${T5}-${T13}" in
355+
true-false) THMP="5"; DSMP="98" ;;
356+
false-true) THMP="13"; DSMP="424.9" ;;
357+
*) THMP="1"; DSMP="98" ;;
358+
esac
359+
sed -i "s/^#define TEMP_SENSOR_0.*/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
360+
sed -i "s/.*#define DEFAULT_AXIS_STEPS_PER_UNIT.*/#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, ${DSMP} }/" Marlin/Configuration.h
361+
if ($BMP); then
362+
sed -i "s/.*#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN/" Marlin/Configuration.h
363+
sed -i "s/.*#define Z_MIN_ENDSTOP_HIT_STATE.*/#define Z_MIN_ENDSTOP_HIT_STATE LOW/" Marlin/Configuration.h
364+
sed -i "s/.*#define Z_MIN_PROBE_ENDSTOP_HIT_STATE.*/#define Z_MIN_PROBE_ENDSTOP_HIT_STATE LOW/" Marlin/Configuration.h
365+
sed -i "s/.*#define BLTOUCH/\/\/#define BLTOUCH/" Marlin/Configuration.h
366+
sed -i "s/.*#define BIQU_MICROPROBE_V2/#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h
367+
sed -i "s/.*#define PROBE_ENABLE_DISABLE/#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h
368+
fi;
347369
sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/\/\/#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
348370
sed -i "s/.*#define DWIN_LCD_PROUI/\/\/#define DWIN_LCD_PROUI/" Marlin/Configuration.h
349371
sed -i "s/.*#define CR10_STOCKDISPLAY/#define CR10_STOCKDISPLAY/" Marlin/Configuration.h
350372
sed -i "s/.*#define LCD_BACKLIGHT_TIMEOUT_MINS.*/\/\/#define LCD_BACKLIGHT_TIMEOUT_MINS/" Marlin/Configuration_adv.h
373+
sed -i "s/.*#define LCD_BED_TRAMMING/#define LCD_BED_TRAMMING/" Marlin/Configuration.h
374+
sed -i "s/.*#define ASSISTED_TRAMMING\b/#define ASSISTED_TRAMMING/" Marlin/Configuration_adv.h
375+
sed -i "s/.*#define ASSISTED_TRAMMING_WIZARD.*/#define ASSISTED_TRAMMING_WIZARD/" Marlin/Configuration_adv.h
376+
NUMBERS_ONLY=$(grep "^#define NOZZLE_TO_PROBE_OFFSET" Marlin/Configuration.h | sed -e 's/.*{//' -e 's/}.*//' | xargs)
377+
OFFSET_X=$(echo "$NUMBERS_ONLY" | awk -F ',' '{print $1}' | xargs)
378+
OFFSET_Y=$(echo "$NUMBERS_ONLY" | awk -F ',' '{print $2}' | xargs)
379+
NEW_TRAMMING_PTS="#define TRAMMING_POINT_XY { { 29, 29 }, { X_BED_SIZE + (${OFFSET_X}), 29 }, { X_BED_SIZE + (${OFFSET_X}), Y_BED_SIZE + (${OFFSET_Y}) }, { 29, Y_BED_SIZE + (${OFFSET_Y}) } }"
380+
sed -i "s/.*#define TRAMMING_POINT_XY.*/${NEW_TRAMMING_PTS}/" Marlin/Configuration_adv.h
381+
pio run
382+
mkdir temp
383+
mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin
384+
env:
385+
AQUILA_VER: ${{ matrix.chip }}
386+
ABL: ${{ matrix.abl }}
387+
IS: ${{ matrix.inshape }}
388+
TP: ${{ matrix.temp }}
389+
T5: ${{ matrix.t5 }}
390+
T13: ${{ matrix.t13 }}
391+
BMP: ${{ matrix.bmp }}
392+
- name: Get release
393+
id: get_release
394+
uses: bruceadams/get-release@v1.3.2
395+
env:
396+
GITHUB_TOKEN: ${{ github.token }}
397+
- name: Upload A Release Asset
398+
uses: classicrocker883/upload-a-release-asset@latest
399+
env:
400+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
401+
with:
402+
upload_url: ${{ steps.get_release.outputs.upload_url }}
403+
asset_path: temp/build.bin
404+
asset_name: ${{ steps.build_configs.outputs.filename }}
405+
asset_content_type: application/x-binary
406+
Build-C2-UBL-SKR-V3-A: # CR10 LCD UBL for Aquila, SKR Mini V3
407+
name: Build C2 UBL SKR V3 Files A
408+
runs-on: ubuntu-latest
409+
strategy:
410+
matrix:
411+
inshape: [true,false]
412+
temp: [true,false]
413+
t5: [true,false]
414+
t13: [true,false]
415+
bmp: [true,false]
416+
exclude:
417+
- t5: true
418+
t13: true
419+
steps:
420+
- uses: actions/checkout@v6.0.0
421+
- name: Set up node
422+
uses: actions/setup-node@v6.0.0
423+
with:
424+
node-version: 20
425+
- name: Cache pip
426+
uses: actions/cache@v4.3.0
427+
with:
428+
path: ~/.cache/pip
429+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
430+
restore-keys: |
431+
${{ runner.os }}-pip-
432+
- name: Cache PlatformIO
433+
uses: actions/cache@v4.3.0
434+
with:
435+
path: ~/.platformio
436+
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
437+
- name: Select Python 3.13
438+
uses: actions/setup-python@v6.0.0
439+
with:
440+
python-version: "3.13"
441+
- name: Install PlatformIO
442+
run: |
443+
python3 -m pip install --upgrade pip wheel platformio
444+
- name: Run PlatformIO
445+
id: build_configs
446+
run: |
447+
if ($IS); then ISTMP=-IS; else ISTMP=; fi;
448+
if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
449+
if ($T5); then STMP=_SPDY5; else STMP=; fi;
450+
if ($T13); then TTMP=_SPRT13; else TTMP=; fi;
451+
if ($BMP); then MPTMP=_BMP; else MPTMP=; fi;
452+
echo "filename=C2_SKR-Mini-E3-V3${TTMP}${STMP}${MPTMP}_UBL${ISTMP}${TPTMP}$(date +"-%m-%d").bin" >> $GITHUB_OUTPUT
453+
> Marlin/Configuration.h
454+
> Marlin/Configuration_adv.h
455+
> Marlin/Version.h
456+
cp configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration.h Marlin/Configuration.h
457+
cp configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration_adv.h Marlin/Configuration_adv.h
458+
cp configurations/BTT_SKR-Mini-E3-V3/UBL/Version.h Marlin/Version.h
459+
sed -i "s/default_envs =.*/default_envs = STM32G0B1RE_btt/" platformio.ini
351460
if ($IS); then STEMP=; else STEMP='\/\/'; fi;
352461
for axis in X Y Z; do
353462
sed -i "s/.*#define INPUT_SHAPING_${axis}/${STEMP}#define INPUT_SHAPING_${axis}/" Marlin/Configuration_adv.h
@@ -370,12 +479,25 @@ jobs:
370479
sed -i "s/.*#define BIQU_MICROPROBE_V2/#define BIQU_MICROPROBE_V2/" Marlin/Configuration.h
371480
sed -i "s/.*#define PROBE_ENABLE_DISABLE/#define PROBE_ENABLE_DISABLE/" Marlin/Configuration.h
372481
fi;
482+
sed -i "s/.*#define SERIAL_PORT\b.*/#define SERIAL_PORT 2/" Marlin/Configuration.h
483+
sed -i "s/.*#define SERIAL_PORT_2.*/#define SERIAL_PORT_2 -1/" Marlin/Configuration.h
484+
sed -i "s/.*#define EDITABLE_HOMING_FEEDRATE.*/#define EDITABLE_HOMING_FEEDRATE/" Marlin/Configuration.h
485+
sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/\/\/#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
486+
sed -i "s/.*#define DWIN_LCD_PROUI/\/\/#define DWIN_LCD_PROUI/" Marlin/Configuration.h
487+
sed -i "s/.*#define CR10_STOCKDISPLAY/#define CR10_STOCKDISPLAY/" Marlin/Configuration.h
488+
sed -i "s/.*#define LCD_BACKLIGHT_TIMEOUT_MINS.*/\/\/#define LCD_BACKLIGHT_TIMEOUT_MINS/" Marlin/Configuration_adv.h
489+
sed -i "s/.*#define LCD_BED_TRAMMING/#define LCD_BED_TRAMMING/" Marlin/Configuration.h
490+
sed -i "s/.*#define ASSISTED_TRAMMING\b/#define ASSISTED_TRAMMING/" Marlin/Configuration_adv.h
491+
sed -i "s/.*#define ASSISTED_TRAMMING_WIZARD.*/#define ASSISTED_TRAMMING_WIZARD/" Marlin/Configuration_adv.h
492+
NUMBERS_ONLY=$(grep "^#define NOZZLE_TO_PROBE_OFFSET" Marlin/Configuration.h | sed -e 's/.*{//' -e 's/}.*//' | xargs)
493+
OFFSET_X=$(echo "$NUMBERS_ONLY" | awk -F ',' '{print $1}' | xargs)
494+
OFFSET_Y=$(echo "$NUMBERS_ONLY" | awk -F ',' '{print $2}' | xargs)
495+
NEW_TRAMMING_PTS="#define TRAMMING_POINT_XY { { 29, 29 }, { X_BED_SIZE + (${OFFSET_X}), 29 }, { X_BED_SIZE + (${OFFSET_X}), Y_BED_SIZE + (${OFFSET_Y}) }, { 29, Y_BED_SIZE + (${OFFSET_Y}) } }"
496+
sed -i "s/.*#define TRAMMING_POINT_XY.*/${NEW_TRAMMING_PTS}/" Marlin/Configuration_adv.h
373497
pio run
374498
mkdir temp
375-
mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin
499+
mv .pio/build/STM32G0B1RE_btt/*.bin temp/build.bin
376500
env:
377-
AQUILA_VER: ${{ matrix.chip }}
378-
ABL: ${{ matrix.abl }}
379501
IS: ${{ matrix.inshape }}
380502
TP: ${{ matrix.temp }}
381503
T5: ${{ matrix.t5 }}

0 commit comments

Comments
 (0)