Merge branch '2.1---sv' of https://git.soost.dev/sv/Marlin into 2.1---sv
This commit is contained in:
25
.gitignore
vendored
25
.gitignore
vendored
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# 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.
|
||||
# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
||||
@@ -23,8 +23,13 @@
|
||||
_Version.h
|
||||
bdf2u8g.exe
|
||||
genpages.exe
|
||||
bdf2u8g.exe
|
||||
genpages.exe
|
||||
marlin_config.json
|
||||
mczip.h
|
||||
language*.csv
|
||||
out-csv/
|
||||
out-language/
|
||||
*.gen
|
||||
*.sublime-workspace
|
||||
|
||||
@@ -32,6 +37,7 @@ mczip.h
|
||||
applet/
|
||||
.DS_Store
|
||||
|
||||
# Compiled C++ Object files
|
||||
# Compiled C++ Object files
|
||||
*.slo
|
||||
*.lo
|
||||
@@ -63,6 +69,7 @@ applet/
|
||||
*.out
|
||||
*.app
|
||||
|
||||
# Compiled C Object files
|
||||
# Compiled C Object files
|
||||
*.o
|
||||
*.ko
|
||||
@@ -123,14 +130,17 @@ vc-fileutils.settings
|
||||
.vscode/*
|
||||
!.vscode/extensions.json
|
||||
|
||||
# Simulation files
|
||||
# Simulation files
|
||||
imgui.ini
|
||||
eeprom.dat
|
||||
spi_flash.bin
|
||||
fs.img
|
||||
fs.img
|
||||
|
||||
# CMake
|
||||
CMakeLists.txt
|
||||
!buildroot/share/cmake/CMakeLists.txt
|
||||
src/CMakeLists.txt
|
||||
CMakeListsPrivate.txt
|
||||
build/
|
||||
@@ -163,3 +173,16 @@ __pycache__
|
||||
tags
|
||||
*.logs
|
||||
*.bak
|
||||
|
||||
# Misc.
|
||||
*~
|
||||
*.orig
|
||||
*.rej
|
||||
*.bak
|
||||
*.idea
|
||||
*.i
|
||||
*.ii
|
||||
*.swp
|
||||
tags
|
||||
*.logs
|
||||
*.bak
|
||||
|
||||
@@ -47,6 +47,7 @@
|
||||
* Defines a generic printer name to be output to the LCD after booting Marlin.
|
||||
*/
|
||||
#define MACHINE_NAME "sv3dprt01.sv.loc"
|
||||
#define MACHINE_NAME "sv3dprt01.sv.loc"
|
||||
|
||||
/**
|
||||
* The SOURCE_CODE_URL is the location where users will find the Marlin Source
|
||||
@@ -55,6 +56,7 @@
|
||||
* Marlin repository.
|
||||
*/
|
||||
#define SOURCE_CODE_URL "https://git.soost.dev/me/Marlin"
|
||||
#define SOURCE_CODE_URL "https://git.soost.dev/me/Marlin"
|
||||
|
||||
/**
|
||||
* Default generic printer UUID.
|
||||
@@ -66,6 +68,7 @@
|
||||
* documentation about a specific Marlin release.
|
||||
*/
|
||||
//define WEBSITE_URL "https://soo.st"
|
||||
//define WEBSITE_URL "https://soo.st"
|
||||
|
||||
/**
|
||||
* Set the vendor info the serial USB interface, if changable
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
*/
|
||||
#ifndef STRING_DISTRIBUTION_DATE
|
||||
#define STRING_DISTRIBUTION_DATE "2023-12-08"
|
||||
#define STRING_DISTRIBUTION_DATE "2023-12-08"
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user