Skip to content

Commit

Permalink
Marlin 2.1.2.1 Release
Browse files Browse the repository at this point in the history 
* πŸ› Fix homing_needed_error

* πŸ§‘β€πŸ’» Fix D5 warning

* 🎨 Misc. formatting

* πŸ”§ Added MOTHERBOARD error text

* ✏️  ProUI followup

* 🎨 Language / menu cleanup

* 🎨 Heading cleanup

* πŸ› Fix potential I2S buffer overwrite (MarlinFirmware#25113)

* πŸ› Fix, Refactor PID scaling (MarlinFirmware#25096)

* πŸ› Fix Ender-2 Stock Display with Melzi (MarlinFirmware#25258)

* πŸ”§ Overridable Stepper EN init

* SDIO retry, hsd clock, etc.

* πŸ”§ Refine Input Shaping check (MarlinFirmware#25280)

* ✏️ Fix probe invert flag (MarlinFirmware#25282)

* πŸ› Fix MKS board Ultipanel support (MarlinFirmware#25278)

* πŸ”¨ Fix config.ini URL fetch (MarlinFirmware#25313)

* 🩹 Fix G61 axis parameters with no offset (MarlinFirmware#25312)

* πŸ”§ Fix build with no Y axis (MarlinFirmware#25311)

* πŸ”§ Fix SD sorting sanity checks (MarlinFirmware#25318)

* πŸ”¨ Fix test build path with spaces (MarlinFirmware#25329)

* πŸ“Ί Melzi v4 with BTT SKR Mini E3 (MarlinFirmware#25321)

* πŸ“ Fix Z*_ENDSTOP_ADJUSTMENT comments (MarlinFirmware#25295)

* πŸ§‘β€πŸ’» Add SD Card 'hide' method for dev usage (MarlinFirmware#22425)

* πŸ§‘β€πŸ’» General 'MediaFile' type alias (MarlinFirmware#24424)

* ✨ BigTreeTech Manta M4P, M5P, M8P V1.0 / 1.1, E3 EZ (MarlinFirmware#25001)

* πŸ”§ Add a test for extra axes

* 🩹 Use 'M205 D' when 'B' is an axis

* 🩹 Misc. extra axis updates

* 🩹 Safe Bed Leveling updates

* 🩹 Various simple fixes

* 🩹 Extra axes for Tool Change

* 🩹 Extra axis min home with Delta Sensorless Probe

* πŸ”¨ Adjust INI comments (MarlinFirmware#25183)

* πŸ”¨ Suppress native build warnings

* πŸ“ Fix BTT_MINI_12864_V1 comment (MarlinFirmware#25366)

* 🚸 SPI endstops for X/Y Dual and Core (MarlinFirmware#25371)

* 🎨 Tweak VALIDATE_MESH_TILT

* ✏️ Fix README typo (MarlinFirmware#25388)

* πŸ› Fix FastPWM calculations (MarlinFirmware#25343)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🚸 Interruptible PLR (MarlinFirmware#25395)

* πŸ“Ί Update Re-ARM VIKI2 SPI pins (MarlinFirmware#25411)

* πŸ”§ Sanity-check hotend max / preheat temps (MarlinFirmware#25407)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* πŸ§‘β€πŸ’» Fix preheat tests (nested macro limit ~256)

Followup to MarlinFirmware#25407

* πŸ”¨ Encrypt some MKS Robin (MarlinFirmware#25349)

* πŸ› Fix AVR maths used by Stepper (MarlinFirmware#25338)

* πŸ”¨ Fix marlin_custom.* without lib_deps

* πŸ”§ Fix Einsy Rambo TMC driver check

* ⚑️ Reduce edit_screen code size (MarlinFirmware#25420)

* 🎨 Use LIMIT macro

* πŸ”¨ Fix env STM32G0B1RE_btt, add …_manta_btt (MarlinFirmware#25431)

* πŸ”¨ Fix 'step' type in createTemperatureLookupMarlin.py (MarlinFirmware#25455)

* πŸ› Fix ISR_SHAPING_LOOP_CYCLES (MarlinFirmware#25335)

* πŸ› Fix Linear Advance E position tracking (MarlinFirmware#25442)

Fix regression from MarlinFirmware#24951

* πŸ”§ Fix Sensorless Probe sanity-check err (MarlinFirmware#25417)

* πŸ”¨ Update font scripts

* πŸ§‘β€πŸ’» Script to make non-accented languages

* 🌐 Regenerate language data

* πŸ”¨ Improve config.ini example fetch

* πŸ› Fix LA retract/feedrate edge case (MarlinFirmware#25445)

Followup to MarlinFirmware#25442

* πŸ› Fix apply_power for SPINDLE_SERVO (MarlinFirmware#25465)

* πŸ› Fix Flash EEPROM for STM32G0B1CB (MarlinFirmware#25469)

* πŸ”¨ VSCode + Devcontainer support (MarlinFirmware#22420)

* ✨ BTT Octopus Max EZ 1.0, SKR 3.0 / 3.0 EZ (MarlinFirmware#25387, MarlinFirmware#25495, MarlinFirmware#25535)

* ⚑️ Exit from ISR on AVR already does sei

Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com>

* πŸ› Fix Anet ET4 SD_SS_PIN (MarlinFirmware#25492)

* πŸ”§ Sanity-check PRINTCOUNTER_SAVE_INTERVAL + ESP32 I2S Exp (MarlinFirmware#25527)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* πŸ› Fix long filename read/report (MarlinFirmware#25509)

* 🎨 Suppress M122 sign warning (MarlinFirmware#25613)

* 🩹 Fix SD partitionTable packing (MarlinFirmware#25648)

* 🩹 Fix MARLIN_F446Zx_TRONXY variant (MarlinFirmware#25659)

Followup to 9be1554

* πŸ”§ Update thermocouple 2 pin sanity check (MarlinFirmware#25627)

* πŸ› Fix MKS Robin Nano 1.3 F4 pin collision (MarlinFirmware#25838)

* πŸ”¨ Fix thread-unsafe deque iteration

* πŸ”¨ Use 'build_src_filter'

* πŸ§‘β€πŸ’» Add IA_CREALITY CI test (MarlinFirmware#25434)

* 🌐 Update Slovak language (MarlinFirmware#25305)

* 🌐 Update Italian language (MarlinFirmware#25309)

* πŸ“ Link to archived RA Control Panel page (MarlinFirmware#25424)

* 🚸 Improve CocoaPress Touch UI (MarlinFirmware#25446)

* πŸ› Fix UBL 'G29 J' mesh tilt (MarlinFirmware#25453)

Fix regression from MarlinFirmware#24214

* πŸ“ Fix a comment

* 🌐 Update Italian language (MarlinFirmware#25454)

* 🌐 Update Turkish language (MarlinFirmware#25447)

* 🩹 Fan Menu / Status fixes

Followup to MarlinFirmware#21888

* 🩹 Fix DWIN MarlinUI Fan/E/XY (MarlinFirmware#25502)

* ✨ Sovol v1.3.1 (Sovol SV06) (MarlinFirmware#25267)

* πŸ§‘β€πŸ’» More IntelliSense-friendly declares

* 🎨 Suppress warning (MarlinFirmware#25529)

* ⚑️ Misc. optimizations

* πŸ› Fix FYSETC Cheetah v2.0 Servo/Probe pins (MarlinFirmware#24635)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🩹 Fix Ender 2 stock LCD (MarlinFirmware#25538)

* 🩹 Fix a serial_ternary

* 🎨 calibration_stage => stage

* 🩹 Reset touch screen calibration on failure (MarlinFirmware#25334)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🎨 Pins header comments

Co-Authored-By: Martin Turski <turningtides@outlook.de>

* 🎨 LPC_SOFTWARE_SPI => SOFTWARE_SPI

Co-Authored-By: Martin Turski <turningtides@outlook.de>

* 🩹 Update TRONXY_V10 SPI_FLASH pins

* 🩹 Fix Chitu3D V6 default probe pin (MarlinFirmware#25552)

* 🎨 Timer tweaks

* 🩹 Fix Touch Calibration first point (MarlinFirmware#25298)

* πŸ§‘β€πŸ’» Auto Fan / Cooler Fan updates (MarlinFirmware#25554)

* πŸ› Fix M23 long filename support (MarlinFirmware#25540)

* πŸ”¨ INI Updates

Co-Authored-By: Martin Turski <turningtides@outlook.de>

* πŸ”§ Fix up WiFi options (MarlinFirmware#25586)

* 🎨 Remove unused ProUI : UBLValidMesh (MarlinFirmware#25591)

* πŸ”¨ Improve Docker local tests support (MarlinFirmware#25583)

* πŸ”¨ MarlinSimUI updates (MarlinFirmware#25589)

* 🩹 Fix Ender-3 V2 with no fan

* 🩹 Fix displayed mix percentages

* 🌐 Update Italian language (MarlinFirmware#25587)

* πŸ› Ensure root for 'M503 C'

* πŸ§‘β€πŸ’» Update pinsformat.js

* πŸ“ Update Ender # labels

* 🚸 Support CoreXY without Z (MarlinFirmware#25630)

* 🎨 Apply const (MarlinFirmware#25643)

* 🎨 Detab some build files

* πŸ”§ Move TFT sanity checks

* ⚑️ Skip a redundant BLTouch::command (MarlinFirmware#25656)

* 🚸 Minor M43 improvements

* πŸ§‘β€πŸ’» Clarify G28 R / R0

* πŸ”§ Move FIL_RUNOUT_PIN for Chiron + GLCD

* 🩹 Fix AUTOFAN_CASE

Followup to MarlinFirmware#25554

* πŸ”¨ Improve runout script check

* πŸ”§ Trigorilla / Chiron updates

Followup to c3f34e4

* πŸ§‘β€πŸ’» Apply simplified ?:

* πŸ§‘β€πŸ’» JyersUI code cleanup

* πŸ§‘β€πŸ’» Status Message cleanup

* πŸ§‘β€πŸ’» HostUI::continue_prompt method

* 🩹 Status / Host Prompt followup (MarlinFirmware#25720)

Followup to MarlinFirmware#25679

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* πŸ› Fix Configuration Embedding (MarlinFirmware#25688)

* πŸ”¨ Fix, clean up STM32F1 envs (MarlinFirmware#25697)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🩹 Bail on 'mc.zip' write error (MarlinFirmware#25695)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🚸 Echo G30 out-of-bounds (MarlinFirmware#25671)

* 🩹 Fix laser with no PWM compile (MarlinFirmware#25290)

* 🩹 Fix Spindle/Laser ENA pin test (MarlinFirmware#25622)

* πŸ§‘β€πŸ’» Minor SpindleLaser::set_enabled tweak

* 🩹 Correctly add JSON to mc.zip (MarlinFirmware#25706)

* πŸ”§ Check renamed LIN_ADVANCE_K (MarlinFirmware#25710)

* πŸ› Fix G38 with Z, support 9 axes (MarlinFirmware#25691)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🚸 Permit G38 with Core (MarlinFirmware#25713)

* 🎨 Clean up TFT Color UI display items (MarlinFirmware#25712)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🩹 Fix UBL safe measure move with extra axes

Followup to 7e79fc5

* 🚸 Improve PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED (MarlinFirmware#25681)

* πŸ“ Developer note in boards.h

* πŸ”¨ Prevent SlowSoftWire + Wire name conflict (MarlinFirmware#25707)

* πŸ”§ Extra axis endstop defaults

* πŸ§‘β€πŸ’» Change HAL_PATH macro for easier HAL relocation (MarlinFirmware#25743)

* πŸ”§ Update config.ini script

* πŸ”¨ Servo Timer 1 with STM32F103RC_fysetc (MarlinFirmware#25741)

* πŸ§‘β€πŸ’» Use NUM_AXIS_ARRAY

* 🩹 Fix TFT sanity error

* πŸ”§ Move MMU section

* πŸ”§ Fix X2/Y2 axis pins check

* πŸ› Fix STM32 USB disconnect behavior (MarlinFirmware#25762)

* 🎨 Move G28O inside ProUI

* πŸ”¨ MKS Robin2 PIO Env (MarlinFirmware#25792)

* 🚸 Faster default Marlin feedrate

* πŸ”§ Move SOFT_PWM_SCALE fallback to cpp (MarlinFirmware#25800)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* πŸ§‘β€πŸ’» M43 updates

* πŸ”§ Fix SHAPING_MIN_FREQ check (MarlinFirmware#25358)

* πŸ“Œ TH3D EZBoard SD_DETECT_PIN 27

* πŸ§‘β€πŸ’» ftdi_language

* 🩹 Improve edit menu rounding

* 🩹 Fix null pwm_details

* 🚸 Improve EEPROM validation (MarlinFirmware#25860)

* 🩹 Fix TFT LVGL compile error (MarlinFirmware#25865)

Fixes regression from MarlinFirmware#24302

* πŸ”– Version 2.1.2.1

* 🩹 Prevent Z drop with G28 X/Y

* πŸ› Fix G2/G3 limiting_speed (MarlinFirmware#25988)

* πŸ› Fix G2/G3 limiting_speed (MarlinFirmware#25988)

* πŸ”– Version 2.1.2.1

---------

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Co-authored-by: John Robertson <john@cirtech.co.uk>
Co-authored-by: MarkMan0 <38912829+MarkMan0@users.noreply.github.com>
Co-authored-by: Bob Kuhn <bob.kuhn@att.net>
Co-authored-by: xBiohazardx <36756950+xBiohazardx@users.noreply.github.com>
Co-authored-by: avionix-g <63542699+avionix-g@users.noreply.github.com>
Co-authored-by: Darren Garnier <dgarnier@reinrag.net>
Co-authored-by: Martin Turski <quiret@vfemail.net>
Co-authored-by: kg333 <matthew@kyengineer.com>
Co-authored-by: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Co-authored-by: vyacheslav-shubin <shubin-vv@krista.ru>
Co-authored-by: Victor Oliveira <rhapsodyv@gmail.com>
Co-authored-by: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Co-authored-by: Radek <46979052+radek8@users.noreply.github.com>
Co-authored-by: Frederik Kemner <stuff+github@fredo.org>
Co-authored-by: Trevin Small <trevincub03@gmail.com>
Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>
Co-authored-by: tombrazier <68918209+tombrazier@users.noreply.github.com>
Co-authored-by: GuΓ°ni MΓ‘r Gilbert <gudni.m.g@gmail.com>
Co-authored-by: Hans-Christian Ebke <ebke@cs.rwth-aachen.de>
Co-authored-by: alextrical <35117191+alextrical@users.noreply.github.com>
Co-authored-by: Sion Williams <sion5@hotmail.co.uk>
Co-authored-by: Eduard Sukharev <sukharev.eh@gmail.com>
Co-authored-by: Jason Smith <jason.inet@gmail.com>
Co-authored-by: Chris Pepper <p3p@p3psoft.co.uk>
Co-authored-by: Roman Moravčík <roman.moravcik@gmail.com>
Co-authored-by: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Co-authored-by: Marcio T <mlt4356-github@yahoo.com>
Co-authored-by: jamespearson04 <jamespearson04@hotmail.co.uk>
Co-authored-by: Abdullah YILMAZ <h.abdullahyilmaz@hotmail.com>
Co-authored-by: dwzg <50058606+dwzg@users.noreply.github.com>
Co-authored-by: Michael Hill <mhill@hillsoftware.com>
Co-authored-by: Davide RombolΓ  <davide.rombola@gmail.com>
Co-authored-by: George Fu <nailao_5918@163.com>
Co-authored-by: Martin Turski <turningtides@outlook.de>
Co-authored-by: Andrew <18502096+classicrocker883@users.noreply.github.com>
Co-authored-by: John Unland <junland.foss@gmail.com>
Co-authored-by: David Fries <David@Fries.net>
Co-authored-by: Dennis Lawler <4824647+drawlerr@users.noreply.github.com>
Co-authored-by: Alexey D. Filimonov <alexey@filimonic.net>
Co-authored-by: Jay Robson <45777442+jsrobson10@users.noreply.github.com>
Co-authored-by: Anson Liu <ansonl@users.noreply.github.com>
Co-authored-by: Scott Mikutsky <smikutsky@gmail.com>
Co-authored-by: Chris Bagwell <chris@cnpbagwell.com>
  • Loading branch information
@pierre-quelin @thinkyhead
@HoverClub @MarkMan0 @Bob-the-Kuhn @xBiohazardx @avionix-g @dgarnier @quiret @kg333 @thisiskeithb @vyacheslav-shubin @rhapsodyv @EvilGremlin @radek8 @040medien @Trevin-Small @ellensp @tombrazier @gudnimg @hcebke @alextrical @willis7 @eduard-sukharev @sjasonsmith @p3p @rmoravcik @GMagician @marciot @jamespearson04 @TA1GI @dwzg @hillsoftware @rmbq @GerogeFu @classicrocker883 @junland @dfries @drawlerr @filimonic @jsrobson10 @ansonl @smiksky @cbagwell
45 people committed Jul 17, 2023
1 parent 0ab321f commit b152c49
Show file tree
Hide file tree
Showing 567 changed files with 42,546 additions and 30,452 deletions.
29 changes: 29 additions & 0 deletions .devcontainer/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/python-3/.devcontainer/base.Dockerfile

# [Choice] Python version: 3, 3.9, 3.8, 3.7, 3.6
ARG VARIANT="3.9.0-buster"
FROM python:${VARIANT}

# [Option] Install Node.js
ARG INSTALL_NODE="true"
ARG NODE_VERSION="lts/*"
RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi

# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
# COPY requirements.txt /tmp/pip-tmp/
# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
# && rm -rf /tmp/pip-tmp

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>

# [Optional] Uncomment this line to install global node packages.
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1


RUN pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
RUN platformio update
# To get the test platforms
RUN pip install PyYaml
#ENV PATH /code/buildroot/bin/:/code/buildroot/tests/:${PATH}
51 changes: 51 additions & 0 deletions .devcontainer/devcontainer.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/python-3
{
"name": "Python 3",
"build": {
"dockerfile": "Dockerfile",
"context": "..",
"args": {
// Update 'VARIANT' to pick a Python version: 3, 3.6, 3.7, 3.8, 3.9
"VARIANT": "3.9.0-buster",
// Options
"INSTALL_NODE": "false",
"NODE_VERSION": "lts/*"
}
},

// Set *default* container specific settings.json values on container create.
"settings": {
"python.pythonPath": "/usr/local/bin/python",
"python.languageServer": "Pylance",
"python.linting.enabled": true,
"python.linting.pylintEnabled": true,
"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-python.python",
"ms-python.vscode-pylance",
"platformio.platformio-ide",
"marlinfirmware.auto-build",
"editorconfig.editorconfig"
],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "pip3 install --user -r requirements.txt",

// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
// "remoteUser": "vscode"
}
45 changes: 19 additions & 26 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,18 @@

# Generated files
_Version.h
bdf2u8g
bdf2u8g.exe
genpages.exe
marlin_config.json
mczip.h
*.gen
*.sublime-workspace

#
# OS
#
applet/
.DS_Store

#
# Misc
#
*~
*.orig
*.rej
*.bak
*.idea
*.i
*.ii
*.swp
tags

#
# C++
#
# Compiled Object files
# Compiled C++ Object files
*.slo
*.lo
*.o
Expand Down Expand Up @@ -80,10 +63,7 @@ tags
*.out
*.app

#
# C
#
# Object files
# Compiled C Object files
*.o
*.ko
*.obj
Expand Down Expand Up @@ -143,13 +123,13 @@ vc-fileutils.settings
.vscode/*
!.vscode/extensions.json

#Simulation
# Simulation files
imgui.ini
eeprom.dat
spi_flash.bin
fs.img

#cmake
# CMake
CMakeLists.txt
src/CMakeLists.txt
CMakeListsPrivate.txt
Expand All @@ -170,3 +150,16 @@ __pycache__

# IOLogger logs
*_log.csv

# Misc.
*~
*.orig
*.rej
*.bak
*.idea
*.i
*.ii
*.swp
tags
*.logs
*.bak
21 changes: 14 additions & 7 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
SCRIPTS_DIR := buildroot/share/scripts
CONTAINER_RT_BIN := docker
CONTAINER_RT_OPTS := --rm -v $(PWD):/code -v platformio-cache:/root/.platformio
CONTAINER_IMAGE := marlin-dev

help:
@echo "Tasks for local development:"
@echo "* tests-single-ci: Run a single test from inside the CI"
@echo "* tests-single-local: Run a single test locally"
@echo "* tests-single-local-docker: Run a single test locally, using docker-compose"
@echo "* tests-single-local-docker: Run a single test locally, using docker"
@echo "* tests-all-local: Run all tests locally"
@echo "* tests-all-local-docker: Run all tests locally, using docker-compose"
@echo "* setup-local-docker: Setup local docker-compose"
@echo "* tests-all-local-docker: Run all tests locally, using docker"
@echo "* setup-local-docker: Build the local docker image"
@echo ""
@echo "Options for testing:"
@echo " TEST_TARGET Set when running tests-single-*, to select the"
Expand Down Expand Up @@ -34,19 +39,21 @@ tests-single-local:

tests-single-local-docker:
@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local-docker" ; return 1; fi
docker-compose run --rm marlin $(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
.PHONY: tests-single-local-docker

tests-all-local:
export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
&& export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
&& for TEST_TARGET in $$(./get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done
&& for TEST_TARGET in $$($(SCRIPTS_DIR)/get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done
.PHONY: tests-all-local

tests-all-local-docker:
docker-compose run --rm marlin $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
.PHONY: tests-all-local-docker

setup-local-docker:
docker-compose build
$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
.PHONY: setup-local-docker
40 changes: 20 additions & 20 deletions Marlin/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*
* Advanced settings can be found in Configuration_adv.h
*/
#define CONFIGURATION_H_VERSION 02010200
#define CONFIGURATION_H_VERSION 02010201

//===========================================================================
//============================= Getting Started =============================
Expand Down Expand Up @@ -242,24 +242,6 @@
//#define SINGLENOZZLE_STANDBY_FAN
#endif

// @section multi-material

/**
* Multi-Material Unit
* Set to one of these predefined models:
*
* PRUSA_MMU1 : PrΕ―Ε‘a MMU1 (The "multiplexer" version)
* PRUSA_MMU2 : PrΕ―Ε‘a MMU2
* PRUSA_MMU2S : PrΕ―Ε‘a MMU2S (Requires MK3S extruder with motion sensor, EXTRUDERS = 5)
* EXTENDABLE_EMU_MMU2 : MMU with configurable number of filaments (ERCF, SMuFF or similar with PrΕ―Ε‘a MMU2 compatible firmware)
* EXTENDABLE_EMU_MMU2S : MMUS with configurable number of filaments (ERCF, SMuFF or similar with PrΕ―Ε‘a MMU2 compatible firmware)
*
* Requires NOZZLE_PARK_FEATURE to park print head in case MMU unit fails.
* See additional options in Configuration_adv.h.
* :["PRUSA_MMU1", "PRUSA_MMU2", "PRUSA_MMU2S", "EXTENDABLE_EMU_MMU2", "EXTENDABLE_EMU_MMU2S"]
*/
//#define MMU_MODEL PRUSA_MMU2

// A dual extruder that uses a single stepper motor
//#define SWITCHING_EXTRUDER
#if ENABLED(SWITCHING_EXTRUDER)
Expand Down Expand Up @@ -393,6 +375,24 @@
//#define HOTEND_OFFSET_Y { 0.0, 5.00 } // (mm) relative Y-offset for each nozzle
//#define HOTEND_OFFSET_Z { 0.0, 0.00 } // (mm) relative Z-offset for each nozzle

// @section multi-material

/**
* Multi-Material Unit
* Set to one of these predefined models:
*
* PRUSA_MMU1 : PrΕ―Ε‘a MMU1 (The "multiplexer" version)
* PRUSA_MMU2 : PrΕ―Ε‘a MMU2
* PRUSA_MMU2S : PrΕ―Ε‘a MMU2S (Requires MK3S extruder with motion sensor, EXTRUDERS = 5)
* EXTENDABLE_EMU_MMU2 : MMU with configurable number of filaments (ERCF, SMuFF or similar with PrΕ―Ε‘a MMU2 compatible firmware)
* EXTENDABLE_EMU_MMU2S : MMUS with configurable number of filaments (ERCF, SMuFF or similar with PrΕ―Ε‘a MMU2 compatible firmware)
*
* Requires NOZZLE_PARK_FEATURE to park print head in case MMU unit fails.
* See additional options in Configuration_adv.h.
* :["PRUSA_MMU1", "PRUSA_MMU2", "PRUSA_MMU2S", "EXTENDABLE_EMU_MMU2", "EXTENDABLE_EMU_MMU2S"]
*/
//#define MMU_MODEL PRUSA_MMU2

// @section psu control

/**
Expand Down Expand Up @@ -2662,7 +2662,7 @@

//
// Elefu RA Board Control Panel
// http://www.elefu.com/index.php?route=product/product&product_id=53
// https://web.archive.org/web/20140823033947/http://www.elefu.com/index.php?route=product/product&product_id=53
//
//#define RA_CONTROL_PANEL

Expand Down
8 changes: 4 additions & 4 deletions Marlin/Configuration_adv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* Basic settings can be found in Configuration.h
*/
#define CONFIGURATION_ADV_H_VERSION 02010200
#define CONFIGURATION_ADV_H_VERSION 02010201

// @section develop

Expand Down Expand Up @@ -839,20 +839,20 @@
//#define Z_MULTI_ENDSTOPS // Other Z axes have their own endstops
#if ENABLED(Z_MULTI_ENDSTOPS)
#define Z2_USE_ENDSTOP _XMAX_ // Z2 endstop board plug. Don't forget to enable USE_*_PLUG.
#define Z2_ENDSTOP_ADJUSTMENT 0 // Z2 offset relative to Y endstop
#define Z2_ENDSTOP_ADJUSTMENT 0 // Z2 offset relative to Z endstop
#endif
#ifdef Z3_DRIVER_TYPE
//#define INVERT_Z3_VS_Z_DIR // Z3 direction signal is the opposite of Z
#if ENABLED(Z_MULTI_ENDSTOPS)
#define Z3_USE_ENDSTOP _YMAX_ // Z3 endstop board plug. Don't forget to enable USE_*_PLUG.
#define Z3_ENDSTOP_ADJUSTMENT 0 // Z3 offset relative to Y endstop
#define Z3_ENDSTOP_ADJUSTMENT 0 // Z3 offset relative to Z endstop
#endif
#endif
#ifdef Z4_DRIVER_TYPE
//#define INVERT_Z4_VS_Z_DIR // Z4 direction signal is the opposite of Z
#if ENABLED(Z_MULTI_ENDSTOPS)
#define Z4_USE_ENDSTOP _ZMAX_ // Z4 endstop board plug. Don't forget to enable USE_*_PLUG.
#define Z4_ENDSTOP_ADJUSTMENT 0 // Z4 offset relative to Y endstop
#define Z4_ENDSTOP_ADJUSTMENT 0 // Z4 offset relative to Z endstop
#endif
#endif
#endif
Expand Down
4 changes: 2 additions & 2 deletions Marlin/Version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* Marlin release version identifier
*/
//#define SHORT_BUILD_VERSION "2.1.2"
//#define SHORT_BUILD_VERSION "2.1.2.1"

/**
* Verbose version identifier which should contain a reference to the location
Expand All @@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2022-12-17"
//#define STRING_DISTRIBUTION_DATE "2023-05-16"

/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
Expand Down
Loading

0 comments on commit b152c49

Please sign in to comment.