Skip to content

Commit d1b8373

Browse files
Update - SKR/S1-F4 build changes
1 parent a8cf5d9 commit d1b8373

File tree

6 files changed

+6
-17
lines changed

6 files changed

+6
-17
lines changed

.github/workflows/compile-configs.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -506,9 +506,6 @@ jobs:
506506
sed -i "s/.*#define CONTROLLER_FAN_PIN.*/#define CONTROLLER_FAN_PIN FAN2_PIN/" Marlin/Configuration_adv.h
507507
sed -i "s/.*#define E0_AUTO_FAN_PIN.*/#define E0_AUTO_FAN_PIN FAN1_PIN/" Marlin/Configuration_adv.h
508508
fi;
509-
if [ "$SKR" = V3_0 ]; then
510-
sed -i "s/.*#define EDITABLE_HOMING_FEEDRATE.*/#define EDITABLE_HOMING_FEEDRATE/" Marlin/Configuration.h
511-
fi;
512509
if ($IS); then STEMP=; else STEMP='\/\/'; fi;
513510
for axis in X Y Z; do
514511
sed -i "s/.*#define INPUT_SHAPING_${axis}/${STEMP}#define INPUT_SHAPING_${axis}/" Marlin/Configuration_adv.h
@@ -639,9 +636,6 @@ jobs:
639636
sed -i "s/.*#define CONTROLLER_FAN_PIN.*/#define CONTROLLER_FAN_PIN FAN2_PIN/" Marlin/Configuration_adv.h
640637
sed -i "s/.*#define E0_AUTO_FAN_PIN.*/#define E0_AUTO_FAN_PIN FAN1_PIN/" Marlin/Configuration_adv.h
641638
fi;
642-
if [ "$SKR" = V3_0 ]; then
643-
sed -i "s/.*#define EDITABLE_HOMING_FEEDRATE.*/#define EDITABLE_HOMING_FEEDRATE/" Marlin/Configuration.h
644-
fi;
645639
if ($IS); then STEMP=; else STEMP='\/\/'; fi;
646640
for axis in X Y Z; do
647641
sed -i "s/.*#define INPUT_SHAPING_${axis}/${STEMP}#define INPUT_SHAPING_${axis}/" Marlin/Configuration_adv.h

.github/workflows/compile-configs_ender3.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,8 @@ jobs:
454454
sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
455455
sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
456456
sed -i "s/.*#define HAS_CGCODE.*/${PTEMP}#define HAS_CGCODE 1/" Marlin/Configuration.h
457+
sed -i "s/.*#define CCLOUD_PRINT_SUPPORT.*/${PTEMP}#define CCLOUD_PRINT_SUPPORT/" Marlin/Configuration.h
458+
sed -i "s/.*#define EDITABLE_HOMING_FEEDRATE.*/${PTEMP}#define EDITABLE_HOMING_FEEDRATE/" Marlin/Configuration.h
457459
if ($TJC); then TJEMP=; else TJEMP='\/\/'; fi;
458460
sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
459461
if ($T5); then THMP="5"; DSMP="98"; else THMP="13"; DSMP="424.9"; fi;
@@ -469,7 +471,6 @@ jobs:
469471
sed -i "s/.*#define HAS_CUSTOM_COLORS.*/#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
470472
sed -i "s/.*#define SHOW_SPEED_IND/#define SHOW_SPEED_IND/" Marlin/Configuration.h
471473
sed -i "s/.*#define M114_DETAIL/#define M114_DETAIL/" Marlin/Configuration_adv.h
472-
sed -i "s/.*#define M115_GEOMETRY_REPORT/\/\/#define M115_GEOMETRY_REPORT/" Marlin/Configuration_adv.h
473474
fi;
474475
pio run
475476
mkdir temp
@@ -1240,9 +1241,6 @@ jobs:
12401241
sed -i "s/.*#define CONTROLLER_FAN_PIN.*/#define CONTROLLER_FAN_PIN FAN2_PIN/" Marlin/Configuration_adv.h
12411242
sed -i "s/.*#define E0_AUTO_FAN_PIN.*/#define E0_AUTO_FAN_PIN FAN1_PIN/" Marlin/Configuration_adv.h
12421243
fi;
1243-
if [ "$SKR" = V3_0 ]; then
1244-
sed -i "s/.*#define EDITABLE_HOMING_FEEDRATE.*/#define EDITABLE_HOMING_FEEDRATE/" Marlin/Configuration.h
1245-
fi;
12461244
if ($IS); then STEMP=; else STEMP='\/\/'; fi;
12471245
for axis in X Y Z; do
12481246
sed -i "s/.*#define INPUT_SHAPING_${axis}/${STEMP}#define INPUT_SHAPING_${axis}/" Marlin/Configuration_adv.h
@@ -1376,9 +1374,6 @@ jobs:
13761374
sed -i "s/.*#define CONTROLLER_FAN_PIN.*/#define CONTROLLER_FAN_PIN FAN2_PIN/" Marlin/Configuration_adv.h
13771375
sed -i "s/.*#define E0_AUTO_FAN_PIN.*/#define E0_AUTO_FAN_PIN FAN1_PIN/" Marlin/Configuration_adv.h
13781376
fi;
1379-
if [ "$SKR" = V3_0 ]; then
1380-
sed -i "s/.*#define EDITABLE_HOMING_FEEDRATE.*/#define EDITABLE_HOMING_FEEDRATE/" Marlin/Configuration.h
1381-
fi;
13821377
if ($IS); then STEMP=; else STEMP='\/\/'; fi;
13831378
for axis in X Y Z; do
13841379
sed -i "s/.*#define INPUT_SHAPING_${axis}/${STEMP}#define INPUT_SHAPING_${axis}/" Marlin/Configuration_adv.h

