sv/Marlin
1
1
Fork 0
Code Issues Pull Requests Wiki Activity

Merge branch '2.1---sv' of https://git.soost.dev/sv/Marlin into 2.1---sv

Browse Source
This commit is contained in:
Sven Soost
2024-01-02 11:30:58 +01:00
parent 07df92fb03 6fcdefe31f
commit d60a566cd2
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
.gitignore vendored
View File

@@ -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
@@ -23,8 +23,13 @@
_Version.h _Version.h
bdf2u8g.exe bdf2u8g.exe
genpages.exe genpages.exe
bdf2u8g.exe
genpages.exe
marlin_config.json marlin_config.json
mczip.h mczip.h
language*.csv
out-csv/
out-language/
*.gen *.gen
*.sublime-workspace *.sublime-workspace
@@ -32,6 +37,7 @@ mczip.h
applet/ applet/
.DS_Store .DS_Store
# Compiled C++ Object files
# Compiled C++ Object files # Compiled C++ Object files
*.slo *.slo
*.lo *.lo
@@ -63,6 +69,7 @@ applet/
*.out *.out
*.app *.app
# Compiled C Object files
# Compiled C Object files # Compiled C Object files
*.o *.o
*.ko *.ko
@@ -123,14 +130,17 @@ vc-fileutils.settings
.vscode/* .vscode/*
!.vscode/extensions.json !.vscode/extensions.json
# Simulation files
# Simulation files # Simulation files
imgui.ini imgui.ini
eeprom.dat eeprom.dat
spi_flash.bin spi_flash.bin
fs.img fs.img
fs.img
# CMake # CMake
CMakeLists.txt CMakeLists.txt
!buildroot/share/cmake/CMakeLists.txt
src/CMakeLists.txt src/CMakeLists.txt
CMakeListsPrivate.txt CMakeListsPrivate.txt
build/ build/
@@ -163,3 +173,16 @@ __pycache__
tags tags
*.logs *.logs
*.bak *.bak
# Misc.
*~
*.orig
*.rej
*.bak
*.idea
*.i
*.ii
*.swp
tags
*.logs
*.bak

3
Marlin/Version.h
View File

@@ -47,6 +47,7 @@
* 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.
*/ */
#define MACHINE_NAME "sv3dprt01.sv.loc" #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 * The SOURCE_CODE_URL is the location where users will find the Marlin Source
@@ -55,6 +56,7 @@
* Marlin repository. * Marlin repository.
*/ */
#define SOURCE_CODE_URL "https://git.soost.dev/me/Marlin" #define SOURCE_CODE_URL "https://git.soost.dev/me/Marlin"
#define SOURCE_CODE_URL "https://git.soost.dev/me/Marlin"
/** /**
* Default generic printer UUID. * Default generic printer UUID.
@@ -66,6 +68,7 @@
* documentation about a specific Marlin release. * documentation about a specific Marlin release.
*/ */
//define WEBSITE_URL "https://soo.st" //define WEBSITE_URL "https://soo.st"
//define WEBSITE_URL "https://soo.st"
/** /**
* Set the vendor info the serial USB interface, if changable * Set the vendor info the serial USB interface, if changable

1
Marlin/src/inc/Version.h
View File

@@ -43,6 +43,7 @@
*/ */
#ifndef STRING_DISTRIBUTION_DATE #ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2023-12-08" #define STRING_DISTRIBUTION_DATE "2023-12-08"
#define STRING_DISTRIBUTION_DATE "2023-12-08"
#endif #endif
/** /**