jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix-2.1.x' into CrealityDwin2.0_Bleeding

Browse Source
This commit is contained in:
InsanityAutomation
2022-10-29 19:42:55 -04:00
parent c5263830d8 6b4d7b9151
commit 3ec124f417
41 changed files with 1289 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ini/features.ini
+1
View File
@@ -189,6 +189,7 @@ HAS_DUPLICATION_MODE = src_filter=+<src/gcode/control/M605.cpp
LIN_ADVANCE = src_filter=+<src/gcode/feature/advance>
PHOTO_GCODE = src_filter=+<src/gcode/feature/camera>
CONTROLLER_FAN_EDITABLE = src_filter=+<src/gcode/feature/controllerfan>
INPUT_SHAPING = src_filter=+<src/gcode/feature/input_shaping>
GCODE_MACROS = src_filter=+<src/gcode/feature/macro>
GRADIENT_MIX = src_filter=+<src/gcode/feature/mixing/M166.cpp>
HAS_SAVED_POSITIONS = src_filter=+<src/gcode/feature/pause/G60.cpp> +<src/gcode/feature/pause/G61.cpp>
ini/native.ini
+2 -2
View File
@@ -66,11 +66,11 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
#
# MacPorts:
# sudo port install gcc11 glm libsdl2 libsdl2_net
# sudo port install gcc12 glm libsdl2 libsdl2_net
#
# cd /opt/local/bin
# sudo rm -f gcc g++ cc
# sudo ln -s gcc-mp-11 gcc ; sudo ln -s g++-mp-11 g++ ; sudo ln -s g++ cc
# sudo ln -s gcc-mp-12 gcc ; sudo ln -s g++-mp-12 g++ ; sudo ln -s g++ cc
# cd -
# rehash
#