configurations/BTT_SKR-Mini-E3-V2/MM/Configuration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2440,7 +2440,7 @@
24402440
#define HOMING_FEEDRATE_MM_M { (60*60), (60*60), (8*60) }
24412441

24422442
// Edit homing feedrates with M210 and MarlinUI menu items
2443-
//#define EDITABLE_HOMING_FEEDRATE // (1012 bytes of flash)
2443+
#define EDITABLE_HOMING_FEEDRATE // (1012 bytes of flash)
24442444

24452445
// Validate that endstops are triggered on homing moves
24462446
#define VALIDATE_HOMING_ENDSTOPS

configurations/BTT_SKR-Mini-E3-V2/UBL/Configuration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2440,7 +2440,7 @@
24402440
#define HOMING_FEEDRATE_MM_M { (60*60), (60*60), (8*60) }
24412441

24422442
// Edit homing feedrates with M210 and MarlinUI menu items
2443-
//#define EDITABLE_HOMING_FEEDRATE // (1012 bytes of flash)
2443+
#define EDITABLE_HOMING_FEEDRATE // (1012 bytes of flash)
24442444

24452445
// Validate that endstops are triggered on homing moves
24462446
#define VALIDATE_HOMING_ENDSTOPS

configurations/BTT_SKR-Mini-E3-V2/UBL/Configuration_adv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1763,7 +1763,7 @@
17631763
//#define SD_DETECT_STATE HIGH
17641764

17651765
//#define SD_IGNORE_AT_STARTUP // Don't mount the SD card when starting up
1766-
#define SDCARD_READONLY // Read-only SD card (to save over 2K of flash)
1766+
//#define SDCARD_READONLY // Read-only SD card (to save over 2K of flash)
17671767

17681768
//#define GCODE_REPEAT_MARKERS // Enable G-code M808 to set repeat markers and do looping
17691769

configurations/Creality Ender/S1/F4/UBL/Configuration_adv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1763,7 +1763,7 @@
17631763
//#define SD_DETECT_STATE HIGH
17641764

17651765
//#define SD_IGNORE_AT_STARTUP // Don't mount the SD card when starting up
1766-
#define SDCARD_READONLY // Read-only SD card (to save over 2K of flash)
1766+
//#define SDCARD_READONLY // Read-only SD card (to save over 2K of flash)
17671767

17681768
//#define GCODE_REPEAT_MARKERS // Enable G-code M808 to set repeat markers and do looping
17691769

0 commit comments

Comments
 (0)