Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
ef7509808f | ||
|
334f8874cf |
110
.gitignore
vendored
110
.gitignore
vendored
@@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Marlin 3D Printer Firmware
|
# Marlin 3D Printer Firmware
|
||||||
# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
# Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
#
|
#
|
||||||
# Based on Sprinter and grbl.
|
# Based on Sprinter and grbl.
|
||||||
# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
@@ -19,34 +19,23 @@
|
|||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
# Our automatic versioning scheme generates the following file
|
# Generated files
|
||||||
# NEVER put it in the repository
|
|
||||||
_Version.h
|
_Version.h
|
||||||
|
bdf2u8g.exe
|
||||||
|
genpages.exe
|
||||||
|
marlin_config.json
|
||||||
|
mczip.h
|
||||||
|
language*.csv
|
||||||
|
out-csv/
|
||||||
|
out-language/
|
||||||
|
*.gen
|
||||||
|
*.sublime-workspace
|
||||||
|
|
||||||
#
|
|
||||||
# OS
|
# OS
|
||||||
#
|
|
||||||
applet/
|
applet/
|
||||||
*.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
#
|
# Compiled C++ Object files
|
||||||
# Misc
|
|
||||||
#
|
|
||||||
*~
|
|
||||||
*.orig
|
|
||||||
*.rej
|
|
||||||
*.bak
|
|
||||||
*.idea
|
|
||||||
*.s
|
|
||||||
*.i
|
|
||||||
*.ii
|
|
||||||
*.swp
|
|
||||||
tags
|
|
||||||
|
|
||||||
#
|
|
||||||
# C++
|
|
||||||
#
|
|
||||||
# Compiled Object files
|
|
||||||
*.slo
|
*.slo
|
||||||
*.lo
|
*.lo
|
||||||
*.o
|
*.o
|
||||||
@@ -77,11 +66,7 @@ tags
|
|||||||
*.out
|
*.out
|
||||||
*.app
|
*.app
|
||||||
|
|
||||||
|
# Compiled C Object files
|
||||||
#
|
|
||||||
# C
|
|
||||||
#
|
|
||||||
# Object files
|
|
||||||
*.o
|
*.o
|
||||||
*.ko
|
*.ko
|
||||||
*.obj
|
*.obj
|
||||||
@@ -123,33 +108,10 @@ tags
|
|||||||
.gcc-flags.json
|
.gcc-flags.json
|
||||||
/lib/
|
/lib/
|
||||||
|
|
||||||
# Workaround for Deviot+platformio quirks
|
|
||||||
Marlin/lib
|
|
||||||
Marlin/platformio.ini
|
|
||||||
Marlin/*/platformio.ini
|
|
||||||
Marlin/*/*/platformio.ini
|
|
||||||
Marlin/*/*/*/platformio.ini
|
|
||||||
Marlin/*/*/*/*/platformio.ini
|
|
||||||
Marlin/.travis.yml
|
|
||||||
Marlin/*/.travis.yml
|
|
||||||
Marlin/*/*/.travis.yml
|
|
||||||
Marlin/*/*/*/.travis.yml
|
|
||||||
Marlin/*/*/*/*/.travis.yml
|
|
||||||
Marlin/.gitignore
|
|
||||||
Marlin/*/.gitignore
|
|
||||||
Marlin/*/*/.gitignore
|
|
||||||
Marlin/*/*/*/.gitignore
|
|
||||||
Marlin/*/*/*/*/.gitignore
|
|
||||||
Marlin/readme.txt
|
|
||||||
Marlin/*/readme.txt
|
|
||||||
Marlin/*/*/readme.txt
|
|
||||||
Marlin/*/*/*/readme.txt
|
|
||||||
Marlin/*/*/*/*/readme.txt
|
|
||||||
|
|
||||||
# Secure Credentials
|
# Secure Credentials
|
||||||
Configuration_Secure.h
|
Configuration_Secure.h
|
||||||
|
|
||||||
#Visual Studio
|
# Visual Studio
|
||||||
*.sln
|
*.sln
|
||||||
*.vcxproj
|
*.vcxproj
|
||||||
*.vcxproj.user
|
*.vcxproj.user
|
||||||
@@ -160,27 +122,49 @@ __vm/
|
|||||||
.vs/
|
.vs/
|
||||||
vc-fileutils.settings
|
vc-fileutils.settings
|
||||||
|
|
||||||
#Visual Studio Code
|
# Visual Studio Code
|
||||||
.vscode
|
.vscode/*
|
||||||
.vscode/.browse.c_cpp.db*
|
!.vscode/extensions.json
|
||||||
.vscode/c_cpp_properties.json
|
|
||||||
.vscode/launch.json
|
|
||||||
.vscode/*.db
|
|
||||||
|
|
||||||
#cmake
|
# Simulation files
|
||||||
|
imgui.ini
|
||||||
|
eeprom.dat
|
||||||
|
spi_flash.bin
|
||||||
|
fs.img
|
||||||
|
|
||||||
|
# CMake
|
||||||
|
buildroot/share/cmake/*
|
||||||
CMakeLists.txt
|
CMakeLists.txt
|
||||||
|
!buildroot/share/cmake/CMakeLists.txt
|
||||||
src/CMakeLists.txt
|
src/CMakeLists.txt
|
||||||
CMakeListsPrivate.txt
|
CMakeListsPrivate.txt
|
||||||
|
build/
|
||||||
|
|
||||||
#CLion
|
# CLion
|
||||||
cmake-build-*
|
cmake-build-*
|
||||||
|
|
||||||
#Eclipse
|
# Eclipse
|
||||||
.project
|
.project
|
||||||
.cproject
|
.cproject
|
||||||
.pydevproject
|
.pydevproject
|
||||||
.settings
|
.settings
|
||||||
.classpath
|
.classpath
|
||||||
|
|
||||||
#Python
|
# Python
|
||||||
__pycache__
|
__pycache__
|
||||||
|
|
||||||
|
# IOLogger logs
|
||||||
|
*_log.csv
|
||||||
|
|
||||||
|
# Misc.
|
||||||
|
*~
|
||||||
|
*.orig
|
||||||
|
*.rej
|
||||||
|
*.bak
|
||||||
|
*.idea
|
||||||
|
*.i
|
||||||
|
*.ii
|
||||||
|
*.swp
|
||||||
|
tags
|
||||||
|
*.logs
|
||||||
|
*.bak
|
||||||
|
10
.vscode/extensions.json
vendored
Normal file
10
.vscode/extensions.json
vendored
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
// See http://go.microsoft.com/fwlink/?LinkId=827846
|
||||||
|
// for the documentation about the extensions.json format
|
||||||
|
"recommendations": [
|
||||||
|
"platformio.platformio-ide"
|
||||||
|
],
|
||||||
|
"unwantedRecommendations": [
|
||||||
|
"ms-vscode.cpptools-extension-pack"
|
||||||
|
]
|
||||||
|
}
|
@@ -28,7 +28,7 @@
|
|||||||
/**
|
/**
|
||||||
* Marlin release version identifier
|
* Marlin release version identifier
|
||||||
*/
|
*/
|
||||||
//#define SHORT_BUILD_VERSION "2.0.7.3"
|
//#define SHORT_BUILD_VERSION "2.0.7.4"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Verbose version identifier which should contain a reference to the location
|
* Verbose version identifier which should contain a reference to the location
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
* here we define this default string as the date where the latest release
|
* here we define this default string as the date where the latest release
|
||||||
* version was tagged.
|
* version was tagged.
|
||||||
*/
|
*/
|
||||||
//#define STRING_DISTRIBUTION_DATE "2023-07-18"
|
//#define STRING_DISTRIBUTION_DATE "2023-12-08"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines a generic printer name to be output to the LCD after booting Marlin.
|
* Defines a generic printer name to be output to the LCD after booting Marlin.
|
||||||
|
@@ -25,7 +25,7 @@
|
|||||||
* Release version. Leave the Marlin version or apply a custom scheme.
|
* Release version. Leave the Marlin version or apply a custom scheme.
|
||||||
*/
|
*/
|
||||||
#ifndef SHORT_BUILD_VERSION
|
#ifndef SHORT_BUILD_VERSION
|
||||||
#define SHORT_BUILD_VERSION "2.0.7.3"
|
#define SHORT_BUILD_VERSION "2.0.7.4"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
* version was tagged.
|
* version was tagged.
|
||||||
*/
|
*/
|
||||||
#ifndef STRING_DISTRIBUTION_DATE
|
#ifndef STRING_DISTRIBUTION_DATE
|
||||||
#define STRING_DISTRIBUTION_DATE "2023-07-18"
|
#define STRING_DISTRIBUTION_DATE "2023-12-08"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -1,3 +1,3 @@
|
|||||||
# Where have all the configurations gone?
|
# Where have all the configurations gone?
|
||||||
|
|
||||||
## https://github.com/MarlinFirmware/Configurations/archive/release-2.0.7.3.zip
|
## https://github.com/MarlinFirmware/Configurations/archive/release-2.0.7.4.zip
|
||||||
|
@@ -205,16 +205,16 @@ lib_deps =
|
|||||||
# Feature Dependencies
|
# Feature Dependencies
|
||||||
#
|
#
|
||||||
[features]
|
[features]
|
||||||
HAS_TFT_LVGL_UI = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/master.zip
|
HAS_TFT_LVGL_UI = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/a3ebe98bc6.zip
|
||||||
build_src_filter=+<src/lcd/extui/lib/mks_ui>
|
build_src_filter=+<src/lcd/extui/lib/mks_ui>
|
||||||
extra_scripts=download_mks_assets.py
|
extra_scripts=download_mks_assets.py
|
||||||
HAS_TRINAMIC_CONFIG = TMCStepper@~0.7.1
|
HAS_TRINAMIC_CONFIG = TMCStepper@~0.7.1
|
||||||
build_src_filter=+<src/feature/tmc_util.cpp> +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp>
|
build_src_filter=+<src/feature/tmc_util.cpp> +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp>
|
||||||
HAS_STEALTHCHOP = build_src_filter=+<src/gcode/feature/trinamic/M569.cpp>
|
HAS_STEALTHCHOP = build_src_filter=+<src/gcode/feature/trinamic/M569.cpp>
|
||||||
SR_LCD_3W_NL = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
|
SR_LCD_3W_NL = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/6f53c19a8a.zip
|
||||||
HAS_MOTOR_CURRENT_I2C = SlowSoftI2CMaster
|
HAS_MOTOR_CURRENT_I2C = SlowSoftI2CMaster
|
||||||
build_src_filter=+<src/feature/digipot>
|
build_src_filter=+<src/feature/digipot>
|
||||||
HAS_TMC26X = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
|
HAS_TMC26X = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/a7d7c92a13.zip
|
||||||
build_src_filter=+<src/module/TMC26X.cpp>
|
build_src_filter=+<src/module/TMC26X.cpp>
|
||||||
HAS_L64XX = Arduino-L6470@0.8.0
|
HAS_L64XX = Arduino-L6470@0.8.0
|
||||||
build_src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470>
|
build_src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470>
|
||||||
|
Reference in New Issue
Block a user