Compare commits
22 Commits
2026-10-02
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| b609ebafe1 | |||
| 0bf5cb1c14 | |||
| 64bb632111 | |||
| f93989689d | |||
| edeca2f7cf | |||
| 38e0c48e48 | |||
| 13d03cc1ea | |||
| fbc7f255b6 | |||
| df86211571 | |||
| 9e98b8d195 | |||
| 7d5eda326f | |||
| 192f3793d2 | |||
| fadb8314aa | |||
| 59d60cc148 | |||
| e0ceeda9b7 | |||
| 49aa5527a8 | |||
| d38d969b56 | |||
| 67d8bbc160 | |||
| 75a3906ed4 | |||
| d23e291505 | |||
| 6c34604161 | |||
| 5bc46ccbb9 |
21
.gitea/workflows/ci.yaml
Normal file
21
.gitea/workflows/ci.yaml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
name: Continuous Integration
|
||||||
|
|
||||||
|
on: [push]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
creality-ender-3-pro-check:
|
||||||
|
name: Creality Ender 3 Pro - Check
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- run: python3 -m pip install platformio
|
||||||
|
- run: ${{ gitea.workspace }}/build.sh ${{ gitea.workspace }}/Configs/Creality/Ender-3\ Pro/BigTreeTech\ SKR\ Mini\ E3\ 3.0/printer.env
|
||||||
|
|
||||||
|
flsun-kossel-check:
|
||||||
|
name: FLSUN Kossel - Check
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- run: python3 -m pip install platformio
|
||||||
|
- run: ${{ gitea.workspace }}/build.sh ${{ gitea.workspace }}/Configs/FLSUN/Kossel/MakerBase\ MKS\ Gen\ L/printer.env
|
||||||
|
|
||||||
31
.gitea/workflows/release.yaml
Normal file
31
.gitea/workflows/release.yaml
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
name: Release Asset
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- "*"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
creality-ender-3-pro-release:
|
||||||
|
name: Creality Ender 3 Pro - Release
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- run: python3 -m pip install platformio
|
||||||
|
- run: ${{ gitea.workspace }}/build.sh ${{ gitea.workspace }}/Configs/Creality/Ender-3\ Pro/BigTreeTech\ SKR\ Mini\ E3\ 3.0/printer.env
|
||||||
|
- uses: akkuman/gitea-release-action@v1
|
||||||
|
with:
|
||||||
|
files: |-
|
||||||
|
output/**
|
||||||
|
|
||||||
|
flsun-kossel-release:
|
||||||
|
name: FLSUN Kossel - Release
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- run: python3 -m pip install platformio
|
||||||
|
- run: ${{ gitea.workspace }}/build.sh ${{ gitea.workspace }}/Configs/FLSUN/Kossel/MakerBase\ MKS\ Gen\ L/printer.env
|
||||||
|
- uses: akkuman/gitea-release-action@v1
|
||||||
|
with:
|
||||||
|
files: |-
|
||||||
|
output/**
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
Marlin
|
Marlin
|
||||||
|
output
|
||||||
4
.vscode/settings.json
vendored
Normal file
4
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"nixEnvSelector.nixFile": "${workspaceFolder}/shell.nix",
|
||||||
|
"nixEnvSelector.useFlakes": false
|
||||||
|
}
|
||||||
@ -2177,13 +2177,13 @@
|
|||||||
/**
|
/**
|
||||||
* Enable the G26 Mesh Validation Pattern tool.
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
*/
|
*/
|
||||||
//#define G26_MESH_VALIDATION
|
#define G26_MESH_VALIDATION
|
||||||
#if ENABLED(G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
#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.
|
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for G26.
|
||||||
#define MESH_TEST_HOTEND_TEMP 205 // (°C) Default nozzle temperature for G26.
|
#define MESH_TEST_HOTEND_TEMP 210 // (°C) Default nozzle temperature for G26.
|
||||||
#define MESH_TEST_BED_TEMP 60 // (°C) Default bed temperature for G26.
|
#define MESH_TEST_BED_TEMP 60 // (°C) Default bed temperature for G26.
|
||||||
#define G26_XY_FEEDRATE 20 // (mm/s) Feedrate for G26 XY moves.
|
#define G26_XY_FEEDRATE 15 // (mm/s) Feedrate for G26 XY moves.
|
||||||
#define G26_XY_FEEDRATE_TRAVEL 100 // (mm/s) Feedrate for G26 XY travel moves.
|
#define G26_XY_FEEDRATE_TRAVEL 100 // (mm/s) Feedrate for G26 XY travel moves.
|
||||||
#define G26_RETRACT_MULTIPLIER 1.0 // G26 Q (retraction) used by default between mesh test elements.
|
#define G26_RETRACT_MULTIPLIER 1.0 // G26 Q (retraction) used by default between mesh test elements.
|
||||||
#endif
|
#endif
|
||||||
@ -2295,7 +2295,7 @@
|
|||||||
#define BED_TRAMMING_HEIGHT 0.0 // (mm) Z height of nozzle at tramming points
|
#define BED_TRAMMING_HEIGHT 0.0 // (mm) Z height of nozzle at tramming points
|
||||||
#define BED_TRAMMING_Z_HOP 4.0 // (mm) Z raise between tramming points
|
#define BED_TRAMMING_Z_HOP 4.0 // (mm) Z raise between tramming points
|
||||||
//#define BED_TRAMMING_INCLUDE_CENTER // Move to the center after the last corner
|
//#define BED_TRAMMING_INCLUDE_CENTER // Move to the center after the last corner
|
||||||
//#define BED_TRAMMING_USE_PROBE
|
#define BED_TRAMMING_USE_PROBE
|
||||||
#if ENABLED(BED_TRAMMING_USE_PROBE)
|
#if ENABLED(BED_TRAMMING_USE_PROBE)
|
||||||
#define BED_TRAMMING_PROBE_TOLERANCE 0.1 // (mm)
|
#define BED_TRAMMING_PROBE_TOLERANCE 0.1 // (mm)
|
||||||
#define BED_TRAMMING_VERIFY_RAISED // After adjustment triggers the probe, re-probe to verify
|
#define BED_TRAMMING_VERIFY_RAISED // After adjustment triggers the probe, re-probe to verify
|
||||||
@ -1091,11 +1091,15 @@
|
|||||||
*
|
*
|
||||||
* Add the G35 command to measure bed corners and help adjust screws. Requires a bed probe.
|
* Add the G35 command to measure bed corners and help adjust screws. Requires a bed probe.
|
||||||
*/
|
*/
|
||||||
//#define ASSISTED_TRAMMING
|
#define ASSISTED_TRAMMING
|
||||||
#if ENABLED(ASSISTED_TRAMMING)
|
#if ENABLED(ASSISTED_TRAMMING)
|
||||||
|
|
||||||
// Define from 3 to 9 points to probe.
|
// Define from 3 to 9 points to probe.
|
||||||
#define TRAMMING_POINT_XY { { 20, 20 }, { 180, 20 }, { 180, 180 }, { 20, 180 } }
|
#define BED_SCREW_POS_FRONT_Y 33
|
||||||
|
#define BED_SCREW_POS_REAR_Y 205
|
||||||
|
#define BED_SCREW_POS_LEFT_X 30
|
||||||
|
#define BED_SCREW_POS_RIGHT_X 200
|
||||||
|
#define TRAMMING_POINT_XY { { BED_SCREW_POS_LEFT_X, BED_SCREW_POS_FRONT_Y }, { BED_SCREW_POS_RIGHT_X, BED_SCREW_POS_FRONT_Y }, { BED_SCREW_POS_RIGHT_X, BED_SCREW_POS_REAR_Y }, { BED_SCREW_POS_LEFT_X, BED_SCREW_POS_REAR_Y } }
|
||||||
|
|
||||||
// Define position names for probe points.
|
// Define position names for probe points.
|
||||||
#define TRAMMING_POINT_NAME_1 "Front-Left"
|
#define TRAMMING_POINT_NAME_1 "Front-Left"
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
name="Creality Ender 3 Pro"
|
||||||
|
board="BigTreeTech SKR Mini E3 3.0"
|
||||||
|
config_version="0.2.0"
|
||||||
|
pio_env="STM32G0B1RE_btt"
|
||||||
|
fw_ext="bin"
|
||||||
3849
Configs/FLSUN/Kossel/MakerBase MKS Gen L/Configuration.h
Normal file
3849
Configs/FLSUN/Kossel/MakerBase MKS Gen L/Configuration.h
Normal file
File diff suppressed because it is too large
Load Diff
4933
Configs/FLSUN/Kossel/MakerBase MKS Gen L/Configuration_adv.h
Normal file
4933
Configs/FLSUN/Kossel/MakerBase MKS Gen L/Configuration_adv.h
Normal file
File diff suppressed because it is too large
Load Diff
5
Configs/FLSUN/Kossel/MakerBase MKS Gen L/printer.env
Normal file
5
Configs/FLSUN/Kossel/MakerBase MKS Gen L/printer.env
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
name="FLSUN Kossel"
|
||||||
|
board="MakerBase MKS Gen L"
|
||||||
|
config_version="0.1.0"
|
||||||
|
pio_env="mega2560"
|
||||||
|
fw_ext="hex"
|
||||||
20
README.md
20
README.md
@ -2,20 +2,32 @@
|
|||||||
|
|
||||||
## License Notice
|
## License Notice
|
||||||
|
|
||||||
This code is not mine. It is a derivative of Marlin's [maintained example configurations](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/). I altered it slightly on December 26th, 2024, to work with my modified printer. The original license, along with this notice, are provided in order to conform to the terms of the original code's license.
|
The configuration files here are not my original creations. They are derivatives of Marlin's [maintained example configurations](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/). I have altered these configurations and maintain these changes so they work with my own printers. The original license, along with this notice, are provided in order to conform to the terms of the original code's license.
|
||||||
|
|
||||||
## About
|
## About
|
||||||
|
|
||||||
This is a set of Marlin configuration files for my modified Ender 3 Pro. The relevant modifications include:
|
This is a set of Marlin configuration files for my modified 3D printers.
|
||||||
|
|
||||||
|
## Printers
|
||||||
|
|
||||||
|
### [Creality/Ender 3 Pro/BigTreeTech SKR Mini E3 3.0](Configs/Creality/Ender-3%20Pro/BigTreeTech%20SKR%20Mini%20E3%203.0/)
|
||||||
|
|
||||||
|
Modifications include:
|
||||||
- A filament runout sensor
|
- A filament runout sensor
|
||||||
- A BLtouch bed leveling probe
|
- A BLtouch bed leveling probe
|
||||||
- A BigTreeTech SKR Mini E3 3.0 mainboard
|
- A BigTreeTech SKR Mini E3 3.0 mainboard
|
||||||
|
|
||||||
I had to modify the configuration files to get the sensors working properly, so in order to avoid having to remember all my modifications when recompiling, I decided to commit the code to a repository.
|
### [FLSUN Kossel MakerBase MKS Gen L](Configs/FLSUN/Kossel/MakerBase%20MKS%20Gen%20L/)
|
||||||
|
|
||||||
|
Modifications include:
|
||||||
|
- None
|
||||||
|
|
||||||
|
## Building
|
||||||
|
|
||||||
|
Run the included build script with one argument, which is the `printer.env` file in the relevant config dir.
|
||||||
|
|
||||||
## Reuse
|
## Reuse
|
||||||
|
|
||||||
Feel free to use this configuration on your own printer, but only if it is the same exact printer with the same exact mainboard. If you don't have a BLtouch, be careful to ensure you comment out all the options relevant to Z-homing with the probe. Otherwise, it may dig the nozzle into the bed while homing the Z axis.
|
Feel free to use these configurations on your own printer, but only if it is the same exact printer with the same exact mainboard.
|
||||||
|
|
||||||
If you are making your own changes, be sure to look through the license before publishing them.
|
If you are making your own changes, be sure to look through the license before publishing them.
|
||||||
|
|||||||
66
build.sh
66
build.sh
@ -1,14 +1,66 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
set -uexo
|
set -ueo pipefail
|
||||||
|
|
||||||
git clone https://github.com/MarlinFirmware/Marlin --depth 1 || true
|
if (( $# < 1 )); then
|
||||||
|
echo "Invalid CLI args."
|
||||||
|
echo "Usage:"
|
||||||
|
echo "./build.sh path/to/printer.env [-c]"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
cp "Creality/Ender-3 Pro/BigTreeTech SKR Mini E3 3.0/"* Marlin/Marlin/
|
if ! [ -f "$1" ]; then
|
||||||
rm -f Marlin/config/*
|
echo "Printer env file not found."
|
||||||
|
echo "Path: $1"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if (( $# == 2 )); then
|
||||||
|
if [ $2 == "-c" ]; then
|
||||||
|
echo "Check mode- will not compile a binary!!!"
|
||||||
|
export TEST_MODE=1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
export TEST_MODE=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Printer env file found: $1"
|
||||||
|
|
||||||
|
echo -n "Loading config variables... "
|
||||||
|
source "$1"
|
||||||
|
echo "OK"
|
||||||
|
|
||||||
|
if (( $TEST_MODE == 0 )); then
|
||||||
|
filename="fw-${name// /_}-${board// /_}-ver$config_version.$fw_ext"
|
||||||
|
echo "Artifact name will be: ""$filename"""
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! [ -d Marlin ]; then
|
||||||
|
git clone https://github.com/MarlinFirmware/Marlin --depth 1
|
||||||
|
else
|
||||||
|
cd Marlin
|
||||||
|
git fetch --all
|
||||||
|
git reset --hard origin/bugfix-2.1.x
|
||||||
|
cd ..
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -n "Copying custom config files... "
|
||||||
|
cp "$(dirname "$1")"/*.h Marlin/Marlin/
|
||||||
|
echo "OK"
|
||||||
|
|
||||||
cd Marlin
|
cd Marlin
|
||||||
pio run -e STM32G0B1RE_btt
|
if (( $TEST_MODE == 0 )); then
|
||||||
cd ..
|
echo "Running PlatformIO build!"
|
||||||
|
pio run -e "$pio_env"
|
||||||
|
echo -n "Finished building. Copying firmware."$fw_ext"... "
|
||||||
|
mkdir -p ../output
|
||||||
|
cp .pio/build/"$pio_env"/firmware.$fw_ext ../output/"$filename"
|
||||||
|
echo "OK"
|
||||||
|
else
|
||||||
|
echo "Running PlatformIO checks!"
|
||||||
|
pio check -e "$pio_env"
|
||||||
|
echo -n "Finished checks."
|
||||||
|
fi
|
||||||
|
cd ../../
|
||||||
|
|
||||||
|
|
||||||
cp Marlin/.pio/build/STM32G0B1RE_btt/firmware.bin ..
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user