diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..7ac3d6078d
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,293 @@
+# Python CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-python/ for more details
+#
+version: 2
+jobs:
+ build:
+ docker:
+ # specify the version you desire here
+ # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
+ - image: circleci/python:2.7.13
+
+ # Specify service dependencies here if necessary
+ # CircleCI maintains a library of pre-built images
+ # documented at https://circleci.com/docs/2.0/circleci-images/
+ # - image: circleci/postgres:9.4
+ environment:
+ TEST_PLATFORM: "-e megaatmega2560"
+
+ working_directory: ~/Marlin
+
+ steps:
+ - checkout
+
+ - restore_cache:
+ paths:
+ - ~/.platformio
+ - ~/Marlin/.piolibdeps
+ keys:
+ - v1-dependencies-{{ checksum "~/Marlin/platformio.ini" }}
+ # fallback to using the latest cache if no exact match is found
+ - v1-dependencies-
+
+ - run:
+ name: install dependencies
+ command: |
+ sudo pip install -U platformio
+
+ # run tests!
+ - run:
+ name: run tests
+ command: |
+ #
+ #
+ # Fetch the tag information for the current branch
+ ls -la
+ git fetch origin --tags
+ #
+ # Publish the buildroot script folder
+ chmod +x buildroot/bin/*
+ export PATH=`pwd`/buildroot/bin/:${PATH}
+
+ # Generate custom version include
+ generate_version ./Marlin/src/inc
+ cat ./Marlin/src/inc/_Version.h
+ #
+ # Backup pins_RAMPS.h
+ #
+ cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
+ #
+
+ env_backup
+
+ #################################
+ # Build all sample configurations
+ #################################
+
+ echo testing megaatmega2560 targets...
+ export TEST_PLATFORM="-e megaatmega2560"
+ restore_configs
+ echo use_example_configs adafruit/ST7565
+ use_example_configs adafruit/ST7565
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs BQ/Hephestos
+ use_example_configs BQ/Hephestos
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs BQ/Hephestos_2
+ use_example_configs BQ/Hephestos_2
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs BQ/WITBOX
+ use_example_configs BQ/WITBOX
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs AliExpress/CL-260
+ use_example_configs AliExpress/CL-260
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Cartesio
+ use_example_configs Cartesio
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs delta/FLSUN/auto_calibrate
+ use_example_configs delta/FLSUN/auto_calibrate
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs delta/FLSUN/kossel_mini
+ use_example_configs delta/FLSUN/kossel_mini
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs delta/generic
+ use_example_configs delta/generic
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs delta/kossel_mini
+ use_example_configs delta/kossel_mini
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs delta/kossel_xl
+ use_example_configs delta/kossel_xl
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Felix
+ use_example_configs Felix
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Felix/DUAL
+ use_example_configs Felix/DUAL
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs gCreate/gMax1.5+
+ use_example_configs gCreate/gMax1.5+
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Geeetech/GT2560
+ use_example_configs Geeetech/GT2560
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Geeetech/I3_Pro_X-GT2560
+ use_example_configs Geeetech/I3_Pro_X-GT2560
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Infitary/i3-M508
+ use_example_configs Infitary/i3-M508
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ #
+ # Disabled due to compile failure on E0_AUTO_FAN_PIN PB8
+ #
+ # use_example_configs Malyan/M200
+ # build_marlin_pio ./ ${TEST_PLATFORM}
+ # restore_configs
+ echo use_example_configs Micromake/C1/basic
+ use_example_configs Micromake/C1/basic
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Micromake/C1/enhanced
+ use_example_configs Micromake/C1/enhanced
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs RepRapWorld/Megatronics
+ use_example_configs RepRapWorld/Megatronics
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs RigidBot
+ use_example_configs RigidBot
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs SCARA
+ use_example_configs SCARA
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Velleman/K8200
+ use_example_configs Velleman/K8200
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Velleman/K8400/Dual-head
+ use_example_configs Velleman/K8400/Dual-head
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Velleman/K8400
+ use_example_configs Velleman/K8400
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Wanhao/Duplicator6
+ use_example_configs Wanhao/Duplicator6
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ #
+ # Disabled due to compile failure on https://github.com/stawel/SlowSoftI2CMaster
+ #
+ # - Requires https://github.com/stawel/SlowSoftI2CMaster
+ # restore_configs
+ # use_example_configs wt150
+ # build_marlin_pio ./ ${TEST_PLATFORM}
+
+
+ echo testing anet10 targets...
+ export TEST_PLATFORM="-e anet10"
+ restore_configs
+ echo use_example_configs Anet/A6
+ use_example_configs Anet/A6
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Anet/A8
+ use_example_configs Anet/A8
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Creality/CR-10
+ use_example_configs Creality/CR-10
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Malyan/M150
+ use_example_configs Malyan/M150
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Sanguinololu
+ use_example_configs Sanguinololu
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs TinyBoy2
+ use_example_configs TinyBoy2
+ build_marlin_pio ./ ${TEST_PLATFORM}
+
+
+ echo testing rambo targets...
+ export TEST_PLATFORM="-e rambo"
+ restore_configs
+ echo use_example_configs AlephObjects/TAZ4
+ use_example_configs AlephObjects/TAZ4
+ build_marlin_pio ./ ${TEST_PLATFORM}
+
+
+ echo testing teensy20 targets...
+ export TEST_PLATFORM="-e teensy20"
+ #
+ # Disabled due to Z_MIN_PIN related compile failure
+ #
+ # restore_configs
+ # use_example_configs delta/kossel_pro
+ # build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs makibox
+ use_example_configs makibox
+ build_marlin_pio ./ ${TEST_PLATFORM}
+
+
+ echo testing sanguino_atmega644p targets...
+ export TEST_PLATFORM="-e sanguino_atmega644p"
+ restore_configs
+ echo use_example_configs tvrrug/Round2
+ use_example_configs tvrrug/Round2
+ build_marlin_pio ./ ${TEST_PLATFORM}
+
+
+ echo testing LPC1768 targets...
+ export TEST_PLATFORM="-e LPC1768"
+ restore_configs
+ echo use_example_configs FolgerTech/i3-2020
+ use_example_configs FolgerTech/i3-2020
+ build_marlin_pio ./ ${TEST_PLATFORM}
+ restore_configs
+ echo use_example_configs Mks/Sbase
+ use_example_configs Mks/Sbase
+ build_marlin_pio ./ ${TEST_PLATFORM}
+
+ #
+ # Disabled due to numerous compile failures
+ #
+ # echo testing STM32F1 targets...
+ # export TEST_PLATFORM="-e STM32F1"
+ # restore_configs
+ # use_example_configs STM32F10
+ # build_marlin_pio ./ ${TEST_PLATFORM}
+ # restore_configs
+ # use_example_configs stm32f103ret6
+ # build_marlin_pio ./ ${TEST_PLATFORM}
+
+
+ #
+ # Disabled due do pin related compile failures
+ #
+ # echo testing DUE targets...
+ # export TEST_PLATFORM="-e DUE"
+ # restore_configs
+ # use_example_configs UltiMachine/Archim2
+ # build_marlin_pio ./ ${TEST_PLATFORM}
+
+ #
+ # Remove temp files from dependencies tree prior to caching
+ rm -rf ~/Marlin/.piolibdeps/_tmp_*
+
+ #
+ # Restore the environment
+ #
+ env_restore
+
+ - save_cache:
+ paths:
+ - ~/.platformio
+ - ~/Marlin/.piolibdeps
+ key: v1-dependencies-{{ checksum "~/Marlin/platformio.ini" }}
diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index a0fa3eff17..0000000000
--- a/.editorconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-# editorconfig.org
-root = true
-
-[{*.patch,syntax_test_*}]
-trim_trailing_whitespace = false
-
-[{*.c,*.cpp,*.h}]
-charset = utf-8
-
-[{*.c,*.cpp,*.h,Makefile}]
-trim_trailing_whitespace = true
-insert_final_newline = true
-end_of_line = lf
-indent_style = space
-indent_size = 2
-
-[{*.py,*.conf,*.sublime-project}]
-indent_style = tab
-indent_size = 4
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index a973242932..0000000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-github: [thinkyhead]
-patreon: thinkyhead
-custom: ["https://www.thinkyhead.com/donate-to-marlin"]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 6e735974a9..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-name: Bug report
-about: Report a bug in Marlin
-title: "[BUG] (short description)"
-labels: ''
-assignees: ''
-
----
-
-
-
-### Bug Description
-
-
-
-### Configuration Files
-
-**Required:** Include a ZIP file containing `Configuration.h` and `Configuration_adv.h`.
-
-If you've made any other modifications describe them in detail here.
-
-### Steps to Reproduce
-
-
-
-1. [First Step]
-2. [Second Step]
-3. [and so on...]
-
-**Expected behavior:**
-
-
-
-**Actual behavior:**
-
-
-
-#### Additional Information
-
-* Provide pictures or links to videos that clearly demonstrate the issue.
-* See [Contributing to Marlin](https://github.com/MarlinFirmware/Marlin/blob/2.0.x/.github/contributing.md) for additional guidelines.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 4b283d2600..0000000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-blank_issues_enabled: false
-contact_links:
- - name: Marlin Documentation
- url: http://marlinfw.org/
- about: Lots of documentation on installing and using Marlin.
- - name: MarlinFirmware Facebook group
- url: https://www.facebook.com/groups/1049718498464482
- about: Please ask and answer questions here.
- - name: Marlin on Discord
- url: https://discord.gg/n5NJ59y
- about: Join the Discord server for support and discussion.
- - name: Marlin Discussion Forum
- url: http://forums.reprap.org/list.php?415
- about: A searchable web forum hosted by RepRap dot org.
- - name: Marlin Videos on YouTube
- url: https://www.youtube.com/results?search_query=marlin+firmware
- about: Tutorials and more from Marlin users all around the world. Great for new users!
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 24de8d0141..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Feature request
-about: Request a Feature
-title: "[FR] (feature request title)"
-labels: 'T: Feature Request'
-assignees: ''
-
----
-
-
-
-### Description
-
-
-
-### Feature Workflow
-
-
-
-1. [First Action]
-2. [Second Action]
-3. [and so on...]
-
-#### Additional Information
-
-* Provide pictures or links that demonstrate a similar feature or concept.
-* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
diff --git a/.github/contributing.md b/.github/contributing.md
index 6bc7b5a005..808c87bb04 100644
--- a/.github/contributing.md
+++ b/.github/contributing.md
@@ -34,15 +34,16 @@ This project and everyone participating in it is governed by the [Marlin Code of
We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions.
-* [Marlin RepRap forum](https://reprap.org/forum/list.php?415)
+* [Marlin RepRap forum](http://forums.reprap.org/list.php?415)
* [MarlinFirmware on Facebook](https://www.facebook.com/groups/1049718498464482/)
-If chat is more your speed, you can join the MarlinFirmware Discord server:
+If chat is more your speed, you can join the MarlinFirmware Slack team:
-* Use the link https://discord.gg/n5NJ59y to join up as a General User.
-* Even though our Discord is pretty active, it may take a while for community members to respond — please be patient!
-* Use the `#general` channel for general questions or discussion about Marlin.
-* Other channels exist for certain topics or are limited to Patrons. Check the channel list.
+* Join the Marlin Slack Team
+ * To obtain group access, please [send a request](http://www.thinkyhead.com/contact/9) to @thinkyhead.
+ * Even though Slack is a chat service, sometimes it takes several hours for community members to respond — please be patient!
+ * Use the `#general` channel for general questions or discussion about Marlin.
+ * Other channels exist for certain topics. Check the channel list.
## How Can I Contribute?
@@ -92,7 +93,7 @@ Before creating a suggestion, please check [this list](#before-submitting-a-sugg
#### Before Submitting a Feature Request
-* **Check the [Marlin website](https://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](https://marlinfw.org/docs/configuration/configuration.html).
+* **Check the [Marlin website](http://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](http://marlinfw.org/docs/configuration/configuration.html).
* **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aissue)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
#### How Do I Submit A (Good) Feature Request?
@@ -116,12 +117,12 @@ Unsure where to begin contributing to Marlin? You can start by looking through t
### Pull Requests
-Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
+Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](http://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
* Fill in [the required template](pull_request_template.md).
* Don't include issue numbers in the PR title.
* Include pictures, diagrams, and links to videos in your Pull Request to demonstrate your changes, if needed.
-* Follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website.
+* Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) posted on our website.
* Document new code with clear and concise comments.
* End all files with a newline.
@@ -136,7 +137,7 @@ Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x
### C++ Coding Standards
-* Please read and follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests.
+* Please read and follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests.
### Documentation
diff --git a/.github/issue_template.md b/.github/issue_template.md
index a211ca5e27..58b4894f67 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,11 +1,31 @@
-# NO SUPPORT REQUESTS PLEASE
+
+
+### Description
+
+
+
+### Steps to Reproduce
+
+
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+**Expected behavior:** [What you expect to happen]
+
+**Actual behavior:** [What actually happens]
+
+#### Additional Information
+
+* Include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
+* Provide pictures or links to videos that clearly demonstrate the issue.
+* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
diff --git a/.github/lock.yml b/.github/lock.yml
deleted file mode 100644
index c5ceff66b0..0000000000
--- a/.github/lock.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
-#
-
-# Number of days of inactivity before a closed issue or pull request is locked
-daysUntilLock: 60
-
-# Skip issues and pull requests created before a given timestamp. Timestamp must
-# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
-skipCreatedBefore: false
-
-# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
-exemptLabels: [ 'no-locking' ]
-
-# Label to add before locking, such as `outdated`. Set to `false` to disable
-lockLabel: false
-
-# Comment to post before locking. Set to `false` to disable
-lockComment: >
- This thread has been automatically locked since there has not been
- any recent activity after it was closed. Please open a new issue for
- related bugs.
-
-# Assign `resolved` as the reason for locking. Set to `false` to disable
-setLockReason: true
-
-# Limit to only `issues` or `pulls`
-# only: issues
-
-# Optionally, specify configuration settings just for `issues` or `pulls`
-# issues:
-# exemptLabels:
-# - help-wanted
-# lockLabel: outdated
-
-# pulls:
-# daysUntilLock: 30
-
-# Repository to extend settings from
-# _extends: repo
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index d82fb0f9e3..9298b2b96d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -14,10 +14,6 @@ We must be able to understand your proposed change from this description. If we
-### Configurations
-
-
-
### Related Issues
diff --git a/.github/workflows/bump-date.yml b/.github/workflows/bump-date.yml
deleted file mode 100644
index 54902da8c9..0000000000
--- a/.github/workflows/bump-date.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# bump-date.yml
-# Bump the distribution date once per day
-#
-
-name: Bump Distribution Date
-
-on:
- schedule:
- - cron: '0 0 * * *'
-
-jobs:
- bump_date:
- name: Bump Distribution Date
- if: github.repository == 'MarlinFirmware/Marlin'
-
- runs-on: ubuntu-latest
-
- steps:
-
- - name: Check out bugfix-2.0.x
- uses: actions/checkout@v2
- with:
- ref: bugfix-2.0.x
-
- - name: Bump Distribution Date
- run: |
- # Inline Bump Script
- DIST=$( date +"%Y-%m-%d" )
- eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
- git config user.name "${GITHUB_ACTOR}" && \
- git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
- git add . && \
- git commit -m "[cron] Bump distribution date ($DIST)" && \
- git push
diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
deleted file mode 100644
index aa4a2c59c9..0000000000
--- a/.github/workflows/check-pr.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# check-pr.yml
-# Close PRs directed at release branches
-#
-
-name: PR Bad Target
-
-on:
- pull_request:
- branches:
- - 1.0.x
- - 1.1.x
- - 2.0.x
-
-jobs:
- bad_target:
- name: PR Bad Target
- if: github.repository == 'MarlinFirmware/Marlin'
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: peter-evans/close-pull@v1
- with:
- delete-branch: false
- comment: >
- Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases.
-
- Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR.
-
- It may help to set your fork's default branch to `bugfix-2.0.x`.
-
- See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml
deleted file mode 100644
index 89d5d65351..0000000000
--- a/.github/workflows/close-stale.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# close-stale.yml
-# Close open issues after a period of inactivity
-#
-
-name: Close Stale Issues
-
-on:
- schedule:
- - cron: "22 1 * * *"
-
-jobs:
- stale:
- name: Close Stale Issues
- if: github.repository == 'MarlinFirmware/Marlin'
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/stale@v3
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
- stale-issue-message: 'This issue has had no activity in the last 30 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 7 days.'
- days-before-stale: 30
- days-before-close: 7
- stale-issue-label: 'stale-closing-soon'
- exempt-issue-labels: 'T: Feature Request'
diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml
deleted file mode 100644
index 8cdcd7a836..0000000000
--- a/.github/workflows/lock-closed.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# lock-closed.yml
-# Lock closed issues after a period of inactivity
-#
-
-name: Lock Closed Issues
-
-on:
- schedule:
- - cron: '0 1/13 * * *'
-
-jobs:
- lock:
- name: Lock Closed Issues
- if: github.repository == 'MarlinFirmware/Marlin'
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: dessant/lock-threads@v2
- with:
- github-token: ${{ github.token }}
- process-only: 'issues'
- issue-lock-inactive-days: '60'
- issue-exclude-created-before: ''
- issue-exclude-labels: 'no-locking'
- issue-lock-labels: ''
- issue-lock-comment: >
- This issue has been automatically locked since there
- has not been any recent activity after it was closed.
- Please open a new issue for related bugs.
- issue-lock-reason: ''
diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
deleted file mode 100644
index b228783799..0000000000
--- a/.github/workflows/test-builds.yml
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# test-builds.yml
-# Do test builds to catch compile errors
-#
-
-name: CI
-
-on:
- pull_request:
- branches:
- - bugfix-2.0.x
- paths-ignore:
- - config/**
- - data/**
- - docs/**
- - '**/*.md'
- push:
- branches:
- - bugfix-2.0.x
- paths-ignore:
- - config/**
- - data/**
- - docs/**
- - '**/*.md'
-
-jobs:
- test_builds:
- name: Run All Tests
- if: github.repository == 'MarlinFirmware/Marlin'
-
- runs-on: ubuntu-latest
-
- strategy:
- matrix:
- test-platform:
- # Base Environments
-
- - DUE
- - esp32
- - linux_native
- - mega2560
- - teensy31
- - teensy35
- - teensy41
- - SAMD51_grandcentral_m4
-
- # Extended AVR Environments
-
- - FYSETC_F6_13
- - mega1280
- - rambo
- - sanguino1284p
- - sanguino644p
-
- # Extended STM32 Environments
-
- - STM32F103RC_btt
- - STM32F103RC_btt_USB
- - STM32F103RE_btt
- - STM32F103RE_btt_USB
- - STM32F103RC_fysetc
- - STM32F103RC_meeb
- - jgaurora_a5s_a1
- - STM32F103VE_longer
- - STM32F407VE_black
- - STM32F401VE_STEVAL
- - BIGTREE_BTT002
- - BIGTREE_SKR_PRO
- - BIGTREE_GTR_V1_0
- - mks_robin
- - mks_robin_stm32
- - ARMED
- - FYSETC_S6
- - STM32F070CB_malyan
- - STM32F070RB_malyan
- - malyan_M300
- - mks_robin_lite
- - FLYF407ZG
- - rumba32
- - mks_robin_pro
- - STM32F103RET6_creality
- - LERDGEX
- - mks_robin_nano35
-
- # Put lengthy tests last
-
- - LPC1768
- - LPC1769
-
- # STM32 with non-STM framework. both broken for now. they should use HAL_STM32 which is working.
-
- #- STM32F4
- #- STM32F7
-
- # Non-working environment tests
- #- at90usb1286_cdc
- #- at90usb1286_dfu
- #- STM32F103CB_malyan
- #- mks_robin_mini
-
- steps:
-
- - name: Select Python 3.7
- uses: actions/setup-python@v1
- with:
- python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
- architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-
- - name: Install PlatformIO
- run: |
- pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
- platformio update
-
- - name: Check out the PR
- uses: actions/checkout@v2
-
- - name: Run ${{ matrix.test-platform }} Tests
- run: |
- # Inline tests script
- chmod +x buildroot/bin/*
- chmod +x buildroot/tests/*
- export PATH=./buildroot/bin/:./buildroot/tests/:${PATH}
- run_tests . ${{ matrix.test-platform }}
diff --git a/.github/workflows/unlock-reopened.yml b/.github/workflows/unlock-reopened.yml
deleted file mode 100644
index 614ef3fab2..0000000000
--- a/.github/workflows/unlock-reopened.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# unlock-reopened.yml
-# Unlock an issue whenever it is re-opened
-#
-
-name: "Unlock reopened issue"
-
-on:
- issues:
- types: [reopened]
-
-jobs:
- unlock:
- name: Unlock Reopened
- if: github.repository == 'MarlinFirmware/Marlin'
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: OSDKDev/unlock-issues@v1.1
- with:
- repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.gitignore b/.gitignore
index c163d339df..7a364bbd42 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
#
# Marlin 3D Printer Firmware
-# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+# Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
#
# Based on Sprinter and grbl.
-# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+# Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
# Our automatic versioning scheme generates the following file
@@ -146,9 +146,6 @@ Marlin/*/*/readme.txt
Marlin/*/*/*/readme.txt
Marlin/*/*/*/*/readme.txt
-# Secure Credentials
-Configuration_Secure.h
-
#Visual Studio
*.sln
*.vcxproj
@@ -174,13 +171,3 @@ CMakeListsPrivate.txt
#CLion
cmake-build-*
-
-#Eclipse
-.project
-.cproject
-.pydevproject
-.settings
-.classpath
-
-#Python
-__pycache__
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..7a80292f3b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,52 @@
+dist: trusty
+sudo: false
+
+language: python
+python:
+ - "2.7"
+
+notifications:
+ email: false
+
+# Cache PlatformIO packages using Travis CI container-based infrastructure
+sudo: false
+cache:
+ pip: true
+ directories:
+ - "~/.platformio"
+
+env:
+ - TEST_PLATFORM="megaatmega2560"
+ - TEST_PLATFORM="LPC1768"
+ - TEST_PLATFORM="DUE"
+ - TEST_PLATFORM="STM32F1"
+ - TEST_PLATFORM="teensy35"
+
+before_install:
+ #
+ # Fetch the tag information for the current branch
+ - git fetch origin --tags
+ #
+ # Publish the buildroot script folder
+ - chmod +x ${TRAVIS_BUILD_DIR}/buildroot/bin/*
+ - export PATH=${TRAVIS_BUILD_DIR}/buildroot/bin/:${PATH}
+ - chmod +x ${TRAVIS_BUILD_DIR}/buildroot/share/tests/*
+ - export PATH=${TRAVIS_BUILD_DIR}/buildroot/share/tests/:${PATH}
+
+install:
+ #- pip install -U platformio
+ - pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
+
+before_script:
+ # Update PlatformIO packages
+ - platformio update
+ #
+ # Change current working directory to the build dir
+ - cd ${TRAVIS_BUILD_DIR}
+ #
+ # Generate custom version include
+ - generate_version ${TRAVIS_BUILD_DIR}/Marlin/src/inc
+ - cat ${TRAVIS_BUILD_DIR}/Marlin/src/inc/_Version.h
+ #
+script:
+ - start_tests ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
diff --git a/LICENSE b/LICENSE
index 6c0e10f3b8..f27031ae85 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3,7 +3,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (c) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -634,7 +634,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
{one line to give the program's name and a brief idea of what it does.}
- Copyright (c) {year} {name of author}
+ Copyright (C) {year} {name of author}
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -647,14 +647,14 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- {project} Copyright (c) {year} {fullname}
+ {project} Copyright (C) {year} {fullname}
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -666,11 +666,12 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
-.
+.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
-.
+.
+
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index db266b524b..bd63e6362b 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1,9 +1,9 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,10 +16,9 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*
*/
-#pragma once
/**
* Configuration.h
@@ -34,8 +33,11 @@
* - Extra features
*
* Advanced settings can be found in Configuration_adv.h
+ *
*/
-#define CONFIGURATION_H_VERSION 020007
+#ifndef CONFIGURATION_H
+#define CONFIGURATION_H
+#define CONFIGURATION_H_VERSION 020000
//===========================================================================
//============================= Getting Started =============================
@@ -44,13 +46,13 @@
/**
* Here are some standard links for getting your machine calibrated:
*
- * https://reprap.org/wiki/Calibration
- * https://youtu.be/wAL9d7FgInk
+ * http://reprap.org/wiki/Calibration
+ * http://youtu.be/wAL9d7FgInk
* http://calculator.josefprusa.cz
- * https://reprap.org/wiki/Triffid_Hunter%27s_Calibration_Guide
- * https://www.thingiverse.com/thing:5573
+ * http://reprap.org/wiki/Triffid_Hunter%27s_Calibration_Guide
+ * http://www.thingiverse.com/thing:5573
* https://sites.google.com/site/repraplogphase/calibration-of-your-reprap
- * https://www.thingiverse.com/thing:298812
+ * http://www.thingiverse.com/thing:298812
*/
//===========================================================================
@@ -69,9 +71,13 @@
// @section info
-// Author info of this build printed to the host during boot and M115
+// User-specified version info of this build to display in [Pronterface, etc] terminal window during
+// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
+// build by the user have been successfully uploaded into firmware.
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
-//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
+#define SHOW_BOOTSCREEN
+#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
+#define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2
/**
* *** VENDORS PLEASE READ ***
@@ -84,13 +90,10 @@
* respectfully request that you retain the unmodified Marlin boot screen.
*/
-// Show the Marlin bootscreen on startup. ** ENABLE FOR PRODUCTION **
-#define SHOW_BOOTSCREEN
-
-// Show the bitmap in Marlin/_Bootscreen.h on startup.
+// Enable to show the bitmap in Marlin/_Bootscreen.h on startup.
//#define SHOW_CUSTOM_BOOTSCREEN
-// Show the bitmap in Marlin/_Statusscreen.h on the status screen.
+// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine
@@ -98,7 +101,6 @@
/**
* Select the serial port on the board to use for communication with the host.
* This allows the connection of wireless adapters (for instance) to non-default port pins.
- * Serial port -1 is the USB emulated serial port, if available.
* Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
*
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
@@ -107,6 +109,9 @@
/**
* Select a secondary serial port on the board to use for communication with the host.
+ * This allows the connection of wireless adapters (for instance) to non-default port pins.
+ * Serial port -1 is the USB emulated serial port, if available.
+ *
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/
//#define SERIAL_PORT_2 -1
@@ -125,37 +130,32 @@
// Enable the Bluetooth serial interface on AT90USB devices
//#define BLUETOOTH
-// Choose the name from boards.h that matches your setup
+// The following define selects which electronics board you have.
+// Please choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD
#define MOTHERBOARD BOARD_RAMPS_14_EFB
#endif
-// Name displayed in the LCD "Ready" message and Info menu
+// Optional custom name for your RepStrap or other custom machine
+// Displayed in the LCD "Ready" message
//#define CUSTOM_MACHINE_NAME "3D Printer"
-// Printer's unique ID, used by some programs to differentiate between machines.
-// Choose your own or use a service like https://www.uuidgenerator.net/version4
+// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
+// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
// @section extruder
// This defines the number of extruders
-// :[0, 1, 2, 3, 4, 5, 6, 7, 8]
+// :[1, 2, 3, 4, 5]
#define EXTRUDERS 1
// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
-#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
-// Save and restore temperature and fan speed on tool-change.
-// Set standby for the unselected tool with M104/106/109 T...
-#if ENABLED(SINGLENOZZLE)
- //#define SINGLENOZZLE_STANDBY_TEMP
- //#define SINGLENOZZLE_STANDBY_FAN
-#endif
-
/**
* Průša MK2 Single Nozzle Multi-Material Multiplexer, and variants.
*
@@ -175,16 +175,6 @@
//#define E_MUX2_PIN 44 // Needed for 5 to 8 inputs
#endif
-/**
- * Průša Multi-Material Unit v2
- *
- * Requires NOZZLE_PARK_FEATURE to park print head in case MMU unit fails.
- * Requires EXTRUDERS = 5
- *
- * For additional configuration see Configuration_adv.h
- */
-//#define PRUSA_MMU2
-
// A dual extruder that uses a single stepper motor
//#define SWITCHING_EXTRUDER
#if ENABLED(SWITCHING_EXTRUDER)
@@ -195,52 +185,25 @@
#endif
#endif
-// A dual-nozzle that uses a servomotor to raise/lower one (or both) of the nozzles
+// A dual-nozzle that uses a servomotor to raise/lower one of the nozzles
//#define SWITCHING_NOZZLE
#if ENABLED(SWITCHING_NOZZLE)
#define SWITCHING_NOZZLE_SERVO_NR 0
- //#define SWITCHING_NOZZLE_E1_SERVO_NR 1 // If two servos are used, the index of the second
- #define SWITCHING_NOZZLE_SERVO_ANGLES { 0, 90 } // Angles for E0, E1 (single servo) or lowered/raised (dual servo)
+ #define SWITCHING_NOZZLE_SERVO_ANGLES { 0, 90 } // Angles for E0, E1
#endif
/**
* Two separate X-carriages with extruders that connect to a moving part
- * via a solenoid docking mechanism. Requires SOL1_PIN and SOL2_PIN.
+ * via a magnetic docking mechanism. Requires SOL1_PIN and SOL2_PIN.
*/
//#define PARKING_EXTRUDER
-
-/**
- * Two separate X-carriages with extruders that connect to a moving part
- * via a magnetic docking mechanism using movements and no solenoid
- *
- * project : https://www.thingiverse.com/thing:3080893
- * movements : https://youtu.be/0xCEiG9VS3k
- * https://youtu.be/Bqbcs0CU2FE
- */
-//#define MAGNETIC_PARKING_EXTRUDER
-
-#if EITHER(PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER)
-
+#if ENABLED(PARKING_EXTRUDER)
+ #define PARKING_EXTRUDER_SOLENOIDS_INVERT // If enabled, the solenoid is NOT magnetized with applied voltage
+ #define PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE LOW // LOW or HIGH pin signal energizes the coil
+ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined.
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
- #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
- //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
-
- #if ENABLED(PARKING_EXTRUDER)
-
- #define PARKING_EXTRUDER_SOLENOIDS_INVERT // If enabled, the solenoid is NOT magnetized with applied voltage
- #define PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE LOW // LOW or HIGH pin signal energizes the coil
- #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // (ms) Delay for magnetic field. No delay if 0 or not defined.
- //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
-
- #elif ENABLED(MAGNETIC_PARKING_EXTRUDER)
-
- #define MPE_FAST_SPEED 9000 // (mm/min) Speed for travel before last distance point
- #define MPE_SLOW_SPEED 4500 // (mm/min) Speed for last distance travel to park and couple
- #define MPE_TRAVEL_DISTANCE 10 // (mm) Last distance point
- #define MPE_COMPENSATION 0 // Offset Compensation -1 , 0 , 1 (multiplier) only for coupling
-
- #endif
-
+ #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
+ #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking
#endif
/**
@@ -250,153 +213,103 @@
* the E3D Tool Changer. Toolheads are locked with a servo.
*/
//#define SWITCHING_TOOLHEAD
-
-/**
- * Magnetic Switching Toolhead
- *
- * Support swappable and dockable toolheads with a magnetic
- * docking mechanism using movement and no servo.
- */
-//#define MAGNETIC_SWITCHING_TOOLHEAD
-
-/**
- * Electromagnetic Switching Toolhead
- *
- * Parking for CoreXY / HBot kinematics.
- * Toolheads are parked at one edge and held with an electromagnet.
- * Supports more than 2 Toolheads. See https://youtu.be/JolbsAKTKf4
- */
-//#define ELECTROMAGNETIC_SWITCHING_TOOLHEAD
-
-#if ANY(SWITCHING_TOOLHEAD, MAGNETIC_SWITCHING_TOOLHEAD, ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
- #define SWITCHING_TOOLHEAD_Y_POS 235 // (mm) Y position of the toolhead dock
- #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis
- #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis
- #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders
- #if ENABLED(SWITCHING_TOOLHEAD)
- #define SWITCHING_TOOLHEAD_SERVO_NR 2 // Index of the servo connector
- #define SWITCHING_TOOLHEAD_SERVO_ANGLES { 0, 180 } // (degrees) Angles for Lock, Unlock
- #elif ENABLED(MAGNETIC_SWITCHING_TOOLHEAD)
- #define SWITCHING_TOOLHEAD_Y_RELEASE 5 // (mm) Security distance Y axis
- #define SWITCHING_TOOLHEAD_X_SECURITY { 90, 150 } // (mm) Security distance X axis (T0,T1)
- //#define PRIME_BEFORE_REMOVE // Prime the nozzle before release from the dock
- #if ENABLED(PRIME_BEFORE_REMOVE)
- #define SWITCHING_TOOLHEAD_PRIME_MM 20 // (mm) Extruder prime length
- #define SWITCHING_TOOLHEAD_RETRACT_MM 10 // (mm) Retract after priming length
- #define SWITCHING_TOOLHEAD_PRIME_FEEDRATE 300 // (mm/min) Extruder prime feedrate
- #define SWITCHING_TOOLHEAD_RETRACT_FEEDRATE 2400 // (mm/min) Extruder retract feedrate
- #endif
- #elif ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
- #define SWITCHING_TOOLHEAD_Z_HOP 2 // (mm) Z raise for switching
- #endif
+#if ENABLED(SWITCHING_TOOLHEAD)
+ #define SWITCHING_TOOLHEAD_SERVO_NR 2 // Index of the servo connector
+ #define SWITCHING_TOOLHEAD_SERVO_ANGLES { 0, 180 } // (degrees) Angles for Lock, Unlock
+ #define SWITCHING_TOOLHEAD_Y_POS 235 // (mm) Y position of the toolhead dock
+ #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis
+ #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis
+ #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders
+ #define SWITCHING_TOOLHEAD_SECURITY_RAISE 5 // (mm) Z-raise before parking
#endif
/**
* "Mixing Extruder"
- * - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
+ * - Adds a new code, M165, to set the current mix factors.
* - Extends the stepping routines to move multiple steppers in proportion to the mix.
- * - Optional support for Repetier Firmware's 'M164 S' supporting virtual tools.
- * - This implementation supports up to two mixing extruders.
- * - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
+ * - Optional support for Repetier Firmware M163, M164, and virtual extruder.
+ * - This implementation supports only a single extruder.
+ * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
*/
//#define MIXING_EXTRUDER
#if ENABLED(MIXING_EXTRUDER)
#define MIXING_STEPPERS 2 // Number of steppers in your mixing extruder
#define MIXING_VIRTUAL_TOOLS 16 // Use the Virtual Tool method with M163 and M164
//#define DIRECT_MIXING_IN_G1 // Allow ABCDHI mix factors in G1 movement commands
- //#define GRADIENT_MIX // Support for gradient mixing with M166 and LCD
- #if ENABLED(GRADIENT_MIX)
- //#define GRADIENT_VTOOL // Add M166 T to use a V-tool index as a Gradient alias
- #endif
#endif
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.
-//#define HOTEND_OFFSET_X { 0.0, 20.00 } // (mm) relative X-offset for each nozzle
-//#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
+//#define HOTEND_OFFSET_X {0.0, 20.00} // (mm) relative X-offset for each nozzle
+//#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 machine
/**
- * Power Supply Control
+ * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN
*
- * Enable and connect the power supply to the PS_ON_PIN.
- * Specify whether the power supply is active HIGH or active LOW.
+ * 0 = No Power Switch
+ * 1 = ATX
+ * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
+ *
+ * :{ 0:'No power switch', 1:'ATX', 2:'X-Box 360' }
*/
-//#define PSU_CONTROL
-//#define PSU_NAME "Power Supply"
+#define POWER_SUPPLY 0
-#if ENABLED(PSU_CONTROL)
- #define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
+#if POWER_SUPPLY > 0
+ // Enable this option to leave the PSU off at startup.
+ // Power to steppers and heaters will need to be turned on with M80.
+ //#define PS_DEFAULT_OFF
- //#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
- //#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
-
- //#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin
+ //#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin
#if ENABLED(AUTO_POWER_CONTROL)
- #define AUTO_POWER_FANS // Turn on PSU if fans need power
+ #define AUTO_POWER_FANS // Turn on PSU if fans need power
#define AUTO_POWER_E_FANS
#define AUTO_POWER_CONTROLLERFAN
- #define AUTO_POWER_CHAMBER_FAN
- //#define AUTO_POWER_E_TEMP 50 // (°C) Turn on PSU over this temperature
- //#define AUTO_POWER_CHAMBER_TEMP 30 // (°C) Turn on PSU over this temperature
#define POWER_TIMEOUT 30
#endif
+
#endif
+// @section temperature
+
//===========================================================================
//============================= Thermal Settings ============================
//===========================================================================
-// @section temperature
/**
* --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
*
* Temperature sensors available:
*
- * -5 : PT100 / PT1000 with MAX31865 (only for sensors 0-1)
- * -3 : thermocouple with MAX31855 (only for sensors 0-1)
- * -2 : thermocouple with MAX6675 (only for sensors 0-1)
* -4 : thermocouple with AD8495
+ * -3 : thermocouple with MAX31855 (only for sensor 0)
+ * -2 : thermocouple with MAX6675 (only for sensor 0)
* -1 : thermocouple with AD595
* 0 : not used
* 1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
- * 331 : (3.3V scaled thermistor 1 table for MEGA)
- * 332 : (3.3V scaled thermistor 1 table for DUE)
* 2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
- * 202 : 200k thermistor - Copymaster 3D
* 3 : Mendel-parts thermistor (4.7k pullup)
* 4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
- * 5 : 100K thermistor - ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan, J-Head, and E3D) (4.7k pullup)
+ * 5 : 100K thermistor - ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan & J-Head) (4.7k pullup)
* 501 : 100K Zonestar (Tronxy X3A) Thermistor
- * 502 : 100K Zonestar Thermistor used by hot bed in Zonestar Průša P802M
- * 512 : 100k RPW-Ultra hotend thermistor (4.7k pullup)
* 6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
* 7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
* 71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
* 8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
* 9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
* 10 : 100k RS thermistor 198-961 (4.7k pullup)
- * 11 : 100k beta 3950 1% thermistor (Used in Keenovo AC silicone mats and most Wanhao i3 machines) (4.7k pullup)
+ * 11 : 100k beta 3950 1% thermistor (4.7k pullup)
* 12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
* 13 : 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
* 15 : 100k thermistor calibration for JGAurora A5 hotend
- * 18 : ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327
- * 20 : Pt100 with circuit in the Ultimainboard V2.x with 5v excitation (AVR)
- * 21 : Pt100 with circuit in the Ultimainboard V2.x with 3.3v excitation (STM32 \ LPC176x....)
- * 22 : 100k (hotend) with 4.7k pullup to 3.3V and 220R to analog input (as in GTM32 Pro vB)
- * 23 : 100k (bed) with 4.7k pullup to 3.3v and 220R to analog input (as in GTM32 Pro vB)
- * 30 : Kis3d Silicone heating mat 200W/300W with 6mm precision cast plate (EN AW 5083) NTC100K / B3950 (4.7k pullup)
- * 201 : Pt100 with circuit in Overlord, similar to Ultimainboard V2.x
+ * 20 : the PT100 circuit found in the Ultimainboard V2.x
* 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
- * 61 : 100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup
* 66 : 4.7M High Temperature thermistor from Dyze Design
- * 67 : 450C thermistor from SliceEngineering
* 70 : the 100K thermistor found in the bq Hephestos 2
* 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
- * 99 : 100k thermistor with a 10K pull-up resistor (found on some Wanhao i3 machines)
*
* 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
* (but gives greater accuracy and more stable PID)
@@ -404,109 +317,105 @@
* 52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
* 55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
*
- * 1047 : Pt1000 with 4k7 pullup (E3D)
+ * 1047 : Pt1000 with 4k7 pullup
* 1010 : Pt1000 with 1k pullup (non standard)
* 147 : Pt100 with 4k7 pullup
* 110 : Pt100 with 1k pullup (non standard)
*
- * 1000 : Custom - Specify parameters in Configuration_adv.h
- *
* Use these for Testing or Development purposes. NEVER for production machine.
* 998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
* 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
+ *
+ * :{ '0': "Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '20':"PT100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '66':"Dyze Design 4.7M High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595",'998':"Dummy 1", '999':"Dummy 2" }
*/
#define TEMP_SENSOR_0 1
#define TEMP_SENSOR_1 0
#define TEMP_SENSOR_2 0
#define TEMP_SENSOR_3 0
#define TEMP_SENSOR_4 0
-#define TEMP_SENSOR_5 0
-#define TEMP_SENSOR_6 0
-#define TEMP_SENSOR_7 0
#define TEMP_SENSOR_BED 0
-#define TEMP_SENSOR_PROBE 0
#define TEMP_SENSOR_CHAMBER 0
// Dummy thermistor constant temperature readings, for use with 998 and 999
#define DUMMY_THERMISTOR_998_VALUE 25
#define DUMMY_THERMISTOR_999_VALUE 100
-// Resistor values when using a MAX31865 (sensor -5)
-// Sensor value is typically 100 (PT100) or 1000 (PT1000)
-// Calibration value is typically 430 ohm for AdaFruit PT100 modules and 4300 ohm for AdaFruit PT1000 modules.
-//#define MAX31865_SENSOR_OHMS 100
-//#define MAX31865_CALIBRATION_OHMS 430
-
// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
// from the two sensors differ too much the print will be aborted.
//#define TEMP_SENSOR_1_AS_REDUNDANT
#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
-#define TEMP_RESIDENCY_TIME 10 // (seconds) Time to wait for hotend to "settle" in M109
-#define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
-#define TEMP_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
+// Extruder temperature must be close to target for this long before M109 returns success
+#define TEMP_RESIDENCY_TIME 10 // (seconds)
+#define TEMP_HYSTERESIS 3 // (degC) range of +/- temperatures considered "close" to the target one
+#define TEMP_WINDOW 1 // (degC) Window around target to start the residency timer x degC early.
-#define TEMP_BED_RESIDENCY_TIME 10 // (seconds) Time to wait for bed to "settle" in M190
-#define TEMP_BED_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
-#define TEMP_BED_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
+// Bed temperature must be close to target for this long before M190 returns success
+#define TEMP_BED_RESIDENCY_TIME 10 // (seconds)
+#define TEMP_BED_HYSTERESIS 3 // (degC) range of +/- temperatures considered "close" to the target one
+#define TEMP_BED_WINDOW 1 // (degC) Window around target to start the residency timer x degC early.
-// Below this temperature the heater will be switched off
-// because it probably indicates a broken thermistor wire.
-#define HEATER_0_MINTEMP 5
-#define HEATER_1_MINTEMP 5
-#define HEATER_2_MINTEMP 5
-#define HEATER_3_MINTEMP 5
-#define HEATER_4_MINTEMP 5
-#define HEATER_5_MINTEMP 5
-#define HEATER_6_MINTEMP 5
-#define HEATER_7_MINTEMP 5
-#define BED_MINTEMP 5
+// The minimal temperature defines the temperature below which the heater will not be enabled It is used
+// to check that the wiring to the thermistor is not broken.
+// Otherwise this would lead to the heater being powered on all the time.
+#define HEATER_0_MINTEMP 5
+#define HEATER_1_MINTEMP 5
+#define HEATER_2_MINTEMP 5
+#define HEATER_3_MINTEMP 5
+#define HEATER_4_MINTEMP 5
+#define BED_MINTEMP 5
-// Above this temperature the heater will be switched off.
-// This can protect components from overheating, but NOT from shorts and failures.
-// (Use MINTEMP for thermistor short/failure protection.)
+// When temperature exceeds max temp, your heater will be switched off.
+// This feature exists to protect your hotend from overheating accidentally, but *NOT* from thermistor short/failure!
+// You should use MINTEMP for thermistor short/failure protection.
#define HEATER_0_MAXTEMP 275
#define HEATER_1_MAXTEMP 275
#define HEATER_2_MAXTEMP 275
#define HEATER_3_MAXTEMP 275
#define HEATER_4_MAXTEMP 275
-#define HEATER_5_MAXTEMP 275
-#define HEATER_6_MAXTEMP 275
-#define HEATER_7_MAXTEMP 275
-#define BED_MAXTEMP 150
+#define BED_MAXTEMP 150
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
-// PID Tuning Guide here: https://reprap.org/wiki/PID_Tuning
+// PID Tuning Guide here: http://reprap.org/wiki/PID_Tuning
// Comment the following line to disable PID and enable bang-bang.
#define PIDTEMP
#define BANG_MAX 255 // Limits current to nozzle while in bang-bang mode; 255=full current
#define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
#define PID_K1 0.95 // Smoothing factor within any PID loop
-
#if ENABLED(PIDTEMP)
- //#define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
- //#define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
+ //#define PID_AUTOTUNE_MENU // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result.
+ //#define PID_DEBUG // Sends debug data to the serial port.
+ //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
+ //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
//#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
// Set/get with gcode: M301 E[extruder number, 0-2]
+ #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
+ // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
+
+ // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
+
+ // Ultimaker
+ #define DEFAULT_Kp 22.2
+ #define DEFAULT_Ki 1.08
+ #define DEFAULT_Kd 114
+
+ // MakerGear
+ //#define DEFAULT_Kp 7.0
+ //#define DEFAULT_Ki 0.1
+ //#define DEFAULT_Kd 12
+
+ // Mendel Parts V9 on 12V
+ //#define DEFAULT_Kp 63.0
+ //#define DEFAULT_Ki 2.25
+ //#define DEFAULT_Kd 440
- #if ENABLED(PID_PARAMS_PER_HOTEND)
- // Specify between 1 and HOTENDS values per array.
- // If fewer than EXTRUDER values are provided, the last element will be repeated.
- #define DEFAULT_Kp_LIST { 22.20, 22.20 }
- #define DEFAULT_Ki_LIST { 1.08, 1.08 }
- #define DEFAULT_Kd_LIST { 114.00, 114.00 }
- #else
- #define DEFAULT_Kp 22.20
- #define DEFAULT_Ki 1.08
- #define DEFAULT_Kd 114.00
- #endif
#endif // PIDTEMP
//===========================================================================
-//====================== PID > Bed Temperature Control ======================
+//============================= PID > Bed Temperature Control ===============
//===========================================================================
/**
@@ -535,26 +444,24 @@
#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current
#if ENABLED(PIDTEMPBED)
- //#define MIN_BED_POWER 0
+
//#define PID_BED_DEBUG // Sends debug data to the serial port.
- // 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
- // from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
+ //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
+ //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
#define DEFAULT_bedKi .023
#define DEFAULT_bedKd 305.4
+ //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
+ //from pidautotune
+ //#define DEFAULT_bedKp 97.1
+ //#define DEFAULT_bedKi 1.41
+ //#define DEFAULT_bedKd 1675.16
+
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
#endif // PIDTEMPBED
-#if EITHER(PIDTEMP, PIDTEMPBED)
- //#define PID_DEBUG // Sends debug data to the serial port. Use 'M303 D' to toggle activation.
- //#define PID_OPENLOOP // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
- //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
- #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
- // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
-#endif
-
// @section extruder
/**
@@ -593,7 +500,6 @@
#define THERMAL_PROTECTION_HOTENDS // Enable thermal protection for all extruders
#define THERMAL_PROTECTION_BED // Enable thermal protection for the heated bed
-#define THERMAL_PROTECTION_CHAMBER // Enable thermal protection for the heated chamber
//===========================================================================
//============================= Mechanical Settings =========================
@@ -601,7 +507,7 @@
// @section machine
-// Enable one of the options below for CoreXY, CoreXZ, or CoreYZ kinematics,
+// Uncomment one of these options to enable CoreXY, CoreXZ, or CoreYZ kinematics
// either in the usual order or reversed
//#define COREXY
//#define COREXZ
@@ -609,7 +515,6 @@
//#define COREYX
//#define COREZX
//#define COREZY
-//#define MARKFORGED_XY // MarkForged. See https://reprap.org/forum/read.php?152,504042
//===========================================================================
//============================== Endstop Settings ===========================
@@ -654,13 +559,13 @@
#endif
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
-#define X_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
-#define Y_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
-#define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
-#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
-#define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
-#define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe.
+#define X_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
+#define Y_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
+#define Z_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
+#define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
+#define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
+#define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
+#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
/**
* Stepper Drivers
@@ -670,13 +575,11 @@
*
* A4988 is assumed for unspecified drivers.
*
- * Options: A4988, A5984, DRV8825, LV8729, L6470, L6474, POWERSTEP01,
- * TB6560, TB6600, TMC2100,
- * TMC2130, TMC2130_STANDALONE, TMC2160, TMC2160_STANDALONE,
- * TMC2208, TMC2208_STANDALONE, TMC2209, TMC2209_STANDALONE,
+ * Options: A4988, A5984, DRV8825, LV8729, L6470, TB6560, TB6600, TMC2100,
+ * TMC2130, TMC2130_STANDALONE, TMC2208, TMC2208_STANDALONE,
* TMC26X, TMC26X_STANDALONE, TMC2660, TMC2660_STANDALONE,
- * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
- * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
+ * TMC5130, TMC5130_STANDALONE
+ * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE']
*/
//#define X_DRIVER_TYPE A4988
//#define Y_DRIVER_TYPE A4988
@@ -684,37 +587,32 @@
//#define X2_DRIVER_TYPE A4988
//#define Y2_DRIVER_TYPE A4988
//#define Z2_DRIVER_TYPE A4988
-//#define Z3_DRIVER_TYPE A4988
-//#define Z4_DRIVER_TYPE A4988
//#define E0_DRIVER_TYPE A4988
//#define E1_DRIVER_TYPE A4988
//#define E2_DRIVER_TYPE A4988
//#define E3_DRIVER_TYPE A4988
//#define E4_DRIVER_TYPE A4988
-//#define E5_DRIVER_TYPE A4988
-//#define E6_DRIVER_TYPE A4988
-//#define E7_DRIVER_TYPE A4988
// Enable this feature if all enabled endstop pins are interrupt-capable.
// This will remove the need to poll the interrupt pins, saving many CPU cycles.
//#define ENDSTOP_INTERRUPTS_FEATURE
/**
- * Endstop Noise Threshold
+ * Endstop Noise Filter
*
- * Enable if your probe or endstops falsely trigger due to noise.
- *
- * - Higher values may affect repeatability or accuracy of some bed probes.
- * - To fix noise install a 100nF ceramic capacitor in parallel with the switch.
- * - This feature is not required for common micro-switches mounted on PCBs
- * based on the Makerbot design, which already have the 100nF capacitor.
- *
- * :[2,3,4,5,6,7]
+ * Enable this option if endstops falsely trigger due to noise.
+ * NOTE: Enabling this feature means adds an error of +/-0.2mm, so homing
+ * will end up at a slightly different position on each G28. This will also
+ * reduce accuracy of some bed probes.
+ * For mechanical switches, the better approach to reduce noise is to install
+ * a 100 nanofarads ceramic capacitor in parallel with the switch, making it
+ * essentially noise-proof without sacrificing accuracy.
+ * This option also increases MCU load when endstops or the probe are enabled.
+ * So this is not recommended. USE AT YOUR OWN RISK.
+ * (This feature is not required for common micro-switches mounted on PCBs
+ * based on the Makerbot design, since they already include the 100nF capacitor.)
*/
-//#define ENDSTOP_NOISE_THRESHOLD 2
-
-// Check for stuck or disconnected endstops during homing moves.
-//#define DETECT_BROKEN_ENDSTOP
+//#define ENDSTOP_NOISE_FILTER
//=============================================================================
//============================== Movement Settings ============================
@@ -739,35 +637,25 @@
/**
* Default Axis Steps Per Unit (steps/mm)
* Override with M92
- * X, Y, Z, E0 [, E1[, E2...]]
+ * X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
*/
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 }
/**
* Default Max Feed Rate (mm/s)
* Override with M203
- * X, Y, Z, E0 [, E1[, E2...]]
+ * X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
*/
#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 }
-//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
-#if ENABLED(LIMITED_MAX_FR_EDITING)
- #define MAX_FEEDRATE_EDIT_VALUES { 600, 600, 10, 50 } // ...or, set your own edit limits
-#endif
-
/**
* Default Max Acceleration (change/s) change = mm/s
* (Maximum start speed for accelerated moves)
* Override with M201
- * X, Y, Z, E0 [, E1[, E2...]]
+ * X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
*/
#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 }
-//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
-#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
- #define MAX_ACCEL_EDIT_VALUES { 6000, 6000, 200, 20000 } // ...or, set your own edit limits
-#endif
-
/**
* Default Acceleration (change/s) change = mm/s
* Override with M204
@@ -781,41 +669,17 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
- * Default Jerk limits (mm/s)
+ * Default Jerk (mm/s)
* Override with M205 X Y Z E
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
-//#define CLASSIC_JERK
-#if ENABLED(CLASSIC_JERK)
- #define DEFAULT_XJERK 10.0
- #define DEFAULT_YJERK 10.0
- #define DEFAULT_ZJERK 0.3
-
- //#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves
-
- //#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
- #if ENABLED(LIMITED_JERK_EDITING)
- #define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits
- #endif
-#endif
-
-#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
-
-/**
- * Junction Deviation Factor
- *
- * See:
- * https://reprap.org/forum/read.php?1,739819
- * https://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
- */
-#if DISABLED(CLASSIC_JERK)
- #define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge
- #define JD_HANDLE_SMALL_SEGMENTS // Use curvature estimation instead of just the junction angle
- // for small segments (< 1mm) with large junction angles (> 135°).
-#endif
+#define DEFAULT_XJERK 10.0
+#define DEFAULT_YJERK 10.0
+#define DEFAULT_ZJERK 0.3
+#define DEFAULT_EJERK 5.0
/**
* S-Curve Acceleration
@@ -833,25 +697,22 @@
// @section probes
//
-// See https://marlinfw.org/docs/configuration/probes.html
+// See http://marlinfw.org/docs/configuration/probes.html
//
/**
- * Enable this option for a probe connected to the Z-MIN pin.
- * The probe replaces the Z-MIN endstop and is used for Z homing.
- * (Automatically enables USE_PROBE_FOR_Z_HOMING.)
+ * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+ *
+ * Enable this option for a probe connected to the Z Min endstop pin.
*/
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
-// Force the use of the probe for Z-axis homing
-//#define USE_PROBE_FOR_Z_HOMING
-
/**
- * Z_MIN_PROBE_PIN
+ * Z_MIN_PROBE_ENDSTOP
*
- * Define this pin if the probe is not connected to Z_MIN_PIN.
- * If not defined the default pin for the selected MOTHERBOARD
- * will be used. Most of the time the default is what you want.
+ * Enable this option for a probe connected to any pin except Z-Min.
+ * (By default Marlin assumes the Z-Max endstop pin.)
+ * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below.
*
* - The simplest option is to use a free endstop connector.
* - Use 5V for powered (usually inductive) sensors.
@@ -860,8 +721,12 @@
* - For simple switches connect...
* - normally-closed switches to GND and D32.
* - normally-open switches to 5V and D32.
+ *
+ * WARNING: Setting the wrong pin may have unexpected and potentially
+ * disastrous consequences. Use with caution and do your homework.
+ *
*/
-//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default
+//#define Z_MIN_PROBE_ENDSTOP
/**
* Probe Type
@@ -884,45 +749,34 @@
*/
//#define FIX_MOUNTED_PROBE
-/**
- * Use the nozzle as the probe, as with a conductive
- * nozzle system or a piezo-electric smart effector.
- */
-//#define NOZZLE_AS_PROBE
-
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
-//#define Z_SERVO_ANGLES { 70, 0 } // Z Servo Deploy and Stow angles
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
* The BLTouch probe uses a Hall effect sensor and emulates a servo.
*/
//#define BLTOUCH
-
-/**
- * Pressure sensor with a BLTouch-like interface
- */
-//#define CREALITY_TOUCH
-
-/**
- * Touch-MI Probe by hotends.fr
- *
- * This probe is deployed and activated by moving the X-axis to a magnet at the edge of the bed.
- * By default, the magnet is assumed to be on the left and activated by a home. If the magnet is
- * on the right, enable and set TOUCH_MI_DEPLOY_XPOS to the deploy position.
- *
- * Also requires: BABYSTEPPING, BABYSTEP_ZPROBE_OFFSET, Z_SAFE_HOMING,
- * and a minimum Z_HOMING_HEIGHT of 10.
- */
-//#define TOUCH_MI_PROBE
-#if ENABLED(TOUCH_MI_PROBE)
- #define TOUCH_MI_RETRACT_Z 0.5 // Height at which the probe retracts
- //#define TOUCH_MI_DEPLOY_XPOS (X_MAX_BED + 2) // For a magnet on the right side of the bed
- //#define TOUCH_MI_MANUAL_DEPLOY // For manual deploy (LCD menu)
+#if ENABLED(BLTOUCH)
+ //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
#endif
+/**
+ * Enable one or more of the following if probing seems unreliable.
+ * Heaters and/or fans can be disabled during probing to minimize electrical
+ * noise. A delay can also be added to allow noise and vibration to settle.
+ * These options are most useful for the BLTouch probe, but may also improve
+ * readings with inductive probes and piezo sensors.
+ */
+//#define PROBING_HEATERS_OFF // Turn heaters off when probing
+#if ENABLED(PROBING_HEATERS_OFF)
+ //#define WAIT_FOR_BED_HEATER // Wait for bed to heat back up between probes (to improve accuracy)
+#endif
+//#define PROBING_FANS_OFF // Turn fans off when probing
+//#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors
+
// A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)
//#define SOLENOID_PROBE
@@ -930,88 +784,49 @@
//#define Z_PROBE_SLED
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
-// A probe deployed by moving the x-axis, such as the Wilson II's rack-and-pinion probe designed by Marty Rice.
-//#define RACK_AND_PINION_PROBE
-#if ENABLED(RACK_AND_PINION_PROBE)
- #define Z_PROBE_DEPLOY_X X_MIN_POS
- #define Z_PROBE_RETRACT_X X_MAX_POS
-#endif
-
-// Duet Smart Effector (for delta printers) - https://bit.ly/2ul5U7J
-// When the pin is defined you can use M672 to set/reset the probe sensivity.
-//#define DUET_SMART_EFFECTOR
-#if ENABLED(DUET_SMART_EFFECTOR)
- #define SMART_EFFECTOR_MOD_PIN -1 // Connect a GPIO pin to the Smart Effector MOD pin
-#endif
-
-/**
- * Use StallGuard2 to probe the bed with the nozzle.
- * Requires stallGuard-capable Trinamic stepper drivers.
- * CAUTION: This can damage machines with Z lead screws.
- * Take extreme care when setting up this feature.
- */
-//#define SENSORLESS_PROBING
-
//
// For Z_PROBE_ALLEN_KEY see the Delta example configurations.
//
/**
- * Nozzle-to-Probe offsets { X, Y, Z }
+ * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
+ * X and Y offsets must be integers.
*
- * - Use a caliper or ruler to measure the distance from the tip of
- * the Nozzle to the center-point of the Probe in the X and Y axes.
- * - For the Z offset use your best known value and adjust at runtime.
- * - Probe Offsets can be tuned at runtime with 'M851', LCD menus, babystepping, etc.
+ * In the following example the X and Y offsets are both positive:
+ * #define X_PROBE_OFFSET_FROM_EXTRUDER 10
+ * #define Y_PROBE_OFFSET_FROM_EXTRUDER 10
*
- * Assuming the typical work area orientation:
- * - Probe to RIGHT of the Nozzle has a Positive X offset
- * - Probe to LEFT of the Nozzle has a Negative X offset
- * - Probe in BACK of the Nozzle has a Positive Y offset
- * - Probe in FRONT of the Nozzle has a Negative Y offset
- *
- * Some examples:
- * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, -1 } // Example "1"
- * #define NOZZLE_TO_PROBE_OFFSET {-10, 5, -1 } // Example "2"
- * #define NOZZLE_TO_PROBE_OFFSET { 5, -5, -1 } // Example "3"
- * #define NOZZLE_TO_PROBE_OFFSET {-15,-10, -1 } // Example "4"
- *
- * +-- BACK ---+
- * | [+] |
- * L | 1 | R <-- Example "1" (right+, back+)
- * E | 2 | I <-- Example "2" ( left-, back+)
- * F |[-] N [+]| G <-- Nozzle
- * T | 3 | H <-- Example "3" (right+, front-)
- * | 4 | T <-- Example "4" ( left-, front-)
- * | [-] |
- * O-- FRONT --+
+ * +-- BACK ---+
+ * | |
+ * L | (+) P | R <-- probe (20,20)
+ * E | | I
+ * F | (-) N (+) | G <-- nozzle (10,10)
+ * T | | H
+ * | (-) | T
+ * | |
+ * O-- FRONT --+
+ * (0,0)
*/
-#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
+#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle]
+#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
+#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
-// Most probes should stay away from the edges of the bed, but
-// with NOZZLE_AS_PROBE this can be negative for a wider probing area.
-#define PROBING_MARGIN 10
+// Certain types of probes need to stay away from edges
+#define MIN_PROBE_EDGE 10
-// X and Y axis travel speed (mm/min) between probes
-#define XY_PROBE_SPEED (133*60)
+// X and Y axis travel speed (mm/m) between probes
+#define XY_PROBE_SPEED 8000
-// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
+// Feedrate (mm/m) for the first approach when double-probing (MULTIPLE_PROBING == 2)
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
-// Feedrate (mm/min) for the "accurate" probe of each point
+// Feedrate (mm/m) for the "accurate" probe of each point
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
-/**
- * Multiple Probing
- *
- * You may get improved results by probing 2 or more times.
- * With EXTRA_PROBING the more atypical reading(s) will be disregarded.
- *
- * A total of 2 does fast/slow probes with a weighted average.
- * A total of 3 or more adds more slow probes, taking the average.
- */
+// The number of probes to perform at each point.
+// Set to 2 for a fast/slow probe, using the second probe result.
+// Set to 3 or more for slow probes, averaging the results.
//#define MULTIPLE_PROBING 2
-//#define EXTRA_PROBING 1
/**
* Z probes require clearance when deploying, stowing, and moving between
@@ -1021,7 +836,7 @@
*
* Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative)
- * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
+ * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD.
* Only integer values >= 1 are valid here.
*
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@@ -1041,27 +856,6 @@
// Enable the M48 repeatability test to test probe accuracy
//#define Z_MIN_PROBE_REPEATABILITY_TEST
-// Before deploy/stow pause for user confirmation
-//#define PAUSE_BEFORE_DEPLOY_STOW
-#if ENABLED(PAUSE_BEFORE_DEPLOY_STOW)
- //#define PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED // For Manual Deploy Allenkey Probe
-#endif
-
-/**
- * Enable one or more of the following if probing seems unreliable.
- * Heaters and/or fans can be disabled during probing to minimize electrical
- * noise. A delay can also be added to allow noise and vibration to settle.
- * These options are most useful for the BLTouch probe, but may also improve
- * readings with inductive probes and piezo sensors.
- */
-//#define PROBING_HEATERS_OFF // Turn heaters off when probing
-#if ENABLED(PROBING_HEATERS_OFF)
- //#define WAIT_FOR_BED_HEATER // Wait for bed to heat back up between probes (to improve accuracy)
-#endif
-//#define PROBING_FANS_OFF // Turn fans off when probing
-//#define PROBING_STEPPERS_OFF // Turn steppers off (unless needed to hold position) when probing
-//#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors
-
// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
// :{ 0:'Low', 1:'High' }
#define X_ENABLE_ON 0
@@ -1069,19 +863,18 @@
#define Z_ENABLE_ON 0
#define E_ENABLE_ON 0 // For all extruders
-// Disable axis steppers immediately when they're not being stepped.
+// Disables axis stepper immediately when it's not being used.
// WARNING: When motors turn off there is a chance of losing position accuracy!
#define DISABLE_X false
#define DISABLE_Y false
#define DISABLE_Z false
-
-// Turn off the display blinking that warns about possible accuracy reduction
+// Warn on display about possibly reduced accuracy
//#define DISABLE_REDUCED_ACCURACY_WARNING
// @section extruder
-#define DISABLE_E false // Disable the extruder when not stepping
-#define DISABLE_INACTIVE_EXTRUDER // Keep only the active extruder enabled
+#define DISABLE_E false // For all extruders
+#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled.
// @section machine
@@ -1098,20 +891,15 @@
#define INVERT_E2_DIR false
#define INVERT_E3_DIR false
#define INVERT_E4_DIR false
-#define INVERT_E5_DIR false
-#define INVERT_E6_DIR false
-#define INVERT_E7_DIR false
// @section homing
-//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
+//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
-//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
+//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
-//#define Z_HOMING_HEIGHT 4 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
- // Be sure to have this much clearance over your Z_MAX_POS to prevent grinding.
-
-//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z
+//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
+ // Be sure you have this distance over your Z_MAX_POS in case.
// Direction of endstops when homing; 1=MAX, -1=MIN
// :[-1,1]
@@ -1158,7 +946,7 @@
#define MAX_SOFTWARE_ENDSTOP_Z
#endif
-#if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
+#if ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS)
//#define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD
#endif
@@ -1168,30 +956,15 @@
*
* RAMPS-based boards use SERVO3_PIN for the first runout sensor.
* For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc.
+ * By default the firmware assumes HIGH=FILAMENT PRESENT.
*/
//#define FILAMENT_RUNOUT_SENSOR
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
- #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
- #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
- #define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.
- #define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
- //#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
-
- // Set one or more commands to execute on filament runout.
- // (After 'M412 H' Marlin will ask the host to handle the process.)
+ #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
+ #define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
+ #define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
+ //#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
#define FILAMENT_RUNOUT_SCRIPT "M600"
-
- // After a runout is detected, continue printing this length of filament
- // before executing the runout script. Useful for a sensor at the end of
- // a feed tube. Requires 4 bytes SRAM per sensor, plus 4 bytes overhead.
- //#define FILAMENT_RUNOUT_DISTANCE_MM 25
-
- #ifdef FILAMENT_RUNOUT_DISTANCE_MM
- // Enable this option to use an encoder disc that toggles the runout pin
- // as the filament moves. (Be sure to set FILAMENT_RUNOUT_DISTANCE_MM
- // large enough to avoid false positives.)
- //#define FILAMENT_MOTION_SENSOR
- #endif
#endif
//===========================================================================
@@ -1251,7 +1024,7 @@
*/
//#define DEBUG_LEVELING_FEATURE
-#if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL)
+#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL)
// Gradually reduce leveling correction until a set height is reached,
// at which point movement will be level to the machine's XY plane.
// The height can be set with M420 Z
@@ -1270,20 +1043,24 @@
#if ENABLED(G26_MESH_VALIDATION)
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
- #define MESH_TEST_HOTEND_TEMP 205 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
- #define MESH_TEST_BED_TEMP 60 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
- #define G26_XY_FEEDRATE 20 // (mm/s) Feedrate for XY Moves for the G26 Mesh Validation Tool.
- #define G26_RETRACT_MULTIPLIER 1.0 // G26 Q (retraction) used by default between mesh test elements.
+ #define MESH_TEST_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
+ #define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
#endif
#endif
-#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
+#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension.
#define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
+ // Set the boundaries for probing (where the probe can reach).
+ //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
+ //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
+ //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
+
// Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST
@@ -1337,6 +1114,19 @@
#endif // BED_LEVELING
+/**
+ * Points to probe for all 3-point Leveling procedures.
+ * Override if the automatically selected points are inadequate.
+ */
+#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL)
+ //#define PROBE_PT_1_X 15
+ //#define PROBE_PT_1_Y 180
+ //#define PROBE_PT_2_X 15
+ //#define PROBE_PT_2_Y 20
+ //#define PROBE_PT_3_X 170
+ //#define PROBE_PT_3_Y 20
+#endif
+
/**
* Add a bed leveling sub-menu for ABL or MBL.
* Include a guided procedure if manual probing is enabled.
@@ -1344,19 +1134,16 @@
//#define LCD_BED_LEVELING
#if ENABLED(LCD_BED_LEVELING)
- #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis.
- #define LCD_PROBE_Z_RANGE 4 // (mm) Z Range centered on Z_MIN_POS for LCD Z adjustment
- //#define MESH_EDIT_MENU // Add a menu to edit mesh points
+ #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis.
+ #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
#if ENABLED(LEVEL_BED_CORNERS)
- #define LEVEL_CORNERS_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets
- #define LEVEL_CORNERS_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points
- #define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Z height of nozzle between leveling points
- //#define LEVEL_CENTER_TOO // Move to the center after the last corner
+ #define LEVEL_CORNERS_INSET 30 // (mm) An inset for corner leveling
+ //#define LEVEL_CENTER_TOO // Move to the center after the last corner
#endif
/**
@@ -1365,6 +1152,7 @@
*/
//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10"
+
// @section homing
// The center of the bed is at (X=0, Y=0)
@@ -1382,23 +1170,20 @@
//
// - Allow Z homing only after X and Y homing AND stepper drivers still enabled.
// - If stepper drivers time out, it will need X and Y homing again before Z homing.
-// - Move the Z probe (or nozzle) to a defined XY point before Z Homing.
+// - Move the Z probe (or nozzle) to a defined XY point before Z Homing when homing all axes (G28).
// - Prevent Z homing when the Z probe is outside bed area.
//
//#define Z_SAFE_HOMING
#if ENABLED(Z_SAFE_HOMING)
- #define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing
- #define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing
+ #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28).
+ #define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28).
#endif
-// Homing speeds (mm/min)
+// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (4*60)
-// Validate that endstops are triggered on homing moves
-#define VALIDATE_HOMING_ENDSTOPS
-
// @section calibrate
/**
@@ -1462,22 +1247,17 @@
// @section extras
-/**
- * EEPROM
- *
- * Persistent storage to preserve configurable settings across reboots.
- *
- * M500 - Store settings to EEPROM.
- * M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
- * M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
- */
-//#define EEPROM_SETTINGS // Persistent storage with M500 and M501
-//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release!
-#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.
-#define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load
-#if ENABLED(EEPROM_SETTINGS)
- //#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors.
-#endif
+//
+// EEPROM
+//
+// The microcontroller can store settings in the EEPROM, e.g. max velocity...
+// M500 - stores parameters in EEPROM
+// M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
+// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
+//
+//#define EEPROM_SETTINGS // Enable for M500 and M501 commands
+//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release!
+#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.
//
// Host Keepalive
@@ -1489,6 +1269,11 @@
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
#define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating
+//
+// M100 Free Memory Watcher
+//
+//#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
+
//
// G20/G21 Inch mode support
//
@@ -1502,12 +1287,10 @@
// @section temperature
// Preheat Constants
-#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 180
#define PREHEAT_1_TEMP_BED 70
#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define PREHEAT_2_LABEL "ABS"
#define PREHEAT_2_TEMP_HOTEND 240
#define PREHEAT_2_TEMP_BED 110
#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
@@ -1526,13 +1309,10 @@
//#define NOZZLE_PARK_FEATURE
#if ENABLED(NOZZLE_PARK_FEATURE)
- // Specify a park position as { X, Y, Z_raise }
+ // Specify a park position as { X, Y, Z }
#define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
- //#define NOZZLE_PARK_X_ONLY // X move only is required to park
- //#define NOZZLE_PARK_Y_ONLY // Y move only is required to park
- #define NOZZLE_PARK_Z_RAISE_MIN 2 // (mm) Always raise Z by at least this distance
- #define NOZZLE_PARK_XY_FEEDRATE 100 // (mm/s) X and Y axes feedrate (also used for delta Z axis)
- #define NOZZLE_PARK_Z_FEEDRATE 5 // (mm/s) Z axis feedrate (not used for delta printers)
+ #define NOZZLE_PARK_XY_FEEDRATE 100 // X and Y axes feedrate in mm/s (also used for delta printers Z axis)
+ #define NOZZLE_PARK_Z_FEEDRATE 5 // Z axis feedrate in mm/s (not used for delta printers)
#endif
/**
@@ -1571,6 +1351,7 @@
*
* Caveats: The ending Z should be the same as starting Z.
* Attention: EXPERIMENTAL. G-code arguments may change.
+ *
*/
//#define NOZZLE_CLEAN_FEATURE
@@ -1581,10 +1362,9 @@
// Default number of triangles
#define NOZZLE_CLEAN_TRIANGLES 3
- // Specify positions for each tool as { { X, Y, Z }, { X, Y, Z } }
- // Dual hotend system may use { { -20, (Y_BED_SIZE / 2), (Z_MIN_POS + 1) }, { 420, (Y_BED_SIZE / 2), (Z_MIN_POS + 1) }}
- #define NOZZLE_CLEAN_START_POINT { { 30, 30, (Z_MIN_POS + 1) } }
- #define NOZZLE_CLEAN_END_POINT { { 100, 60, (Z_MIN_POS + 1) } }
+ // Specify positions as { X, Y, Z }
+ #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)}
+ #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)}
// Circular pattern radius
#define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5
@@ -1593,18 +1373,8 @@
// Middle point of circle
#define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT
- // Move the nozzle to the initial position after cleaning
+ // Moves the nozzle to the initial position
#define NOZZLE_CLEAN_GOBACK
-
- // For a purge/clean station that's always at the gantry height (thus no Z move)
- //#define NOZZLE_CLEAN_NO_Z
-
- // For a purge/clean station mounted on the X axis
- //#define NOZZLE_CLEAN_NO_Y
-
- // Explicit wipe G-code script applies to a G12 with no arguments.
- //#define WIPE_SEQUENCE_COMMANDS "G1 X-17 Y25 Z10 F4000\nG1 Z1\nM114\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 Z15\nM400\nG0 X-10.0 Y-9.0"
-
#endif
/**
@@ -1638,37 +1408,6 @@
*/
//#define PRINTCOUNTER
-/**
- * Password
- *
- * Set a numerical password for the printer which can be requested:
- *
- * - When the printer boots up
- * - Upon opening the 'Print from Media' Menu
- * - When SD printing is completed or aborted
- *
- * The following G-codes can be used:
- *
- * M510 - Lock Printer. Blocks all commands except M511.
- * M511 - Unlock Printer.
- * M512 - Set, Change and Remove Password.
- *
- * If you forget the password and get locked out you'll need to re-flash
- * the firmware with the feature disabled, reset EEPROM, and (optionally)
- * re-flash the firmware again with this feature enabled.
- */
-//#define PASSWORD_FEATURE
-#if ENABLED(PASSWORD_FEATURE)
- #define PASSWORD_LENGTH 4 // (#) Number of digits (1-9). 3 or 4 is recommended
- #define PASSWORD_ON_STARTUP
- #define PASSWORD_UNLOCK_GCODE // Unlock with the M511 P command. Disable to prevent brute-force attack.
- #define PASSWORD_CHANGE_GCODE // Change the password with M512 P S.
- //#define PASSWORD_ON_SD_PRINT_MENU // This does not prevent gcodes from running
- //#define PASSWORD_AFTER_SD_PRINT_END
- //#define PASSWORD_AFTER_SD_PRINT_ABORT
- //#include "Configuration_Secure.h" // External file with PASSWORD_DEFAULT_VALUE
-#endif
-
//=============================================================================
//============================= LCD and SD support ============================
//=============================================================================
@@ -1680,10 +1419,10 @@
*
* Select the language to display on the LCD. These languages are available:
*
- * en, an, bg, ca, cz, da, de, el, el_gr, es, eu, fi, fr, gl, hr, hu, it,
- * jp_kana, ko_KR, nl, pl, pt, pt_br, ro, ru, sk, tr, uk, vi, zh_CN, zh_TW, test
+ * en, an, bg, ca, cz, de, el, el-gr, es, eu, fi, fr, gl, hr, it,
+ * jp-kana, nl, pl, pt, pt-br, ru, sk, tr, uk, zh_CN, zh_TW, test
*
- * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek', 'el_gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'hu':'Hungarian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ro':'Romanian', 'ru':'Russian', 'sk':'Slovak', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)', 'test':'TEST' }
+ * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'jp-kana':'Japanese', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'ru':'Russian', 'sk':'Slovak', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)', 'test':'TEST' }
*/
#define LCD_LANGUAGE en
@@ -1705,24 +1444,18 @@
* - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text
*
- * See https://marlinfw.org/docs/development/lcd_language.html
+ * See http://marlinfw.org/docs/development/lcd_language.html
*
* :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/
#define DISPLAY_CHARSET_HD44780 JAPANESE
-/**
- * Info Screen Style (0:Classic, 1:Průša)
- *
- * :[0:'Classic', 1:'Průša']
- */
-#define LCD_INFO_SCREEN_STYLE 0
-
/**
* SD CARD
*
* SD Card support is disabled by default. If your controller has an SD slot,
* you must uncomment the following option or it won't work.
+ *
*/
//#define SDSUPPORT
@@ -1791,14 +1524,6 @@
//
//#define REVERSE_MENU_DIRECTION
-//
-// This option reverses the encoder direction for Select Screen.
-//
-// If CLOCKWISE normally moves LEFT this makes it go RIGHT.
-// If CLOCKWISE normally moves RIGHT this makes it go LEFT.
-//
-//#define REVERSE_SELECT_DIRECTION
-
//
// Individual Axis Homing
//
@@ -1831,7 +1556,7 @@
//
// RepRapDiscount Smart Controller.
-// https://reprap.org/wiki/RepRapDiscount_Smart_Controller
+// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
//
// Note: Usually sold with a white PCB.
//
@@ -1855,13 +1580,13 @@
//
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
-// https://reprap.org/wiki/PanelOne
+// http://reprap.org/wiki/PanelOne
//
//#define PANEL_ONE
//
// GADGETS3D G3D LCD/SD Controller
-// https://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
+// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
//
// Note: Usually sold with a blue PCB.
//
@@ -1875,7 +1600,7 @@
//
// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
-// https://www.aliexpress.com/item/32765887917.html
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
//
//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
@@ -1947,26 +1672,11 @@
//
//
-// 2-wire Non-latching LCD SR from https://goo.gl/aJJ4sH
-// LCD configuration: https://reprap.org/wiki/SAV_3D_LCD
+// 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH
+// LCD configuration: http://reprap.org/wiki/SAV_3D_LCD
//
//#define SAV_3DLCD
-//
-// 3-wire SR LCD with strobe using 74HC4094
-// https://github.com/mikeshub/SailfishLCD
-// Uses the code directly from Sailfish
-//
-//#define FF_INTERFACEBOARD
-
-//
-// TFT GLCD Panel with Marlin UI
-// Panel connected to main board by SPI or I2C interface.
-// See https://github.com/Serhiy-K/TFTGLCDAdapter
-//
-//#define TFTGLCD_PANEL_SPI
-//#define TFTGLCD_PANEL_I2C
-
//=============================================================================
//======================= LCD / Controller Selection =======================
//========================= (Graphical LCDs) ========================
@@ -1978,12 +1688,10 @@
// IMPORTANT: The U8glib library is required for Graphical Display!
// https://github.com/olikraus/U8glib_Arduino
//
-// NOTE: If the LCD is unresponsive you may need to reverse the plugs.
-//
//
// RepRapDiscount FULL GRAPHIC Smart Controller
-// https://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
+// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
//
//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
@@ -1996,20 +1704,20 @@
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD
-// https://www.panucatt.com
+// http://panucatt.com
//
//#define VIKI2
//#define miniVIKI
//
// MakerLab Mini Panel with graphic
-// controller and SD support - https://reprap.org/wiki/Mini_panel
+// controller and SD support - http://reprap.org/wiki/Mini_panel
//
//#define MINIPANEL
//
// MaKr3d Makr-Panel with graphic controller and SD support.
-// https://reprap.org/wiki/MaKr3d_MaKrPanel
+// http://reprap.org/wiki/MaKr3d_MaKrPanel
//
//#define MAKRPANEL
@@ -2036,73 +1744,6 @@
//
//#define LCD_FOR_MELZI
-//
-// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
-// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
-//
-//#define ULTI_CONTROLLER
-
-//
-// MKS MINI12864 with graphic controller and SD support
-// https://reprap.org/wiki/MKS_MINI_12864
-//
-//#define MKS_MINI_12864
-
-//
-// MKS LCD12864A/B with graphic controller and SD support. Follows MKS_MINI_12864 pinout.
-// https://www.aliexpress.com/item/33018110072.html
-//
-//#define MKS_LCD12864
-
-//
-// FYSETC variant of the MINI12864 graphic controller with SD support
-// https://wiki.fysetc.com/Mini12864_Panel/
-//
-//#define FYSETC_MINI_12864_X_X // Type C/D/E/F. No tunable RGB Backlight by default
-//#define FYSETC_MINI_12864_1_2 // Type C/D/E/F. Simple RGB Backlight (always on)
-//#define FYSETC_MINI_12864_2_0 // Type A/B. Discreet RGB Backlight
-//#define FYSETC_MINI_12864_2_1 // Type A/B. NeoPixel RGB Backlight
-//#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight.
-
-//
-// Factory display for Creality CR-10
-// https://www.aliexpress.com/item/32833148327.html
-//
-// This is RAMPS-compatible using a single 10-pin connector.
-// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
-//
-//#define CR10_STOCKDISPLAY
-
-//
-// Ender-2 OEM display, a variant of the MKS_MINI_12864
-//
-//#define ENDER2_STOCKDISPLAY
-
-//
-// ANET and Tronxy Graphical Controller
-//
-// Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
-// A clone of the RepRapDiscount full graphics display but with
-// different pins/wiring (see pins_ANET_10.h).
-//
-//#define ANET_FULL_GRAPHICS_LCD
-
-//
-// AZSMZ 12864 LCD with SD
-// https://www.aliexpress.com/item/32837222770.html
-//
-//#define AZSMZ_12864
-
-//
-// Silvergate GLCD controller
-// https://github.com/android444/Silvergate
-//
-//#define SILVER_GATE_GLCD_CONTROLLER
-
-//=============================================================================
-//============================== OLED Displays ==============================
-//=============================================================================
-
//
// SSD1306 OLED full graphics generic display
//
@@ -2113,18 +1754,46 @@
//
//#define SAV_3DGLCD
#if ENABLED(SAV_3DGLCD)
- #define U8GLIB_SSD1306
- //#define U8GLIB_SH1106
+ //#define U8GLIB_SSD1306
+ #define U8GLIB_SH1106
#endif
+//
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
+//
+//#define ULTI_CONTROLLER
+
//
// TinyBoy2 128x64 OLED / Encoder Panel
//
//#define OLED_PANEL_TINYBOY2
//
-// MKS OLED 1.3" 128×64 FULL GRAPHICS CONTROLLER
-// https://reprap.org/wiki/MKS_12864OLED
+// MKS MINI12864 with graphic controller and SD support
+// http://reprap.org/wiki/MKS_MINI_12864
+//
+//#define MKS_MINI_12864
+
+//
+// Factory display for Creality CR-10
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
+//
+// This is RAMPS-compatible using a single 10-pin connector.
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
+//
+//#define CR10_STOCKDISPLAY
+
+//
+// ANET and Tronxy Graphical Controller
+//
+//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
+ // A clone of the RepRapDiscount full graphics display but with
+ // different pins/wiring (see pins_ANET_10.h).
+
+//
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
+// http://reprap.org/wiki/MKS_12864OLED
//
// Tiny, but very sharp OLED display
//
@@ -2132,151 +1801,43 @@
//#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller
//
-// Zonestar OLED 128×64 FULL GRAPHICS CONTROLLER
+// AZSMZ 12864 LCD with SD
+// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
-//#define ZONESTAR_12864LCD // Graphical (DOGM) with ST7920 controller
-//#define ZONESTAR_12864OLED // 1.3" OLED with SH1106 controller (default)
-//#define ZONESTAR_12864OLED_SSD1306 // 0.96" OLED with SSD1306 controller
+//#define AZSMZ_12864
//
-// Einstart S OLED SSD1306
+// Silvergate GLCD controller
+// http://github.com/android444/Silvergate
//
-//#define U8GLIB_SH1106_EINSTART
-
-//
-// Overlord OLED display/controller with i2c buzzer and LEDs
-//
-//#define OVERLORD_OLED
-
-//
-// FYSETC OLED 2.42" 128×64 FULL GRAPHICS CONTROLLER with WS2812 RGB
-// Where to find : https://www.aliexpress.com/item/4000345255731.html
-//#define FYSETC_242_OLED_12864 // Uses the SSD1309 controller
-
-//=============================================================================
-//========================== Extensible UI Displays ===========================
-//=============================================================================
-
-//
-// DGUS Touch Display with DWIN OS. (Choose one.)
-// ORIGIN : https://www.aliexpress.com/item/32993409517.html
-// FYSETC : https://www.aliexpress.com/item/32961471929.html
-//
-//#define DGUS_LCD_UI_ORIGIN
-//#define DGUS_LCD_UI_FYSETC
-//#define DGUS_LCD_UI_HIPRECY
-
-//
-// Touch-screen LCD for Malyan M200/M300 printers
-//
-//#define MALYAN_LCD
-#if ENABLED(MALYAN_LCD)
- #define LCD_SERIAL_PORT 1 // Default is 1 for Malyan M200
-#endif
-
-//
-// Touch UI for FTDI EVE (FT800/FT810) displays
-// See Configuration_adv.h for all configuration options.
-//
-//#define TOUCH_UI_FTDI_EVE
-
-//
-// Touch-screen LCD for Anycubic printers
-//
-//#define ANYCUBIC_LCD_I3MEGA
-//#define ANYCUBIC_LCD_CHIRON
-#if EITHER(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON)
- #define LCD_SERIAL_PORT 3 // Default is 3 for Anycubic
- //#define ANYCUBIC_LCD_DEBUG
-#endif
-
-//
-// Third-party or vendor-customized controller interfaces.
-// Sources should be installed in 'src/lcd/extensible_ui'.
-//
-//#define EXTENSIBLE_UI
-
-#if ENABLED(EXTENSIBLE_UI)
- //#define EXTUI_LOCAL_BEEPER // Enables use of local Beeper pin with external display
-#endif
-
-//=============================================================================
-//=============================== Graphical TFTs ==============================
-//=============================================================================
-
-/**
- * TFT Type - Select your Display type
- *
- * Available options are:
- * MKS_TS35_V2_0,
- * MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35,
- * MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R
- * TFT_TRONXY_X5SA, ANYCUBIC_TFT35, LONGER_LK_TFT28
- * TFT_GENERIC
- *
- * For TFT_GENERIC, you need to configure these 3 options:
- * Driver: TFT_DRIVER
- * Current Drivers are: AUTO, ST7735, ST7789, ST7796, R61505, ILI9328, ILI9341, ILI9488
- * Resolution: TFT_WIDTH and TFT_HEIGHT
- * Interface: TFT_INTERFACE_FSMC or TFT_INTERFACE_SPI
- */
-//#define TFT_GENERIC
-
-/**
- * TFT UI - User Interface Selection. Enable one of the following options:
- *
- * TFT_CLASSIC_UI - Emulated DOGM - 128x64 Upscaled
- * TFT_COLOR_UI - Marlin Default Menus, Touch Friendly, using full TFT capabilities
- * TFT_LVGL_UI - A Modern UI using LVGL
- *
- * For LVGL_UI also copy the 'assets' folder from the build directory to the
- * root of your SD card, together with the compiled firmware.
- */
-//#define TFT_CLASSIC_UI
-//#define TFT_COLOR_UI
-//#define TFT_LVGL_UI
-
-/**
- * TFT Rotation. Set to one of the following values:
- *
- * TFT_ROTATE_90, TFT_ROTATE_90_MIRROR_X, TFT_ROTATE_90_MIRROR_Y,
- * TFT_ROTATE_180, TFT_ROTATE_180_MIRROR_X, TFT_ROTATE_180_MIRROR_Y,
- * TFT_ROTATE_270, TFT_ROTATE_270_MIRROR_X, TFT_ROTATE_270_MIRROR_Y,
- * TFT_MIRROR_X, TFT_MIRROR_Y, TFT_NO_ROTATION
- */
-//#define TFT_ROTATION TFT_NO_ROTATION
+//#define SILVER_GATE_GLCD_CONTROLLER
//=============================================================================
//============================ Other Controllers ============================
//=============================================================================
//
-// Ender-3 v2 OEM display. A DWIN display with Rotary Encoder.
+// CONTROLLER TYPE: Standalone / Serial
//
-//#define DWIN_CREALITY_LCD
//
-// ADS7843/XPT2046 ADC Touchscreen such as ILI9341 2.8
+// LCD for Malyan M200 printers.
//
-//#define TOUCH_SCREEN
-#if ENABLED(TOUCH_SCREEN)
- #define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens
- #define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus
+//#define MALYAN_LCD
- #define TOUCH_SCREEN_CALIBRATION
-
- //#define XPT2046_X_CALIBRATION 12316
- //#define XPT2046_Y_CALIBRATION -8981
- //#define XPT2046_X_OFFSET -43
- //#define XPT2046_Y_OFFSET 257
-#endif
+//
+// CONTROLLER TYPE: Keypad / Add-on
+//
//
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
-// https://reprapworld.com/products/electronics/ramps/keypad_v1_0_fully_assembled/
+// http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626
+//
+// REPRAPWORLD_KEYPAD_MOVE_STEP sets how much should the robot move when a key
+// is pressed, a value of 10.0 means 10mm per click.
//
//#define REPRAPWORLD_KEYPAD
-//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 // (mm) Distance to move per key-press
+//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
//=============================================================================
//=============================== Extra Features ==============================
@@ -2284,10 +1845,6 @@
// @section extras
-// Set number of user-controlled fans. Disable to use all board-defined fans.
-// :[1,2,3,4,5,6,7,8]
-//#define NUM_M106_FANS 1
-
// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
//#define FAST_PWM_FAN
@@ -2300,7 +1857,6 @@
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
// However, control resolution will be halved for each increment;
// at zero value, there are 128 effective control positions.
-// :[0,1,2,3,4,5,6,7]
#define SOFT_PWM_SCALE 0
// If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
@@ -2314,6 +1870,13 @@
// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
//#define TEMP_STAT_LEDS
+// M240 Triggers a camera by emulating a Canon RC-1 Remote
+// Data from: http://www.doc-diy.net/photo/rc-1_hacked/
+//#define PHOTOGRAPH_PIN 23
+
+// SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure
+//#define SF_ARC_FIX
+
// Support for the BariCUDA Paste Extruder
//#define BARICUDA
@@ -2323,9 +1886,6 @@
// Support for PCA9632 PWM LED driver
//#define PCA9632
-// Support for PCA9533 PWM LED driver
-//#define PCA9533
-
/**
* RGB LED / LED Strip Control
*
@@ -2335,53 +1895,38 @@
* Adds the M150 command to set the LED (or LED strip) color.
* If pins are PWM capable (e.g., 4, 5, 6, 11) then a range of
* luminance values can be set from 0 to 255.
- * For NeoPixel LED an overall brightness parameter is also available.
+ * For Neopixel LED an overall brightness parameter is also available.
*
* *** CAUTION ***
* LED Strips require a MOSFET Chip between PWM lines and LEDs,
* as the Arduino cannot handle the current the LEDs will require.
* Failure to follow this precaution can destroy your Arduino!
- * NOTE: A separate 5V power supply is required! The NeoPixel LED needs
+ * NOTE: A separate 5V power supply is required! The Neopixel LED needs
* more current than the Arduino 5V linear regulator can produce.
* *** CAUTION ***
*
* LED Type. Enable only one of the following two options.
+ *
*/
//#define RGB_LED
//#define RGBW_LED
-#if EITHER(RGB_LED, RGBW_LED)
- //#define RGB_LED_R_PIN 34
- //#define RGB_LED_G_PIN 43
- //#define RGB_LED_B_PIN 35
- //#define RGB_LED_W_PIN -1
+#if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
+ #define RGB_LED_R_PIN 34
+ #define RGB_LED_G_PIN 43
+ #define RGB_LED_B_PIN 35
+ #define RGB_LED_W_PIN -1
#endif
-// Support for Adafruit NeoPixel LED driver
+// Support for Adafruit Neopixel LED driver
//#define NEOPIXEL_LED
#if ENABLED(NEOPIXEL_LED)
#define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
- #define NEOPIXEL_PIN 4 // LED driving pin
- //#define NEOPIXEL2_TYPE NEOPIXEL_TYPE
- //#define NEOPIXEL2_PIN 5
- #define NEOPIXEL_PIXELS 30 // Number of LEDs in the strip. (Longest strip when NEOPIXEL2_SEPARATE is disabled.)
+ #define NEOPIXEL_PIN 4 // LED driving pin on motherboard 4 => D4 (EXP2-5 on Printrboard) / 30 => PC7 (EXP3-13 on Rumba)
+ #define NEOPIXEL_PIXELS 30 // Number of LEDs in the strip
#define NEOPIXEL_IS_SEQUENTIAL // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once.
#define NEOPIXEL_BRIGHTNESS 127 // Initial brightness (0-255)
//#define NEOPIXEL_STARTUP_TEST // Cycle through colors at startup
-
- // Support for second Adafruit NeoPixel LED driver controlled with M150 S1 ...
- //#define NEOPIXEL2_SEPARATE
- #if ENABLED(NEOPIXEL2_SEPARATE)
- #define NEOPIXEL2_PIXELS 15 // Number of LEDs in the second strip
- #define NEOPIXEL2_BRIGHTNESS 127 // Initial brightness (0-255)
- #define NEOPIXEL2_STARTUP_TEST // Cycle through colors at startup
- #else
- //#define NEOPIXEL2_INSERIES // Default behavior is NeoPixel 2 in parallel
- #endif
-
- // Use a single NeoPixel LED for static (background) lighting
- //#define NEOPIXEL_BKGD_LED_INDEX 0 // Index of the LED to use
- //#define NEOPIXEL_BKGD_COLOR { 255, 255, 255, 0 } // R, G, B, W
#endif
/**
@@ -2395,20 +1940,25 @@
* - Change to green once print has finished
* - Turn off after the print has finished and the user has pushed a button
*/
-#if ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
+#if ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(NEOPIXEL_LED)
#define PRINTER_EVENT_LEDS
#endif
+/**
+ * R/C SERVO support
+ * Sponsored by TrinityLabs, Reworked by codexmas
+ */
+
/**
* Number of servos
*
* For some servo-related options NUM_SERVOS will be set automatically.
* Set this manually if there are extra servos needing manual control.
- * Set to 0 to turn off servo support.
+ * Leave undefined or set to 0 to entirely disable the servo subsystem.
*/
//#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command
-// (ms) Delay before the next move will start, to give the servo time to reach its target angle.
+// Delay (in milliseconds) before the next move will start, to give the servo time to reach its target angle.
// 300ms is a good value but you can try less delay.
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
@@ -2416,5 +1966,7 @@
// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
-// Edit servo angles with M281 and save to EEPROM with M500
+// Allow servo angle to be edited and saved to EEPROM
//#define EDITABLE_SERVO_ANGLES
+
+#endif // CONFIGURATION_H
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index bcacddd20d..f5e753882a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1,9 +1,9 @@
/**
* Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,10 +16,9 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*
*/
-#pragma once
/**
* Configuration_adv.h
@@ -29,89 +28,17 @@
* Some of these settings can damage your printer if improperly set!
*
* Basic settings can be found in Configuration.h
+ *
*/
-#define CONFIGURATION_ADV_H_VERSION 020007
+#ifndef CONFIGURATION_ADV_H
+#define CONFIGURATION_ADV_H
+#define CONFIGURATION_ADV_H_VERSION 020000
-//===========================================================================
-//============================= Thermal Settings ============================
-//===========================================================================
// @section temperature
-/**
- * Thermocouple sensors are quite sensitive to noise. Any noise induced in
- * the sensor wires, such as by stepper motor wires run in parallel to them,
- * may result in the thermocouple sensor reporting spurious errors. This
- * value is the number of errors which can occur in a row before the error
- * is reported. This allows us to ignore intermittent error conditions while
- * still detecting an actual failure, which should result in a continuous
- * stream of errors from the sensor.
- *
- * Set this value to 0 to fail on the first error to occur.
- */
-#define THERMOCOUPLE_MAX_ERRORS 15
-
-//
-// Custom Thermistor 1000 parameters
-//
-#if TEMP_SENSOR_0 == 1000
- #define HOTEND0_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
- #define HOTEND0_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
- #define HOTEND0_BETA 3950 // Beta value
-#endif
-
-#if TEMP_SENSOR_1 == 1000
- #define HOTEND1_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
- #define HOTEND1_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
- #define HOTEND1_BETA 3950 // Beta value
-#endif
-
-#if TEMP_SENSOR_2 == 1000
- #define HOTEND2_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
- #define HOTEND2_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
- #define HOTEND2_BETA 3950 // Beta value
-#endif
-
-#if TEMP_SENSOR_3 == 1000
- #define HOTEND3_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
- #define HOTEND3_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
- #define HOTEND3_BETA 3950 // Beta value
-#endif
-
-#if TEMP_SENSOR_4 == 1000
- #define HOTEND4_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
- #define HOTEND4_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
- #define HOTEND4_BETA 3950 // Beta value
-#endif
-
-#if TEMP_SENSOR_5 == 1000
- #define HOTEND5_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
- #define HOTEND5_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
- #define HOTEND5_BETA 3950 // Beta value
-#endif
-
-#if TEMP_SENSOR_6 == 1000
- #define HOTEND6_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
- #define HOTEND6_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
- #define HOTEND6_BETA 3950 // Beta value
-#endif
-
-#if TEMP_SENSOR_7 == 1000
- #define HOTEND7_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
- #define HOTEND7_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
- #define HOTEND7_BETA 3950 // Beta value
-#endif
-
-#if TEMP_SENSOR_BED == 1000
- #define BED_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
- #define BED_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
- #define BED_BETA 3950 // Beta value
-#endif
-
-#if TEMP_SENSOR_CHAMBER == 1000
- #define CHAMBER_PULLUP_RESISTOR_OHMS 4700 // Pullup resistor
- #define CHAMBER_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
- #define CHAMBER_BETA 3950 // Beta value
-#endif
+//===========================================================================
+//=============================Thermal Settings ============================
+//===========================================================================
//
// Hephestos 2 24V heated bed upgrade kit.
@@ -124,48 +51,10 @@
#define HEATER_BED_INVERTING true
#endif
-//
-// Heated Bed Bang-Bang options
-//
#if DISABLED(PIDTEMPBED)
- #define BED_CHECK_INTERVAL 5000 // (ms) Interval between checks in bang-bang control
+ #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control
#if ENABLED(BED_LIMIT_SWITCHING)
- #define BED_HYSTERESIS 2 // (°C) Only set the relevant heater state when ABS(T-target) > BED_HYSTERESIS
- #endif
-#endif
-
-//
-// Heated Chamber options
-//
-#if TEMP_SENSOR_CHAMBER
- #define CHAMBER_MINTEMP 5
- #define CHAMBER_MAXTEMP 60
- #define TEMP_CHAMBER_HYSTERESIS 1 // (°C) Temperature proximity considered "close enough" to the target
- //#define CHAMBER_LIMIT_SWITCHING
- //#define HEATER_CHAMBER_PIN 44 // Chamber heater on/off pin
- //#define HEATER_CHAMBER_INVERTING false
-
- //#define CHAMBER_FAN // Enable a fan on the chamber
- #if ENABLED(CHAMBER_FAN)
- #define CHAMBER_FAN_MODE 2 // Fan control mode: 0=Static; 1=Linear increase when temp is higher than target; 2=V-shaped curve.
- #if CHAMBER_FAN_MODE == 0
- #define CHAMBER_FAN_BASE 255 // Chamber fan PWM (0-255)
- #elif CHAMBER_FAN_MODE == 1
- #define CHAMBER_FAN_BASE 128 // Base chamber fan PWM (0-255); turns on when chamber temperature is above the target
- #define CHAMBER_FAN_FACTOR 25 // PWM increase per °C above target
- #elif CHAMBER_FAN_MODE == 2
- #define CHAMBER_FAN_BASE 128 // Minimum chamber fan PWM (0-255)
- #define CHAMBER_FAN_FACTOR 25 // PWM increase per °C difference from target
- #endif
- #endif
-
- //#define CHAMBER_VENT // Enable a servo-controlled vent on the chamber
- #if ENABLED(CHAMBER_VENT)
- #define CHAMBER_VENT_SERVO_NR 1 // Index of the vent servo
- #define HIGH_EXCESS_HEAT_LIMIT 5 // How much above target temp to consider there is excess heat in the chamber
- #define LOW_EXCESS_HEAT_LIMIT 3
- #define MIN_COOLING_SLOPE_TIME_CHAMBER_VENT 20
- #define MIN_COOLING_SLOPE_DEG_CHAMBER_VENT 1.5
+ #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS
#endif
#endif
@@ -189,11 +78,6 @@
#define THERMAL_PROTECTION_PERIOD 40 // Seconds
#define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius
- //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops
- #if BOTH(ADAPTIVE_FAN_SLOWING, PIDTEMP)
- //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303
- #endif
-
/**
* Whenever an M104, M109, or M303 increases the target temperature, the
* firmware will wait for the WATCH_TEMP_PERIOD to expire. If the temperature
@@ -214,115 +98,44 @@
* Thermal Protection parameters for the bed are just as above for hotends.
*/
#if ENABLED(THERMAL_PROTECTION_BED)
- #define THERMAL_PROTECTION_BED_PERIOD 20 // Seconds
- #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius
+ #define THERMAL_PROTECTION_BED_PERIOD 20 // Seconds
+ #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius
/**
* As described above, except for the bed (M140/M190/M303).
*/
- #define WATCH_BED_TEMP_PERIOD 60 // Seconds
- #define WATCH_BED_TEMP_INCREASE 2 // Degrees Celsius
-#endif
-
-/**
- * Thermal Protection parameters for the heated chamber.
- */
-#if ENABLED(THERMAL_PROTECTION_CHAMBER)
- #define THERMAL_PROTECTION_CHAMBER_PERIOD 20 // Seconds
- #define THERMAL_PROTECTION_CHAMBER_HYSTERESIS 2 // Degrees Celsius
-
- /**
- * Heated chamber watch settings (M141/M191).
- */
- #define WATCH_CHAMBER_TEMP_PERIOD 60 // Seconds
- #define WATCH_CHAMBER_TEMP_INCREASE 2 // Degrees Celsius
+ #define WATCH_BED_TEMP_PERIOD 60 // Seconds
+ #define WATCH_BED_TEMP_INCREASE 2 // Degrees Celsius
#endif
#if ENABLED(PIDTEMP)
- // Add an experimental additional term to the heater power, proportional to the extrusion speed.
- // A well-chosen Kc value should add just enough power to melt the increased material volume.
+ // this adds an experimental additional term to the heating power, proportional to the extrusion speed.
+ // if Kc is chosen well, the additional required power due to increased melting should be compensated.
//#define PID_EXTRUSION_SCALING
#if ENABLED(PID_EXTRUSION_SCALING)
- #define DEFAULT_Kc (100) // heating power = Kc * e_speed
+ #define DEFAULT_Kc (100) //heating power=Kc*(e_speed)
#define LPQ_MAX_LEN 50
#endif
-
- /**
- * Add an experimental additional term to the heater power, proportional to the fan speed.
- * A well-chosen Kf value should add just enough power to compensate for power-loss from the cooling fan.
- * You can either just add a constant compensation with the DEFAULT_Kf value
- * or follow the instruction below to get speed-dependent compensation.
- *
- * Constant compensation (use only with fanspeeds of 0% and 100%)
- * ---------------------------------------------------------------------
- * A good starting point for the Kf-value comes from the calculation:
- * kf = (power_fan * eff_fan) / power_heater * 255
- * where eff_fan is between 0.0 and 1.0, based on fan-efficiency and airflow to the nozzle / heater.
- *
- * Example:
- * Heater: 40W, Fan: 0.1A * 24V = 2.4W, eff_fan = 0.8
- * Kf = (2.4W * 0.8) / 40W * 255 = 12.24
- *
- * Fan-speed dependent compensation
- * --------------------------------
- * 1. To find a good Kf value, set the hotend temperature, wait for it to settle, and enable the fan (100%).
- * Make sure PID_FAN_SCALING_LIN_FACTOR is 0 and PID_FAN_SCALING_ALTERNATIVE_DEFINITION is not enabled.
- * If you see the temperature drop repeat the test, increasing the Kf value slowly, until the temperature
- * drop goes away. If the temperature overshoots after enabling the fan, the Kf value is too big.
- * 2. Note the Kf-value for fan-speed at 100%
- * 3. Determine a good value for PID_FAN_SCALING_MIN_SPEED, which is around the speed, where the fan starts moving.
- * 4. Repeat step 1. and 2. for this fan speed.
- * 5. Enable PID_FAN_SCALING_ALTERNATIVE_DEFINITION and enter the two identified Kf-values in
- * PID_FAN_SCALING_AT_FULL_SPEED and PID_FAN_SCALING_AT_MIN_SPEED. Enter the minimum speed in PID_FAN_SCALING_MIN_SPEED
- */
- //#define PID_FAN_SCALING
- #if ENABLED(PID_FAN_SCALING)
- //#define PID_FAN_SCALING_ALTERNATIVE_DEFINITION
- #if ENABLED(PID_FAN_SCALING_ALTERNATIVE_DEFINITION)
- // The alternative definition is used for an easier configuration.
- // Just figure out Kf at fullspeed (255) and PID_FAN_SCALING_MIN_SPEED.
- // DEFAULT_Kf and PID_FAN_SCALING_LIN_FACTOR are calculated accordingly.
-
- #define PID_FAN_SCALING_AT_FULL_SPEED 13.0 //=PID_FAN_SCALING_LIN_FACTOR*255+DEFAULT_Kf
- #define PID_FAN_SCALING_AT_MIN_SPEED 6.0 //=PID_FAN_SCALING_LIN_FACTOR*PID_FAN_SCALING_MIN_SPEED+DEFAULT_Kf
- #define PID_FAN_SCALING_MIN_SPEED 10.0 // Minimum fan speed at which to enable PID_FAN_SCALING
-
- #define DEFAULT_Kf (255.0*PID_FAN_SCALING_AT_MIN_SPEED-PID_FAN_SCALING_AT_FULL_SPEED*PID_FAN_SCALING_MIN_SPEED)/(255.0-PID_FAN_SCALING_MIN_SPEED)
- #define PID_FAN_SCALING_LIN_FACTOR (PID_FAN_SCALING_AT_FULL_SPEED-DEFAULT_Kf)/255.0
-
- #else
- #define PID_FAN_SCALING_LIN_FACTOR (0) // Power loss due to cooling = Kf * (fan_speed)
- #define DEFAULT_Kf 10 // A constant value added to the PID-tuner
- #define PID_FAN_SCALING_MIN_SPEED 10 // Minimum fan speed at which to enable PID_FAN_SCALING
- #endif
- #endif
#endif
/**
- * Automatic Temperature Mode
- *
- * Dynamically adjust the hotend target temperature based on planned E moves.
- *
- * (Contrast with PID_EXTRUSION_SCALING, which tracks E movement and adjusts PID
- * behavior using an additional kC value.)
- *
- * Autotemp is calculated by (mintemp + factor * mm_per_sec), capped to maxtemp.
- *
- * Enable Autotemp Mode with M104/M109 F S B.
- * Disable by sending M104/M109 with no F parameter (or F0 with AUTOTEMP_PROPORTIONAL).
+ * Automatic Temperature:
+ * The hotend target temperature is calculated by all the buffered lines of gcode.
+ * The maximum buffered steps/sec of the extruder motor is called "se".
+ * Start autotemp mode with M109 S B F
+ * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by
+ * mintemp and maxtemp. Turn this off by executing M109 without F*
+ * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
+ * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
*/
#define AUTOTEMP
#if ENABLED(AUTOTEMP)
- #define AUTOTEMP_OLDWEIGHT 0.98
- // Turn on AUTOTEMP on M104/M109 by default using proportions set here
- //#define AUTOTEMP_PROPORTIONAL
- #if ENABLED(AUTOTEMP_PROPORTIONAL)
- #define AUTOTEMP_MIN_P 0 // (°C) Added to the target temperature
- #define AUTOTEMP_MAX_P 5 // (°C) Added to the target temperature
- #define AUTOTEMP_FACTOR_P 1 // Apply this F parameter by default (overridden by M104/M109 F)
- #endif
+ #define AUTOTEMP_OLDWEIGHT 0.98
#endif
+// Show extra position information in M114
+//#define M114_DETAIL
+
// Show Temperature ADC value
// Enable for M105 to include ADC values read from temperature sensors.
//#define SHOW_TEMP_ADC_VALUES
@@ -363,20 +176,8 @@
#if ENABLED(EXTRUDER_RUNOUT_PREVENT)
#define EXTRUDER_RUNOUT_MINTEMP 190
#define EXTRUDER_RUNOUT_SECONDS 30
- #define EXTRUDER_RUNOUT_SPEED 1500 // (mm/min)
- #define EXTRUDER_RUNOUT_EXTRUDE 5 // (mm)
-#endif
-
-/**
- * Hotend Idle Timeout
- * Prevent filament in the nozzle from charring and causing a critical jam.
- */
-//#define HOTEND_IDLE_TIMEOUT
-#if ENABLED(HOTEND_IDLE_TIMEOUT)
- #define HOTEND_IDLE_TIMEOUT_SEC (5*60) // (seconds) Time without extruder movement to trigger protection
- #define HOTEND_IDLE_MIN_TRIGGER 180 // (°C) Minimum temperature to enable hotend protection
- #define HOTEND_IDLE_NOZZLE_TARGET 0 // (°C) Safe temperature for the nozzle after timeout
- #define HOTEND_IDLE_BED_TARGET 0 // (°C) Safe temperature for the bed after timeout
+ #define EXTRUDER_RUNOUT_SPEED 1500 // mm/m
+ #define EXTRUDER_RUNOUT_EXTRUDE 5 // mm
#endif
// @section temperature
@@ -392,22 +193,14 @@
* Controller Fan
* To cool down the stepper drivers and MOSFETs.
*
- * The fan turns on automatically whenever any driver is enabled and turns
- * off (or reduces to idle speed) shortly after drivers are turned off.
+ * The fan will turn on automatically whenever any stepper is enabled
+ * and turn off after a set period after all steppers are turned off.
*/
//#define USE_CONTROLLER_FAN
#if ENABLED(USE_CONTROLLER_FAN)
//#define CONTROLLER_FAN_PIN -1 // Set a custom pin for the controller fan
- //#define CONTROLLER_FAN_USE_Z_ONLY // With this option only the Z axis is considered
- //#define CONTROLLER_FAN_IGNORE_Z // Ignore Z stepper. Useful when stepper timeout is disabled.
- #define CONTROLLERFAN_SPEED_MIN 0 // (0-255) Minimum speed. (If set below this value the fan is turned off.)
- #define CONTROLLERFAN_SPEED_ACTIVE 255 // (0-255) Active speed, used when any motor is enabled
- #define CONTROLLERFAN_SPEED_IDLE 0 // (0-255) Idle speed, used when motors are disabled
- #define CONTROLLERFAN_IDLE_TIME 60 // (seconds) Extra time to keep the fan running after disabling motors
- //#define CONTROLLER_FAN_EDITABLE // Enable M710 configurable settings
- #if ENABLED(CONTROLLER_FAN_EDITABLE)
- #define CONTROLLER_FAN_MENU // Enable the Controller Fan submenu
- #endif
+ #define CONTROLLERFAN_SECS 60 // Duration in seconds for the fan to run after all motors are disabled
+ #define CONTROLLERFAN_SPEED 255 // 255 == full speed
#endif
// When first starting the main fan, run it at full speed for the
@@ -415,9 +208,6 @@
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
//#define FAN_KICKSTART_TIME 100
-// Some coolers may require a non-zero "off" state.
-//#define FAN_OFF_PWM 1
-
/**
* PWM Fan Scaling
*
@@ -433,33 +223,6 @@
//#define FAN_MIN_PWM 50
//#define FAN_MAX_PWM 128
-/**
- * FAST PWM FAN Settings
- *
- * Use to change the FAST FAN PWM frequency (if enabled in Configuration.h)
- * Combinations of PWM Modes, prescale values and TOP resolutions are used internally to produce a
- * frequency as close as possible to the desired frequency.
- *
- * FAST_PWM_FAN_FREQUENCY [undefined by default]
- * Set this to your desired frequency.
- * If left undefined this defaults to F = F_CPU/(2*255*1)
- * i.e., F = 31.4kHz on 16MHz microcontrollers or F = 39.2kHz on 20MHz microcontrollers.
- * These defaults are the same as with the old FAST_PWM_FAN implementation - no migration is required
- * NOTE: Setting very low frequencies (< 10 Hz) may result in unexpected timer behavior.
- *
- * USE_OCR2A_AS_TOP [undefined by default]
- * Boards that use TIMER2 for PWM have limitations resulting in only a few possible frequencies on TIMER2:
- * 16MHz MCUs: [62.5KHz, 31.4KHz (default), 7.8KHz, 3.92KHz, 1.95KHz, 977Hz, 488Hz, 244Hz, 60Hz, 122Hz, 30Hz]
- * 20MHz MCUs: [78.1KHz, 39.2KHz (default), 9.77KHz, 4.9KHz, 2.44KHz, 1.22KHz, 610Hz, 305Hz, 153Hz, 76Hz, 38Hz]
- * A greater range can be achieved by enabling USE_OCR2A_AS_TOP. But note that this option blocks the use of
- * PWM on pin OC2A. Only use this option if you don't need PWM on 0C2A. (Check your schematic.)
- * USE_OCR2A_AS_TOP sacrifices duty cycle control resolution to achieve this broader range of frequencies.
- */
-#if ENABLED(FAST_PWM_FAN)
- //#define FAST_PWM_FAN_FREQUENCY 31400
- //#define USE_OCR2A_AS_TOP
-#endif
-
// @section extruder
/**
@@ -479,15 +242,9 @@
#define E2_AUTO_FAN_PIN -1
#define E3_AUTO_FAN_PIN -1
#define E4_AUTO_FAN_PIN -1
-#define E5_AUTO_FAN_PIN -1
-#define E6_AUTO_FAN_PIN -1
-#define E7_AUTO_FAN_PIN -1
#define CHAMBER_AUTO_FAN_PIN -1
-
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
-#define EXTRUDER_AUTO_FAN_SPEED 255 // 255 == full speed
-#define CHAMBER_AUTO_FAN_TEMPERATURE 30
-#define CHAMBER_AUTO_FAN_SPEED 255
+#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
/**
* Part-Cooling Fan Multiplexer
@@ -509,15 +266,17 @@
#define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW
#define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on
#define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin)
- //#define CASE_LIGHT_MAX_PWM 128 // Limit pwm
- //#define CASE_LIGHT_MENU // Add Case Light options to the LCD menu
- //#define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting.
- //#define CASE_LIGHT_USE_NEOPIXEL // Use NeoPixel LED as case light, requires NEOPIXEL_LED.
+ //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu
+ //#define CASE_LIGHT_USE_NEOPIXEL // Use Neopixel LED as case light, requires NEOPIXEL_LED.
#if ENABLED(CASE_LIGHT_USE_NEOPIXEL)
#define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White }
#endif
#endif
+//===========================================================================
+//============================ Mechanical Settings ==========================
+//===========================================================================
+
// @section homing
// If you want endstops to stay on (by default) even when not homing
@@ -556,7 +315,7 @@
//#define X_DUAL_ENDSTOPS
#if ENABLED(X_DUAL_ENDSTOPS)
#define X2_USE_ENDSTOP _XMAX_
- #define X2_ENDSTOP_ADJUSTMENT 0
+ #define X_DUAL_ENDSTOPS_ADJUSTMENT 0
#endif
#endif
@@ -566,28 +325,16 @@
//#define Y_DUAL_ENDSTOPS
#if ENABLED(Y_DUAL_ENDSTOPS)
#define Y2_USE_ENDSTOP _YMAX_
- #define Y2_ENDSTOP_ADJUSTMENT 0
+ #define Y_DUAL_ENDSTOPS_ADJUSTMENT 0
#endif
#endif
-//
-// For Z set the number of stepper drivers
-//
-#define NUM_Z_STEPPER_DRIVERS 1 // (1-4) Z options change based on how many
-
-#if NUM_Z_STEPPER_DRIVERS > 1
- //#define Z_MULTI_ENDSTOPS
- #if ENABLED(Z_MULTI_ENDSTOPS)
- #define Z2_USE_ENDSTOP _XMAX_
- #define Z2_ENDSTOP_ADJUSTMENT 0
- #if NUM_Z_STEPPER_DRIVERS >= 3
- #define Z3_USE_ENDSTOP _YMAX_
- #define Z3_ENDSTOP_ADJUSTMENT 0
- #endif
- #if NUM_Z_STEPPER_DRIVERS >= 4
- #define Z4_USE_ENDSTOP _ZMAX_
- #define Z4_ENDSTOP_ADJUSTMENT 0
- #endif
+//#define Z_DUAL_STEPPER_DRIVERS
+#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
+ //#define Z_DUAL_ENDSTOPS
+ #if ENABLED(Z_DUAL_ENDSTOPS)
+ #define Z2_USE_ENDSTOP _XMAX_
+ #define Z_DUAL_ENDSTOPS_ADJUSTMENT 0
#endif
#endif
@@ -600,44 +347,40 @@
* The inactive carriage is parked automatically to prevent oozing.
* X1 is the left carriage, X2 the right. They park and home at opposite ends of the X axis.
* By default the X2 stepper is assigned to the first unused E plug on the board.
- *
- * The following Dual X Carriage modes can be selected with M605 S:
- *
- * 0 : (FULL_CONTROL) The slicer has full control over both X-carriages and can achieve optimal travel
- * results as long as it supports dual X-carriages. (M605 S0)
- *
- * 1 : (AUTO_PARK) The firmware automatically parks and unparks the X-carriages on tool-change so
- * that additional slicer support is not required. (M605 S1)
- *
- * 2 : (DUPLICATION) The firmware moves the second X-carriage and extruder in synchronization with
- * the first X-carriage and extruder, to print 2 copies of the same object at the same time.
- * Set the constant X-offset and temperature differential with M605 S2 X[offs] R[deg] and
- * follow with M605 S2 to initiate duplicated movement.
- *
- * 3 : (MIRRORED) Formbot/Vivedino-inspired mirrored mode in which the second extruder duplicates
- * the movement of the first except the second extruder is reversed in the X axis.
- * Set the initial X offset and temperature differential with M605 S2 X[offs] R[deg] and
- * follow with M605 S3 to initiate mirrored movement.
*/
//#define DUAL_X_CARRIAGE
#if ENABLED(DUAL_X_CARRIAGE)
- #define X1_MIN_POS X_MIN_POS // Set to X_MIN_POS
- #define X1_MAX_POS X_BED_SIZE // Set a maximum so the first X-carriage can't hit the parked second X-carriage
- #define X2_MIN_POS 80 // Set a minimum to ensure the second X-carriage can't hit the parked first X-carriage
- #define X2_MAX_POS 353 // Set this to the distance between toolheads when both heads are homed
- #define X2_HOME_DIR 1 // Set to 1. The second X-carriage always homes to the maximum endstop position
- #define X2_HOME_POS X2_MAX_POS // Default X2 home position. Set to X2_MAX_POS.
- // However: In this mode the HOTEND_OFFSET_X value for the second extruder provides a software
- // override for X2_HOME_POS. This also allow recalibration of the distance between the two endstops
- // without modifying the firmware (through the "M218 T1 X???" command).
- // Remember: you should set the second extruder x-offset to 0 in your slicer.
+ #define X1_MIN_POS X_MIN_POS // set minimum to ensure first x-carriage doesn't hit the parked second X-carriage
+ #define X1_MAX_POS X_BED_SIZE // set maximum to ensure first x-carriage doesn't hit the parked second X-carriage
+ #define X2_MIN_POS 80 // set minimum to ensure second x-carriage doesn't hit the parked first X-carriage
+ #define X2_MAX_POS 353 // set maximum to the distance between toolheads when both heads are homed
+ #define X2_HOME_DIR 1 // the second X-carriage always homes to the maximum endstop position
+ #define X2_HOME_POS X2_MAX_POS // default home position is the maximum carriage position
+ // However: In this mode the HOTEND_OFFSET_X value for the second extruder provides a software
+ // override for X2_HOME_POS. This also allow recalibration of the distance between the two endstops
+ // without modifying the firmware (through the "M218 T1 X???" command).
+ // Remember: you should set the second extruder x-offset to 0 in your slicer.
+
+ // There are a few selectable movement modes for dual x-carriages using M605 S
+ // Mode 0 (DXC_FULL_CONTROL_MODE): Full control. The slicer has full control over both x-carriages and can achieve optimal travel results
+ // as long as it supports dual x-carriages. (M605 S0)
+ // Mode 1 (DXC_AUTO_PARK_MODE) : Auto-park mode. The firmware will automatically park and unpark the x-carriages on tool changes so
+ // that additional slicer support is not required. (M605 S1)
+ // Mode 2 (DXC_DUPLICATION_MODE) : Duplication mode. The firmware will transparently make the second x-carriage and extruder copy all
+ // actions of the first x-carriage. This allows the printer to print 2 arbitrary items at
+ // once. (2nd extruder x offset and temp offset are set using: M605 S2 [Xnnn] [Rmmm])
// This is the default power-up mode which can be later using M605.
- #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_AUTO_PARK_MODE
+ #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE
+
+ // Default settings in "Auto-park Mode"
+ #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder
+ #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder
// Default x offset in duplication mode (typically set to half print bed width)
#define DEFAULT_DUPLICATION_X_OFFSET 100
-#endif
+
+#endif // DUAL_X_CARRIAGE
// Activate a solenoid on the active extruder with M380. Disable all with M381.
// Define SOL0_PIN, SOL1_PIN, etc., for each extruder that has a solenoid.
@@ -645,187 +388,25 @@
// @section homing
-/**
- * Homing Procedure
- * Homing (G28) does an indefinite move towards the endstops to establish
- * the position of the toolhead relative to the workspace.
- */
+// Homing hits each endstop, retracts by these distances, then does a slower bump.
+#define X_HOME_BUMP_MM 5
+#define Y_HOME_BUMP_MM 5
+#define Z_HOME_BUMP_MM 2
+#define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate)
+//#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially
-//#define SENSORLESS_BACKOFF_MM { 2, 2 } // (mm) Backoff from endstops before sensorless homing
+// When G28 is called, this option will make Y home before X
+//#define HOME_Y_BEFORE_X
-#define HOMING_BUMP_MM { 5, 5, 2 } // (mm) Backoff from endstops after first bump
-#define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate)
+// Enable this if X or Y can't home without homing the other axis first.
+//#define CODEPENDENT_XY_HOMING
-//#define HOMING_BACKOFF_POST_MM { 2, 2, 2 } // (mm) Backoff from endstops after homing
+// @section machine
-//#define QUICK_HOME // If G28 contains XY do a diagonal move first
-//#define HOME_Y_BEFORE_X // If G28 contains XY home Y before X
-//#define CODEPENDENT_XY_HOMING // If X/Y can't home without homing Y/X first
+#define AXIS_RELATIVE_MODES {false, false, false, false}
-// @section bltouch
-
-#if ENABLED(BLTOUCH)
- /**
- * Either: Use the defaults (recommended) or: For special purposes, use the following DEFINES
- * Do not activate settings that the probe might not understand. Clones might misunderstand
- * advanced commands.
- *
- * Note: If the probe is not deploying, do a "Reset" and "Self-Test" and then check the
- * wiring of the BROWN, RED and ORANGE wires.
- *
- * Note: If the trigger signal of your probe is not being recognized, it has been very often
- * because the BLACK and WHITE wires needed to be swapped. They are not "interchangeable"
- * like they would be with a real switch. So please check the wiring first.
- *
- * Settings for all BLTouch and clone probes:
- */
-
- // Safety: The probe needs time to recognize the command.
- // Minimum command delay (ms). Enable and increase if needed.
- //#define BLTOUCH_DELAY 500
-
- /**
- * Settings for BLTOUCH Classic 1.2, 1.3 or BLTouch Smart 1.0, 2.0, 2.2, 3.0, 3.1, and most clones:
- */
-
- // Feature: Switch into SW mode after a deploy. It makes the output pulse longer. Can be useful
- // in special cases, like noisy or filtered input configurations.
- //#define BLTOUCH_FORCE_SW_MODE
-
- /**
- * Settings for BLTouch Smart 3.0 and 3.1
- * Summary:
- * - Voltage modes: 5V and OD (open drain - "logic voltage free") output modes
- * - High-Speed mode
- * - Disable LCD voltage options
- */
-
- /**
- * Danger: Don't activate 5V mode unless attached to a 5V-tolerant controller!
- * V3.0 or 3.1: Set default mode to 5V mode at Marlin startup.
- * If disabled, OD mode is the hard-coded default on 3.0
- * On startup, Marlin will compare its eeprom to this value. If the selected mode
- * differs, a mode set eeprom write will be completed at initialization.
- * Use the option below to force an eeprom write to a V3.1 probe regardless.
- */
- //#define BLTOUCH_SET_5V_MODE
-
- /**
- * Safety: Activate if connecting a probe with an unknown voltage mode.
- * V3.0: Set a probe into mode selected above at Marlin startup. Required for 5V mode on 3.0
- * V3.1: Force a probe with unknown mode into selected mode at Marlin startup ( = Probe EEPROM write )
- * To preserve the life of the probe, use this once then turn it off and re-flash.
- */
- //#define BLTOUCH_FORCE_MODE_SET
-
- /**
- * Use "HIGH SPEED" mode for probing.
- * Danger: Disable if your probe sometimes fails. Only suitable for stable well-adjusted systems.
- * This feature was designed for Delta's with very fast Z moves however higher speed cartesians may function
- * If the machine cannot raise the probe fast enough after a trigger, it may enter a fault state.
- */
- //#define BLTOUCH_HS_MODE
-
- // Safety: Enable voltage mode settings in the LCD menu.
- //#define BLTOUCH_LCD_VOLTAGE_MENU
-
-#endif // BLTOUCH
-
-// @section extras
-
-/**
- * Z Steppers Auto-Alignment
- * Add the G34 command to align multiple Z steppers using a bed probe.
- */
-//#define Z_STEPPER_AUTO_ALIGN
-#if ENABLED(Z_STEPPER_AUTO_ALIGN)
- // Define probe X and Y positions for Z1, Z2 [, Z3 [, Z4]]
- // If not defined, probe limits will be used.
- // Override with 'M422 S X Y'
- //#define Z_STEPPER_ALIGN_XY { { 10, 190 }, { 100, 10 }, { 190, 190 } }
-
- /**
- * Orientation for the automatically-calculated probe positions.
- * Override Z stepper align points with 'M422 S X Y'
- *
- * 2 Steppers: (0) (1)
- * | | 2 |
- * | 1 2 | |
- * | | 1 |
- *
- * 3 Steppers: (0) (1) (2) (3)
- * | 3 | 1 | 2 1 | 2 |
- * | | 3 | | 3 |
- * | 1 2 | 2 | 3 | 1 |
- *
- * 4 Steppers: (0) (1) (2) (3)
- * | 4 3 | 1 4 | 2 1 | 3 2 |
- * | | | | |
- * | 1 2 | 2 3 | 3 4 | 4 1 |
- */
- #ifndef Z_STEPPER_ALIGN_XY
- //#define Z_STEPPERS_ORIENTATION 0
- #endif
-
- // Provide Z stepper positions for more rapid convergence in bed alignment.
- // Requires triple stepper drivers (i.e., set NUM_Z_STEPPER_DRIVERS to 3)
- //#define Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS
- #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
- // Define Stepper XY positions for Z1, Z2, Z3 corresponding to
- // the Z screw positions in the bed carriage.
- // Define one position per Z stepper in stepper driver order.
- #define Z_STEPPER_ALIGN_STEPPER_XY { { 210.7, 102.5 }, { 152.6, 220.0 }, { 94.5, 102.5 } }
- #else
- // Amplification factor. Used to scale the correction step up or down in case
- // the stepper (spindle) position is farther out than the test point.
- #define Z_STEPPER_ALIGN_AMP 1.0 // Use a value > 1.0 NOTE: This may cause instability!
- #endif
-
- // On a 300mm bed a 5% grade would give a misalignment of ~1.5cm
- #define G34_MAX_GRADE 5 // (%) Maximum incline that G34 will handle
- #define Z_STEPPER_ALIGN_ITERATIONS 5 // Number of iterations to apply during alignment
- #define Z_STEPPER_ALIGN_ACC 0.02 // Stop iterating early if the accuracy is better than this
- #define RESTORE_LEVELING_AFTER_G34 // Restore leveling after G34 is done?
- // After G34, re-home Z (G28 Z) or just calculate it from the last probe heights?
- // Re-homing might be more precise in reproducing the actual 'G28 Z' homing height, especially on an uneven bed.
- #define HOME_AFTER_G34
-#endif
-
-//
-// Add the G35 command to read bed corners to help adjust screws. Requires a bed probe.
-//
-//#define ASSISTED_TRAMMING
-#if ENABLED(ASSISTED_TRAMMING)
-
- // Define positions for probing points, use the hotend as reference not the sensor.
- #define TRAMMING_POINT_XY { { 20, 20 }, { 200, 20 }, { 200, 200 }, { 20, 200 } }
-
- // Define positions names for probing points.
- #define TRAMMING_POINT_NAME_1 "Front-Left"
- #define TRAMMING_POINT_NAME_2 "Front-Right"
- #define TRAMMING_POINT_NAME_3 "Back-Right"
- #define TRAMMING_POINT_NAME_4 "Back-Left"
-
- #define RESTORE_LEVELING_AFTER_G35 // Enable to restore leveling setup after operation
- //#define REPORT_TRAMMING_MM // Report Z deviation (mm) for each point relative to the first
- //#define ASSISTED_TRAMMING_MENU_ITEM // Add a menu item for Assisted Tramming
-
- /**
- * Screw thread:
- * M3: 30 = Clockwise, 31 = Counter-Clockwise
- * M4: 40 = Clockwise, 41 = Counter-Clockwise
- * M5: 50 = Clockwise, 51 = Counter-Clockwise
- */
- #define TRAMMING_SCREW_THREAD 30
-
-#endif
-
-// @section motion
-
-#define AXIS_RELATIVE_MODES { false, false, false, false }
-
-// Add a Duplicate option for well-separated conjoined nozzles
-//#define MULTI_NOZZLE_DUPLICATION
+// Allow duplication mode with a basic dual-nozzle extruder
+//#define DUAL_NOZZLE_DUPLICATION_MODE
// By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
#define INVERT_X_STEP_PIN false
@@ -833,139 +414,52 @@
#define INVERT_Z_STEP_PIN false
#define INVERT_E_STEP_PIN false
-/**
- * Idle Stepper Shutdown
- * Set DISABLE_INACTIVE_? 'true' to shut down axis steppers after an idle period.
- * The Deactive Time can be overridden with M18 and M84. Set to 0 for No Timeout.
- */
+// Default stepper release if idle. Set to 0 to deactivate.
+// Steppers will shut down DEFAULT_STEPPER_DEACTIVE_TIME seconds after the last move when DISABLE_INACTIVE_? is true.
+// Time can be set by M18 and M84.
#define DEFAULT_STEPPER_DEACTIVE_TIME 120
#define DISABLE_INACTIVE_X true
#define DISABLE_INACTIVE_Y true
-#define DISABLE_INACTIVE_Z true // Set 'false' if the nozzle could fall onto your printed part!
+#define DISABLE_INACTIVE_Z true // set to false if the nozzle will fall down on your printed part when print has finished.
#define DISABLE_INACTIVE_E true
-// If the Nozzle or Bed falls when the Z stepper is disabled, set its resting position here.
-//#define Z_AFTER_DEACTIVATE Z_HOME_POS
+#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate
+#define DEFAULT_MINTRAVELFEEDRATE 0.0
//#define HOME_AFTER_DEACTIVATE // Require rehoming after steppers are deactivated
-// Default Minimum Feedrates for printing and travel moves
-#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S.
-#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T.
+// @section lcd
-// Minimum time that a segment needs to take as the buffer gets emptied
-#define DEFAULT_MINSEGMENTTIME 20000 // (µs) Set with M205 B.
+#if ENABLED(ULTIPANEL)
+ #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
+ #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
+ #define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder
+#endif
-// Slow down the machine if the lookahead buffer is (by default) half full.
-// Increase the slowdown divisor for larger buffer sizes.
+// @section extras
+
+// minimum time in microseconds that a movement needs to take if the buffer is emptied.
+#define DEFAULT_MINSEGMENTTIME 20000
+
+// If defined the movements slow down when the look ahead buffer is only half full
#define SLOWDOWN
-#if ENABLED(SLOWDOWN)
- #define SLOWDOWN_DIVISOR 2
-#endif
-/**
- * XY Frequency limit
- * Reduce resonance by limiting the frequency of small zigzag infill moves.
- * See https://hydraraptor.blogspot.com/2010/12/frequency-limit.html
- * Use M201 F G to change limits at runtime.
- */
-//#define XY_FREQUENCY_LIMIT 10 // (Hz) Maximum frequency of small zigzag infill moves. Set with M201 F.
-#ifdef XY_FREQUENCY_LIMIT
- #define XY_FREQUENCY_MIN_PERCENT 5 // (percent) Minimum FR percentage to apply. Set with M201 G.
-#endif
+// Frequency limit
+// See nophead's blog for more info
+// Not working O
+//#define XY_FREQUENCY_LIMIT 15
// Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end
// of the buffer and all stops. This should not be much greater than zero and should only be changed
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
-#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
+#define MINIMUM_PLANNER_SPEED 0.05 // (mm/sec)
//
-// Backlash Compensation
-// Adds extra movement to axes on direction-changes to account for backlash.
+// Use Junction Deviation instead of traditional Jerk Limiting
//
-//#define BACKLASH_COMPENSATION
-#if ENABLED(BACKLASH_COMPENSATION)
- // Define values for backlash distance and correction.
- // If BACKLASH_GCODE is enabled these values are the defaults.
- #define BACKLASH_DISTANCE_MM { 0, 0, 0 } // (mm)
- #define BACKLASH_CORRECTION 0.0 // 0.0 = no correction; 1.0 = full correction
-
- // Set BACKLASH_SMOOTHING_MM to spread backlash correction over multiple segments
- // to reduce print artifacts. (Enabling this is costly in memory and computation!)
- //#define BACKLASH_SMOOTHING_MM 3 // (mm)
-
- // Add runtime configuration and tuning of backlash values (M425)
- //#define BACKLASH_GCODE
-
- #if ENABLED(BACKLASH_GCODE)
- // Measure the Z backlash when probing (G29) and set with "M425 Z"
- #define MEASURE_BACKLASH_WHEN_PROBING
-
- #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
- // When measuring, the probe will move up to BACKLASH_MEASUREMENT_LIMIT
- // mm away from point of contact in BACKLASH_MEASUREMENT_RESOLUTION
- // increments while checking for the contact to be broken.
- #define BACKLASH_MEASUREMENT_LIMIT 0.5 // (mm)
- #define BACKLASH_MEASUREMENT_RESOLUTION 0.005 // (mm)
- #define BACKLASH_MEASUREMENT_FEEDRATE Z_PROBE_SPEED_SLOW // (mm/min)
- #endif
- #endif
-#endif
-
-/**
- * Automatic backlash, position and hotend offset calibration
- *
- * Enable G425 to run automatic calibration using an electrically-
- * conductive cube, bolt, or washer mounted on the bed.
- *
- * G425 uses the probe to touch the top and sides of the calibration object
- * on the bed and measures and/or correct positional offsets, axis backlash
- * and hotend offsets.
- *
- * Note: HOTEND_OFFSET and CALIBRATION_OBJECT_CENTER must be set to within
- * ±5mm of true values for G425 to succeed.
- */
-//#define CALIBRATION_GCODE
-#if ENABLED(CALIBRATION_GCODE)
-
- //#define CALIBRATION_SCRIPT_PRE "M117 Starting Auto-Calibration\nT0\nG28\nG12\nM117 Calibrating..."
- //#define CALIBRATION_SCRIPT_POST "M500\nM117 Calibration data saved"
-
- #define CALIBRATION_MEASUREMENT_RESOLUTION 0.01 // mm
-
- #define CALIBRATION_FEEDRATE_SLOW 60 // mm/min
- #define CALIBRATION_FEEDRATE_FAST 1200 // mm/min
- #define CALIBRATION_FEEDRATE_TRAVEL 3000 // mm/min
-
- // The following parameters refer to the conical section of the nozzle tip.
- #define CALIBRATION_NOZZLE_TIP_HEIGHT 1.0 // mm
- #define CALIBRATION_NOZZLE_OUTER_DIAMETER 2.0 // mm
-
- // Uncomment to enable reporting (required for "G425 V", but consumes PROGMEM).
- //#define CALIBRATION_REPORTING
-
- // The true location and dimension the cube/bolt/washer on the bed.
- #define CALIBRATION_OBJECT_CENTER { 264.0, -22.0, -2.0 } // mm
- #define CALIBRATION_OBJECT_DIMENSIONS { 10.0, 10.0, 10.0 } // mm
-
- // Comment out any sides which are unreachable by the probe. For best
- // auto-calibration results, all sides must be reachable.
- #define CALIBRATION_MEASURE_RIGHT
- #define CALIBRATION_MEASURE_FRONT
- #define CALIBRATION_MEASURE_LEFT
- #define CALIBRATION_MEASURE_BACK
-
- // Probing at the exact top center only works if the center is flat. If
- // probing on a screwhead or hollow washer, probe near the edges.
- //#define CALIBRATION_MEASURE_AT_TOP_EDGES
-
- // Define the pin to read during calibration
- #ifndef CALIBRATION_PIN
- //#define CALIBRATION_PIN -1 // Define here to override the default pin
- #define CALIBRATION_PIN_INVERTING false // Set to true to invert the custom pin
- //#define CALIBRATION_PIN_PULLDOWN
- #define CALIBRATION_PIN_PULLUP
- #endif
+//#define JUNCTION_DEVIATION
+#if ENABLED(JUNCTION_DEVIATION)
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
@@ -976,19 +470,8 @@
*/
//#define ADAPTIVE_STEP_SMOOTHING
-/**
- * Custom Microstepping
- * Override as-needed for your setup. Up to 3 MS pins are supported.
- */
-//#define MICROSTEP1 LOW,LOW,LOW
-//#define MICROSTEP2 HIGH,LOW,LOW
-//#define MICROSTEP4 LOW,HIGH,LOW
-//#define MICROSTEP8 HIGH,HIGH,LOW
-//#define MICROSTEP16 LOW,LOW,HIGH
-//#define MICROSTEP32 HIGH,LOW,HIGH
-
-// Microstep settings (Requires a board with pins named X_MS1, X_MS2, etc.)
-#define MICROSTEP_MODES { 16, 16, 16, 16, 16, 16 } // [1,2,4,8,16]
+// Microstep setting (Only functional when stepper driver microstep pins are connected to MCU.
+#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16]
/**
* @section stepper motor current
@@ -1014,109 +497,43 @@
//#define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
//#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis
-/**
- * I2C-based DIGIPOTs (e.g., Azteeg X3 Pro)
- */
-//#define DIGIPOT_MCP4018 // Requires https://github.com/stawel/SlowSoftI2CMaster
-//#define DIGIPOT_MCP4451
-#if EITHER(DIGIPOT_MCP4018, DIGIPOT_MCP4451)
- #define DIGIPOT_I2C_NUM_CHANNELS 8 // 5DPRINT:4 AZTEEG_X3_PRO:8 MKS_SBASE:5 MIGHTYBOARD_REVE:5
-
- // Actual motor currents in Amps. The number of entries must match DIGIPOT_I2C_NUM_CHANNELS.
- // These correspond to the physical drivers, so be mindful if the order is changed.
- #define DIGIPOT_I2C_MOTOR_CURRENTS { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 } // AZTEEG_X3_PRO
-
- //#define DIGIPOT_USE_RAW_VALUES // Use DIGIPOT_MOTOR_CURRENT raw wiper values (instead of A4988 motor currents)
-
+// Use an I2C based DIGIPOT (e.g., Azteeg X3 Pro)
+//#define DIGIPOT_I2C
+#if ENABLED(DIGIPOT_I2C) && !defined(DIGIPOT_I2C_ADDRESS_A)
/**
* Common slave addresses:
*
* A (A shifted) B (B shifted) IC
* Smoothie 0x2C (0x58) 0x2D (0x5A) MCP4451
* AZTEEG_X3_PRO 0x2C (0x58) 0x2E (0x5C) MCP4451
- * AZTEEG_X5_MINI 0x2C (0x58) 0x2E (0x5C) MCP4451
* AZTEEG_X5_MINI_WIFI 0x58 0x5C MCP4451
* MIGHTYBOARD_REVE 0x2F (0x5E) MCP4018
*/
- //#define DIGIPOT_I2C_ADDRESS_A 0x2C // Unshifted slave address for first DIGIPOT
- //#define DIGIPOT_I2C_ADDRESS_B 0x2D // Unshifted slave address for second DIGIPOT
+ #define DIGIPOT_I2C_ADDRESS_A 0x2C // unshifted slave address for first DIGIPOT
+ #define DIGIPOT_I2C_ADDRESS_B 0x2D // unshifted slave address for second DIGIPOT
#endif
+//#define DIGIPOT_MCP4018 // Requires library from https://github.com/stawel/SlowSoftI2CMaster
+#define DIGIPOT_I2C_NUM_CHANNELS 8 // 5DPRINT: 4 AZTEEG_X3_PRO: 8 MKS SBASE: 5
+// Actual motor currents in Amps. The number of entries must match DIGIPOT_I2C_NUM_CHANNELS.
+// These correspond to the physical drivers, so be mindful if the order is changed.
+#define DIGIPOT_I2C_MOTOR_CURRENTS { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 } // AZTEEG_X3_PRO
+
//===========================================================================
//=============================Additional Features===========================
//===========================================================================
+#define ENCODER_RATE_MULTIPLIER // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly
+#define ENCODER_10X_STEPS_PER_SEC 75 // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value
+#define ENCODER_100X_STEPS_PER_SEC 160 // If the encoder steps per sec exceeds this value, multiply steps moved x100 to really quickly advance the value
+
+//#define CHDK 4 //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
+#define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again
+
// @section lcd
-#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
- #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // (mm/min) Feedrates for manual moves along X, Y, Z, E from panel
- #define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
- #if ENABLED(ULTIPANEL)
- #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
- #define ULTIPANEL_FEEDMULTIPLY // Encoder sets the feedrate multiplier on the Status Screen
- #endif
-#endif
-
-// Change values more rapidly when the encoder is rotated faster
-#define ENCODER_RATE_MULTIPLIER
-#if ENABLED(ENCODER_RATE_MULTIPLIER)
- #define ENCODER_10X_STEPS_PER_SEC 30 // (steps/s) Encoder rate for 10x speed
- #define ENCODER_100X_STEPS_PER_SEC 80 // (steps/s) Encoder rate for 100x speed
-#endif
-
-// Play a beep when the feedrate is changed from the Status Screen
-//#define BEEP_ON_FEEDRATE_CHANGE
-#if ENABLED(BEEP_ON_FEEDRATE_CHANGE)
- #define FEEDRATE_CHANGE_BEEP_DURATION 10
- #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
-#endif
-
-#if HAS_LCD_MENU
-
- // Add Probe Z Offset calibration to the Z Probe Offsets menu
- #if HAS_BED_PROBE
- //#define PROBE_OFFSET_WIZARD
- #if ENABLED(PROBE_OFFSET_WIZARD)
- #define PROBE_OFFSET_START -4.0 // Estimated nozzle-to-probe Z offset, plus a little extra
- #endif
- #endif
-
- // Include a page of printer information in the LCD Main Menu
- //#define LCD_INFO_MENU
- #if ENABLED(LCD_INFO_MENU)
- //#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages
- #endif
-
- // BACK menu items keep the highlight at the top
- //#define TURBO_BACK_MENU_ITEM
-
- /**
- * LED Control Menu
- * Add LED Control to the LCD menu
- */
- //#define LED_CONTROL_MENU
- #if ENABLED(LED_CONTROL_MENU)
- #define LED_COLOR_PRESETS // Enable the Preset Color menu option
- //#define NEO2_COLOR_PRESETS // Enable a second NeoPixel Preset Color menu option
- #if ENABLED(LED_COLOR_PRESETS)
- #define LED_USER_PRESET_RED 255 // User defined RED value
- #define LED_USER_PRESET_GREEN 128 // User defined GREEN value
- #define LED_USER_PRESET_BLUE 0 // User defined BLUE value
- #define LED_USER_PRESET_WHITE 255 // User defined WHITE value
- #define LED_USER_PRESET_BRIGHTNESS 255 // User defined intensity
- //#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
- #endif
- #if ENABLED(NEO2_COLOR_PRESETS)
- #define NEO2_USER_PRESET_RED 255 // User defined RED value
- #define NEO2_USER_PRESET_GREEN 128 // User defined GREEN value
- #define NEO2_USER_PRESET_BLUE 0 // User defined BLUE value
- #define NEO2_USER_PRESET_WHITE 255 // User defined WHITE value
- #define NEO2_USER_PRESET_BRIGHTNESS 255 // User defined intensity
- //#define NEO2_USER_PRESET_STARTUP // Have the printer display the user preset color on startup for the second strip
- #endif
- #endif
-
-#endif // HAS_LCD_MENU
+// Include a page of printer information in the LCD Main Menu
+//#define LCD_INFO_MENU
// Scroll a longer status message into view
//#define STATUS_MESSAGE_SCROLLING
@@ -1130,62 +547,52 @@
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
-// Show the E position (filament used) during printing
-//#define LCD_SHOW_E_TOTAL
-
-#if ENABLED(SHOW_BOOTSCREEN)
- #define BOOTSCREEN_TIMEOUT 4000 // (ms) Total Duration to display the boot screen(s)
-#endif
-
-#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY) && ANY(HAS_MARLINUI_U8GLIB, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
- //#define SHOW_REMAINING_TIME // Display estimated time to completion
- #if ENABLED(SHOW_REMAINING_TIME)
- //#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
- //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
+#if ENABLED(SDSUPPORT) || ENABLED(LCD_SET_PROGRESS_MANUALLY)
+ //#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
+ #if ENABLED(LCD_PROGRESS_BAR)
+ #define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
+ #define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
+ #define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
+ //#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
+ //#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
#endif
+#endif // SDSUPPORT || LCD_SET_PROGRESS_MANUALLY
- #if HAS_MARLINUI_U8GLIB
- //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
+/**
+ * LED Control Menu
+ * Enable this feature to add LED Control to the LCD menu
+ */
+//#define LED_CONTROL_MENU
+#if ENABLED(LED_CONTROL_MENU)
+ #define LED_COLOR_PRESETS // Enable the Preset Color menu option
+ #if ENABLED(LED_COLOR_PRESETS)
+ #define LED_USER_PRESET_RED 255 // User defined RED value
+ #define LED_USER_PRESET_GREEN 128 // User defined GREEN value
+ #define LED_USER_PRESET_BLUE 0 // User defined BLUE value
+ #define LED_USER_PRESET_WHITE 255 // User defined WHITE value
+ #define LED_USER_PRESET_BRIGHTNESS 255 // User defined intensity
+ //#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup
#endif
-
- #if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
- //#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
- #if ENABLED(LCD_PROGRESS_BAR)
- #define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
- #define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message
- #define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever)
- //#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it
- //#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar
- #endif
- #endif
-#endif
+#endif // LED_CONTROL_MENU
#if ENABLED(SDSUPPORT)
- // The standard SD detect circuit reads LOW when media is inserted and HIGH when empty.
- // Enable this option and set to HIGH if your SD cards are incorrectly detected.
- //#define SD_DETECT_STATE HIGH
+ // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
+ // around this by connecting a push button or single throw switch to the pin defined
+ // as SD_DETECT_PIN in your board's pins definitions.
+ // This setting should be disabled unless you are using a push button, pulling the pin to ground.
+ // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
+ #define SD_DETECT_INVERTED
- //#define SDCARD_READONLY // Read-only SD card (to save over 2K of flash)
-
- #define SD_PROCEDURE_DEPTH 1 // Increase if you need more nested M32 calls
-
- #define SD_FINISHED_STEPPERRELEASE true // Disable steppers when SD Print is finished
- #define SD_FINISHED_RELEASECOMMAND "M84" // Use "M84XYE" to keep Z enabled so your bed stays in place
+ #define SD_FINISHED_STEPPERRELEASE true // Disable steppers when SD Print is finished
+ #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
// Reverse SD sort to show "more recent" files first, according to the card's FAT.
// Since the FAT gets out of order with usage, SDCARD_SORT_ALPHA is recommended.
#define SDCARD_RATHERRECENTFIRST
- #define SD_MENU_CONFIRM_START // Confirm the selected SD file before printing
-
- //#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files
-
- #define EVENT_GCODE_SD_ABORT "G28XY" // G-code to run on SD Abort Print (e.g., "G28XY" or "G27")
-
- #if ENABLED(PRINTER_EVENT_LEDS)
- #define PE_LEDS_COMPLETED_TIME (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination
- #endif
+ // Add an option in the menu to run all auto#.g files
+ //#define MENU_ADDAUTOSTART
/**
* Continue after Power-Loss (Creality3D)
@@ -1197,19 +604,8 @@
*/
//#define POWER_LOSS_RECOVERY
#if ENABLED(POWER_LOSS_RECOVERY)
- #define PLR_ENABLED_DEFAULT false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
- //#define BACKUP_POWER_SUPPLY // Backup power / UPS to move the steppers on power loss
- //#define POWER_LOSS_RECOVER_ZHOME // Z homing is needed for proper recovery. 99.9% of the time this should be disabled!
- //#define POWER_LOSS_ZRAISE 2 // (mm) Z axis raise on resume (on power loss with UPS)
- //#define POWER_LOSS_PIN 44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
- //#define POWER_LOSS_STATE HIGH // State of pin indicating power loss
- //#define POWER_LOSS_PULL // Set pullup / pulldown as appropriate
- //#define POWER_LOSS_PURGE_LEN 20 // (mm) Length of filament to purge on resume
- //#define POWER_LOSS_RETRACT_LEN 10 // (mm) Length of filament to retract on fail. Requires backup power.
-
- // Without a POWER_LOSS_PIN the following option helps reduce wear on the SD card,
- // especially with "vase mode" printing. Set too high and vases cannot be continued.
- #define POWER_LOSS_MIN_Z_CHANGE 0.05 // (mm) Minimum Z change before saving power-loss data
+ //#define POWER_LOSS_PIN 44 // Pin to detect power loss
+ //#define POWER_LOSS_STATE HIGH // State of pin indicating power loss
#endif
/**
@@ -1241,7 +637,7 @@
#if ENABLED(SDCARD_SORT_ALPHA)
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
- #define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 G-code.
+ #define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 g-code.
#define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting.
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
#define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option.
@@ -1256,15 +652,12 @@
// Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES
- // Leave the heaters on after Stop Print (not recommended!)
- //#define SD_ABORT_NO_COOLDOWN
-
/**
* This option allows you to abort SD printing when any endstop is triggered.
* This feature must be enabled with "M540 S1" or from the LCD menu.
* To have any effect, endstops must be enabled during SD printing.
*/
- //#define SD_ABORT_ON_ENDSTOP_HIT
+ //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
/**
* This option makes it easier to print the same SD Card file again.
@@ -1278,76 +671,8 @@
*/
//#define AUTO_REPORT_SD_STATUS
- /**
- * Support for USB thumb drives using an Arduino USB Host Shield or
- * equivalent MAX3421E breakout board. The USB thumb drive will appear
- * to Marlin as an SD card.
- *
- * The MAX3421E can be assigned the same pins as the SD card reader, with
- * the following pin mapping:
- *
- * SCLK, MOSI, MISO --> SCLK, MOSI, MISO
- * INT --> SD_DETECT_PIN [1]
- * SS --> SDSS
- *
- * [1] On AVR an interrupt-capable pin is best for UHS3 compatibility.
- */
- //#define USB_FLASH_DRIVE_SUPPORT
- #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
- #define USB_CS_PIN SDSS
- #define USB_INTR_PIN SD_DETECT_PIN
-
- /**
- * USB Host Shield Library
- *
- * - UHS2 uses no interrupts and has been production-tested
- * on a LulzBot TAZ Pro with a 32-bit Archim board.
- *
- * - UHS3 is newer code with better USB compatibility. But it
- * is less tested and is known to interfere with Servos.
- * [1] This requires USB_INTR_PIN to be interrupt-capable.
- */
- //#define USE_UHS3_USB
- #endif
-
- /**
- * When using a bootloader that supports SD-Firmware-Flashing,
- * add a menu item to activate SD-FW-Update on the next reboot.
- *
- * Requires ATMEGA2560 (Arduino Mega)
- *
- * Tested with this bootloader:
- * https://github.com/FleetProbe/MicroBridge-Arduino-ATMega2560
- */
- //#define SD_FIRMWARE_UPDATE
- #if ENABLED(SD_FIRMWARE_UPDATE)
- #define SD_FIRMWARE_UPDATE_EEPROM_ADDR 0x1FF
- #define SD_FIRMWARE_UPDATE_ACTIVE_VALUE 0xF0
- #define SD_FIRMWARE_UPDATE_INACTIVE_VALUE 0xFF
- #endif
-
- // Add an optimized binary file transfer mode, initiated with 'M28 B1'
- //#define BINARY_FILE_TRANSFER
-
- /**
- * Set this option to one of the following (or the board's defaults apply):
- *
- * LCD - Use the SD drive in the external LCD controller.
- * ONBOARD - Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.)
- * CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
- *
- * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
- */
- //#define SDCARD_CONNECTION LCD
-
#endif // SDSUPPORT
-/**
- * By default an onboard SD card reader may be shared as a USB mass-
- * storage device. This option hides the SD card from the host PC.
- */
-//#define NO_SD_HOST_DRIVE // Disable SD Card access over USB (for security).
-
/**
* Additional options for Graphical Displays
*
@@ -1360,12 +685,11 @@
* controller events, as there is a trade-off between reliable
* printing performance versus fast display updates.
*/
-#if HAS_MARLINUI_U8GLIB
+#if ENABLED(DOGLCD)
// Show SD percentage next to the progress bar
//#define DOGM_SD_PERCENT
- // Save many cycles by drawing a hollow frame or no frame on the Info Screen
- //#define XYZ_NO_FRAME
+ // Enable to save many cycles by drawing a hollow frame on the Info Screen
#define XYZ_HOLLOW_FRAME
// Enable to save many cycles by drawing a hollow frame on Menu Screens
@@ -1375,222 +699,48 @@
// Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
//#define USE_BIG_EDIT_FONT
- // A smaller font may be used on the Info Screen. Costs 2434 bytes of PROGMEM.
+ // A smaller font may be used on the Info Screen. Costs 2300 bytes of PROGMEM.
// Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
//#define USE_SMALL_INFOFONT
+ // Enable this option and reduce the value to optimize screen updates.
+ // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
+ //#define DOGM_SPI_DELAY_US 5
+
// Swap the CW/CCW indicators in the graphics overlay
//#define OVERLAY_GFX_REVERSE
- /**
- * ST7920-based LCDs can emulate a 16 x 4 character display using
- * the ST7920 character-generator for very fast screen updates.
- * Enable LIGHTWEIGHT_UI to use this special display mode.
- *
- * Since LIGHTWEIGHT_UI has limited space, the position and status
- * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
- * length of time to display the status message before clearing.
- *
- * Set STATUS_EXPIRE_SECONDS to zero to never clear the status.
- * This will prevent position updates from being displayed.
- */
#if ENABLED(U8GLIB_ST7920)
- // Enable this option and reduce the value to optimize screen updates.
- // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
- //#define DOGM_SPI_DELAY_US 5
-
+ /**
+ * ST7920-based LCDs can emulate a 16 x 4 character display using
+ * the ST7920 character-generator for very fast screen updates.
+ * Enable LIGHTWEIGHT_UI to use this special display mode.
+ *
+ * Since LIGHTWEIGHT_UI has limited space, the position and status
+ * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+ * length of time to display the status message before clearing.
+ *
+ * Set STATUS_EXPIRE_SECONDS to zero to never clear the status.
+ * This will prevent position updates from being displayed.
+ */
//#define LIGHTWEIGHT_UI
#if ENABLED(LIGHTWEIGHT_UI)
#define STATUS_EXPIRE_SECONDS 20
#endif
#endif
- /**
- * Status (Info) Screen customizations
- * These options may affect code size and screen render time.
- * Custom status screens can forcibly override these settings.
- */
- //#define STATUS_COMBINE_HEATERS // Use combined heater images instead of separate ones
- //#define STATUS_HOTEND_NUMBERLESS // Use plain hotend icons instead of numbered ones (with 2+ hotends)
- #define STATUS_HOTEND_INVERTED // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM)
- #define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating
- #define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating
- #define STATUS_CHAMBER_ANIM // Use a second bitmap to indicate chamber heating
- //#define STATUS_CUTTER_ANIM // Use a second bitmap to indicate spindle / laser active
- //#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap
- //#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap
- //#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames
- //#define STATUS_HEAT_PERCENT // Show heating in a progress bar
- //#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash)
- //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of PROGMEM.
-
- // Frivolous Game Options
- //#define MARLIN_BRICKOUT
- //#define MARLIN_INVADERS
- //#define MARLIN_SNAKE
- //#define GAMES_EASTER_EGG // Add extra blank lines above the "Games" sub-menu
-
-#endif // HAS_MARLINUI_U8GLIB
-
-//
-// Additional options for DGUS / DWIN displays
-//
-#if HAS_DGUS_LCD
- #define LCD_SERIAL_PORT 3
- #define LCD_BAUDRATE 115200
-
- #define DGUS_RX_BUFFER_SIZE 128
- #define DGUS_TX_BUFFER_SIZE 48
- //#define SERIAL_STATS_RX_BUFFER_OVERRUNS // Fix Rx overrun situation (Currently only for AVR)
-
- #define DGUS_UPDATE_INTERVAL_MS 500 // (ms) Interval between automatic screen updates
-
- #if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
- #define DGUS_PRINT_FILENAME // Display the filename during printing
- #define DGUS_PREHEAT_UI // Display a preheat screen during heatup
-
- #if ENABLED(DGUS_LCD_UI_FYSETC)
- //#define DGUS_UI_MOVE_DIS_OPTION // Disabled by default for UI_FYSETC
- #else
- #define DGUS_UI_MOVE_DIS_OPTION // Enabled by default for UI_HIPRECY
- #endif
-
- #define DGUS_FILAMENT_LOADUNLOAD
- #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
- #define DGUS_FILAMENT_PURGE_LENGTH 10
- #define DGUS_FILAMENT_LOAD_LENGTH_PER_TIME 0.5 // (mm) Adjust in proportion to DGUS_UPDATE_INTERVAL_MS
- #endif
-
- #define DGUS_UI_WAITING // Show a "waiting" screen between some screens
- #if ENABLED(DGUS_UI_WAITING)
- #define DGUS_UI_WAITING_STATUS 10
- #define DGUS_UI_WAITING_STATUS_PERIOD 8 // Increase to slower waiting status looping
- #endif
- #endif
-#endif // HAS_DGUS_LCD
-
-//
-// Touch UI for the FTDI Embedded Video Engine (EVE)
-//
-#if ENABLED(TOUCH_UI_FTDI_EVE)
- // Display board used
- //#define LCD_FTDI_VM800B35A // FTDI 3.5" with FT800 (320x240)
- //#define LCD_4DSYSTEMS_4DLCD_FT843 // 4D Systems 4.3" (480x272)
- //#define LCD_HAOYU_FT800CB // Haoyu with 4.3" or 5" (480x272)
- //#define LCD_HAOYU_FT810CB // Haoyu with 5" (800x480)
- //#define LCD_ALEPHOBJECTS_CLCD_UI // Aleph Objects Color LCD UI
- //#define LCD_FYSETC_TFT81050 // FYSETC with 5" (800x480)
-
- // Correct the resolution if not using the stock TFT panel.
- //#define TOUCH_UI_320x240
- //#define TOUCH_UI_480x272
- //#define TOUCH_UI_800x480
-
- // Mappings for boards with a standard RepRapDiscount Display connector
- //#define AO_EXP1_PINMAP // AlephObjects CLCD UI EXP1 mapping
- //#define AO_EXP2_PINMAP // AlephObjects CLCD UI EXP2 mapping
- //#define CR10_TFT_PINMAP // Rudolph Riedel's CR10 pin mapping
- //#define S6_TFT_PINMAP // FYSETC S6 pin mapping
- //#define F6_TFT_PINMAP // FYSETC F6 pin mapping
-
- //#define OTHER_PIN_LAYOUT // Define pins manually below
- #if ENABLED(OTHER_PIN_LAYOUT)
- // Pins for CS and MOD_RESET (PD) must be chosen
- #define CLCD_MOD_RESET 9
- #define CLCD_SPI_CS 10
-
- // If using software SPI, specify pins for SCLK, MOSI, MISO
- //#define CLCD_USE_SOFT_SPI
- #if ENABLED(CLCD_USE_SOFT_SPI)
- #define CLCD_SOFT_SPI_MOSI 11
- #define CLCD_SOFT_SPI_MISO 12
- #define CLCD_SOFT_SPI_SCLK 13
- #endif
- #endif
-
- // Display Orientation. An inverted (i.e. upside-down) display
- // is supported on the FT800. The FT810 and beyond also support
- // portrait and mirrored orientations.
- //#define TOUCH_UI_INVERTED
- //#define TOUCH_UI_PORTRAIT
- //#define TOUCH_UI_MIRRORED
-
- // UTF8 processing and rendering.
- // Unsupported characters are shown as '?'.
- //#define TOUCH_UI_USE_UTF8
- #if ENABLED(TOUCH_UI_USE_UTF8)
- // Western accents support. These accented characters use
- // combined bitmaps and require relatively little storage.
- #define TOUCH_UI_UTF8_WESTERN_CHARSET
- #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
- // Additional character groups. These characters require
- // full bitmaps and take up considerable storage:
- //#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
- //#define TOUCH_UI_UTF8_COPYRIGHT // © ®
- //#define TOUCH_UI_UTF8_GERMANIC // ß
- //#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
- //#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
- //#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
- //#define TOUCH_UI_UTF8_ORDINALS // º ª
- //#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
- //#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
- //#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
- #endif
- #endif
-
- // Use a smaller font when labels don't fit buttons
- #define TOUCH_UI_FIT_TEXT
-
- // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
- //#define LCD_LANGUAGE_1 en
- //#define LCD_LANGUAGE_2 fr
- //#define LCD_LANGUAGE_3 de
- //#define LCD_LANGUAGE_4 es
- //#define LCD_LANGUAGE_5 it
-
- // Use a numeric passcode for "Screen lock" keypad.
- // (recommended for smaller displays)
- //#define TOUCH_UI_PASSCODE
-
- // Output extra debug info for Touch UI events
- //#define TOUCH_UI_DEBUG
-
- // Developer menu (accessed by touching "About Printer" copyright text)
- //#define TOUCH_UI_DEVELOPER_MENU
-#endif
-
-//
-// Classic UI Options
-//
-#if TFT_SCALED_DOGLCD
- //#define TFT_MARLINUI_COLOR 0xFFFF // White
- //#define TFT_MARLINBG_COLOR 0x0000 // Black
- //#define TFT_DISABLED_COLOR 0x0003 // Almost black
- //#define TFT_BTCANCEL_COLOR 0xF800 // Red
- //#define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- //#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
-
-//
-// ADC Button Debounce
-//
-#if HAS_ADC_BUTTONS
- #define ADC_BUTTON_DEBOUNCE_DELAY 16 // Increase if buttons bounce or repeat too fast
-#endif
+#endif // DOGLCD
// @section safety
-/**
- * The watchdog hardware timer will do a reset and disable all outputs
- * if the firmware gets too overloaded to read the temperature sensors.
- *
- * If you find that watchdog reboot causes your AVR board to hang forever,
- * enable WATCHDOG_RESET_MANUAL to use a custom timer instead of WDTO.
- * NOTE: This method is less reliable as it can only catch hangups while
- * interrupts are enabled.
- */
+// The hardware watchdog should reset the microcontroller disabling all outputs,
+// in case the firmware gets stuck and doesn't do temperature regulation.
#define USE_WATCHDOG
+
#if ENABLED(USE_WATCHDOG)
+ // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on.
+ // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset.
+ // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled.
//#define WATCHDOG_RESET_MANUAL
#endif
@@ -1605,32 +755,14 @@
*/
//#define BABYSTEPPING
#if ENABLED(BABYSTEPPING)
- //#define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR
- //#define BABYSTEP_WITHOUT_HOMING
- //#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
- //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
- #define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way
- //#define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps
- #define BABYSTEP_MULTIPLICATOR_Z 1 // (steps or mm) Steps or millimeter distance for each Z babystep
- #define BABYSTEP_MULTIPLICATOR_XY 1 // (steps or mm) Steps or millimeter distance for each XY babystep
-
- //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
- #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
- #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
- // Note: Extra time may be added to mitigate controller latency.
- //#define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on doubleclick when printer is idle.
- #if ENABLED(MOVE_Z_WHEN_IDLE)
- #define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size.
- #endif
- #endif
-
- //#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28
-
- //#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
- #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
- //#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets
- //#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
- #endif
+ //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
+ #define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way
+ #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
+ //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping
+ //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
+ #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
+ // Note: Extra time may be added to mitigate controller latency.
+ //#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
#endif
// @section extruder
@@ -1648,58 +780,18 @@
* If this algorithm produces a higher speed offset than the extruder can handle (compared to E jerk)
* print acceleration will be reduced during the affected moves to keep within the limit.
*
- * See https://marlinfw.org/docs/features/lin_advance.html for full instructions.
+ * See http://marlinfw.org/docs/features/lin_advance.html for full instructions.
+ * Mention @Sebastianv650 on GitHub to alert the author of any issues.
*/
//#define LIN_ADVANCE
#if ENABLED(LIN_ADVANCE)
- //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
- #define LIN_ADVANCE_K 0.22 // Unit: mm compression per 1mm/s extruder speed
- //#define LA_DEBUG // If enabled, this will generate debug information output over USB.
- //#define EXPERIMENTAL_SCURVE // Enable this option to permit S-Curve Acceleration
+ #define LIN_ADVANCE_K 0.22 // Unit: mm compression per 1mm/s extruder speed
+ //#define LA_DEBUG // If enabled, this will generate debug information output over USB.
#endif
// @section leveling
-/**
- * Points to probe for all 3-point Leveling procedures.
- * Override if the automatically selected points are inadequate.
- */
-#if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
- //#define PROBE_PT_1_X 15
- //#define PROBE_PT_1_Y 180
- //#define PROBE_PT_2_X 15
- //#define PROBE_PT_2_Y 20
- //#define PROBE_PT_3_X 170
- //#define PROBE_PT_3_Y 20
-#endif
-
-/**
- * Probing Margins
- *
- * Override PROBING_MARGIN for each side of the build plate
- * Useful to get probe points to exact positions on targets or
- * to allow leveling to avoid plate clamps on only specific
- * sides of the bed. With NOZZLE_AS_PROBE negative values are
- * allowed, to permit probing outside the bed.
- *
- * If you are replacing the prior *_PROBE_BED_POSITION options,
- * LEFT and FRONT values in most cases will map directly over
- * RIGHT and REAR would be the inverse such as
- * (X/Y_BED_SIZE - RIGHT/BACK_PROBE_BED_POSITION)
- *
- * This will allow all positions to match at compilation, however
- * should the probe position be modified with M851XY then the
- * probe points will follow. This prevents any change from causing
- * the probe to be unable to reach any points.
- */
-#if PROBE_SELECTED && !IS_KINEMATIC
- //#define PROBING_MARGIN_LEFT PROBING_MARGIN
- //#define PROBING_MARGIN_RIGHT PROBING_MARGIN
- //#define PROBING_MARGIN_FRONT PROBING_MARGIN
- //#define PROBING_MARGIN_BACK PROBING_MARGIN
-#endif
-
-#if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
+#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
// Override the mesh area if the automatic (max) area is too large
//#define MESH_MIN_X MESH_INSET
//#define MESH_MIN_Y MESH_INSET
@@ -1722,118 +814,43 @@
#define G29_SUCCESS_COMMANDS "M117 Bed leveling done."
#define G29_RECOVER_COMMANDS "M117 Probe failed. Rewiping.\nG28\nG12 P0 S12 T0"
#define G29_FAILURE_COMMANDS "M117 Bed leveling failed.\nG0 Z10\nM300 P25 S880\nM300 P50 S0\nM300 P25 S880\nM300 P50 S0\nM300 P25 S880\nM300 P50 S0\nG4 S1"
-
-#endif
-
-/**
- * Thermal Probe Compensation
- * Probe measurements are adjusted to compensate for temperature distortion.
- * Use G76 to calibrate this feature. Use M871 to set values manually.
- * For a more detailed explanation of the process see G76_M871.cpp.
- */
-#if HAS_BED_PROBE && TEMP_SENSOR_PROBE && TEMP_SENSOR_BED
- // Enable thermal first layer compensation using bed and probe temperatures
- #define PROBE_TEMP_COMPENSATION
-
- // Add additional compensation depending on hotend temperature
- // Note: this values cannot be calibrated and have to be set manually
- #if ENABLED(PROBE_TEMP_COMPENSATION)
- // Park position to wait for probe cooldown
- #define PTC_PARK_POS { 0, 0, 100 }
-
- // Probe position to probe and wait for probe to reach target temperature
- #define PTC_PROBE_POS { 90, 100 }
-
- // Enable additional compensation using hotend temperature
- // Note: this values cannot be calibrated automatically but have to be set manually
- //#define USE_TEMP_EXT_COMPENSATION
-
- // Probe temperature calibration generates a table of values starting at PTC_SAMPLE_START
- // (e.g. 30), in steps of PTC_SAMPLE_RES (e.g. 5) with PTC_SAMPLE_COUNT (e.g. 10) samples.
-
- //#define PTC_SAMPLE_START 30.0f
- //#define PTC_SAMPLE_RES 5.0f
- //#define PTC_SAMPLE_COUNT 10U
-
- // Bed temperature calibration builds a similar table.
-
- //#define BTC_SAMPLE_START 60.0f
- //#define BTC_SAMPLE_RES 5.0f
- //#define BTC_SAMPLE_COUNT 10U
-
- // The temperature the probe should be at while taking measurements during bed temperature
- // calibration.
- //#define BTC_PROBE_TEMP 30.0f
-
- // Height above Z=0.0f to raise the nozzle. Lowering this can help the probe to heat faster.
- // Note: the Z=0.0f offset is determined by the probe offset which can be set using M851.
- //#define PTC_PROBE_HEATING_OFFSET 0.5f
-
- // Height to raise the Z-probe between heating and taking the next measurement. Some probes
- // may fail to untrigger if they have been triggered for a long time, which can be solved by
- // increasing the height the probe is raised to.
- //#define PTC_PROBE_RAISE 15U
-
- // If the probe is outside of the defined range, use linear extrapolation using the closest
- // point and the PTC_LINEAR_EXTRAPOLATION'th next point. E.g. if set to 4 it will use data[0]
- // and data[4] to perform linear extrapolation for values below PTC_SAMPLE_START.
- //#define PTC_LINEAR_EXTRAPOLATION 4
- #endif
+ /**
+ * Specify an action command to send to the host on a recovery attempt or failure.
+ * Will be sent in the form '//action:ACTION_ON_G29_FAILURE', e.g. '//action:probe_failed'.
+ * The host must be configured to handle the action command.
+ */
+ #define G29_ACTION_ON_RECOVER "probe_rewipe"
+ #define G29_ACTION_ON_FAILURE "probe_failed"
#endif
// @section extras
-//
-// G60/G61 Position Save and Return
-//
-//#define SAVED_POSITIONS 1 // Each saved position slot costs 12 bytes
-
//
// G2/G3 Arc Support
//
-#define ARC_SUPPORT // Disable this feature to save ~3226 bytes
+#define ARC_SUPPORT // Disable this feature to save ~3226 bytes
#if ENABLED(ARC_SUPPORT)
- #define MM_PER_ARC_SEGMENT 1 // (mm) Length (or minimum length) of each arc segment
- //#define ARC_SEGMENTS_PER_R 1 // Max segment length, MM_PER = Min
- #define MIN_ARC_SEGMENTS 24 // Minimum number of segments in a complete circle
- //#define ARC_SEGMENTS_PER_SEC 50 // Use feedrate to choose segment length (with MM_PER_ARC_SEGMENT as the minimum)
- #define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections
- //#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles
- //#define CNC_WORKSPACE_PLANES // Allow G2/G3 to operate in XY, ZX, or YZ planes
- //#define SF_ARC_FIX // Enable only if using SkeinForge with "Arc Point" fillet procedure
+ #define MM_PER_ARC_SEGMENT 1 // Length of each arc segment
+ #define N_ARC_CORRECTION 25 // Number of intertpolated segments between corrections
+ //#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles
+ //#define CNC_WORKSPACE_PLANES // Allow G2/G3 to operate in XY, ZX, or YZ planes
#endif
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT
-/**
- * Direct Stepping
- *
- * Comparable to the method used by Klipper, G6 direct stepping significantly
- * reduces motion calculations, increases top printing speeds, and results in
- * less step aliasing by calculating all motions in advance.
- * Preparing your G-code: https://github.com/colinrgodsey/step-daemon
- */
-//#define DIRECT_STEPPING
-
-/**
- * G38 Probe Target
- *
- * This option adds G38.2 and G38.3 (probe towards target)
- * and optionally G38.4 and G38.5 (probe away from target).
- * Set MULTIPLE_PROBING for G38 to probe more than once.
- */
+// G38.2 and G38.3 Probe Target
+// Set MULTIPLE_PROBING if you want G38 to double touch
//#define G38_PROBE_TARGET
#if ENABLED(G38_PROBE_TARGET)
- //#define G38_PROBE_AWAY // Include G38.4 and G38.5 to probe away from target
- #define G38_MINIMUM_MOVE 0.0275 // (mm) Minimum distance that will produce a move.
+ #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)
#endif
// Moves (or segments) with fewer steps than this will be joined with the next move
#define MIN_STEPS_PER_SEGMENT 6
/**
- * Minimum delay before and after setting the stepper DIR (in ns)
+ * Minimum delay after setting the stepper DIR (in ns)
* 0 : No delay (Expect at least 10µS since one Stepper ISR must transpire)
* 20 : Minimum for TMC2xxx drivers
* 200 : Minimum for A4988 drivers
@@ -1845,14 +862,12 @@
*
* Override the default value based on the driver type set in Configuration.h.
*/
-//#define MINIMUM_STEPPER_POST_DIR_DELAY 650
-//#define MINIMUM_STEPPER_PRE_DIR_DELAY 650
+//#define MINIMUM_STEPPER_DIR_DELAY 650
/**
* Minimum stepper driver pulse width (in µs)
* 0 : Smallest possible width the MCU can produce, compatible with TMC2xxx drivers
- * 0 : Minimum 500ns for LV8729, adjusted in stepper.h
- * 1 : Minimum for A4988 and A5984 stepper drivers
+ * 1 : Minimum for A4988, A5984, and LV8729 stepper drivers
* 2 : Minimum for DRV8825 stepper drivers
* 3 : Minimum for TB6600 stepper drivers
* 30 : Minimum for TB6560 stepper drivers
@@ -1864,12 +879,12 @@
/**
* Maximum stepping rate (in Hz) the stepper driver allows
* If undefined, defaults to 1MHz / (2 * MINIMUM_STEPPER_PULSE)
- * 5000000 : Maximum for TMC2xxx stepper drivers
- * 1000000 : Maximum for LV8729 stepper driver
- * 500000 : Maximum for A4988 stepper driver
- * 250000 : Maximum for DRV8825 stepper driver
- * 150000 : Maximum for TB6600 stepper driver
- * 15000 : Maximum for TB6560 stepper driver
+ * 500000 : Maximum for A4988 stepper driver
+ * 400000 : Maximum for TMC2xxx stepper drivers
+ * 250000 : Maximum for DRV8825 stepper driver
+ * 150000 : Maximum for TB6600 stepper driver
+ * 130000 : Maximum for LV8729 stepper driver
+ * 15000 : Maximum for TB6560 stepper driver
*
* Override the default value based on the driver type set in Configuration.h.
*/
@@ -1884,16 +899,14 @@
//================================= Buffers =================================
//===========================================================================
-// @section motion
+// @section hidden
-// The number of linear moves that can be in the planner at once.
-// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g. 8, 16, 32)
-#if BOTH(SDSUPPORT, DIRECT_STEPPING)
- #define BLOCK_BUFFER_SIZE 8
-#elif ENABLED(SDSUPPORT)
- #define BLOCK_BUFFER_SIZE 16
+// The number of linear motions that can be in the plan at any give time.
+// THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2 (e.g. 8, 16, 32) because shifts and ors are used to do the ring-buffering.
+#if ENABLED(SDSUPPORT)
+ #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller
#else
- #define BLOCK_BUFFER_SIZE 16
+ #define BLOCK_BUFFER_SIZE 16 // maximize block buffer
#endif
// @section serial
@@ -1923,9 +936,6 @@
//#define SERIAL_XON_XOFF
#endif
-// Add M575 G-code to change the baud rate
-//#define BAUD_RATE_GCODE
-
#if ENABLED(SDSUPPORT)
// Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD.
@@ -1936,14 +946,10 @@
//#define SERIAL_STATS_DROPPED_RX
#endif
-/**
- * Emergency Command Parser
- *
- * Add a low-level parser to intercept certain commands as they
- * enter the serial receive buffer, so they cannot be blocked.
- * Currently handles M108, M112, M410, M876
- * NOTE: Not yet implemented for all platforms.
- */
+// Enable an emergency-command parser to intercept certain commands as they
+// enter the serial receive buffer, so they cannot be blocked.
+// Currently handles M108, M112, M410
+// Does not work on boards using AT90USB (USBCON) processors!
//#define EMERGENCY_PARSER
// Bad Serial-connections can miss a received command by sending an 'ok'
@@ -1955,24 +961,8 @@
// Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
//#define ADVANCED_OK
-// Printrun may have trouble receiving long strings all at once.
-// This option inserts short delays between lines of serial output.
-#define SERIAL_OVERRUN_PROTECTION
-
-// For serial echo, the number of digits after the decimal point
-//#define SERIAL_FLOAT_PRECISION 4
-
// @section extras
-/**
- * Extra Fan Speed
- * Adds a secondary fan speed for each print-cooling fan.
- * 'M106 P T3-255' : Set a secondary speed for
- * 'M106 P T2' : Use the set secondary speed
- * 'M106 P T1' : Restore the previous fan speed
- */
-//#define EXTRA_FAN_SPEED
-
/**
* Firmware-based and LCD-controlled retract
*
@@ -1986,96 +976,30 @@
* Be sure to turn off auto-retract during filament change.
*
* Note that M207 / M208 / M209 settings are saved to EEPROM.
+ *
*/
-//#define FWRETRACT
+//#define FWRETRACT // ONLY PARTIALLY TESTED
#if ENABLED(FWRETRACT)
- #define FWRETRACT_AUTORETRACT // Override slicer retractions
- #if ENABLED(FWRETRACT_AUTORETRACT)
- #define MIN_AUTORETRACT 0.1 // (mm) Don't convert E moves under this length
- #define MAX_AUTORETRACT 10.0 // (mm) Don't convert E moves over this length
- #endif
- #define RETRACT_LENGTH 3 // (mm) Default retract length (positive value)
- #define RETRACT_LENGTH_SWAP 13 // (mm) Default swap retract length (positive value)
- #define RETRACT_FEEDRATE 45 // (mm/s) Default feedrate for retracting
- #define RETRACT_ZRAISE 0 // (mm) Default retract Z-raise
- #define RETRACT_RECOVER_LENGTH 0 // (mm) Default additional recover length (added to retract length on recover)
- #define RETRACT_RECOVER_LENGTH_SWAP 0 // (mm) Default additional swap recover length (added to retract length on recover from toolchange)
- #define RETRACT_RECOVER_FEEDRATE 8 // (mm/s) Default feedrate for recovering from retraction
- #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // (mm/s) Default feedrate for recovering from swap retraction
- #if ENABLED(MIXING_EXTRUDER)
- //#define RETRACT_SYNC_MIXING // Retract and restore all mixing steppers simultaneously
- #endif
+ #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over
+ #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion
+ #define RETRACT_LENGTH 3 // Default retract length (positive mm)
+ #define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change
+ #define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s)
+ #define RETRACT_ZLIFT 0 // Default retract Z-lift
+ #define RETRACT_RECOVER_LENGTH 0 // Default additional recover length (mm, added to retract length when recovering)
+ #define RETRACT_RECOVER_LENGTH_SWAP 0 // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
+ #define RETRACT_RECOVER_FEEDRATE 8 // Default feedrate for recovering from retraction (mm/s)
+ #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
/**
- * Universal tool change settings.
- * Applies to all types of extruders except where explicitly noted.
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P T3-255' : Set a secondary speed for
+ * 'M106 P T2' : Use the set secondary speed
+ * 'M106 P T1' : Restore the previous fan speed
*/
-#if HAS_MULTI_EXTRUDER
- // Z raise distance for tool-change, as needed for some extruders
- #define TOOLCHANGE_ZRAISE 2 // (mm)
- //#define TOOLCHANGE_ZRAISE_BEFORE_RETRACT // Apply raise before swap retraction (if enabled)
- //#define TOOLCHANGE_NO_RETURN // Never return to previous position on tool-change
- #if ENABLED(TOOLCHANGE_NO_RETURN)
- //#define EVENT_GCODE_AFTER_TOOLCHANGE "G12X" // Extra G-code to run after tool-change
- #endif
-
- /**
- * Retract and prime filament on tool-change to reduce
- * ooze and stringing and to get cleaner transitions.
- */
- //#define TOOLCHANGE_FILAMENT_SWAP
- #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
- // Load / Unload
- #define TOOLCHANGE_FS_LENGTH 12 // (mm) Load / Unload length
- #define TOOLCHANGE_FS_EXTRA_RESUME_LENGTH 0 // (mm) Extra length for better restart, fine tune by LCD/Gcode)
- #define TOOLCHANGE_FS_RETRACT_SPEED (50*60) // (mm/min) (Unloading)
- #define TOOLCHANGE_FS_UNRETRACT_SPEED (25*60) // (mm/min) (On SINGLENOZZLE or Bowden loading must be slowed down)
-
- // Longer prime to clean out a SINGLENOZZLE
- #define TOOLCHANGE_FS_EXTRA_PRIME 0 // (mm) Extra priming length
- #define TOOLCHANGE_FS_PRIME_SPEED (4.6*60) // (mm/min) Extra priming feedrate
- #define TOOLCHANGE_FS_WIPE_RETRACT 0 // (mm/min) Retract before cooling for less stringing, better wipe, etc.
-
- // Cool after prime to reduce stringing
- #define TOOLCHANGE_FS_FAN -1 // Fan index or -1 to skip
- #define TOOLCHANGE_FS_FAN_SPEED 255 // 0-255
- #define TOOLCHANGE_FS_FAN_TIME 10 // (seconds)
-
- // Swap uninitialized extruder with TOOLCHANGE_FS_PRIME_SPEED for all lengths (recover + prime)
- // (May break filament if not retracted beforehand.)
- //#define TOOLCHANGE_FS_INIT_BEFORE_SWAP
-
- // Prime on the first T0 (If other, TOOLCHANGE_FS_INIT_BEFORE_SWAP applied)
- // Enable it (M217 V[0/1]) before printing, to avoid unwanted priming on host connect
- //#define TOOLCHANGE_FS_PRIME_FIRST_USED
-
- /**
- * Tool Change Migration
- * This feature provides G-code and LCD options to switch tools mid-print.
- * All applicable tool properties are migrated so the print can continue.
- * Tools must be closely matching and other restrictions may apply.
- * Useful to:
- * - Change filament color without interruption
- * - Switch spools automatically on filament runout
- * - Switch to a different nozzle on an extruder jam
- */
- #define TOOLCHANGE_MIGRATION_FEATURE
-
- #endif
-
- /**
- * Position to park head during tool change.
- * Doesn't apply to SWITCHING_TOOLHEAD, DUAL_X_CARRIAGE, or PARKING_EXTRUDER
- */
- //#define TOOLCHANGE_PARK
- #if ENABLED(TOOLCHANGE_PARK)
- #define TOOLCHANGE_PARK_XY { X_MIN_POS + 10, Y_MIN_POS + 10 }
- #define TOOLCHANGE_PARK_XY_FEEDRATE 6000 // (mm/min)
- //#define TOOLCHANGE_PARK_X_ONLY // X axis only move
- //#define TOOLCHANGE_PARK_Y_ONLY // Y axis only move
- #endif
-#endif // HAS_MULTI_EXTRUDER
+//#define EXTRA_FAN_SPEED
/**
* Advanced Pause
@@ -2112,21 +1036,18 @@
// Set to 0 for manual extrusion.
// Filament can be extruded repeatedly from the Filament Change menu
// until extrusion is consistent, and to purge old filament.
- #define ADVANCED_PAUSE_RESUME_PRIME 0 // (mm) Extra distance to prime nozzle after returning from park.
- //#define ADVANCED_PAUSE_FANS_PAUSE // Turn off print-cooling fans while the machine is paused.
// Filament Unload does a Retract, Delay, and Purge first:
- #define FILAMENT_UNLOAD_PURGE_RETRACT 13 // (mm) Unload initial retract length.
- #define FILAMENT_UNLOAD_PURGE_DELAY 5000 // (ms) Delay for the filament to cool after retract.
+ #define FILAMENT_UNLOAD_RETRACT_LENGTH 13 // (mm) Unload initial retract length.
+ #define FILAMENT_UNLOAD_DELAY 5000 // (ms) Delay for the filament to cool after retract.
#define FILAMENT_UNLOAD_PURGE_LENGTH 8 // (mm) An unretract is done, then this length is purged.
- #define FILAMENT_UNLOAD_PURGE_FEEDRATE 25 // (mm/s) feedrate to purge before unload
#define PAUSE_PARK_NOZZLE_TIMEOUT 45 // (seconds) Time limit before the nozzle is turned off for safety.
#define FILAMENT_CHANGE_ALERT_BEEPS 10 // Number of alert beeps to play when a response is needed.
#define PAUSE_PARK_NO_STEPPER_TIMEOUT // Enable for XYZ steppers to stay powered on during filament change.
//#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
- //#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change
+ //#define HOME_BEFORE_FILAMENT_CHANGE // Ensure homing has been completed prior to parking for filament change
//#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
//#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
@@ -2142,269 +1063,113 @@
*/
#if HAS_DRIVER(TMC26X)
- #if AXIS_DRIVER_TYPE_X(TMC26X)
- #define X_MAX_CURRENT 1000 // (mA)
- #define X_SENSE_RESISTOR 91 // (mOhms)
- #define X_MICROSTEPS 16 // Number of microsteps
- #endif
+ #define X_MAX_CURRENT 1000 // in mA
+ #define X_SENSE_RESISTOR 91 // in mOhms
+ #define X_MICROSTEPS 16 // number of microsteps
- #if AXIS_DRIVER_TYPE_X2(TMC26X)
- #define X2_MAX_CURRENT 1000
- #define X2_SENSE_RESISTOR 91
- #define X2_MICROSTEPS 16
- #endif
+ #define X2_MAX_CURRENT 1000
+ #define X2_SENSE_RESISTOR 91
+ #define X2_MICROSTEPS 16
- #if AXIS_DRIVER_TYPE_Y(TMC26X)
- #define Y_MAX_CURRENT 1000
- #define Y_SENSE_RESISTOR 91
- #define Y_MICROSTEPS 16
- #endif
+ #define Y_MAX_CURRENT 1000
+ #define Y_SENSE_RESISTOR 91
+ #define Y_MICROSTEPS 16
- #if AXIS_DRIVER_TYPE_Y2(TMC26X)
- #define Y2_MAX_CURRENT 1000
- #define Y2_SENSE_RESISTOR 91
- #define Y2_MICROSTEPS 16
- #endif
+ #define Y2_MAX_CURRENT 1000
+ #define Y2_SENSE_RESISTOR 91
+ #define Y2_MICROSTEPS 16
- #if AXIS_DRIVER_TYPE_Z(TMC26X)
- #define Z_MAX_CURRENT 1000
- #define Z_SENSE_RESISTOR 91
- #define Z_MICROSTEPS 16
- #endif
+ #define Z_MAX_CURRENT 1000
+ #define Z_SENSE_RESISTOR 91
+ #define Z_MICROSTEPS 16
- #if AXIS_DRIVER_TYPE_Z2(TMC26X)
- #define Z2_MAX_CURRENT 1000
- #define Z2_SENSE_RESISTOR 91
- #define Z2_MICROSTEPS 16
- #endif
+ #define Z2_MAX_CURRENT 1000
+ #define Z2_SENSE_RESISTOR 91
+ #define Z2_MICROSTEPS 16
- #if AXIS_DRIVER_TYPE_Z3(TMC26X)
- #define Z3_MAX_CURRENT 1000
- #define Z3_SENSE_RESISTOR 91
- #define Z3_MICROSTEPS 16
- #endif
+ #define E0_MAX_CURRENT 1000
+ #define E0_SENSE_RESISTOR 91
+ #define E0_MICROSTEPS 16
- #if AXIS_DRIVER_TYPE_Z4(TMC26X)
- #define Z4_MAX_CURRENT 1000
- #define Z4_SENSE_RESISTOR 91
- #define Z4_MICROSTEPS 16
- #endif
+ #define E1_MAX_CURRENT 1000
+ #define E1_SENSE_RESISTOR 91
+ #define E1_MICROSTEPS 16
- #if AXIS_DRIVER_TYPE_E0(TMC26X)
- #define E0_MAX_CURRENT 1000
- #define E0_SENSE_RESISTOR 91
- #define E0_MICROSTEPS 16
- #endif
+ #define E2_MAX_CURRENT 1000
+ #define E2_SENSE_RESISTOR 91
+ #define E2_MICROSTEPS 16
- #if AXIS_DRIVER_TYPE_E1(TMC26X)
- #define E1_MAX_CURRENT 1000
- #define E1_SENSE_RESISTOR 91
- #define E1_MICROSTEPS 16
- #endif
+ #define E3_MAX_CURRENT 1000
+ #define E3_SENSE_RESISTOR 91
+ #define E3_MICROSTEPS 16
- #if AXIS_DRIVER_TYPE_E2(TMC26X)
- #define E2_MAX_CURRENT 1000
- #define E2_SENSE_RESISTOR 91
- #define E2_MICROSTEPS 16
- #endif
-
- #if AXIS_DRIVER_TYPE_E3(TMC26X)
- #define E3_MAX_CURRENT 1000
- #define E3_SENSE_RESISTOR 91
- #define E3_MICROSTEPS 16
- #endif
-
- #if AXIS_DRIVER_TYPE_E4(TMC26X)
- #define E4_MAX_CURRENT 1000
- #define E4_SENSE_RESISTOR 91
- #define E4_MICROSTEPS 16
- #endif
-
- #if AXIS_DRIVER_TYPE_E5(TMC26X)
- #define E5_MAX_CURRENT 1000
- #define E5_SENSE_RESISTOR 91
- #define E5_MICROSTEPS 16
- #endif
-
- #if AXIS_DRIVER_TYPE_E6(TMC26X)
- #define E6_MAX_CURRENT 1000
- #define E6_SENSE_RESISTOR 91
- #define E6_MICROSTEPS 16
- #endif
-
- #if AXIS_DRIVER_TYPE_E7(TMC26X)
- #define E7_MAX_CURRENT 1000
- #define E7_SENSE_RESISTOR 91
- #define E7_MICROSTEPS 16
- #endif
+ #define E4_MAX_CURRENT 1000
+ #define E4_SENSE_RESISTOR 91
+ #define E4_MICROSTEPS 16
#endif // TMC26X
// @section tmc_smart
/**
- * To use TMC2130, TMC2160, TMC2660, TMC5130, TMC5160 stepper drivers in SPI mode
- * connect your SPI pins to the hardware SPI interface on your board and define
- * the required CS pins in your `pins_MYBOARD.h` file. (e.g., RAMPS 1.4 uses AUX3
- * pins `X_CS_PIN 53`, `Y_CS_PIN 49`, etc.).
+ * To use TMC2130 stepper drivers in SPI mode connect your SPI pins to
+ * the hardware SPI interface on your board and define the required CS pins
+ * in your `pins_MYBOARD.h` file. (e.g., RAMPS 1.4 uses AUX3 pins `X_CS_PIN 53`, `Y_CS_PIN 49`, etc.).
* You may also use software SPI if you wish to use general purpose IO pins.
*
- * To use TMC2208 stepper UART-configurable stepper drivers connect #_SERIAL_TX_PIN
- * to the driver side PDN_UART pin with a 1K resistor.
- * To use the reading capabilities, also connect #_SERIAL_RX_PIN to PDN_UART without
- * a resistor.
+ * The TMC2130Stepper library is required for this stepper driver.
+ * https://github.com/teemuatlut/TMC2130Stepper
+ *
+ * To use TMC2208 stepper UART-configurable stepper drivers
+ * connect #_SERIAL_TX_PIN to the driver side PDN_UART pin with a 1K resistor.
+ * To use the reading capabilities, also connect #_SERIAL_RX_PIN
+ * to PDN_UART without a resistor.
* The drivers can also be used with hardware serial.
*
- * TMCStepper library is required to use TMC stepper drivers.
- * https://github.com/teemuatlut/TMCStepper
+ * The TMC2208Stepper library is required for this stepper driver.
+ * https://github.com/teemuatlut/TMC2208Stepper
*/
-#if HAS_TRINAMIC_CONFIG
+#if HAS_TRINAMIC
+ #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130
#define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current
#define INTERPOLATE true // Interpolate X/Y/Z_MICROSTEPS to 256
- #if AXIS_IS_TMC(X)
- #define X_CURRENT 800 // (mA) RMS current. Multiply by 1.414 for peak current.
- #define X_CURRENT_HOME X_CURRENT // (mA) RMS current for sensorless homing
- #define X_MICROSTEPS 16 // 0..256
- #define X_RSENSE 0.11
- #define X_CHAIN_POS -1 // <=0 : Not chained. 1 : MCU MOSI connected. 2 : Next in chain, ...
- #endif
+ #define X_CURRENT 800 // rms current in mA. Multiply by 1.41 for peak current.
+ #define X_MICROSTEPS 16 // 0..256
- #if AXIS_IS_TMC(X2)
- #define X2_CURRENT 800
- #define X2_CURRENT_HOME X2_CURRENT
- #define X2_MICROSTEPS 16
- #define X2_RSENSE 0.11
- #define X2_CHAIN_POS -1
- #endif
+ #define Y_CURRENT 800
+ #define Y_MICROSTEPS 16
- #if AXIS_IS_TMC(Y)
- #define Y_CURRENT 800
- #define Y_CURRENT_HOME Y_CURRENT
- #define Y_MICROSTEPS 16
- #define Y_RSENSE 0.11
- #define Y_CHAIN_POS -1
- #endif
+ #define Z_CURRENT 800
+ #define Z_MICROSTEPS 16
- #if AXIS_IS_TMC(Y2)
- #define Y2_CURRENT 800
- #define Y2_CURRENT_HOME Y2_CURRENT
- #define Y2_MICROSTEPS 16
- #define Y2_RSENSE 0.11
- #define Y2_CHAIN_POS -1
- #endif
+ #define X2_CURRENT 800
+ #define X2_MICROSTEPS 16
- #if AXIS_IS_TMC(Z)
- #define Z_CURRENT 800
- #define Z_CURRENT_HOME Z_CURRENT
- #define Z_MICROSTEPS 16
- #define Z_RSENSE 0.11
- #define Z_CHAIN_POS -1
- #endif
+ #define Y2_CURRENT 800
+ #define Y2_MICROSTEPS 16
- #if AXIS_IS_TMC(Z2)
- #define Z2_CURRENT 800
- #define Z2_CURRENT_HOME Z2_CURRENT
- #define Z2_MICROSTEPS 16
- #define Z2_RSENSE 0.11
- #define Z2_CHAIN_POS -1
- #endif
+ #define Z2_CURRENT 800
+ #define Z2_MICROSTEPS 16
- #if AXIS_IS_TMC(Z3)
- #define Z3_CURRENT 800
- #define Z3_CURRENT_HOME Z3_CURRENT
- #define Z3_MICROSTEPS 16
- #define Z3_RSENSE 0.11
- #define Z3_CHAIN_POS -1
- #endif
+ #define E0_CURRENT 800
+ #define E0_MICROSTEPS 16
- #if AXIS_IS_TMC(Z4)
- #define Z4_CURRENT 800
- #define Z4_CURRENT_HOME Z4_CURRENT
- #define Z4_MICROSTEPS 16
- #define Z4_RSENSE 0.11
- #define Z4_CHAIN_POS -1
- #endif
+ #define E1_CURRENT 800
+ #define E1_MICROSTEPS 16
- #if AXIS_IS_TMC(E0)
- #define E0_CURRENT 800
- #define E0_MICROSTEPS 16
- #define E0_RSENSE 0.11
- #define E0_CHAIN_POS -1
- #endif
+ #define E2_CURRENT 800
+ #define E2_MICROSTEPS 16
- #if AXIS_IS_TMC(E1)
- #define E1_CURRENT 800
- #define E1_MICROSTEPS 16
- #define E1_RSENSE 0.11
- #define E1_CHAIN_POS -1
- #endif
+ #define E3_CURRENT 800
+ #define E3_MICROSTEPS 16
- #if AXIS_IS_TMC(E2)
- #define E2_CURRENT 800
- #define E2_MICROSTEPS 16
- #define E2_RSENSE 0.11
- #define E2_CHAIN_POS -1
- #endif
-
- #if AXIS_IS_TMC(E3)
- #define E3_CURRENT 800
- #define E3_MICROSTEPS 16
- #define E3_RSENSE 0.11
- #define E3_CHAIN_POS -1
- #endif
-
- #if AXIS_IS_TMC(E4)
- #define E4_CURRENT 800
- #define E4_MICROSTEPS 16
- #define E4_RSENSE 0.11
- #define E4_CHAIN_POS -1
- #endif
-
- #if AXIS_IS_TMC(E5)
- #define E5_CURRENT 800
- #define E5_MICROSTEPS 16
- #define E5_RSENSE 0.11
- #define E5_CHAIN_POS -1
- #endif
-
- #if AXIS_IS_TMC(E6)
- #define E6_CURRENT 800
- #define E6_MICROSTEPS 16
- #define E6_RSENSE 0.11
- #define E6_CHAIN_POS -1
- #endif
-
- #if AXIS_IS_TMC(E7)
- #define E7_CURRENT 800
- #define E7_MICROSTEPS 16
- #define E7_RSENSE 0.11
- #define E7_CHAIN_POS -1
- #endif
+ #define E4_CURRENT 800
+ #define E4_MICROSTEPS 16
/**
- * Override default SPI pins for TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160 drivers here.
- * The default pins can be found in your board's pins file.
- */
- //#define X_CS_PIN -1
- //#define Y_CS_PIN -1
- //#define Z_CS_PIN -1
- //#define X2_CS_PIN -1
- //#define Y2_CS_PIN -1
- //#define Z2_CS_PIN -1
- //#define Z3_CS_PIN -1
- //#define E0_CS_PIN -1
- //#define E1_CS_PIN -1
- //#define E2_CS_PIN -1
- //#define E3_CS_PIN -1
- //#define E4_CS_PIN -1
- //#define E5_CS_PIN -1
- //#define E6_CS_PIN -1
- //#define E7_CS_PIN -1
-
- /**
- * Software option for SPI driven drivers (TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160).
+ * Use software SPI for TMC2130.
* The default SW SPI pins are defined the respective pins files,
* but you can override or define them here.
*/
@@ -2414,78 +1179,21 @@
//#define TMC_SW_SCK -1
/**
- * Four TMC2209 drivers can use the same HW/SW serial port with hardware configured addresses.
- * Set the address using jumpers on pins MS1 and MS2.
- * Address | MS1 | MS2
- * 0 | LOW | LOW
- * 1 | HIGH | LOW
- * 2 | LOW | HIGH
- * 3 | HIGH | HIGH
- *
- * Set *_SERIAL_TX_PIN and *_SERIAL_RX_PIN to match for all drivers
- * on the same serial port, either here or in your board's pins file.
- */
- #define X_SLAVE_ADDRESS 0
- #define Y_SLAVE_ADDRESS 0
- #define Z_SLAVE_ADDRESS 0
- #define X2_SLAVE_ADDRESS 0
- #define Y2_SLAVE_ADDRESS 0
- #define Z2_SLAVE_ADDRESS 0
- #define Z3_SLAVE_ADDRESS 0
- #define Z4_SLAVE_ADDRESS 0
- #define E0_SLAVE_ADDRESS 0
- #define E1_SLAVE_ADDRESS 0
- #define E2_SLAVE_ADDRESS 0
- #define E3_SLAVE_ADDRESS 0
- #define E4_SLAVE_ADDRESS 0
- #define E5_SLAVE_ADDRESS 0
- #define E6_SLAVE_ADDRESS 0
- #define E7_SLAVE_ADDRESS 0
-
- /**
- * Software enable
- *
- * Use for drivers that do not use a dedicated enable pin, but rather handle the same
- * function through a communication line such as SPI or UART.
- */
- //#define SOFTWARE_DRIVER_ENABLE
-
- /**
- * TMC2130, TMC2160, TMC2208, TMC2209, TMC5130 and TMC5160 only
* Use Trinamic's ultra quiet stepping mode.
* When disabled, Marlin will use spreadCycle stepping mode.
*/
- #define STEALTHCHOP_XY
- #define STEALTHCHOP_Z
- #define STEALTHCHOP_E
+ #define STEALTHCHOP
/**
- * Optimize spreadCycle chopper parameters by using predefined parameter sets
- * or with the help of an example included in the library.
- * Provided parameter sets are
- * CHOPPER_DEFAULT_12V
- * CHOPPER_DEFAULT_19V
- * CHOPPER_DEFAULT_24V
- * CHOPPER_DEFAULT_36V
- * CHOPPER_09STEP_24V // 0.9 degree steppers (24V)
- * CHOPPER_PRUSAMK3_24V // Imported parameters from the official Průša firmware for MK3 (24V)
- * CHOPPER_MARLIN_119 // Old defaults from Marlin v1.1.9
- *
- * Define you own with
- * { , , hysteresis_start[1..8] }
- */
- #define CHOPPER_TIMING CHOPPER_DEFAULT_12V
-
- /**
- * Monitor Trinamic drivers
- * for error conditions like overtemperature and short to ground.
- * To manage over-temp Marlin can decrease the driver current until the error condition clears.
+ * Monitor Trinamic TMC2130 and TMC2208 drivers for error conditions,
+ * like overtemperature and short to ground. TMC2208 requires hardware serial.
+ * In the case of overtemperature Marlin can decrease the driver current until error condition clears.
* Other detected conditions can be used to stop the current print.
- * Relevant G-codes:
+ * Relevant g-codes:
* M906 - Set or get motor current in milliamps using axis codes X, Y, Z, E. Report values if no axis codes given.
* M911 - Report stepper driver overtemperature pre-warn condition.
* M912 - Clear stepper driver overtemperature pre-warn condition flag.
- * M122 - Report driver parameters (Requires TMC_DEBUG)
+ * M122 S0/1 - Report driver parameters (Requires TMC_DEBUG)
*/
//#define MONITOR_DRIVER_STATUS
@@ -2496,10 +1204,9 @@
#endif
/**
- * TMC2130, TMC2160, TMC2208, TMC2209, TMC5130 and TMC5160 only
* The driver will switch to spreadCycle when stepper speed is over HYBRID_THRESHOLD.
* This mode allows for faster movements at the expense of higher noise levels.
- * STEALTHCHOP_(XY|Z|E) must be enabled to use HYBRID_THRESHOLD.
+ * STEALTHCHOP needs to be enabled.
* M913 X/Y/Z/E to live tune the setting
*/
//#define HYBRID_THRESHOLD
@@ -2510,298 +1217,125 @@
#define Y2_HYBRID_THRESHOLD 100
#define Z_HYBRID_THRESHOLD 3
#define Z2_HYBRID_THRESHOLD 3
- #define Z3_HYBRID_THRESHOLD 3
- #define Z4_HYBRID_THRESHOLD 3
#define E0_HYBRID_THRESHOLD 30
#define E1_HYBRID_THRESHOLD 30
#define E2_HYBRID_THRESHOLD 30
#define E3_HYBRID_THRESHOLD 30
#define E4_HYBRID_THRESHOLD 30
- #define E5_HYBRID_THRESHOLD 30
- #define E6_HYBRID_THRESHOLD 30
- #define E7_HYBRID_THRESHOLD 30
/**
- * Use StallGuard to home / probe X, Y, Z.
- *
- * TMC2130, TMC2160, TMC2209, TMC2660, TMC5130, and TMC5160 only
- * Connect the stepper driver's DIAG1 pin to the X/Y endstop pin.
+ * Use stallGuard2 to sense an obstacle and trigger an endstop.
+ * You need to place a wire from the driver's DIAG1 pin to the X/Y endstop pin.
* X, Y, and Z homing will always be done in spreadCycle mode.
*
- * X/Y/Z_STALL_SENSITIVITY is the default stall threshold.
- * Use M914 X Y Z to set the stall threshold at runtime:
- *
- * Sensitivity TMC2209 Others
- * HIGHEST 255 -64 (Too sensitive => False positive)
- * LOWEST 0 63 (Too insensitive => No trigger)
- *
- * It is recommended to set HOMING_BUMP_MM to { 0, 0, 0 }.
- *
- * SPI_ENDSTOPS *** Beta feature! *** TMC2130 Only ***
- * Poll the driver through SPI to determine load when homing.
- * Removes the need for a wire from DIAG1 to an endstop pin.
- *
- * IMPROVE_HOMING_RELIABILITY tunes acceleration and jerk when
- * homing and adds a guard period for endstop triggering.
- *
- * Comment *_STALL_SENSITIVITY to disable sensorless homing for that axis.
+ * X/Y/Z_HOMING_SENSITIVITY is used for tuning the trigger sensitivity.
+ * Higher values make the system LESS sensitive.
+ * Lower value make the system MORE sensitive.
+ * Too low values can lead to false positives, while too high values will collide the axis without triggering.
+ * It is advised to set X/Y/Z_HOME_BUMP_MM to 0.
+ * M914 X/Y/Z to live tune the setting
*/
- //#define SENSORLESS_HOMING // StallGuard capable drivers only
+ //#define SENSORLESS_HOMING // TMC2130 only
- #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
- // TMC2209: 0...255. TMC2130: -64...63
- #define X_STALL_SENSITIVITY 8
- #define X2_STALL_SENSITIVITY X_STALL_SENSITIVITY
- #define Y_STALL_SENSITIVITY 8
- #define Y2_STALL_SENSITIVITY Y_STALL_SENSITIVITY
- //#define Z_STALL_SENSITIVITY 8
- //#define Z2_STALL_SENSITIVITY Z_STALL_SENSITIVITY
- //#define Z3_STALL_SENSITIVITY Z_STALL_SENSITIVITY
- //#define Z4_STALL_SENSITIVITY Z_STALL_SENSITIVITY
- //#define SPI_ENDSTOPS // TMC2130 only
- //#define IMPROVE_HOMING_RELIABILITY
+ #if ENABLED(SENSORLESS_HOMING)
+ #define X_HOMING_SENSITIVITY 8
+ #define Y_HOMING_SENSITIVITY 8
+ #define Z_HOMING_SENSITIVITY 8
#endif
- /**
- * TMC Homing stepper phase.
- *
- * Improve homing repeatability by homing to stepper coil's nearest absolute
- * phase position. Trinamic drivers use a stepper phase table with 1024 values
- * spanning 4 full steps with 256 positions each (ergo, 1024 positions).
- * Full step positions (128, 384, 640, 896) have the highest holding torque.
- *
- * Values from 0..1023, -1 to disable homing phase for that axis.
- */
- //#define TMC_HOME_PHASE { 896, 896, 896 }
-
- /**
- * Beta feature!
- * Create a 50/50 square wave step pulse optimal for stepper drivers.
- */
- //#define SQUARE_WAVE_STEPPING
-
/**
* Enable M122 debugging command for TMC stepper drivers.
* M122 S0/1 will enable continous reporting.
*/
//#define TMC_DEBUG
+ /**
+ * M915 Z Axis Calibration
+ *
+ * - Adjust Z stepper current,
+ * - Drive the Z axis to its physical maximum, and
+ * - Home Z to account for the lost steps.
+ *
+ * Use M915 Snn to specify the current.
+ * Use M925 Znn to add extra Z height to Z_MAX_POS.
+ */
+ //#define TMC_Z_CALIBRATION
+ #if ENABLED(TMC_Z_CALIBRATION)
+ #define CALIBRATION_CURRENT 250
+ #define CALIBRATION_EXTRA_HEIGHT 10
+ #endif
+
/**
* You can set your own advanced settings by filling in predefined functions.
* A list of available functions can be found on the library github page
- * https://github.com/teemuatlut/TMCStepper
+ * https://github.com/teemuatlut/TMC2130Stepper
+ * https://github.com/teemuatlut/TMC2208Stepper
*
* Example:
* #define TMC_ADV() { \
- * stepperX.diag0_otpw(1); \
- * stepperY.intpol(0); \
+ * stepperX.diag0_temp_prewarn(1); \
+ * stepperY.interpolate(0); \
* }
*/
#define TMC_ADV() { }
-#endif // HAS_TRINAMIC_CONFIG
+#endif // TMC2130 || TMC2208
-// @section L64XX
+// @section L6470
/**
- * L64XX Stepper Driver options
+ * L6470 Stepper Driver options
*
- * Arduino-L6470 library (0.8.0 or higher) is required.
+ * The Arduino-L6470 library is required for this stepper driver.
* https://github.com/ameyer/Arduino-L6470
- *
- * Requires the following to be defined in your pins_YOUR_BOARD file
- * L6470_CHAIN_SCK_PIN
- * L6470_CHAIN_MISO_PIN
- * L6470_CHAIN_MOSI_PIN
- * L6470_CHAIN_SS_PIN
- * ENABLE_RESET_L64XX_CHIPS(Q) where Q is 1 to enable and 0 to reset
*/
+#if HAS_DRIVER(L6470)
-#if HAS_L64XX
+ #define X_MICROSTEPS 16 // number of microsteps
+ #define X_OVERCURRENT 2000 // maxc current in mA. If the current goes over this value, the driver will switch off
+ #define X_STALLCURRENT 1500 // current in mA where the driver will detect a stall
- //#define L6470_CHITCHAT // Display additional status info
+ #define X2_MICROSTEPS 16
+ #define X2_OVERCURRENT 2000
+ #define X2_STALLCURRENT 1500
- #if AXIS_IS_L64XX(X)
- #define X_MICROSTEPS 128 // Number of microsteps (VALID: 1, 2, 4, 8, 16, 32, 128) - L6474 max is 16
- #define X_OVERCURRENT 2000 // (mA) Current where the driver detects an over current
- // L6470 & L6474 - VALID: 375 x (1 - 16) - 6A max - rounds down
- // POWERSTEP01: VALID: 1000 x (1 - 32) - 32A max - rounds down
- #define X_STALLCURRENT 1500 // (mA) Current where the driver detects a stall (VALID: 31.25 * (1-128) - 4A max - rounds down)
- // L6470 & L6474 - VALID: 31.25 * (1-128) - 4A max - rounds down
- // POWERSTEP01: VALID: 200 x (1 - 32) - 6.4A max - rounds down
- // L6474 - STALLCURRENT setting is used to set the nominal (TVAL) current
- #define X_MAX_VOLTAGE 127 // 0-255, Maximum effective voltage seen by stepper - not used by L6474
- #define X_CHAIN_POS -1 // Position in SPI chain, 0=Not in chain, 1=Nearest MOSI
- #define X_SLEW_RATE 1 // 0-3, Slew 0 is slowest, 3 is fastest
- #endif
+ #define Y_MICROSTEPS 16
+ #define Y_OVERCURRENT 2000
+ #define Y_STALLCURRENT 1500
- #if AXIS_IS_L64XX(X2)
- #define X2_MICROSTEPS 128
- #define X2_OVERCURRENT 2000
- #define X2_STALLCURRENT 1500
- #define X2_MAX_VOLTAGE 127
- #define X2_CHAIN_POS -1
- #define X2_SLEW_RATE 1
- #endif
+ #define Y2_MICROSTEPS 16
+ #define Y2_OVERCURRENT 2000
+ #define Y2_STALLCURRENT 1500
- #if AXIS_IS_L64XX(Y)
- #define Y_MICROSTEPS 128
- #define Y_OVERCURRENT 2000
- #define Y_STALLCURRENT 1500
- #define Y_MAX_VOLTAGE 127
- #define Y_CHAIN_POS -1
- #define Y_SLEW_RATE 1
- #endif
+ #define Z_MICROSTEPS 16
+ #define Z_OVERCURRENT 2000
+ #define Z_STALLCURRENT 1500
- #if AXIS_IS_L64XX(Y2)
- #define Y2_MICROSTEPS 128
- #define Y2_OVERCURRENT 2000
- #define Y2_STALLCURRENT 1500
- #define Y2_MAX_VOLTAGE 127
- #define Y2_CHAIN_POS -1
- #define Y2_SLEW_RATE 1
- #endif
+ #define Z2_MICROSTEPS 16
+ #define Z2_OVERCURRENT 2000
+ #define Z2_STALLCURRENT 1500
- #if AXIS_IS_L64XX(Z)
- #define Z_MICROSTEPS 128
- #define Z_OVERCURRENT 2000
- #define Z_STALLCURRENT 1500
- #define Z_MAX_VOLTAGE 127
- #define Z_CHAIN_POS -1
- #define Z_SLEW_RATE 1
- #endif
+ #define E0_MICROSTEPS 16
+ #define E0_OVERCURRENT 2000
+ #define E0_STALLCURRENT 1500
- #if AXIS_IS_L64XX(Z2)
- #define Z2_MICROSTEPS 128
- #define Z2_OVERCURRENT 2000
- #define Z2_STALLCURRENT 1500
- #define Z2_MAX_VOLTAGE 127
- #define Z2_CHAIN_POS -1
- #define Z2_SLEW_RATE 1
- #endif
+ #define E1_MICROSTEPS 16
+ #define E1_OVERCURRENT 2000
+ #define E1_STALLCURRENT 1500
- #if AXIS_IS_L64XX(Z3)
- #define Z3_MICROSTEPS 128
- #define Z3_OVERCURRENT 2000
- #define Z3_STALLCURRENT 1500
- #define Z3_MAX_VOLTAGE 127
- #define Z3_CHAIN_POS -1
- #define Z3_SLEW_RATE 1
- #endif
+ #define E2_MICROSTEPS 16
+ #define E2_OVERCURRENT 2000
+ #define E2_STALLCURRENT 1500
- #if AXIS_IS_L64XX(Z4)
- #define Z4_MICROSTEPS 128
- #define Z4_OVERCURRENT 2000
- #define Z4_STALLCURRENT 1500
- #define Z4_MAX_VOLTAGE 127
- #define Z4_CHAIN_POS -1
- #define Z4_SLEW_RATE 1
- #endif
+ #define E3_MICROSTEPS 16
+ #define E3_OVERCURRENT 2000
+ #define E3_STALLCURRENT 1500
- #if AXIS_IS_L64XX(E0)
- #define E0_MICROSTEPS 128
- #define E0_OVERCURRENT 2000
- #define E0_STALLCURRENT 1500
- #define E0_MAX_VOLTAGE 127
- #define E0_CHAIN_POS -1
- #define E0_SLEW_RATE 1
- #endif
+ #define E4_MICROSTEPS 16
+ #define E4_OVERCURRENT 2000
+ #define E4_STALLCURRENT 1500
- #if AXIS_IS_L64XX(E1)
- #define E1_MICROSTEPS 128
- #define E1_OVERCURRENT 2000
- #define E1_STALLCURRENT 1500
- #define E1_MAX_VOLTAGE 127
- #define E1_CHAIN_POS -1
- #define E1_SLEW_RATE 1
- #endif
-
- #if AXIS_IS_L64XX(E2)
- #define E2_MICROSTEPS 128
- #define E2_OVERCURRENT 2000
- #define E2_STALLCURRENT 1500
- #define E2_MAX_VOLTAGE 127
- #define E2_CHAIN_POS -1
- #define E2_SLEW_RATE 1
- #endif
-
- #if AXIS_IS_L64XX(E3)
- #define E3_MICROSTEPS 128
- #define E3_OVERCURRENT 2000
- #define E3_STALLCURRENT 1500
- #define E3_MAX_VOLTAGE 127
- #define E3_CHAIN_POS -1
- #define E3_SLEW_RATE 1
- #endif
-
- #if AXIS_IS_L64XX(E4)
- #define E4_MICROSTEPS 128
- #define E4_OVERCURRENT 2000
- #define E4_STALLCURRENT 1500
- #define E4_MAX_VOLTAGE 127
- #define E4_CHAIN_POS -1
- #define E4_SLEW_RATE 1
- #endif
-
- #if AXIS_IS_L64XX(E5)
- #define E5_MICROSTEPS 128
- #define E5_OVERCURRENT 2000
- #define E5_STALLCURRENT 1500
- #define E5_MAX_VOLTAGE 127
- #define E5_CHAIN_POS -1
- #define E5_SLEW_RATE 1
- #endif
-
- #if AXIS_IS_L64XX(E6)
- #define E6_MICROSTEPS 128
- #define E6_OVERCURRENT 2000
- #define E6_STALLCURRENT 1500
- #define E6_MAX_VOLTAGE 127
- #define E6_CHAIN_POS -1
- #define E6_SLEW_RATE 1
- #endif
-
- #if AXIS_IS_L64XX(E7)
- #define E7_MICROSTEPS 128
- #define E7_OVERCURRENT 2000
- #define E7_STALLCURRENT 1500
- #define E7_MAX_VOLTAGE 127
- #define E7_CHAIN_POS -1
- #define E7_SLEW_RATE 1
- #endif
-
- /**
- * Monitor L6470 drivers for error conditions like over temperature and over current.
- * In the case of over temperature Marlin can decrease the drive until the error condition clears.
- * Other detected conditions can be used to stop the current print.
- * Relevant G-codes:
- * M906 - I1/2/3/4/5 Set or get motor drive level using axis codes X, Y, Z, E. Report values if no axis codes given.
- * I not present or I0 or I1 - X, Y, Z or E0
- * I2 - X2, Y2, Z2 or E1
- * I3 - Z3 or E3
- * I4 - Z4 or E4
- * I5 - E5
- * M916 - Increase drive level until get thermal warning
- * M917 - Find minimum current thresholds
- * M918 - Increase speed until max or error
- * M122 S0/1 - Report driver parameters
- */
- //#define MONITOR_L6470_DRIVER_STATUS
-
- #if ENABLED(MONITOR_L6470_DRIVER_STATUS)
- #define KVAL_HOLD_STEP_DOWN 1
- //#define L6470_STOP_ON_ERROR
- #endif
-
-#endif // HAS_L64XX
-
-// @section i2cbus
-
-//
-// I2C Master ID for LPC176x LCD and Digital Current control
-// Does not apply to other peripherals based on the Wire library.
-//
-//#define I2C_MASTER_ID 1 // Set a value from 0 to 2
+#endif // L6470
/**
* TWI/I2C BUS
@@ -2831,54 +1365,13 @@
* echo:i2c-reply: from:99 bytes:5 data:hello
*/
+// @section i2cbus
+
//#define EXPERIMENTAL_I2CBUS
-#if ENABLED(EXPERIMENTAL_I2CBUS)
- #define I2C_SLAVE_ADDRESS 0 // Set a value from 8 to 127 to act as a slave
-#endif
+#define I2C_SLAVE_ADDRESS 0 // Set a value from 8 to 127 to act as a slave
// @section extras
-/**
- * Photo G-code
- * Add the M240 G-code to take a photo.
- * The photo can be triggered by a digital pin or a physical movement.
- */
-//#define PHOTO_GCODE
-#if ENABLED(PHOTO_GCODE)
- // A position to move to (and raise Z) before taking the photo
- //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z)
- //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P)
- //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S)
-
- // Canon RC-1 or homebrew digital camera trigger
- // Data from: https://www.doc-diy.net/photo/rc-1_hacked/
- //#define PHOTOGRAPH_PIN 23
-
- // Canon Hack Development Kit
- // https://captain-slow.dk/2014/03/09/3d-printing-timelapses/
- //#define CHDK_PIN 4
-
- // Optional second move with delay to trigger the camera shutter
- //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J)
-
- // Duration to hold the switch or keep CHDK_PIN high
- //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D)
-
- /**
- * PHOTO_PULSES_US may need adjustment depending on board and camera model.
- * Pin must be running at 48.4kHz.
- * Be sure to use a PHOTOGRAPH_PIN which can rise and fall quick enough.
- * (e.g., MKS SBase temp sensor pin was too slow, so used P1.23 on J8.)
- *
- * Example pulse data for Nikon: https://bit.ly/2FKD0Aq
- * IR Wiring: https://git.io/JvJf7
- */
- //#define PHOTO_PULSES_US { 2000, 27850, 400, 1580, 400, 3580, 400 } // (µs) Durations for each 48.4kHz oscillation
- #ifdef PHOTO_PULSES_US
- #define PHOTO_PULSE_DELAY_US 13 // (µs) Approximate duration of each HIGH and LOW pulse in the oscillation
- #endif
-#endif
-
/**
* Spindle & Laser control
*
@@ -2892,154 +1385,38 @@
* You'll need to select a pin for the ON/OFF function and optionally choose a 0-5V
* hardware PWM pin for the speed control and a pin for the rotation direction.
*
- * See https://marlinfw.org/docs/configuration/laser_spindle.html for more config details.
+ * See http://marlinfw.org/docs/configuration/laser_spindle.html for more config details.
*/
-//#define SPINDLE_FEATURE
-//#define LASER_FEATURE
-#if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
- #define SPINDLE_LASER_ACTIVE_STATE LOW // Set to "HIGH" if the on/off function is active HIGH
- #define SPINDLE_LASER_PWM true // Set to "true" if your controller supports setting the speed/power
- #define SPINDLE_LASER_PWM_INVERT false // Set to "true" if the speed/power goes up when you want it to go slower
+//#define SPINDLE_LASER_ENABLE
+#if ENABLED(SPINDLE_LASER_ENABLE)
- #define SPINDLE_LASER_FREQUENCY 2500 // (Hz) Spindle/laser frequency (only on supported HALs: AVR and LPC)
+ #define SPINDLE_LASER_ENABLE_INVERT false // set to "true" if the on/off function is reversed
+ #define SPINDLE_LASER_PWM true // set to true if your controller supports setting the speed/power
+ #define SPINDLE_LASER_PWM_INVERT true // set to "true" if the speed/power goes up when you want it to go slower
+ #define SPINDLE_LASER_POWERUP_DELAY 5000 // delay in milliseconds to allow the spindle/laser to come up to speed/power
+ #define SPINDLE_LASER_POWERDOWN_DELAY 5000 // delay in milliseconds to allow the spindle to stop
+ #define SPINDLE_DIR_CHANGE true // set to true if your spindle controller supports changing spindle direction
+ #define SPINDLE_INVERT_DIR false
+ #define SPINDLE_STOP_ON_DIR_CHANGE true // set to true if Marlin should stop the spindle before changing rotation direction
/**
- * Speed / Power can be set ('M3 S') and displayed in terms of:
- * - PWM255 (S0 - S255)
- * - PERCENT (S0 - S100)
- * - RPM (S0 - S50000) Best for use with a spindle
+ * The M3 & M4 commands use the following equation to convert PWM duty cycle to speed/power
+ *
+ * SPEED/POWER = PWM duty cycle * SPEED_POWER_SLOPE + SPEED_POWER_INTERCEPT
+ * where PWM duty cycle varies from 0 to 255
+ *
+ * set the following for your controller (ALL MUST BE SET)
*/
- #define CUTTER_POWER_UNIT PWM255
- /**
- * Relative Cutter Power
- * Normally, 'M3 O' sets
- * OCR power is relative to the range SPEED_POWER_MIN...SPEED_POWER_MAX.
- * so input powers of 0...255 correspond to SPEED_POWER_MIN...SPEED_POWER_MAX
- * instead of normal range (0 to SPEED_POWER_MAX).
- * Best used with (e.g.) SuperPID router controller: S0 = 5,000 RPM and S255 = 30,000 RPM
- */
- //#define CUTTER_POWER_RELATIVE // Set speed proportional to [SPEED_POWER_MIN...SPEED_POWER_MAX]
+ #define SPEED_POWER_SLOPE 118.4
+ #define SPEED_POWER_INTERCEPT 0
+ #define SPEED_POWER_MIN 5000
+ #define SPEED_POWER_MAX 30000 // SuperPID router controller 0 - 30,000 RPM
- #if ENABLED(SPINDLE_FEATURE)
- //#define SPINDLE_CHANGE_DIR // Enable if your spindle controller can change spindle direction
- #define SPINDLE_CHANGE_DIR_STOP // Enable if the spindle should stop before changing spin direction
- #define SPINDLE_INVERT_DIR false // Set to "true" if the spin direction is reversed
-
- #define SPINDLE_LASER_POWERUP_DELAY 5000 // (ms) Delay to allow the spindle/laser to come up to speed/power
- #define SPINDLE_LASER_POWERDOWN_DELAY 5000 // (ms) Delay to allow the spindle to stop
-
- /**
- * M3/M4 Power Equation
- *
- * Each tool uses different value ranges for speed / power control.
- * These parameters are used to convert between tool power units and PWM.
- *
- * Speed/Power = (PWMDC / 255 * 100 - SPEED_POWER_INTERCEPT) / SPEED_POWER_SLOPE
- * PWMDC = (spdpwr - SPEED_POWER_MIN) / (SPEED_POWER_MAX - SPEED_POWER_MIN) / SPEED_POWER_SLOPE
- */
- #define SPEED_POWER_INTERCEPT 0 // (%) 0-100 i.e., Minimum power percentage
- #define SPEED_POWER_MIN 5000 // (RPM)
- #define SPEED_POWER_MAX 30000 // (RPM) SuperPID router controller 0 - 30,000 RPM
- #define SPEED_POWER_STARTUP 25000 // (RPM) M3/M4 speed/power default (with no arguments)
-
- #else
-
- #define SPEED_POWER_INTERCEPT 0 // (%) 0-100 i.e., Minimum power percentage
- #define SPEED_POWER_MIN 0 // (%) 0-100
- #define SPEED_POWER_MAX 100 // (%) 0-100
- #define SPEED_POWER_STARTUP 80 // (%) M3/M4 speed/power default (with no arguments)
-
- /**
- * Enable inline laser power to be handled in the planner / stepper routines.
- * Inline power is specified by the I (inline) flag in an M3 command (e.g., M3 S20 I)
- * or by the 'S' parameter in G0/G1/G2/G3 moves (see LASER_MOVE_POWER).
- *
- * This allows the laser to keep in perfect sync with the planner and removes
- * the powerup/down delay since lasers require negligible time.
- */
- #define LASER_POWER_INLINE
-
- #if ENABLED(LASER_POWER_INLINE)
- /**
- * Scale the laser's power in proportion to the movement rate.
- *
- * - Sets the entry power proportional to the entry speed over the nominal speed.
- * - Ramps the power up every N steps to approximate the speed trapezoid.
- * - Due to the limited power resolution this is only approximate.
- */
- #define LASER_POWER_INLINE_TRAPEZOID
-
- /**
- * Continuously calculate the current power (nominal_power * current_rate / nominal_rate).
- * Required for accurate power with non-trapezoidal acceleration (e.g., S_CURVE_ACCELERATION).
- * This is a costly calculation so this option is discouraged on 8-bit AVR boards.
- *
- * LASER_POWER_INLINE_TRAPEZOID_CONT_PER defines how many step cycles there are between power updates. If your
- * board isn't able to generate steps fast enough (and you are using LASER_POWER_INLINE_TRAPEZOID_CONT), increase this.
- * Note that when this is zero it means it occurs every cycle; 1 means a delay wait one cycle then run, etc.
- */
- //#define LASER_POWER_INLINE_TRAPEZOID_CONT
-
- /**
- * Stepper iterations between power updates. Increase this value if the board
- * can't keep up with the processing demands of LASER_POWER_INLINE_TRAPEZOID_CONT.
- * Disable (or set to 0) to recalculate power on every stepper iteration.
- */
- //#define LASER_POWER_INLINE_TRAPEZOID_CONT_PER 10
-
- /**
- * Include laser power in G0/G1/G2/G3/G5 commands with the 'S' parameter
- */
- //#define LASER_MOVE_POWER
-
- #if ENABLED(LASER_MOVE_POWER)
- // Turn off the laser on G0 moves with no power parameter.
- // If a power parameter is provided, use that instead.
- //#define LASER_MOVE_G0_OFF
-
- // Turn off the laser on G28 homing.
- //#define LASER_MOVE_G28_OFF
- #endif
-
- /**
- * Inline flag inverted
- *
- * WARNING: M5 will NOT turn off the laser unless another move
- * is done (so G-code files must end with 'M5 I').
- */
- //#define LASER_POWER_INLINE_INVERT
-
- /**
- * Continuously apply inline power. ('M3 S3' == 'G1 S3' == 'M3 S3 I')
- *
- * The laser might do some weird things, so only enable this
- * feature if you understand the implications.
- */
- //#define LASER_POWER_INLINE_CONTINUOUS
-
- #else
-
- #define SPINDLE_LASER_POWERUP_DELAY 50 // (ms) Delay to allow the spindle/laser to come up to speed/power
- #define SPINDLE_LASER_POWERDOWN_DELAY 50 // (ms) Delay to allow the spindle to stop
-
- #endif
- #endif
-#endif
-
-/**
- * Coolant Control
- *
- * Add the M7, M8, and M9 commands to turn mist or flood coolant on and off.
- *
- * Note: COOLANT_MIST_PIN and/or COOLANT_FLOOD_PIN must also be defined.
- */
-//#define COOLANT_CONTROL
-#if ENABLED(COOLANT_CONTROL)
- #define COOLANT_MIST // Enable if mist coolant is present
- #define COOLANT_FLOOD // Enable if flood coolant is present
- #define COOLANT_MIST_INVERT false // Set "true" if the on/off function is reversed
- #define COOLANT_FLOOD_INVERT false // Set "true" if the on/off function is reversed
+ //#define SPEED_POWER_SLOPE 0.3922
+ //#define SPEED_POWER_INTERCEPT 0
+ //#define SPEED_POWER_MIN 10
+ //#define SPEED_POWER_MAX 100 // 0-100%
#endif
/**
@@ -3075,24 +1452,6 @@
//#define FILAMENT_LCD_DISPLAY
#endif
-/**
- * Power Monitor
- * Monitor voltage (V) and/or current (A), and -when possible- power (W)
- *
- * Read and configure with M430
- *
- * The current sensor feeds DC voltage (relative to the measured current) to an analog pin
- * The voltage sensor feeds DC voltage (relative to the measured voltage) to an analog pin
- */
-//#define POWER_MONITOR_CURRENT // Monitor the system current
-//#define POWER_MONITOR_VOLTAGE // Monitor the system voltage
-#if EITHER(POWER_MONITOR_CURRENT, POWER_MONITOR_VOLTAGE)
- #define POWER_MONITOR_VOLTS_PER_AMP 0.05000 // Input voltage to the MCU analog pin per amp - DO NOT apply more than ADC_VREF!
- #define POWER_MONITOR_CURRENT_OFFSET -1 // Offset value for current sensors with linear function output
- #define POWER_MONITOR_VOLTS_PER_VOLT 0.11786 // Input voltage to the MCU analog pin per volt - DO NOT apply more than ADC_VREF!
- #define POWER_MONITOR_FIXED_VOLTAGE 13.6 // Voltage for a current sensor with no voltage sensor (for power display)
-#endif
-
/**
* CNC Coordinate Systems
*
@@ -3101,6 +1460,11 @@
*/
//#define CNC_COORDINATE_SYSTEMS
+/**
+ * M43 - display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins
+ */
+//#define PINS_DEBUGGING
+
/**
* Auto-report temperatures with M155 S
*/
@@ -3110,16 +1474,6 @@
* Include capabilities in M115 output
*/
#define EXTENDED_CAPABILITIES_REPORT
-#if ENABLED(EXTENDED_CAPABILITIES_REPORT)
- //#define M115_GEOMETRY_REPORT
-#endif
-
-/**
- * Expected Printer Check
- * Add the M16 G-code to compare a string to the MACHINE_NAME.
- * M16 with a non-matching string causes the printer to halt.
- */
-//#define EXPECTED_PRINTER_CHECK
/**
* Disable all Volumetric extrusion options
@@ -3132,21 +1486,9 @@
* Activate to make volumetric extrusion the default method,
* with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter.
*
- * M200 D0 to disable, M200 Dn to set a new diameter (and enable volumetric).
- * M200 S0/S1 to disable/enable volumetric extrusion.
+ * M200 D0 to disable, M200 Dn to set a new diameter.
*/
//#define VOLUMETRIC_DEFAULT_ON
-
- //#define VOLUMETRIC_EXTRUDER_LIMIT
- #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
- /**
- * Default volumetric extrusion limit in cubic mm per second (mm^3/sec).
- * This factory setting applies to all extruders.
- * Use 'M200 [T] L' to override and 'M502' to reset.
- * A non-zero value activates Volume-based Extrusion Limiting.
- */
- #define DEFAULT_VOLUMETRIC_EXTRUDER_LIMIT 0.00 // (mm^3/sec)
- #endif
#endif
/**
@@ -3158,13 +1500,6 @@
*/
//#define NO_WORKSPACE_OFFSETS
-// Extra options for the M114 "Current Position" report
-//#define M114_DETAIL // Use 'M114` for details to check planner calculations
-//#define M114_REALTIME // Real current position based on forward kinematics
-//#define M114_LEGACY // M114 used to synchronize on every call. Enable if needed.
-
-//#define REPORT_FAN_CHANGE // Report the new fan speed when changed by M106 (and others)
-
/**
* Set the number of proportional font spaces required to fill up a typical character space.
* This can help to better align the output of commands like `G29 O` Mesh Output.
@@ -3179,54 +1514,11 @@
*/
#define FASTER_GCODE_PARSER
-#if ENABLED(FASTER_GCODE_PARSER)
- //#define GCODE_QUOTED_STRINGS // Support for quoted string parameters
-#endif
-
-//#define GCODE_CASE_INSENSITIVE // Accept G-code sent to the firmware in lowercase
-
-//#define REPETIER_GCODE_M360 // Add commands originally from Repetier FW
-
-/**
- * CNC G-code options
- * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
- * Note that G0 feedrates should be used with care for 3D printing (if used at all).
- * High feedrates may cause ringing and harm print quality.
- */
-//#define PAREN_COMMENTS // Support for parentheses-delimited comments
-//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
-
-// Enable and set a (default) feedrate for all G0 moves
-//#define G0_FEEDRATE 3000 // (mm/min)
-#ifdef G0_FEEDRATE
- //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
-#endif
-
-/**
- * Startup commands
- *
- * Execute certain G-code commands immediately after power-on.
- */
-//#define STARTUP_COMMANDS "M17 Z"
-
-/**
- * G-code Macros
- *
- * Add G-codes M810-M819 to define and run G-code macros.
- * Macros are not saved to EEPROM.
- */
-//#define GCODE_MACROS
-#if ENABLED(GCODE_MACROS)
- #define GCODE_MACROS_SLOTS 5 // Up to 10 may be used
- #define GCODE_MACROS_SLOT_SIZE 50 // Maximum length of a single macro
-#endif
-
/**
* User-defined menu items that execute custom GCode
*/
//#define CUSTOM_USER_MENUS
#if ENABLED(CUSTOM_USER_MENUS)
- //#define CUSTOM_USER_MENU_TITLE "Custom Commands"
#define USER_SCRIPT_DONE "M117 User Script Done"
#define USER_SCRIPT_AUDIBLE_FEEDBACK
//#define USER_SCRIPT_RETURN // Return to status screen after a script
@@ -3234,10 +1526,10 @@
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
- #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
+ #define USER_DESC_2 "Preheat for PLA"
#define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
- #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
+ #define USER_DESC_3 "Preheat for ABS"
#define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
#define USER_DESC_4 "Heat Bed/Home/Level"
@@ -3248,43 +1540,35 @@
#endif
/**
- * Host Action Commands
- *
- * Define host streamer action commands in compliance with the standard.
- *
- * See https://reprap.org/wiki/G-code#Action_commands
- * Common commands ........ poweroff, pause, paused, resume, resumed, cancel
- * G29_RETRY_AND_RECOVER .. probe_rewipe, probe_failed
- *
- * Some features add reason codes to extend these commands.
- *
- * Host Prompt Support enables Marlin to use the host for user prompts so
- * filament runout and other processes can be managed from the host side.
+ * Specify an action command to send to the host when the printer is killed.
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
+ * The host must be configured to handle the action command.
*/
-//#define HOST_ACTION_COMMANDS
-#if ENABLED(HOST_ACTION_COMMANDS)
- //#define HOST_PROMPT_SUPPORT
- //#define HOST_START_MENU_ITEM // Add a menu item that tells the host to start
-#endif
+//#define ACTION_ON_KILL "poweroff"
/**
- * Cancel Objects
- *
- * Implement M486 to allow Marlin to skip objects
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
*/
-//#define CANCEL_OBJECTS
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
+//===========================================================================
+//====================== I2C Position Encoder Settings ======================
+//===========================================================================
/**
- * I2C position encoders for closed loop control.
- * Developed by Chris Barr at Aus3D.
+ * I2C position encoders for closed loop control.
+ * Developed by Chris Barr at Aus3D.
*
- * Wiki: https://wiki.aus3d.com.au/Magnetic_Encoder
- * Github: https://github.com/Aus3D/MagneticEncoder
+ * Wiki: http://wiki.aus3d.com.au/Magnetic_Encoder
+ * Github: https://github.com/Aus3D/MagneticEncoder
*
- * Supplier: https://aus3d.com.au/magnetic-encoder-module
- * Alternative Supplier: https://reliabuild3d.com/
+ * Supplier: http://aus3d.com.au/magnetic-encoder-module
+ * Alternative Supplier: http://reliabuild3d.com/
*
- * Reliabuild encoders have been modified to improve reliability.
+ * Reilabuild encoders have been modified to improve reliability.
*/
//#define I2C_POSITION_ENCODERS
@@ -3336,7 +1620,7 @@
//#define I2CPE_ERR_THRESH_ABORT 100.0 // Threshold size for error (in mm) error on any given
// axis after which the printer will abort. Comment out to
- // disable abort behavior.
+ // disable abort behaviour.
#define I2CPE_TIME_TRUSTED 10000 // After an encoder fault, there must be no further fault
// for this amount of time (in ms) before the encoder
@@ -3354,46 +1638,6 @@
#endif // I2C_POSITION_ENCODERS
-/**
- * Analog Joystick(s)
- */
-//#define JOYSTICK
-#if ENABLED(JOYSTICK)
- #define JOY_X_PIN 5 // RAMPS: Suggested pin A5 on AUX2
- #define JOY_Y_PIN 10 // RAMPS: Suggested pin A10 on AUX2
- #define JOY_Z_PIN 12 // RAMPS: Suggested pin A12 on AUX2
- #define JOY_EN_PIN 44 // RAMPS: Suggested pin D44 on AUX2
-
- //#define INVERT_JOY_X // Enable if X direction is reversed
- //#define INVERT_JOY_Y // Enable if Y direction is reversed
- //#define INVERT_JOY_Z // Enable if Z direction is reversed
-
- // Use M119 with JOYSTICK_DEBUG to find reasonable values after connecting:
- #define JOY_X_LIMITS { 5600, 8190-100, 8190+100, 10800 } // min, deadzone start, deadzone end, max
- #define JOY_Y_LIMITS { 5600, 8250-100, 8250+100, 11000 }
- #define JOY_Z_LIMITS { 4800, 8080-100, 8080+100, 11550 }
- //#define JOYSTICK_DEBUG
-#endif
-
-/**
- * Mechanical Gantry Calibration
- * Modern replacement for the Prusa TMC_Z_CALIBRATION.
- * Adds capability to work with any adjustable current drivers.
- * Implemented as G34 because M915 is deprecated.
- */
-//#define MECHANICAL_GANTRY_CALIBRATION
-#if ENABLED(MECHANICAL_GANTRY_CALIBRATION)
- #define GANTRY_CALIBRATION_CURRENT 600 // Default calibration current in ma
- #define GANTRY_CALIBRATION_EXTRA_HEIGHT 15 // Extra distance in mm past Z_###_POS to move
- #define GANTRY_CALIBRATION_FEEDRATE 500 // Feedrate for correction move
- //#define GANTRY_CALIBRATION_TO_MIN // Enable to calibrate Z in the MIN direction
-
- //#define GANTRY_CALIBRATION_SAFE_POSITION { X_CENTER, Y_CENTER } // Safe position for nozzle
- //#define GANTRY_CALIBRATION_XY_PARK_FEEDRATE 3000 // XY Park Feedrate - MMM
- //#define GANTRY_CALIBRATION_COMMANDS_PRE ""
- #define GANTRY_CALIBRATION_COMMANDS_POST "G28" // G28 highly recommended to ensure an accurate position
-#endif
-
/**
* MAX7219 Debug Matrix
*
@@ -3407,12 +1651,10 @@
#define MAX7219_LOAD_PIN 44
//#define MAX7219_GCODE // Add the M7219 G-code to control the LED matrix
- #define MAX7219_INIT_TEST 2 // Test pattern at startup: 0=none, 1=sweep, 2=spiral
+ #define MAX7219_INIT_TEST 2 // Do a test pattern at initialization (Set to 2 for spiral)
#define MAX7219_NUMBER_UNITS 1 // Number of Max7219 units in chain.
#define MAX7219_ROTATE 0 // Rotate the display clockwise (in multiples of +/- 90°)
// connector at: right=0 bottom=-90 top=90 left=180
- //#define MAX7219_REVERSE_ORDER // The individual LED matrix units may be in reversed order
- //#define MAX7219_SIDE_BY_SIDE // Big chip+matrix boards can be chained side-by-side
/**
* Sample debug features
@@ -3437,153 +1679,19 @@
//#define NANODLP_Z_SYNC
#if ENABLED(NANODLP_Z_SYNC)
//#define NANODLP_ALL_AXIS // Enables "Z_move_comp" output on any axis move.
- // Default behavior is limited to Z axis only.
+ // Default behaviour is limited to Z axis only.
#endif
/**
* WiFi Support (Espressif ESP32 WiFi)
*/
-//#define WIFISUPPORT // Marlin embedded WiFi managenent
-//#define ESP3D_WIFISUPPORT // ESP3D Library WiFi management (https://github.com/luc-github/ESP3DLib)
-
-#if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
- //#define WEBSUPPORT // Start a webserver (which may include auto-discovery)
- //#define OTASUPPORT // Support over-the-air firmware updates
- //#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host
-
- /**
- * To set a default WiFi SSID / Password, create a file called Configuration_Secure.h with
- * the following defines, customized for your network. This specific file is excluded via
- * .gitignore to prevent it from accidentally leaking to the public.
- *
- * #define WIFI_SSID "WiFi SSID"
- * #define WIFI_PWD "WiFi Password"
- */
- //#include "Configuration_Secure.h" // External file with WiFi SSID / Password
+//#define WIFISUPPORT
+#if ENABLED(WIFISUPPORT)
+ #define WIFI_SSID "Wifi SSID"
+ #define WIFI_PWD "Wifi Password"
#endif
-/**
- * Průša Multi-Material Unit v2
- * Enable in Configuration.h
- */
-#if ENABLED(PRUSA_MMU2)
-
- // Serial port used for communication with MMU2.
- // For AVR enable the UART port used for the MMU. (e.g., mmuSerial)
- // For 32-bit boards check your HAL for available serial ports. (e.g., Serial2)
- #define MMU2_SERIAL_PORT 2
- #define MMU2_SERIAL mmuSerial
-
- // Use hardware reset for MMU if a pin is defined for it
- //#define MMU2_RST_PIN 23
-
- // Enable if the MMU2 has 12V stepper motors (MMU2 Firmware 1.0.2 and up)
- //#define MMU2_MODE_12V
-
- // G-code to execute when MMU2 F.I.N.D.A. probe detects filament runout
- #define MMU2_FILAMENT_RUNOUT_SCRIPT "M600"
-
- // Add an LCD menu for MMU2
- //#define MMU2_MENUS
- #if ENABLED(MMU2_MENUS)
- // Settings for filament load / unload from the LCD menu.
- // This is for Průša MK3-style extruders. Customize for your hardware.
- #define MMU2_FILAMENTCHANGE_EJECT_FEED 80.0
- #define MMU2_LOAD_TO_NOZZLE_SEQUENCE \
- { 7.2, 1145 }, \
- { 14.4, 871 }, \
- { 36.0, 1393 }, \
- { 14.4, 871 }, \
- { 50.0, 198 }
-
- #define MMU2_RAMMING_SEQUENCE \
- { 1.0, 1000 }, \
- { 1.0, 1500 }, \
- { 2.0, 2000 }, \
- { 1.5, 3000 }, \
- { 2.5, 4000 }, \
- { -15.0, 5000 }, \
- { -14.0, 1200 }, \
- { -6.0, 600 }, \
- { 10.0, 700 }, \
- { -10.0, 400 }, \
- { -50.0, 2000 }
- #endif
-
- /**
- * MMU Extruder Sensor
- *
- * Support for a Průša (or other) IR Sensor to detect filament near the extruder
- * and make loading more reliable. Suitable for an extruder equipped with a filament
- * sensor less than 38mm from the gears.
- *
- * During loading the extruder will stop when the sensor is triggered, then do a last
- * move up to the gears. If no filament is detected, the MMU2 can make some more attempts.
- * If all attempts fail, a filament runout will be triggered.
- */
- //#define MMU_EXTRUDER_SENSOR
- #if ENABLED(MMU_EXTRUDER_SENSOR)
- #define MMU_LOADING_ATTEMPTS_NR 5 // max. number of attempts to load filament if first load fail
- #endif
-
- /**
- * Using a sensor like the MMU2S
- * This mode requires a MK3S extruder with a sensor at the extruder idler, like the MMU2S.
- * See https://help.prusa3d.com/en/guide/3b-mk3s-mk2-5s-extruder-upgrade_41560, step 11
- */
- //#define PRUSA_MMU2_S_MODE
- #if ENABLED(PRUSA_MMU2_S_MODE)
- #define MMU2_C0_RETRY 5 // Number of retries (total time = timeout*retries)
-
- #define MMU2_CAN_LOAD_FEEDRATE 800 // (mm/min)
- #define MMU2_CAN_LOAD_SEQUENCE \
- { 0.1, MMU2_CAN_LOAD_FEEDRATE }, \
- { 60.0, MMU2_CAN_LOAD_FEEDRATE }, \
- { -52.0, MMU2_CAN_LOAD_FEEDRATE }
-
- #define MMU2_CAN_LOAD_RETRACT 6.0 // (mm) Keep under the distance between Load Sequence values
- #define MMU2_CAN_LOAD_DEVIATION 0.8 // (mm) Acceptable deviation
-
- #define MMU2_CAN_LOAD_INCREMENT 0.2 // (mm) To reuse within MMU2 module
- #define MMU2_CAN_LOAD_INCREMENT_SEQUENCE \
- { -MMU2_CAN_LOAD_INCREMENT, MMU2_CAN_LOAD_FEEDRATE }
-
- #endif
-
- //#define MMU2_DEBUG // Write debug info to serial output
-
-#endif // PRUSA_MMU2
-
-/**
- * Advanced Print Counter settings
- */
-#if ENABLED(PRINTCOUNTER)
- #define SERVICE_WARNING_BUZZES 3
- // Activate up to 3 service interval watchdogs
- //#define SERVICE_NAME_1 "Service S"
- //#define SERVICE_INTERVAL_1 100 // print hours
- //#define SERVICE_NAME_2 "Service L"
- //#define SERVICE_INTERVAL_2 200 // print hours
- //#define SERVICE_NAME_3 "Service 3"
- //#define SERVICE_INTERVAL_3 1 // print hours
-#endif
-
-// @section develop
-
-//
-// M100 Free Memory Watcher to debug memory usage
-//
-//#define M100_FREE_MEMORY_WATCHER
-
-//
-// M42 - Set pin states
-//
-//#define DIRECT_PIN_CONTROL
-
-//
-// M43 - display pin status, toggle pins, watch pins, watch endstops & toggle LED, test servo probe
-//
-//#define PINS_DEBUGGING
-
// Enable Marlin dev mode which adds some special commands
//#define MARLIN_DEV_MODE
+
+#endif // CONFIGURATION_ADV_H
diff --git a/Marlin/Makefile b/Marlin/Makefile
index 49cb960b92..da3897e807 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -14,7 +14,7 @@
# Detailed instructions for using the makefile:
#
# 1. Modify the line containing "ARDUINO_INSTALL_DIR" to point to the directory that
-# contains the Arduino installation (for example, under macOS, this
+# contains the Arduino installation (for example, under Mac OS X, this
# might be /Applications/Arduino.app/Contents/Resources/Java).
#
# 2. Modify the line containing "UPLOAD_PORT" to refer to the filename
@@ -22,10 +22,8 @@
# (e.g. UPLOAD_PORT = /dev/tty.USB0). If the exact name of this file
# changes, you can use * as a wild card (e.g. UPLOAD_PORT = /dev/tty.usb*).
#
-# 3. Set the line containing "MCU" to match your board's processor. Set
-# "PROG_MCU" as the AVR part name corresponding to "MCU". You can use the
-# following command to get a list of correspondences: `avrdude -c alf -p x`
-# Older boards are atmega8 based, newer ones like Arduino Mini, Bluetooth
+# 3. Set the line containing "MCU" to match your board's processor.
+# Older one's are atmega8 based, newer ones like Arduino Mini, Bluetooth
# or Diecimila have the atmega168. If you're using a LilyPad Arduino,
# change F_CPU to 8000000. If you are using Gen7 electronics, you
# probably need to use 20000000. Either way, you must regenerate
@@ -36,18 +34,18 @@
# 5. Type "make upload", reset your Arduino board, and press enter to
# upload your program to the Arduino board.
#
-# Note that all settings at the top of this file can be overridden from
+# Note that all settings at the top of this file can be overriden from
# the command line with, for example, "make HARDWARE_MOTHERBOARD=71"
#
# To compile for RAMPS (atmega2560) with Arduino 1.6.9 at root/arduino you would use...
#
# make ARDUINO_VERSION=10609 AVR_TOOLS_PATH=/root/arduino/hardware/tools/avr/bin/ \
-# HARDWARE_MOTHERBOARD=1200 ARDUINO_INSTALL_DIR=/root/arduino
+# HARDWARE_MOTHERBOARD=33 ARDUINO_INSTALL_DIR=/root/arduino
#
# To compile and upload simply add "upload" to the end of the line...
#
# make ARDUINO_VERSION=10609 AVR_TOOLS_PATH=/root/arduino/hardware/tools/avr/bin/ \
-# HARDWARE_MOTHERBOARD=1200 ARDUINO_INSTALL_DIR=/root/arduino upload
+# HARDWARE_MOTHERBOARD=33 ARDUINO_INSTALL_DIR=/root/arduino upload
#
# If uploading doesn't work try adding the parameter "AVRDUDE_PROGRAMMER=wiring" or
# start upload manually (using stk500) like so:
@@ -59,26 +57,7 @@
#
# This defines the board to compile for (see boards.h for your board's ID)
-HARDWARE_MOTHERBOARD ?= 1020
-
-ifeq ($(OS),Windows_NT)
- # Windows
- ARDUINO_INSTALL_DIR ?= ${HOME}/Arduino
- ARDUINO_USER_DIR ?= ${HOME}/Arduino
-else
- UNAME_S := $(shell uname -s)
- ifeq ($(UNAME_S),Linux)
- # Linux
- ARDUINO_INSTALL_DIR ?= /usr/share/arduino
- ARDUINO_USER_DIR ?= ${HOME}/Arduino
- endif
- ifeq ($(UNAME_S),Darwin)
- # Darwin (macOS)
- ARDUINO_INSTALL_DIR ?= /Applications/Arduino.app/Contents/Java
- ARDUINO_USER_DIR ?= ${HOME}/Documents/Arduino
- AVR_TOOLS_PATH ?= /Applications/Arduino.app/Contents/Java/hardware/tools/avr/bin/
- endif
-endif
+HARDWARE_MOTHERBOARD ?= 11
# Arduino source install directory, and version number
# On most linuxes this will be /usr/share/arduino
@@ -88,44 +67,35 @@ ARDUINO_VERSION ?= 106
# The installed Libraries are in the User folder
ARDUINO_USER_DIR ?= ${HOME}/Arduino
-# You can optionally set a path to the avr-gcc tools.
-# Requires a trailing slash. For example, /usr/local/avr-gcc/bin/
+# You can optionally set a path to the avr-gcc tools. Requires a trailing slash. (ex: /usr/local/avr-gcc/bin)
AVR_TOOLS_PATH ?=
-# Programmer configuration
+#Programmer configuration
UPLOAD_RATE ?= 57600
AVRDUDE_PROGRAMMER ?= arduino
-# On most linuxes this will be /dev/ttyACM0 or /dev/ttyACM1
+# on most linuxes this will be /dev/ttyACM0 or /dev/ttyACM1
UPLOAD_PORT ?= /dev/ttyUSB0
-# Directory used to build files in, contains all the build files, from object
-# files to the final hex file on linux it is best to put an absolute path
-# like /home/username/tmp .
+#Directory used to build files in, contains all the build files, from object files to the final hex file
+#on linux it is best to put an absolute path like /home/username/tmp .
BUILD_DIR ?= applet
# This defines whether Liquid_TWI2 support will be built
LIQUID_TWI2 ?= 0
-# This defines if Wire is needed
+# this defines if Wire is needed
WIRE ?= 0
-# This defines if Tone is needed (i.e SPEAKER is defined in Configuration.h)
-# Disabling this (and SPEAKER) saves approximatively 350 bytes of memory.
-TONE ?= 1
+# this defines if U8GLIB is needed (may require RELOC_WORKAROUND)
+U8GLIB ?= 1
-# This defines if U8GLIB is needed (may require RELOC_WORKAROUND)
-U8GLIB ?= 0
-
-# This defines whether to include the Trinamic TMCStepper library
-TMC ?= 0
-
-# This defines whether to include the AdaFruit NeoPixel library
-NEOPIXEL ?= 0
+# this defines whether to include the Trinamic TMC2630Stepper
+TMC2630 ?= 1
############
# Try to automatically determine whether RELOC_WORKAROUND is needed based
# on GCC versions:
-# https://www.avrfreaks.net/comment/1789106#comment-1789106
+# http://www.avrfreaks.net/comment/1789106#comment-1789106
CC_MAJ:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC__ | cut -f3 -d\ )
CC_MIN:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC_MINOR__ | cut -f3 -d\ )
@@ -133,7 +103,7 @@ CC_PATCHLEVEL:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC_PATCHLEVEL__ | c
CC_VER:=$(shell echo $$(( $(CC_MAJ) * 10000 + $(CC_MIN) * 100 + $(CC_PATCHLEVEL) )))
ifeq ($(shell test $(CC_VER) -lt 40901 && echo 1),1)
@echo This version of GCC is likely broken. Enabling relocation workaround.
- RELOC_WORKAROUND = 1
+ RELOC_WORKAROUND = 1
endif
############################################################################
@@ -152,444 +122,298 @@ ifeq ($(HARDWARE_MOTHERBOARD),0)
#
# MEGA/RAMPS up to 1.2
-else ifeq ($(HARDWARE_MOTHERBOARD),1000)
+else ifeq ($(HARDWARE_MOTHERBOARD),3)
# RAMPS 1.3 (Power outputs: Hotend, Fan, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1010)
+else ifeq ($(HARDWARE_MOTHERBOARD),33)
# RAMPS 1.3 (Power outputs: Hotend0, Hotend1, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1011)
+else ifeq ($(HARDWARE_MOTHERBOARD),34)
# RAMPS 1.3 (Power outputs: Hotend, Fan0, Fan1)
-else ifeq ($(HARDWARE_MOTHERBOARD),1012)
+else ifeq ($(HARDWARE_MOTHERBOARD),35)
# RAMPS 1.3 (Power outputs: Hotend0, Hotend1, Fan)
-else ifeq ($(HARDWARE_MOTHERBOARD),1013)
+else ifeq ($(HARDWARE_MOTHERBOARD),36)
# RAMPS 1.3 (Power outputs: Spindle, Controller Fan)
-else ifeq ($(HARDWARE_MOTHERBOARD),1014)
+else ifeq ($(HARDWARE_MOTHERBOARD),38)
# RAMPS 1.4 (Power outputs: Hotend, Fan, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1020)
+else ifeq ($(HARDWARE_MOTHERBOARD),43)
# RAMPS 1.4 (Power outputs: Hotend0, Hotend1, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1021)
+else ifeq ($(HARDWARE_MOTHERBOARD),44)
# RAMPS 1.4 (Power outputs: Hotend, Fan0, Fan1)
-else ifeq ($(HARDWARE_MOTHERBOARD),1022)
+else ifeq ($(HARDWARE_MOTHERBOARD),45)
# RAMPS 1.4 (Power outputs: Hotend0, Hotend1, Fan)
-else ifeq ($(HARDWARE_MOTHERBOARD),1023)
+else ifeq ($(HARDWARE_MOTHERBOARD),46)
# RAMPS 1.4 (Power outputs: Spindle, Controller Fan)
-else ifeq ($(HARDWARE_MOTHERBOARD),1024)
+else ifeq ($(HARDWARE_MOTHERBOARD),48)
# RAMPS Plus 3DYMY (Power outputs: Hotend, Fan, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1030)
+else ifeq ($(HARDWARE_MOTHERBOARD),143)
# RAMPS Plus 3DYMY (Power outputs: Hotend0, Hotend1, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1031)
+else ifeq ($(HARDWARE_MOTHERBOARD),144)
# RAMPS Plus 3DYMY (Power outputs: Hotend, Fan0, Fan1)
-else ifeq ($(HARDWARE_MOTHERBOARD),1032)
+else ifeq ($(HARDWARE_MOTHERBOARD),145)
# RAMPS Plus 3DYMY (Power outputs: Hotend0, Hotend1, Fan)
-else ifeq ($(HARDWARE_MOTHERBOARD),1033)
+else ifeq ($(HARDWARE_MOTHERBOARD),146)
# RAMPS Plus 3DYMY (Power outputs: Spindle, Controller Fan)
-else ifeq ($(HARDWARE_MOTHERBOARD),1034)
+else ifeq ($(HARDWARE_MOTHERBOARD),148)
#
# RAMPS Derivatives - ATmega1280, ATmega2560
#
# 3Drag Controller
-else ifeq ($(HARDWARE_MOTHERBOARD),1100)
+else ifeq ($(HARDWARE_MOTHERBOARD),77)
# Velleman K8200 Controller (derived from 3Drag Controller)
-else ifeq ($(HARDWARE_MOTHERBOARD),1101)
+else ifeq ($(HARDWARE_MOTHERBOARD),78)
# Velleman K8400 Controller (derived from 3Drag Controller)
-else ifeq ($(HARDWARE_MOTHERBOARD),1102)
-# Velleman K8600 Controller (Vertex Nano)
-else ifeq ($(HARDWARE_MOTHERBOARD),1103)
-# Velleman K8800 Controller (Vertex Delta)
-else ifeq ($(HARDWARE_MOTHERBOARD),1104)
+else ifeq ($(HARDWARE_MOTHERBOARD),79)
# 2PrintBeta BAM&DICE with STK drivers
-else ifeq ($(HARDWARE_MOTHERBOARD),1105)
+else ifeq ($(HARDWARE_MOTHERBOARD),401)
# 2PrintBeta BAM&DICE Due with STK drivers
-else ifeq ($(HARDWARE_MOTHERBOARD),1106)
+else ifeq ($(HARDWARE_MOTHERBOARD),402)
# MKS BASE v1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1107)
-# MKS v1.4 with A4982 stepper drivers
-else ifeq ($(HARDWARE_MOTHERBOARD),1108)
+else ifeq ($(HARDWARE_MOTHERBOARD),40)
# MKS v1.5 with Allegro A4982 stepper drivers
-else ifeq ($(HARDWARE_MOTHERBOARD),1109)
-# MKS v1.6 with Allegro A4982 stepper drivers
-else ifeq ($(HARDWARE_MOTHERBOARD),1110)
+else ifeq ($(HARDWARE_MOTHERBOARD),405)
# MKS BASE 1.0 with Heroic HR4982 stepper drivers
-else ifeq ($(HARDWARE_MOTHERBOARD),1111)
+else ifeq ($(HARDWARE_MOTHERBOARD),41)
# MKS GEN v1.3 or 1.4
-else ifeq ($(HARDWARE_MOTHERBOARD),1112)
+else ifeq ($(HARDWARE_MOTHERBOARD),47)
# MKS GEN L
-else ifeq ($(HARDWARE_MOTHERBOARD),1113)
+else ifeq ($(HARDWARE_MOTHERBOARD),53)
# zrib V2.0 control board (Chinese knock off RAMPS replica)
-else ifeq ($(HARDWARE_MOTHERBOARD),1114)
-# BigTreeTech or BIQU KFB2.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1115)
+else ifeq ($(HARDWARE_MOTHERBOARD),504)
# Felix 2.0+ Electronics Board (RAMPS like)
-else ifeq ($(HARDWARE_MOTHERBOARD),1116)
+else ifeq ($(HARDWARE_MOTHERBOARD),37)
# Invent-A-Part RigidBoard
-else ifeq ($(HARDWARE_MOTHERBOARD),1117)
+else ifeq ($(HARDWARE_MOTHERBOARD),42)
# Invent-A-Part RigidBoard V2
-else ifeq ($(HARDWARE_MOTHERBOARD),1118)
+else ifeq ($(HARDWARE_MOTHERBOARD),52)
# Sainsmart 2-in-1 board
-else ifeq ($(HARDWARE_MOTHERBOARD),1119)
+else ifeq ($(HARDWARE_MOTHERBOARD),49)
# Ultimaker
-else ifeq ($(HARDWARE_MOTHERBOARD),1120)
+else ifeq ($(HARDWARE_MOTHERBOARD),7)
# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
-else ifeq ($(HARDWARE_MOTHERBOARD),1121)
- MCU ?= atmega1280
- PROG_MCU ?= m1280
-
+else ifeq ($(HARDWARE_MOTHERBOARD),71)
+MCU ?= atmega1280
# Azteeg X3
-else ifeq ($(HARDWARE_MOTHERBOARD),1122)
+else ifeq ($(HARDWARE_MOTHERBOARD),67)
# Azteeg X3 Pro
-else ifeq ($(HARDWARE_MOTHERBOARD),1123)
+else ifeq ($(HARDWARE_MOTHERBOARD),68)
# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
-else ifeq ($(HARDWARE_MOTHERBOARD),1124)
+else ifeq ($(HARDWARE_MOTHERBOARD),72)
# Rumba
-else ifeq ($(HARDWARE_MOTHERBOARD),1125)
-# Raise3D Rumba
-else ifeq ($(HARDWARE_MOTHERBOARD),1126)
-# Rapide Lite RL200 Rumba
-else ifeq ($(HARDWARE_MOTHERBOARD),1127)
-# Formbot T-Rex 2 Plus
-else ifeq ($(HARDWARE_MOTHERBOARD),1128)
-# Formbot T-Rex 3
-else ifeq ($(HARDWARE_MOTHERBOARD),1129)
-# Formbot Raptor
-else ifeq ($(HARDWARE_MOTHERBOARD),1130)
-# Formbot Raptor 2
-else ifeq ($(HARDWARE_MOTHERBOARD),1131)
+else ifeq ($(HARDWARE_MOTHERBOARD),80)
# bq ZUM Mega 3D
-else ifeq ($(HARDWARE_MOTHERBOARD),1132)
+else ifeq ($(HARDWARE_MOTHERBOARD),503)
# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
-else ifeq ($(HARDWARE_MOTHERBOARD),1133)
+else ifeq ($(HARDWARE_MOTHERBOARD),431)
# TriGorilla Anycubic version 1.3 based on RAMPS EFB
-else ifeq ($(HARDWARE_MOTHERBOARD),1134)
+else ifeq ($(HARDWARE_MOTHERBOARD),343)
# TriGorilla Anycubic version 1.4 based on RAMPS EFB
-else ifeq ($(HARDWARE_MOTHERBOARD),1135)
-# TriGorilla Anycubic version 1.4 Rev 1.1
-else ifeq ($(HARDWARE_MOTHERBOARD),1136)
+else ifeq ($(HARDWARE_MOTHERBOARD),443)
# Creality: Ender-4, CR-8
-else ifeq ($(HARDWARE_MOTHERBOARD),1137)
-# Creality: CR10S, CR20, CR-X
-else ifeq ($(HARDWARE_MOTHERBOARD),1138)
-# Dagoma F5
-else ifeq ($(HARDWARE_MOTHERBOARD),1139)
-# FYSETC F6 1.3
-else ifeq ($(HARDWARE_MOTHERBOARD),1140)
-# FYSETC F6 1.5
-else ifeq ($(HARDWARE_MOTHERBOARD),1141)
-# Duplicator i3 Plus
-else ifeq ($(HARDWARE_MOTHERBOARD),1142)
-# VORON
-else ifeq ($(HARDWARE_MOTHERBOARD),1143)
-# TRONXY V3 1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1144)
-# Z-Bolt X Series
-else ifeq ($(HARDWARE_MOTHERBOARD),1145)
-# TT OSCAR
-else ifeq ($(HARDWARE_MOTHERBOARD),1146)
-# Overlord/Overlord Pro
-else ifeq ($(HARDWARE_MOTHERBOARD),1147)
-# ADIMLab Gantry v1
-else ifeq ($(HARDWARE_MOTHERBOARD),1148)
-# ADIMLab Gantry v2
-else ifeq ($(HARDWARE_MOTHERBOARD),1149)
-# BIQU Tango V1
-else ifeq ($(HARDWARE_MOTHERBOARD),1150)
-# MKS GEN L V2
-else ifeq ($(HARDWARE_MOTHERBOARD),1151)
-# MKS GEN L V2.1
-else ifeq ($(HARDWARE_MOTHERBOARD),1152)
-# Copymaster 3D
-else ifeq ($(HARDWARE_MOTHERBOARD),1153)
-# Ortur 4
-else ifeq ($(HARDWARE_MOTHERBOARD),1154)
-# Tenlog D3 Hero
-else ifeq ($(HARDWARE_MOTHERBOARD),1155)
-
-#
-# RAMBo and derivatives
-#
-
-# Rambo
-else ifeq ($(HARDWARE_MOTHERBOARD),1200)
-# Mini-Rambo
-else ifeq ($(HARDWARE_MOTHERBOARD),1201)
-# Mini-Rambo 1.0a
-else ifeq ($(HARDWARE_MOTHERBOARD),1202)
-# Einsy Rambo
-else ifeq ($(HARDWARE_MOTHERBOARD),1203)
-# Einsy Retro
-else ifeq ($(HARDWARE_MOTHERBOARD),1204)
-# abee Scoovo X9H
-else ifeq ($(HARDWARE_MOTHERBOARD),1205)
+else ifeq ($(HARDWARE_MOTHERBOARD),243)
#
# Other ATmega1280, ATmega2560
#
# Cartesio CN Controls V11
-else ifeq ($(HARDWARE_MOTHERBOARD),1300)
+else ifeq ($(HARDWARE_MOTHERBOARD),111)
# Cartesio CN Controls V12
-else ifeq ($(HARDWARE_MOTHERBOARD),1301)
-# Cartesio CN Controls V15
-else ifeq ($(HARDWARE_MOTHERBOARD),1302)
+else ifeq ($(HARDWARE_MOTHERBOARD),112)
# Cheaptronic v1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1303)
+else ifeq ($(HARDWARE_MOTHERBOARD),2)
# Cheaptronic v2.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1304)
+else ifeq ($(HARDWARE_MOTHERBOARD),21)
# Makerbot Mightyboard Revision E
-else ifeq ($(HARDWARE_MOTHERBOARD),1305)
+else ifeq ($(HARDWARE_MOTHERBOARD),200)
# Megatronics
-else ifeq ($(HARDWARE_MOTHERBOARD),1306)
+else ifeq ($(HARDWARE_MOTHERBOARD),70)
# Megatronics v2.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1307)
+else ifeq ($(HARDWARE_MOTHERBOARD),701)
# Megatronics v3.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1308)
+else ifeq ($(HARDWARE_MOTHERBOARD),703)
# Megatronics v3.1
-else ifeq ($(HARDWARE_MOTHERBOARD),1309)
-# Megatronics v3.2
-else ifeq ($(HARDWARE_MOTHERBOARD),1310)
+else ifeq ($(HARDWARE_MOTHERBOARD),704)
+# Rambo
+else ifeq ($(HARDWARE_MOTHERBOARD),301)
+# Mini-Rambo
+else ifeq ($(HARDWARE_MOTHERBOARD),302)
+# Mini-Rambo 1.0a
+else ifeq ($(HARDWARE_MOTHERBOARD),303)
+# Einsy Rambo
+else ifeq ($(HARDWARE_MOTHERBOARD),304)
+# Einsy Retro
+else ifeq ($(HARDWARE_MOTHERBOARD),305)
# Elefu Ra Board (v3)
-else ifeq ($(HARDWARE_MOTHERBOARD),1311)
+else ifeq ($(HARDWARE_MOTHERBOARD),21)
# Leapfrog
-else ifeq ($(HARDWARE_MOTHERBOARD),1312)
+else ifeq ($(HARDWARE_MOTHERBOARD),999)
# Mega controller
-else ifeq ($(HARDWARE_MOTHERBOARD),1313)
-# Geeetech GT2560 Rev B for Mecreator2
-else ifeq ($(HARDWARE_MOTHERBOARD),1314)
+else ifeq ($(HARDWARE_MOTHERBOARD),310)
+# abee Scoovo X9H
+else ifeq ($(HARDWARE_MOTHERBOARD),321)
# Geeetech GT2560 Rev. A
-else ifeq ($(HARDWARE_MOTHERBOARD),1315)
+else ifeq ($(HARDWARE_MOTHERBOARD),74)
# Geeetech GT2560 Rev. A+ (with auto level probe)
-else ifeq ($(HARDWARE_MOTHERBOARD),1316)
-# Geeetech GT2560 Rev B for A10(M/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1317)
-# Geeetech GT2560 Rev B for A20(M/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1318)
-# Einstart retrofit
-else ifeq ($(HARDWARE_MOTHERBOARD),1319)
-# Wanhao 0ne+ i3 Mini
-else ifeq ($(HARDWARE_MOTHERBOARD),1320)
+else ifeq ($(HARDWARE_MOTHERBOARD),75)
#
# ATmega1281, ATmega2561
#
-# Minitronics v1.0/1.1
-else ifeq ($(HARDWARE_MOTHERBOARD),1400)
- MCU ?= atmega1281
- PROG_MCU ?= m1281
-# Silvergate v1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1401)
- MCU ?= atmega1281
- PROG_MCU ?= m1281
+else ifeq ($(HARDWARE_MOTHERBOARD),702)
+MCU ?= atmega1281
+else ifeq ($(HARDWARE_MOTHERBOARD),25)
+MCU ?= atmega1281
#
# Sanguinololu and Derivatives - ATmega644P, ATmega1284P
#
# Sanguinololu < 1.2
-else ifeq ($(HARDWARE_MOTHERBOARD),1500)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega644p
- PROG_MCU ?= m644p
+else ifeq ($(HARDWARE_MOTHERBOARD),6)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega644p
# Sanguinololu 1.2 and above
-else ifeq ($(HARDWARE_MOTHERBOARD),1501)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega644p
- PROG_MCU ?= m644p
+else ifeq ($(HARDWARE_MOTHERBOARD),62)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega644p
# Melzi
-else ifeq ($(HARDWARE_MOTHERBOARD),1502)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega644p
- PROG_MCU ?= m644p
-# Melzi V2.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1503)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega1284p
- PROG_MCU ?= m1284p
+else ifeq ($(HARDWARE_MOTHERBOARD),63)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega644p
# Melzi with ATmega1284 (MaKr3d version)
-else ifeq ($(HARDWARE_MOTHERBOARD),1504)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega1284p
- PROG_MCU ?= m1284p
+else ifeq ($(HARDWARE_MOTHERBOARD),66)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega1284p
# Melzi Creality3D board (for CR-10 etc)
-else ifeq ($(HARDWARE_MOTHERBOARD),1505)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega1284p
- PROG_MCU ?= m1284p
+else ifeq ($(HARDWARE_MOTHERBOARD),89)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega1284p
# Melzi Malyan M150 board
-else ifeq ($(HARDWARE_MOTHERBOARD),1506)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega1284p
- PROG_MCU ?= m1284p
+else ifeq ($(HARDWARE_MOTHERBOARD),92)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega1284p
# Tronxy X5S
-else ifeq ($(HARDWARE_MOTHERBOARD),1507)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega1284p
- PROG_MCU ?= m1284p
+else ifeq ($(HARDWARE_MOTHERBOARD),505)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega1284p
# STB V1.1
-else ifeq ($(HARDWARE_MOTHERBOARD),1508)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega1284p
- PROG_MCU ?= m1284p
+else ifeq ($(HARDWARE_MOTHERBOARD),64)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega1284p
# Azteeg X1
-else ifeq ($(HARDWARE_MOTHERBOARD),1509)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega1284p
- PROG_MCU ?= m1284p
+else ifeq ($(HARDWARE_MOTHERBOARD),65)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega1284p
# Anet 1.0 (Melzi clone)
-else ifeq ($(HARDWARE_MOTHERBOARD),1510)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega1284p
- PROG_MCU ?= m1284p
+else ifeq ($(HARDWARE_MOTHERBOARD),69)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega1284p
#
# Other ATmega644P, ATmega644, ATmega1284P
#
# Gen3 Monolithic Electronics
-else ifeq ($(HARDWARE_MOTHERBOARD),1600)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega644p
- PROG_MCU ?= m644p
+else ifeq ($(HARDWARE_MOTHERBOARD),22)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega644p
# Gen3+
-else ifeq ($(HARDWARE_MOTHERBOARD),1601)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega644p
- PROG_MCU ?= m644p
+else ifeq ($(HARDWARE_MOTHERBOARD),9)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega644p
# Gen6
-else ifeq ($(HARDWARE_MOTHERBOARD),1602)
- HARDWARE_VARIANT ?= Gen6
- MCU ?= atmega644p
- PROG_MCU ?= m644p
+else ifeq ($(HARDWARE_MOTHERBOARD),5)
+HARDWARE_VARIANT ?= Gen6
+MCU ?= atmega644p
# Gen6 deluxe
-else ifeq ($(HARDWARE_MOTHERBOARD),1603)
- HARDWARE_VARIANT ?= Gen6
- MCU ?= atmega644p
- PROG_MCU ?= m644p
+else ifeq ($(HARDWARE_MOTHERBOARD),51)
+HARDWARE_VARIANT ?= Gen6
+MCU ?= atmega644p
# Gen7 custom (Alfons3 Version)
-else ifeq ($(HARDWARE_MOTHERBOARD),1604)
- HARDWARE_VARIANT ?= Gen7
- MCU ?= atmega644
- PROG_MCU ?= m644
- F_CPU ?= 20000000
+else ifeq ($(HARDWARE_MOTHERBOARD),10)
+HARDWARE_VARIANT ?= Gen7
+MCU ?= atmega644
+F_CPU ?= 20000000
# Gen7 v1.1, v1.2
-else ifeq ($(HARDWARE_MOTHERBOARD),1605)
- HARDWARE_VARIANT ?= Gen7
- MCU ?= atmega644p
- PROG_MCU ?= m644p
- F_CPU ?= 20000000
+else ifeq ($(HARDWARE_MOTHERBOARD),11)
+HARDWARE_VARIANT ?= Gen7
+MCU ?= atmega644p
+F_CPU ?= 20000000
# Gen7 v1.3
-else ifeq ($(HARDWARE_MOTHERBOARD),1606)
- HARDWARE_VARIANT ?= Gen7
- MCU ?= atmega644p
- PROG_MCU ?= m644p
- F_CPU ?= 20000000
+else ifeq ($(HARDWARE_MOTHERBOARD),12)
+HARDWARE_VARIANT ?= Gen7
+MCU ?= atmega644p
+F_CPU ?= 20000000
# Gen7 v1.4
-else ifeq ($(HARDWARE_MOTHERBOARD),1607)
- HARDWARE_VARIANT ?= Gen7
- MCU ?= atmega1284p
- PROG_MCU ?= m1284p
- F_CPU ?= 20000000
+else ifeq ($(HARDWARE_MOTHERBOARD),13)
+HARDWARE_VARIANT ?= Gen7
+MCU ?= atmega1284p
+F_CPU ?= 20000000
# Alpha OMCA board
-else ifeq ($(HARDWARE_MOTHERBOARD),1608)
- HARDWARE_VARIANT ?= SanguinoA
- MCU ?= atmega644
- PROG_MCU ?= m644
+else ifeq ($(HARDWARE_MOTHERBOARD),90)
+HARDWARE_VARIANT ?= SanguinoA
+MCU ?= atmega644
# Final OMCA board
-else ifeq ($(HARDWARE_MOTHERBOARD),1609)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega644p
- PROG_MCU ?= m644p
+else ifeq ($(HARDWARE_MOTHERBOARD),91)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega644p
# Sethi 3D_1
-else ifeq ($(HARDWARE_MOTHERBOARD),1610)
- HARDWARE_VARIANT ?= Sanguino
- MCU ?= atmega644p
- PROG_MCU ?= m644p
+else ifeq ($(HARDWARE_MOTHERBOARD),20)
+HARDWARE_VARIANT ?= Sanguino
+MCU ?= atmega644p
#
# Teensyduino - AT90USB1286, AT90USB1286P
#
# Teensylu
-else ifeq ($(HARDWARE_MOTHERBOARD),1700)
- HARDWARE_VARIANT ?= Teensy
- MCU ?= at90usb1286
- PROG_MCU ?= usb1286
+else ifeq ($(HARDWARE_MOTHERBOARD),8)
+HARDWARE_VARIANT ?= Teensy
+MCU ?= at90usb1286
# Printrboard (AT90USB1286)
-else ifeq ($(HARDWARE_MOTHERBOARD),1701)
- HARDWARE_VARIANT ?= Teensy
- MCU ?= at90usb1286
- PROG_MCU ?= usb1286
+else ifeq ($(HARDWARE_MOTHERBOARD),81)
+HARDWARE_VARIANT ?= Teensy
+MCU ?= at90usb1286
# Printrboard Revision F (AT90USB1286)
-else ifeq ($(HARDWARE_MOTHERBOARD),1702)
- HARDWARE_VARIANT ?= Teensy
- MCU ?= at90usb1286
- PROG_MCU ?= usb1286
+else ifeq ($(HARDWARE_MOTHERBOARD),811)
+HARDWARE_VARIANT ?= Teensy
+MCU ?= at90usb1286
# Brainwave (AT90USB646)
-else ifeq ($(HARDWARE_MOTHERBOARD),1703)
- HARDWARE_VARIANT ?= Teensy
- MCU ?= at90usb646
- PROG_MCU ?= usb646
+else ifeq ($(HARDWARE_MOTHERBOARD),82)
+HARDWARE_VARIANT ?= Teensy
+MCU ?= at90usb646
# Brainwave Pro (AT90USB1286)
-else ifeq ($(HARDWARE_MOTHERBOARD),1704)
- HARDWARE_VARIANT ?= Teensy
- MCU ?= at90usb1286
- PROG_MCU ?= usb1286
+else ifeq ($(HARDWARE_MOTHERBOARD),83)
+HARDWARE_VARIANT ?= Teensy
+MCU ?= at90usb1286
# SAV Mk-I (AT90USB1286)
-else ifeq ($(HARDWARE_MOTHERBOARD),1705)
- HARDWARE_VARIANT ?= Teensy
- MCU ?= at90usb1286
- PROG_MCU ?= usb1286
+else ifeq ($(HARDWARE_MOTHERBOARD),84)
+HARDWARE_VARIANT ?= Teensy
+MCU ?= at90usb1286
# Teensy++2.0 (AT90USB1286)
-else ifeq ($(HARDWARE_MOTHERBOARD),1706)
- HARDWARE_VARIANT ?= Teensy
- MCU ?= at90usb1286
- PROG_MCU ?= usb1286
+else ifeq ($(HARDWARE_MOTHERBOARD),85)
+HARDWARE_VARIANT ?= Teensy
+MCU ?= at90usb1286
# 5DPrint D8 Driver Board
-else ifeq ($(HARDWARE_MOTHERBOARD),1707)
- HARDWARE_VARIANT ?= Teensy
- MCU ?= at90usb1286
- PROG_MCU ?= usb1286
+else ifeq ($(HARDWARE_MOTHERBOARD),88)
+HARDWARE_VARIANT ?= Teensy
+MCU ?= at90usb1286
-# UltiMachine Archim1 (with DRV8825 drivers)
-else ifeq ($(HARDWARE_MOTHERBOARD),3023)
- HARDWARE_VARIANT ?= archim
- MCPU = cortex-m3
- F_CPU = 84000000
- IS_MCU = 0
-# UltiMachine Archim2 (with TMC2130 drivers)
-else ifeq ($(HARDWARE_MOTHERBOARD),3024)
- HARDWARE_VARIANT ?= archim
- MCPU = cortex-m3
- F_CPU = 84000000
- IS_MCU = 0
endif
# Be sure to regenerate speed_lookuptable.h with create_speed_lookuptable.py
# if you are setting this to something other than 16MHz
-# Do not put the UL suffix, it's done later on.
# Set to 16Mhz if not yet set.
F_CPU ?= 16000000
-# Set to microcontroller if IS_MCU not yet set
-IS_MCU ?= 1
-
-ifeq ($(IS_MCU),1)
- # Set to arduino, ATmega2560 if not yet set.
- HARDWARE_VARIANT ?= arduino
- MCU ?= atmega2560
- PROG_MCU ?= m2560
-
- TOOL_PREFIX = avr
- MCU_FLAGS = -mmcu=$(MCU)
- SIZE_FLAGS = --mcu=$(MCU) -C
-else
- TOOL_PREFIX = arm-none-eabi
- CPU_FLAGS = -mthumb -mcpu=$(MCPU)
- SIZE_FLAGS = -A
-endif
+# Set to arduino, ATmega2560 if not yet set.
+HARDWARE_VARIANT ?= arduino
+MCU ?= atmega2560
# Arduino contained the main source code for the Arduino
# Libraries, the "hardware variant" are for boards
@@ -610,137 +434,99 @@ VPATH = .
VPATH += $(BUILD_DIR)
VPATH += $(HARDWARE_SRC)
+# U8glib
+VPATH += $(ARDUINO_USER_DIR)/libraries/U8glib
+VPATH += $(ARDUINO_USER_DIR)/libraries/U8glib/clib
+
ifeq ($(HARDWARE_VARIANT), $(filter $(HARDWARE_VARIANT),arduino Teensy Sanguino))
- # Old libraries (avr-core 1.6.21 < / Arduino < 1.6.8)
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI
- # New libraries (avr-core >= 1.6.21 / Arduino >= 1.6.8)
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI/src
+VPATH += $(ARDUINO_INSTALL_DIR)/hardware/marlin/avr/libraries/LiquidCrystal/src
+VPATH += $(ARDUINO_INSTALL_DIR)/hardware/marlin/avr/libraries/SPI
endif
-ifeq ($(IS_MCU),1)
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/cores/arduino
-
- # Old libraries (avr-core 1.6.21 < / Arduino < 1.6.8)
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SoftwareSerial
- # New libraries (avr-core >= 1.6.21 / Arduino >= 1.6.8)
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI/src
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SoftwareSerial/src
-endif
+VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/cores/arduino
+VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI
+VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI/src
VPATH += $(ARDUINO_INSTALL_DIR)/libraries/LiquidCrystal/src
-
ifeq ($(LIQUID_TWI2), 1)
- WIRE = 1
- VPATH += $(ARDUINO_INSTALL_DIR)/libraries/LiquidTWI2
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/Wire
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/Wire/utility
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/LiquidTWI2
endif
ifeq ($(WIRE), 1)
- # Old libraries (avr-core 1.6.21 / Arduino < 1.6.8)
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/Wire
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/Wire/utility
- # New libraries (avr-core >= 1.6.21 / Arduino >= 1.6.8)
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/Wire/src
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/Wire/src/utility
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/Wire
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/Wire/utility
endif
ifeq ($(NEOPIXEL), 1)
VPATH += $(ARDUINO_INSTALL_DIR)/libraries/Adafruit_NeoPixel
endif
ifeq ($(U8GLIB), 1)
VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/csrc
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/cppsrc
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/fntsrc
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/clib
endif
-ifeq ($(TMC), 1)
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/TMCStepper/src
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/TMCStepper/src/source
+ifeq ($(TMC2630), 1)
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/TMC2130Stepper/src
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/TMC2130Stepper/src/source
endif
ifeq ($(HARDWARE_VARIANT), arduino)
- HARDWARE_SUB_VARIANT ?= mega
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/variants/$(HARDWARE_SUB_VARIANT)
-else ifeq ($(HARDWARE_VARIANT), Sanguino)
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/marlin/avr/variants/sanguino
-else ifeq ($(HARDWARE_VARIANT), archim)
- VPATH += $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/system/libsam
- VPATH += $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/system/CMSIS/CMSIS/Include/
- VPATH += $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/system/CMSIS/Device/ATMEL/
- VPATH += $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/cores/arduino
- VPATH += $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/cores/arduino/avr
- VPATH += $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/cores/arduino/USB
- VPATH += $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/libraries/Wire/src
- VPATH += $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/libraries/SPI/src
- VPATH += $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/libraries/U8glib/src/clib
- VPATH += $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/variants/archim
- LDSCRIPT = $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/variants/archim/linker_scripts/gcc/flash.ld
- LDLIBS = $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/variants/archim/libsam_sam3x8e_gcc_rel.a
+HARDWARE_SUB_VARIANT ?= mega
+VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/variants/$(HARDWARE_SUB_VARIANT)
else
- HARDWARE_SUB_VARIANT ?= standard
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/$(HARDWARE_VARIANT)/variants/$(HARDWARE_SUB_VARIANT)
+ifeq ($(HARDWARE_VARIANT), Sanguino)
+VPATH += $(ARDUINO_INSTALL_DIR)/hardware/marlin/avr/variants/sanguino
+else
+HARDWARE_SUB_VARIANT ?= standard
+VPATH += $(ARDUINO_INSTALL_DIR)/hardware/$(HARDWARE_VARIANT)/variants/$(HARDWARE_SUB_VARIANT)
+endif
endif
-
LIB_SRC = wiring.c \
- wiring_analog.c wiring_digital.c \
- wiring_shift.c WInterrupts.c hooks.c
-
-ifeq ($(HARDWARE_VARIANT), archim)
- LIB_ASRC += wiring_pulse_asm.S
-else
- LIB_SRC += wiring_pulse.c
-endif
+ wiring_analog.c wiring_digital.c \
+ wiring_pulse.c \
+ wiring_shift.c WInterrupts.c hooks.c
ifeq ($(HARDWARE_VARIANT), Teensy)
- LIB_SRC = wiring.c
- VPATH += $(ARDUINO_INSTALL_DIR)/hardware/teensy/cores/teensy
+LIB_SRC = wiring.c
+VPATH += $(ARDUINO_INSTALL_DIR)/hardware/teensy/cores/teensy
endif
-LIB_CXXSRC = WMath.cpp WString.cpp Print.cpp SPI.cpp
+LIB_CXXSRC = WMath.cpp WString.cpp Print.cpp SPI.cpp Tone.cpp
ifeq ($(NEOPIXEL), 1)
- LIB_CXXSRC += Adafruit_NeoPixel.cpp
+LIB_CXXSRC += Adafruit_NeoPixel.cpp
endif
ifeq ($(LIQUID_TWI2), 0)
- LIB_CXXSRC += LiquidCrystal.cpp
+LIB_CXXSRC += LiquidCrystal.cpp
else
- LIB_SRC += twi.c
- LIB_CXXSRC += Wire.cpp LiquidTWI2.cpp
+LIB_SRC += twi.c
+LIB_CXXSRC += Wire.cpp LiquidTWI2.cpp
endif
ifeq ($(WIRE), 1)
- LIB_SRC += twi.c
- LIB_CXXSRC += Wire.cpp
-endif
-
-ifeq ($(TONE), 1)
- LIB_CXXSRC += Tone.cpp
+LIB_SRC += twi.c
+LIB_CXXSRC += Wire.cpp
endif
ifeq ($(U8GLIB), 1)
- LIB_CXXSRC += U8glib.cpp
- LIB_SRC += u8g_ll_api.c u8g_bitmap.c u8g_clip.c u8g_com_null.c u8g_delay.c \
- u8g_page.c u8g_pb.c u8g_pb16h1.c u8g_rect.c u8g_state.c u8g_font.c \
- u8g_font_6x13.c u8g_font_04b_03.c u8g_font_5x8.c
+LIB_CXXSRC += U8glib.cpp
+LIB_SRC += u8g_ll_api.c u8g_bitmap.c u8g_clip.c u8g_com_null.c u8g_delay.c u8g_page.c u8g_pb.c u8g_pb16h1.c u8g_rect.c u8g_state.c u8g_font.c u8g_font_data.c
endif
-ifeq ($(TMC), 1)
- LIB_CXXSRC += TMCStepper.cpp COOLCONF.cpp DRV_STATUS.cpp IHOLD_IRUN.cpp \
- CHOPCONF.cpp GCONF.cpp PWMCONF.cpp DRV_CONF.cpp DRVCONF.cpp DRVCTRL.cpp \
- DRVSTATUS.cpp ENCMODE.cpp RAMP_STAT.cpp SGCSCONF.cpp SHORT_CONF.cpp \
- SMARTEN.cpp SW_MODE.cpp SW_SPI.cpp TMC2130Stepper.cpp TMC2208Stepper.cpp \
- TMC2209Stepper.cpp TMC2660Stepper.cpp TMC5130Stepper.cpp TMC5160Stepper.cpp
+ifeq ($(TMC2630), 1)
+LIB_CXXSRC += TMC2130Stepper.cpp TMC2130Stepper_COOLCONF.cpp TMC2130Stepper_DRV_STATUS.cpp TMC2130Stepper_IHOLD_IRUN.cpp TMC2130Stepper_CHOPCONF.cpp TMC2130Stepper_GCONF.cpp TMC2130Stepper_PWMCONF.cpp SW_SPI.cpp
endif
ifeq ($(RELOC_WORKAROUND), 1)
- LD_PREFIX=-nodefaultlibs
- LD_SUFFIX=-lm -lgcc -lc -lgcc
+LD_PREFIX=-nodefaultlibs
+LD_SUFFIX=-lm -lgcc -lc -lgcc
endif
#Check for Arduino 1.0.0 or higher and use the correct source files for that version
ifeq ($(shell [ $(ARDUINO_VERSION) -ge 100 ] && echo true), true)
- LIB_CXXSRC += main.cpp
+LIB_CXXSRC += main.cpp
else
- LIB_SRC += pins_arduino.c main.c
+LIB_SRC += pins_arduino.c main.c
endif
FORMAT = ihex
@@ -758,91 +544,62 @@ OPT = s
DEFINES ?=
# Program settings
-CC = $(AVR_TOOLS_PATH)$(TOOL_PREFIX)-gcc
-CXX = $(AVR_TOOLS_PATH)$(TOOL_PREFIX)-g++
-OBJCOPY = $(AVR_TOOLS_PATH)$(TOOL_PREFIX)-objcopy
-OBJDUMP = $(AVR_TOOLS_PATH)$(TOOL_PREFIX)-objdump
-AR = $(AVR_TOOLS_PATH)$(TOOL_PREFIX)-ar
-SIZE = $(AVR_TOOLS_PATH)$(TOOL_PREFIX)-size
-NM = $(AVR_TOOLS_PATH)$(TOOL_PREFIX)-nm
+CC = $(AVR_TOOLS_PATH)avr-gcc
+CXX = $(AVR_TOOLS_PATH)avr-g++
+OBJCOPY = $(AVR_TOOLS_PATH)avr-objcopy
+OBJDUMP = $(AVR_TOOLS_PATH)avr-objdump
+AR = $(AVR_TOOLS_PATH)avr-ar
+SIZE = $(AVR_TOOLS_PATH)avr-size
+NM = $(AVR_TOOLS_PATH)avr-nm
AVRDUDE = avrdude
REMOVE = rm -f
MV = mv -f
# Place -D or -U options here
-CDEFS = -DF_CPU=$(F_CPU)UL ${addprefix -D , $(DEFINES)} -DARDUINO=$(ARDUINO_VERSION)
+CDEFS = -DF_CPU=$(F_CPU) ${addprefix -D , $(DEFINES)}
CXXDEFS = $(CDEFS)
ifeq ($(HARDWARE_VARIANT), Teensy)
- CDEFS += -DUSB_SERIAL
- LIB_SRC += usb.c pins_teensy.c
- LIB_CXXSRC += usb_api.cpp
-
-else ifeq ($(HARDWARE_VARIANT), archim)
- CDEFS += -DARDUINO_SAM_ARCHIM -DARDUINO_ARCH_SAM -D__SAM3X8E__
- CDEFS += -DUSB_VID=0x27B1 -DUSB_PID=0x0001 -DUSBCON
- CDEFS += '-DUSB_MANUFACTURER="UltiMachine"' '-DUSB_PRODUCT_STRING="Archim"'
-
- LIB_CXXSRC += variant.cpp IPAddress.cpp Reset.cpp RingBuffer.cpp Stream.cpp \
- UARTClass.cpp USARTClass.cpp abi.cpp new.cpp watchdog.cpp CDC.cpp \
- PluggableUSB.cpp USBCore.cpp
-
- LIB_SRC += cortex_handlers.c iar_calls_sam3.c syscalls_sam3.c dtostrf.c itoa.c
-
- ifeq ($(U8GLIB), 1)
- LIB_SRC += u8g_com_api.c u8g_pb32h1.c
- endif
+CDEFS += -DUSB_SERIAL
+LIB_SRC += usb.c pins_teensy.c
+LIB_CXXSRC += usb_api.cpp
endif
# Add all the source directories as include directories too
CINCS = ${addprefix -I ,${VPATH}}
CXXINCS = ${addprefix -I ,${VPATH}}
-# Silence warnings for library code (won't work for .h files, unfortunately)
-LIBWARN = -w -Wno-packed-bitfield-compat
-
# Compiler flag to set the C/CPP Standard level.
CSTANDARD = -std=gnu99
CXXSTANDARD = -std=gnu++11
CDEBUG = -g$(DEBUG)
-CWARN = -Wall -Wstrict-prototypes -Wno-packed-bitfield-compat -Wno-pragmas -Wunused-parameter
-CXXWARN = -Wall -Wno-packed-bitfield-compat -Wno-pragmas -Wunused-parameter
-CTUNING = -fsigned-char -funsigned-bitfields -fno-exceptions \
- -fshort-enums -ffunction-sections -fdata-sections
+CWARN = -Wall -Wstrict-prototypes
+CTUNING = -w -fsigned-char -funsigned-bitfields -fpack-struct \
+ -fshort-enums -ffunction-sections -fdata-sections -flto \
+ -DARDUINO=$(ARDUINO_VERSION)
ifneq ($(HARDWARE_MOTHERBOARD),)
- CTUNING += -DMOTHERBOARD=${HARDWARE_MOTHERBOARD}
+CTUNING += -DMOTHERBOARD=${HARDWARE_MOTHERBOARD}
endif
-
#CEXTRA = -Wa,-adhlns=$(<:.c=.lst)
-CXXEXTRA = -fno-use-cxa-atexit -fno-threadsafe-statics -fno-rtti
-CFLAGS := $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CEXTRA) $(CTUNING) $(CSTANDARD)
-CXXFLAGS := $(CDEFS) $(CINCS) -O$(OPT) $(CXXEXTRA) $(CTUNING) $(CXXSTANDARD)
-ASFLAGS := $(CDEFS)
+CEXTRA = -fno-use-cxa-atexit -fno-threadsafe-statics
+
+CFLAGS := $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CEXTRA) $(CTUNING) $(CSTANDARD)
+CXXFLAGS := $(CDEFS) $(CINCS) -O$(OPT) -Wall $(CEXTRA) $(CTUNING) $(CXXSTANDARD)
#ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs
+LDFLAGS = -lm
-ifeq ($(HARDWARE_VARIANT), archim)
- LD_PREFIX = -Wl,--gc-sections,-Map,Marlin.ino.map,--cref,--check-sections,--entry=Reset_Handler,--unresolved-symbols=report-all,--warn-common,--warn-section-align
- LD_SUFFIX = $(LDLIBS)
-
- LDFLAGS = -lm -T$(LDSCRIPT) -u _sbrk -u link -u _close -u _fstat -u _isatty
- LDFLAGS += -u _lseek -u _read -u _write -u _exit -u kill -u _getpid
-else
- LD_PREFIX = -Wl,--gc-sections,--relax
- LDFLAGS = -lm
- CTUNING += -flto
-endif
# Programming support using avrdude. Settings and variables.
AVRDUDE_PORT = $(UPLOAD_PORT)
AVRDUDE_WRITE_FLASH = -Uflash:w:$(BUILD_DIR)/$(TARGET).hex:i
ifeq ($(shell uname -s), Linux)
- AVRDUDE_CONF = /etc/avrdude/avrdude.conf
+AVRDUDE_CONF = /etc/avrdude/avrdude.conf
else
- AVRDUDE_CONF = $(ARDUINO_INSTALL_DIR)/hardware/tools/avr/etc/avrdude.conf
+AVRDUDE_CONF = $(ARDUINO_INSTALL_DIR)/hardware/tools/avr/etc/avrdude.conf
endif
AVRDUDE_FLAGS = -D -C$(AVRDUDE_CONF) \
- -p$(PROG_MCU) -P$(AVRDUDE_PORT) -c$(AVRDUDE_PROGRAMMER) \
- -b$(UPLOAD_RATE)
+ -p$(MCU) -P$(AVRDUDE_PORT) -c$(AVRDUDE_PROGRAMMER) \
+ -b$(UPLOAD_RATE)
# Since Marlin 2.0, the source files may be distributed into several
# different directories, so it is necessary to find them recursively
@@ -862,17 +619,17 @@ LST = $(LIB_ASRC:.S=.lst) $(LIB_CXXSRC:.cpp=.lst) $(LIB_SRC:.c=.lst)
# Combine all necessary flags and optional flags.
# Add target processor to flags.
-ALL_CFLAGS = $(MCU_FLAGS) $(CPU_FLAGS) $(CFLAGS) -I.
-ALL_CXXFLAGS = $(MCU_FLAGS) $(CPU_FLAGS) $(CXXFLAGS)
-ALL_ASFLAGS = $(MCU_FLAGS) $(CPU_FLAGS) $(ASFLAGS) -x assembler-with-cpp
+ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS)
+ALL_CXXFLAGS = -mmcu=$(MCU) $(CXXFLAGS)
+ALL_ASFLAGS = -mmcu=$(MCU) -x assembler-with-cpp $(ASFLAGS)
# set V=1 (eg, "make V=1") to print the full commands etc.
ifneq ($V,1)
- Pecho=@echo
- P=@
+ Pecho=@echo
+ P=@
else
- Pecho=@:
- P=
+ Pecho=@:
+ P=
endif
# Create required build hierarchy if it does not exist
@@ -882,10 +639,9 @@ $(shell mkdir -p $(dir $(OBJ)))
# Default target.
all: sizeafter
-build: elf hex bin
+build: elf hex
elf: $(BUILD_DIR)/$(TARGET).elf
-bin: $(BUILD_DIR)/$(TARGET).bin
hex: $(BUILD_DIR)/$(TARGET).hex
eep: $(BUILD_DIR)/$(TARGET).eep
lss: $(BUILD_DIR)/$(TARGET).lss
@@ -902,9 +658,9 @@ ifeq (${AVRDUDE_PROGRAMMER}, arduino)
stty -hup < $(UPLOAD_PORT); true
endif
-# Display size of file.
+ # Display size of file.
HEXSIZE = $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex
-ELFSIZE = $(SIZE) $(SIZE_FLAGS) $(BUILD_DIR)/$(TARGET).elf; \
+ELFSIZE = $(SIZE) --mcu=$(MCU) -C $(BUILD_DIR)/$(TARGET).elf; \
$(SIZE) $(BUILD_DIR)/$(TARGET).elf
sizebefore:
$P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
@@ -915,10 +671,10 @@ sizeafter: build
# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
COFFCONVERT=$(OBJCOPY) --debugging \
- --change-section-address .data-0x800000 \
- --change-section-address .bss-0x800000 \
- --change-section-address .noinit-0x800000 \
- --change-section-address .eeprom-0x810000
+ --change-section-address .data-0x800000 \
+ --change-section-address .bss-0x800000 \
+ --change-section-address .noinit-0x800000 \
+ --change-section-address .eeprom-0x810000
coff: $(BUILD_DIR)/$(TARGET).elf
@@ -929,20 +685,16 @@ extcoff: $(TARGET).elf
$(COFFCONVERT) -O coff-ext-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
-.SUFFIXES: .elf .hex .eep .lss .sym .bin
+.SUFFIXES: .elf .hex .eep .lss .sym
.PRECIOUS: .o
.elf.hex:
$(Pecho) " COPY $@"
$P $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
-.elf.bin:
- $(Pecho) " COPY $@"
- $P $(OBJCOPY) -O binary -R .eeprom $< $@
-
.elf.eep:
-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
- --change-section-lma .eeprom=0 -O $(FORMAT) $< $@
+ --change-section-lma .eeprom=0 -O $(FORMAT) $< $@
# Create extended listing file from ELF output file.
.elf.lss:
@@ -952,36 +704,32 @@ extcoff: $(TARGET).elf
.elf.sym:
$(NM) -n $< > $@
-# Link: create ELF output file from library.
+ # Link: create ELF output file from library.
$(BUILD_DIR)/$(TARGET).elf: $(OBJ) Configuration.h
$(Pecho) " CXX $@"
- $P $(CXX) $(LD_PREFIX) $(ALL_CXXFLAGS) -o $@ -L. $(OBJ) $(LDFLAGS) $(LD_SUFFIX)
+ $P $(CC) $(LD_PREFIX) $(ALL_CXXFLAGS) -Wl,--gc-sections,--relax -o $@ -L. $(OBJ) $(LDFLAGS) $(LD_SUFFIX)
# Object files that were found in "src" will be stored in $(BUILD_DIR)
# in directories that mirror the structure of "src"
$(BUILD_DIR)/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
$(Pecho) " CC $<"
- $P $(CC) -MMD -c $(ALL_CFLAGS) $(CWARN) $< -o $@
+ $P $(CC) -MMD -c $(ALL_CFLAGS) $< -o $@
$(BUILD_DIR)/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
$(Pecho) " CXX $<"
- $P $(CXX) -MMD -c $(ALL_CXXFLAGS) $(CXXWARN) $< -o $@
+ $P $(CXX) -MMD -c $(ALL_CXXFLAGS) $< -o $@
# Object files for Arduino libs will be created in $(BUILD_DIR)/arduino
$(BUILD_DIR)/arduino/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
$(Pecho) " CC $<"
- $P $(CC) -MMD -c $(ALL_CFLAGS) $(LIBWARN) $< -o $@
+ $P $(CC) -MMD -c $(ALL_CFLAGS) $< -o $@
$(BUILD_DIR)/arduino/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
$(Pecho) " CXX $<"
- $P $(CXX) -MMD -c $(ALL_CXXFLAGS) $(LIBWARN) $< -o $@
-
-$(BUILD_DIR)/arduino/%.o: %.S $(MAKEFILE)
- $(Pecho) " CXX $<"
- $P $(CXX) -MMD -c $(ALL_ASFLAGS) $< -o $@
+ $P $(CXX) -MMD -c $(ALL_CXXFLAGS) $< -o $@
# Target: clean project.
clean:
@@ -989,7 +737,7 @@ clean:
$P rm -rf $(BUILD_DIR)
-.PHONY: all build elf hex eep lss sym program coff extcoff clean depend sizebefore sizeafter
+.PHONY: all build elf hex eep lss sym program coff extcoff clean depend sizebefore sizeafter
# Automaticaly include the dependency files created by gcc
-include ${patsubst %.o, %.d, ${OBJ}}
diff --git a/Marlin/Marlin.ino b/Marlin/Marlin.ino
index 57c825445f..842b2a14b9 100644
--- a/Marlin/Marlin.ino
+++ b/Marlin/Marlin.ino
@@ -1,8 +1,9 @@
-/*==============================================================================
+/*
+================================================================================
Marlin Firmware
- (c) 2011-2020 MarlinFirmware
+ (c) 2011-2018 MarlinFirmware
Portions of Marlin are (c) by their respective authors.
All code complies with GPLv2 and/or GPLv3
@@ -11,33 +12,30 @@
Greetings! Thank you for choosing Marlin 2 as your 3D printer firmware.
To configure Marlin you must edit Configuration.h and Configuration_adv.h
-located in the root 'Marlin' folder. Check our Configurations repository to
-see if there's a more suitable starting-point for your specific hardware.
+located in the root 'Marlin' folder. Check the config/examples folder to see if
+there's a more suitable starting-point for your specific hardware.
Before diving in, we recommend the following essential links:
Marlin Firmware Official Website
- - https://marlinfw.org/
+ - http://marlinfw.org/
The official Marlin Firmware website contains the most up-to-date
documentation. Contributions are always welcome!
Configuration
- - https://github.com/MarlinFirmware/Configurations
- Example configurations for several printer models.
-
- https://www.youtube.com/watch?v=3gwWVFtdg-4
A good 20-minute overview of Marlin configuration by Tom Sanladerer.
(Applies to Marlin 1.0.x, so Jerk and Acceleration should be halved.)
Also... https://www.google.com/search?tbs=vid%3A1&q=configure+marlin
- - https://marlinfw.org/docs/configuration/configuration.html
+ - http://marlinfw.org/docs/configuration/configuration.html
Marlin's configuration options are explained in more detail here.
Getting Help
- - https://reprap.org/forum/list.php?415
+ - http://forums.reprap.org/list.php?415
The Marlin Discussion Forum is a great place to get help from other Marlin
users who may have experienced similar issues to your own.
@@ -47,11 +45,9 @@ Getting Help
Contributing
- - https://marlinfw.org/docs/development/contributing.html
+ - http://marlinfw.org/docs/development/contributing.html
If you'd like to contribute to Marlin, read this first!
- - https://marlinfw.org/docs/development/coding_standards.html
+ - http://marlinfw.org/docs/development/coding_standards.html
Before submitting code get to know the Coding Standards.
-
-
-------------------------------------------------------------------------------*/
+*/
diff --git a/Marlin/Version.h b/Marlin/Version.h
deleted file mode 100644
index 60e068ba35..0000000000
--- a/Marlin/Version.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-////////////////////////////
-// VENDOR VERSION EXAMPLE //
-////////////////////////////
-
-/**
- * Marlin release version identifier
- */
-//#define SHORT_BUILD_VERSION "2.0.7.2"
-
-/**
- * Verbose version identifier which should contain a reference to the location
- * from where the binary was downloaded or the source code was compiled.
- */
-//#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION
-
-/**
- * The STRING_DISTRIBUTION_DATE represents when the binary file was built,
- * here we define this default string as the date where the latest release
- * version was tagged.
- */
-//#define STRING_DISTRIBUTION_DATE "2020-07-09"
-
-/**
- * Defines a generic printer name to be output to the LCD after booting Marlin.
- */
-//#define MACHINE_NAME "3D Printer"
-
-/**
- * The SOURCE_CODE_URL is the location where users will find the Marlin Source
- * Code which is installed on the device. In most cases —unless the manufacturer
- * has a distinct Github fork— the Source Code URL should just be the main
- * Marlin repository.
- */
-//#define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin"
-
-/**
- * Default generic printer UUID.
- */
-//#define DEFAULT_MACHINE_UUID "cede2a2f-41a2-4748-9b12-c55c62f367ff"
-
-/**
- * The WEBSITE_URL is the location where users can get more information such as
- * documentation about a specific Marlin release.
- */
-//#define WEBSITE_URL "https://marlinfw.org"
-
-/**
- * Set the vendor info the serial USB interface, if changable
- * Currently only supported by DUE platform
- */
-//#define USB_DEVICE_VENDOR_ID 0x0000
-//#define USB_DEVICE_PRODUCT_ID 0x0000
-//#define USB_DEVICE_MANUFACTURE_NAME WEBSITE_URL
diff --git a/Marlin/lib/readme.txt b/Marlin/lib/readme.txt
index 5ec60aa858..dbadc3d630 100644
--- a/Marlin/lib/readme.txt
+++ b/Marlin/lib/readme.txt
@@ -33,4 +33,4 @@ PlatformIO will find your libraries automatically, configure preprocessor's
include paths and build them.
More information about PlatformIO Library Dependency Finder
-- https://docs.platformio.org/page/librarymanager/ldf.html
+- http://docs.platformio.org/page/librarymanager/ldf.html
diff --git a/Marlin/src/HAL/AVR/HAL.cpp b/Marlin/src/HAL/AVR/HAL.cpp
deleted file mode 100644
index 58d57c8ee5..0000000000
--- a/Marlin/src/HAL/AVR/HAL.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#ifdef __AVR__
-
-#include "../../inc/MarlinConfig.h"
-#include "HAL.h"
-
-// ------------------------
-// Public Variables
-// ------------------------
-
-//uint8_t MCUSR;
-
-// ------------------------
-// Public functions
-// ------------------------
-
-void HAL_init() {
- // Init Servo Pins
- #define INIT_SERVO(N) OUT_WRITE(SERVO##N##_PIN, LOW)
- #if HAS_SERVO_0
- INIT_SERVO(0);
- #endif
- #if HAS_SERVO_1
- INIT_SERVO(1);
- #endif
- #if HAS_SERVO_2
- INIT_SERVO(2);
- #endif
- #if HAS_SERVO_3
- INIT_SERVO(3);
- #endif
-}
-
-#if ENABLED(SDSUPPORT)
-
- #include "../../sd/SdFatUtil.h"
- int freeMemory() { return SdFatUtil::FreeRam(); }
-
-#else // !SDSUPPORT
-
-extern "C" {
- extern char __bss_end;
- extern char __heap_start;
- extern void* __brkval;
-
- int freeMemory() {
- int free_memory;
- if ((int)__brkval == 0)
- free_memory = ((int)&free_memory) - ((int)&__bss_end);
- else
- free_memory = ((int)&free_memory) - ((int)__brkval);
- return free_memory;
- }
-}
-
-#endif // !SDSUPPORT
-
-#endif // __AVR__
diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
deleted file mode 100644
index 6e0afa8f10..0000000000
--- a/Marlin/src/HAL/AVR/HAL.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-#include "../shared/Marduino.h"
-#include "../shared/HAL_SPI.h"
-#include "fastio.h"
-#include "watchdog.h"
-#include "math.h"
-
-#ifdef IS_AT90USB
- #include
-#else
- #define HardwareSerial_h // Hack to prevent HardwareSerial.h header inclusion
- #include "MarlinSerial.h"
-#endif
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#ifndef pgm_read_ptr
- // Compatibility for avr-libc 1.8.0-4.1 included with Ubuntu for
- // Windows Subsystem for Linux on Windows 10 as of 10/18/2019
- #define pgm_read_ptr_far(address_long) (void*)__ELPM_word((uint32_t)(address_long))
- #define pgm_read_ptr_near(address_short) (void*)__LPM_word((uint16_t)(address_short))
- #define pgm_read_ptr(address_short) pgm_read_ptr_near(address_short)
-#endif
-
-// ------------------------
-// Defines
-// ------------------------
-
-// AVR PROGMEM extension for sprintf_P
-#define S_FMT "%S"
-
-// AVR PROGMEM extension for string define
-#define PGMSTR(NAM,STR) const char NAM[] PROGMEM = STR
-
-#ifndef CRITICAL_SECTION_START
- #define CRITICAL_SECTION_START() unsigned char _sreg = SREG; cli()
- #define CRITICAL_SECTION_END() SREG = _sreg
-#endif
-#define ISRS_ENABLED() TEST(SREG, SREG_I)
-#define ENABLE_ISRS() sei()
-#define DISABLE_ISRS() cli()
-
-// ------------------------
-// Types
-// ------------------------
-
-typedef int8_t pin_t;
-
-#define SHARED_SERVOS HAS_SERVOS
-#define HAL_SERVO_LIB Servo
-
-// ------------------------
-// Public Variables
-// ------------------------
-
-//extern uint8_t MCUSR;
-
-// Serial ports
-#ifdef IS_AT90USB
- #define MYSERIAL0 TERN(BLUETOOTH, bluetoothSerial, Serial)
-#else
- #if !WITHIN(SERIAL_PORT, -1, 3)
- #error "SERIAL_PORT must be from -1 to 3. Please update your configuration."
- #endif
- #define MYSERIAL0 customizedSerial1
-
- #ifdef SERIAL_PORT_2
- #if !WITHIN(SERIAL_PORT_2, -1, 3)
- #error "SERIAL_PORT_2 must be from -1 to 3. Please update your configuration."
- #endif
- #define MYSERIAL1 customizedSerial2
- #endif
-#endif
-
-#ifdef LCD_SERIAL_PORT
- #if !WITHIN(LCD_SERIAL_PORT, -1, 3)
- #error "LCD_SERIAL_PORT must be from -1 to 3. Please update your configuration."
- #endif
- #define LCD_SERIAL lcdSerial
- #if HAS_DGUS_LCD
- #define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.get_tx_buffer_free()
- #endif
-#endif
-
-// ------------------------
-// Public functions
-// ------------------------
-
-void HAL_init();
-
-//void cli();
-
-//void _delay_ms(const int delay);
-
-inline void HAL_clear_reset_source() { MCUSR = 0; }
-inline uint8_t HAL_get_reset_source() { return MCUSR; }
-
-inline void HAL_reboot() {} // reboot the board or restart the bootloader
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-extern "C" {
- int freeMemory();
-}
-#pragma GCC diagnostic pop
-
-// ADC
-#ifdef DIDR2
- #define HAL_ANALOG_SELECT(ind) do{ if (ind < 8) SBI(DIDR0, ind); else SBI(DIDR2, ind & 0x07); }while(0)
-#else
- #define HAL_ANALOG_SELECT(ind) SBI(DIDR0, ind);
-#endif
-
-inline void HAL_adc_init() {
- ADCSRA = _BV(ADEN) | _BV(ADSC) | _BV(ADIF) | 0x07;
- DIDR0 = 0;
- #ifdef DIDR2
- DIDR2 = 0;
- #endif
-}
-
-#define SET_ADMUX_ADCSRA(ch) ADMUX = _BV(REFS0) | (ch & 0x07); SBI(ADCSRA, ADSC)
-#ifdef MUX5
- #define HAL_START_ADC(ch) if (ch > 7) ADCSRB = _BV(MUX5); else ADCSRB = 0; SET_ADMUX_ADCSRA(ch)
-#else
- #define HAL_START_ADC(ch) ADCSRB = 0; SET_ADMUX_ADCSRA(ch)
-#endif
-
-#define HAL_ADC_VREF 5.0
-#define HAL_ADC_RESOLUTION 10
-#define HAL_READ_ADC() ADC
-#define HAL_ADC_READY() !TEST(ADCSRA, ADSC)
-
-#define GET_PIN_MAP_PIN(index) index
-#define GET_PIN_MAP_INDEX(pin) pin
-#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
-
-#define HAL_SENSITIVE_PINS 0, 1
-
-#ifdef __AVR_AT90USB1286__
- #define JTAG_DISABLE() do{ MCUCR = 0x80; MCUCR = 0x80; }while(0)
-#endif
-
-// AVR compatibility
-#define strtof strtod
-
-#define HAL_CAN_SET_PWM_FREQ // This HAL supports PWM Frequency adjustment
-
-/**
- * set_pwm_frequency
- * Sets the frequency of the timer corresponding to the provided pin
- * as close as possible to the provided desired frequency. Internally
- * calculates the required waveform generation mode, prescaler and
- * resolution values required and sets the timer registers accordingly.
- * NOTE that the frequency is applied to all pins on the timer (Ex OC3A, OC3B and OC3B)
- * NOTE that there are limitations, particularly if using TIMER2. (see Configuration_adv.h -> FAST FAN PWM Settings)
- */
-void set_pwm_frequency(const pin_t pin, int f_desired);
-
-/**
- * set_pwm_duty
- * Sets the PWM duty cycle of the provided pin to the provided value
- * Optionally allows inverting the duty cycle [default = false]
- * Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
- */
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
diff --git a/Marlin/src/HAL/AVR/HAL_SPI.cpp b/Marlin/src/HAL/AVR/HAL_SPI.cpp
deleted file mode 100644
index 31e589746c..0000000000
--- a/Marlin/src/HAL/AVR/HAL_SPI.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-/**
- * Adapted from Arduino Sd2Card Library
- * Copyright (c) 2009 by William Greiman
- */
-
-/**
- * HAL for AVR - SPI functions
- */
-
-#ifdef __AVR__
-
-#include "../../inc/MarlinConfig.h"
-
-void spiBegin() {
- OUT_WRITE(SS_PIN, HIGH);
- SET_OUTPUT(SCK_PIN);
- SET_INPUT(MISO_PIN);
- SET_OUTPUT(MOSI_PIN);
-
- #if DISABLED(SOFTWARE_SPI)
- // SS must be in output mode even it is not chip select
- //SET_OUTPUT(SS_PIN);
- // set SS high - may be chip select for another SPI device
- //#if SET_SPI_SS_HIGH
- //WRITE(SS_PIN, HIGH);
- //#endif
- // set a default rate
- spiInit(1);
- #endif
-}
-
-#if NONE(SOFTWARE_SPI, FORCE_SOFT_SPI)
-
- // ------------------------
- // Hardware SPI
- // ------------------------
-
- // make sure SPCR rate is in expected bits
- #if (SPR0 != 0 || SPR1 != 1)
- #error "unexpected SPCR bits"
- #endif
-
- /**
- * Initialize hardware SPI
- * Set SCK rate to F_CPU/pow(2, 1 + spiRate) for spiRate [0,6]
- */
- void spiInit(uint8_t spiRate) {
- // See avr processor documentation
- CBI(
- #ifdef PRR
- PRR
- #elif defined(PRR0)
- PRR0
- #endif
- , PRSPI);
-
- SPCR = _BV(SPE) | _BV(MSTR) | (spiRate >> 1);
- SPSR = spiRate & 1 || spiRate == 6 ? 0 : _BV(SPI2X);
- }
-
- /** SPI receive a byte */
- uint8_t spiRec() {
- SPDR = 0xFF;
- while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
- return SPDR;
- }
-
- /** SPI read data */
- void spiRead(uint8_t* buf, uint16_t nbyte) {
- if (nbyte-- == 0) return;
- SPDR = 0xFF;
- for (uint16_t i = 0; i < nbyte; i++) {
- while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
- buf[i] = SPDR;
- SPDR = 0xFF;
- }
- while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
- buf[nbyte] = SPDR;
- }
-
- /** SPI send a byte */
- void spiSend(uint8_t b) {
- SPDR = b;
- while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
- }
-
- /** SPI send block */
- void spiSendBlock(uint8_t token, const uint8_t* buf) {
- SPDR = token;
- for (uint16_t i = 0; i < 512; i += 2) {
- while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
- SPDR = buf[i];
- while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
- SPDR = buf[i + 1];
- }
- while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
- }
-
-
- /** begin spi transaction */
- void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode) {
- // Based on Arduino SPI library
- // Clock settings are defined as follows. Note that this shows SPI2X
- // inverted, so the bits form increasing numbers. Also note that
- // fosc/64 appears twice
- // SPR1 SPR0 ~SPI2X Freq
- // 0 0 0 fosc/2
- // 0 0 1 fosc/4
- // 0 1 0 fosc/8
- // 0 1 1 fosc/16
- // 1 0 0 fosc/32
- // 1 0 1 fosc/64
- // 1 1 0 fosc/64
- // 1 1 1 fosc/128
-
- // We find the fastest clock that is less than or equal to the
- // given clock rate. The clock divider that results in clock_setting
- // is 2 ^^ (clock_div + 1). If nothing is slow enough, we'll use the
- // slowest (128 == 2 ^^ 7, so clock_div = 6).
- uint8_t clockDiv;
-
- // When the clock is known at compiletime, use this if-then-else
- // cascade, which the compiler knows how to completely optimize
- // away. When clock is not known, use a loop instead, which generates
- // shorter code.
- if (__builtin_constant_p(spiClock)) {
- if (spiClock >= F_CPU / 2) clockDiv = 0;
- else if (spiClock >= F_CPU / 4) clockDiv = 1;
- else if (spiClock >= F_CPU / 8) clockDiv = 2;
- else if (spiClock >= F_CPU / 16) clockDiv = 3;
- else if (spiClock >= F_CPU / 32) clockDiv = 4;
- else if (spiClock >= F_CPU / 64) clockDiv = 5;
- else clockDiv = 6;
- }
- else {
- uint32_t clockSetting = F_CPU / 2;
- clockDiv = 0;
- while (clockDiv < 6 && spiClock < clockSetting) {
- clockSetting /= 2;
- clockDiv++;
- }
- }
-
- // Compensate for the duplicate fosc/64
- if (clockDiv == 6) clockDiv = 7;
-
- // Invert the SPI2X bit
- clockDiv ^= 0x1;
-
- SPCR = _BV(SPE) | _BV(MSTR) | ((bitOrder == LSBFIRST) ? _BV(DORD) : 0) |
- (dataMode << CPHA) | ((clockDiv >> 1) << SPR0);
- SPSR = clockDiv | 0x01;
- }
-
-
-#else // SOFTWARE_SPI || FORCE_SOFT_SPI
-
- // ------------------------
- // Software SPI
- // ------------------------
-
- // nop to tune soft SPI timing
- #define nop asm volatile ("\tnop\n")
-
- void spiInit(uint8_t) { /* do nothing */ }
-
- // Begin SPI transaction, set clock, bit order, data mode
- void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode) { /* do nothing */ }
-
- // Soft SPI receive byte
- uint8_t spiRec() {
- uint8_t data = 0;
- // no interrupts during byte receive - about 8µs
- cli();
- // output pin high - like sending 0xFF
- WRITE(MOSI_PIN, HIGH);
-
- LOOP_L_N(i, 8) {
- WRITE(SCK_PIN, HIGH);
-
- nop; // adjust so SCK is nice
- nop;
-
- data <<= 1;
-
- if (READ(MISO_PIN)) data |= 1;
-
- WRITE(SCK_PIN, LOW);
- }
-
- sei();
- return data;
- }
-
- // Soft SPI read data
- void spiRead(uint8_t* buf, uint16_t nbyte) {
- for (uint16_t i = 0; i < nbyte; i++)
- buf[i] = spiRec();
- }
-
- // Soft SPI send byte
- void spiSend(uint8_t data) {
- // no interrupts during byte send - about 8µs
- cli();
- LOOP_L_N(i, 8) {
- WRITE(SCK_PIN, LOW);
- WRITE(MOSI_PIN, data & 0x80);
- data <<= 1;
- WRITE(SCK_PIN, HIGH);
- }
-
- nop; // hold SCK high for a few ns
- nop;
- nop;
- nop;
-
- WRITE(SCK_PIN, LOW);
-
- sei();
- }
-
- // Soft SPI send block
- void spiSendBlock(uint8_t token, const uint8_t* buf) {
- spiSend(token);
- for (uint16_t i = 0; i < 512; i++)
- spiSend(buf[i]);
- }
-
-#endif // SOFTWARE_SPI || FORCE_SOFT_SPI
-
-#endif // __AVR__
diff --git a/Marlin/src/HAL/AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp
deleted file mode 100644
index 8feac32aa7..0000000000
--- a/Marlin/src/HAL/AVR/MarlinSerial.cpp
+++ /dev/null
@@ -1,802 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-/**
- * MarlinSerial.cpp - Hardware serial library for Wiring
- * Copyright (c) 2006 Nicholas Zambetti. All right reserved.
- *
- * Modified 23 November 2006 by David A. Mellis
- * Modified 28 September 2010 by Mark Sproul
- * Modified 14 February 2016 by Andreas Hardtung (added tx buffer)
- * Modified 01 October 2017 by Eduardo José Tagle (added XON/XOFF)
- * Modified 10 June 2018 by Eduardo José Tagle (See #10991)
- * Templatized 01 October 2018 by Eduardo José Tagle to allow multiple instances
- */
-
-#ifdef __AVR__
-
-// Disable HardwareSerial.cpp to support chips without a UART (Attiny, etc.)
-
-#include "../../inc/MarlinConfig.h"
-
-#if !IS_AT90USB && (defined(UBRRH) || defined(UBRR0H) || defined(UBRR1H) || defined(UBRR2H) || defined(UBRR3H))
-
-#include "MarlinSerial.h"
-#include "../../MarlinCore.h"
-
-#if ENABLED(DIRECT_STEPPING)
- #include "../../feature/direct_stepping.h"
-#endif
-
-template typename MarlinSerial::ring_buffer_r MarlinSerial::rx_buffer = { 0, 0, { 0 } };
-template typename MarlinSerial::ring_buffer_t MarlinSerial::tx_buffer = { 0 };
-template bool MarlinSerial::_written = false;
-template uint8_t MarlinSerial::xon_xoff_state = MarlinSerial::XON_XOFF_CHAR_SENT | MarlinSerial::XON_CHAR;
-template uint8_t MarlinSerial::rx_dropped_bytes = 0;
-template uint8_t MarlinSerial::rx_buffer_overruns = 0;
-template uint8_t MarlinSerial::rx_framing_errors = 0;
-template typename MarlinSerial::ring_buffer_pos_t MarlinSerial::rx_max_enqueued = 0;
-
-// A SW memory barrier, to ensure GCC does not overoptimize loops
-#define sw_barrier() asm volatile("": : :"memory");
-
-#include "../../feature/e_parser.h"
-
-// "Atomically" read the RX head index value without disabling interrupts:
-// This MUST be called with RX interrupts enabled, and CAN'T be called
-// from the RX ISR itself!
-template
-FORCE_INLINE typename MarlinSerial::ring_buffer_pos_t MarlinSerial::atomic_read_rx_head() {
- if (Cfg::RX_SIZE > 256) {
- // Keep reading until 2 consecutive reads return the same value,
- // meaning there was no update in-between caused by an interrupt.
- // This works because serial RX interrupts happen at a slower rate
- // than successive reads of a variable, so 2 consecutive reads with
- // the same value means no interrupt updated it.
- ring_buffer_pos_t vold, vnew = rx_buffer.head;
- sw_barrier();
- do {
- vold = vnew;
- vnew = rx_buffer.head;
- sw_barrier();
- } while (vold != vnew);
- return vnew;
- }
- else {
- // With an 8bit index, reads are always atomic. No need for special handling
- return rx_buffer.head;
- }
-}
-
-template
-volatile bool MarlinSerial::rx_tail_value_not_stable = false;
-template
-volatile uint16_t MarlinSerial::rx_tail_value_backup = 0;
-
-// Set RX tail index, taking into account the RX ISR could interrupt
-// the write to this variable in the middle - So a backup strategy
-// is used to ensure reads of the correct values.
-// -Must NOT be called from the RX ISR -
-template
-FORCE_INLINE void MarlinSerial::atomic_set_rx_tail(typename MarlinSerial::ring_buffer_pos_t value) {
- if (Cfg::RX_SIZE > 256) {
- // Store the new value in the backup
- rx_tail_value_backup = value;
- sw_barrier();
- // Flag we are about to change the true value
- rx_tail_value_not_stable = true;
- sw_barrier();
- // Store the new value
- rx_buffer.tail = value;
- sw_barrier();
- // Signal the new value is completely stored into the value
- rx_tail_value_not_stable = false;
- sw_barrier();
- }
- else
- rx_buffer.tail = value;
-}
-
-// Get the RX tail index, taking into account the read could be
-// interrupting in the middle of the update of that index value
-// -Called from the RX ISR -
-template
-FORCE_INLINE typename MarlinSerial::ring_buffer_pos_t MarlinSerial::atomic_read_rx_tail() {
- if (Cfg::RX_SIZE > 256) {
- // If the true index is being modified, return the backup value
- if (rx_tail_value_not_stable) return rx_tail_value_backup;
- }
- // The true index is stable, return it
- return rx_buffer.tail;
-}
-
-// (called with RX interrupts disabled)
-template
-FORCE_INLINE void MarlinSerial::store_rxd_char() {
-
- static EmergencyParser::State emergency_state; // = EP_RESET
-
- // This must read the R_UCSRA register before reading the received byte to detect error causes
- if (Cfg::DROPPED_RX && B_DOR && !++rx_dropped_bytes) --rx_dropped_bytes;
- if (Cfg::RX_OVERRUNS && B_DOR && !++rx_buffer_overruns) --rx_buffer_overruns;
- if (Cfg::RX_FRAMING_ERRORS && B_FE && !++rx_framing_errors) --rx_framing_errors;
-
- // Read the character from the USART
- uint8_t c = R_UDR;
-
- #if ENABLED(DIRECT_STEPPING)
- if (page_manager.maybe_store_rxd_char(c)) return;
- #endif
-
- // Get the tail - Nothing can alter its value while this ISR is executing, but there's
- // a chance that this ISR interrupted the main process while it was updating the index.
- // The backup mechanism ensures the correct value is always returned.
- const ring_buffer_pos_t t = atomic_read_rx_tail();
-
- // Get the head pointer - This ISR is the only one that modifies its value, so it's safe to read here
- ring_buffer_pos_t h = rx_buffer.head;
-
- // Get the next element
- ring_buffer_pos_t i = (ring_buffer_pos_t)(h + 1) & (ring_buffer_pos_t)(Cfg::RX_SIZE - 1);
-
- if (Cfg::EMERGENCYPARSER) emergency_parser.update(emergency_state, c);
-
- // If the character is to be stored at the index just before the tail
- // (such that the head would advance to the current tail), the RX FIFO is
- // full, so don't write the character or advance the head.
- if (i != t) {
- rx_buffer.buffer[h] = c;
- h = i;
- }
- else if (Cfg::DROPPED_RX && !++rx_dropped_bytes)
- --rx_dropped_bytes;
-
- if (Cfg::MAX_RX_QUEUED) {
- // Calculate count of bytes stored into the RX buffer
- const ring_buffer_pos_t rx_count = (ring_buffer_pos_t)(h - t) & (ring_buffer_pos_t)(Cfg::RX_SIZE - 1);
-
- // Keep track of the maximum count of enqueued bytes
- NOLESS(rx_max_enqueued, rx_count);
- }
-
- if (Cfg::XONOFF) {
- // If the last char that was sent was an XON
- if ((xon_xoff_state & XON_XOFF_CHAR_MASK) == XON_CHAR) {
-
- // Bytes stored into the RX buffer
- const ring_buffer_pos_t rx_count = (ring_buffer_pos_t)(h - t) & (ring_buffer_pos_t)(Cfg::RX_SIZE - 1);
-
- // If over 12.5% of RX buffer capacity, send XOFF before running out of
- // RX buffer space .. 325 bytes @ 250kbits/s needed to let the host react
- // and stop sending bytes. This translates to 13mS propagation time.
- if (rx_count >= (Cfg::RX_SIZE) / 8) {
-
- // At this point, definitely no TX interrupt was executing, since the TX ISR can't be preempted.
- // Don't enable the TX interrupt here as a means to trigger the XOFF char, because if it happens
- // to be in the middle of trying to disable the RX interrupt in the main program, eventually the
- // enabling of the TX interrupt could be undone. The ONLY reliable thing this can do to ensure
- // the sending of the XOFF char is to send it HERE AND NOW.
-
- // About to send the XOFF char
- xon_xoff_state = XOFF_CHAR | XON_XOFF_CHAR_SENT;
-
- // Wait until the TX register becomes empty and send it - Here there could be a problem
- // - While waiting for the TX register to empty, the RX register could receive a new
- // character. This must also handle that situation!
- while (!B_UDRE) {
-
- if (B_RXC) {
- // A char arrived while waiting for the TX buffer to be empty - Receive and process it!
-
- i = (ring_buffer_pos_t)(h + 1) & (ring_buffer_pos_t)(Cfg::RX_SIZE - 1);
-
- // Read the character from the USART
- c = R_UDR;
-
- if (Cfg::EMERGENCYPARSER) emergency_parser.update(emergency_state, c);
-
- // If the character is to be stored at the index just before the tail
- // (such that the head would advance to the current tail), the FIFO is
- // full, so don't write the character or advance the head.
- if (i != t) {
- rx_buffer.buffer[h] = c;
- h = i;
- }
- else if (Cfg::DROPPED_RX && !++rx_dropped_bytes)
- --rx_dropped_bytes;
- }
- sw_barrier();
- }
-
- R_UDR = XOFF_CHAR;
-
- // Clear the TXC bit -- "can be cleared by writing a one to its bit
- // location". This makes sure flush() won't return until the bytes
- // actually got written
- B_TXC = 1;
-
- // At this point there could be a race condition between the write() function
- // and this sending of the XOFF char. This interrupt could happen between the
- // wait to be empty TX buffer loop and the actual write of the character. Since
- // the TX buffer is full because it's sending the XOFF char, the only way to be
- // sure the write() function will succeed is to wait for the XOFF char to be
- // completely sent. Since an extra character could be received during the wait
- // it must also be handled!
- while (!B_UDRE) {
-
- if (B_RXC) {
- // A char arrived while waiting for the TX buffer to be empty - Receive and process it!
-
- i = (ring_buffer_pos_t)(h + 1) & (ring_buffer_pos_t)(Cfg::RX_SIZE - 1);
-
- // Read the character from the USART
- c = R_UDR;
-
- if (Cfg::EMERGENCYPARSER)
- emergency_parser.update(emergency_state, c);
-
- // If the character is to be stored at the index just before the tail
- // (such that the head would advance to the current tail), the FIFO is
- // full, so don't write the character or advance the head.
- if (i != t) {
- rx_buffer.buffer[h] = c;
- h = i;
- }
- else if (Cfg::DROPPED_RX && !++rx_dropped_bytes)
- --rx_dropped_bytes;
- }
- sw_barrier();
- }
-
- // At this point everything is ready. The write() function won't
- // have any issues writing to the UART TX register if it needs to!
- }
- }
- }
-
- // Store the new head value - The main loop will retry until the value is stable
- rx_buffer.head = h;
-}
-
-// (called with TX irqs disabled)
-template
-FORCE_INLINE void MarlinSerial::_tx_udr_empty_irq() {
- if (Cfg::TX_SIZE > 0) {
- // Read positions
- uint8_t t = tx_buffer.tail;
- const uint8_t h = tx_buffer.head;
-
- if (Cfg::XONOFF) {
- // If an XON char is pending to be sent, do it now
- if (xon_xoff_state == XON_CHAR) {
-
- // Send the character
- R_UDR = XON_CHAR;
-
- // clear the TXC bit -- "can be cleared by writing a one to its bit
- // location". This makes sure flush() won't return until the bytes
- // actually got written
- B_TXC = 1;
-
- // Remember we sent it.
- xon_xoff_state = XON_CHAR | XON_XOFF_CHAR_SENT;
-
- // If nothing else to transmit, just disable TX interrupts.
- if (h == t) B_UDRIE = 0; // (Non-atomic, could be reenabled by the main program, but eventually this will succeed)
-
- return;
- }
- }
-
- // If nothing to transmit, just disable TX interrupts. This could
- // happen as the result of the non atomicity of the disabling of RX
- // interrupts that could end reenabling TX interrupts as a side effect.
- if (h == t) {
- B_UDRIE = 0; // (Non-atomic, could be reenabled by the main program, but eventually this will succeed)
- return;
- }
-
- // There is something to TX, Send the next byte
- const uint8_t c = tx_buffer.buffer[t];
- t = (t + 1) & (Cfg::TX_SIZE - 1);
- R_UDR = c;
- tx_buffer.tail = t;
-
- // Clear the TXC bit (by writing a one to its bit location).
- // Ensures flush() won't return until the bytes are actually written/
- B_TXC = 1;
-
- // Disable interrupts if there is nothing to transmit following this byte
- if (h == t) B_UDRIE = 0; // (Non-atomic, could be reenabled by the main program, but eventually this will succeed)
- }
-}
-
-// Public Methods
-template
-void MarlinSerial::begin(const long baud) {
- uint16_t baud_setting;
- bool useU2X = true;
-
- #if F_CPU == 16000000UL && SERIAL_PORT == 0
- // Hard-coded exception for compatibility with the bootloader shipped
- // with the Duemilanove and previous boards, and the firmware on the
- // 8U2 on the Uno and Mega 2560.
- if (baud == 57600) useU2X = false;
- #endif
-
- R_UCSRA = 0;
- if (useU2X) {
- B_U2X = 1;
- baud_setting = (F_CPU / 4 / baud - 1) / 2;
- }
- else
- baud_setting = (F_CPU / 8 / baud - 1) / 2;
-
- // assign the baud_setting, a.k.a. ubbr (USART Baud Rate Register)
- R_UBRRH = baud_setting >> 8;
- R_UBRRL = baud_setting;
-
- B_RXEN = 1;
- B_TXEN = 1;
- B_RXCIE = 1;
- if (Cfg::TX_SIZE > 0) B_UDRIE = 0;
- _written = false;
-}
-
-template
-void MarlinSerial::end() {
- B_RXEN = 0;
- B_TXEN = 0;
- B_RXCIE = 0;
- B_UDRIE = 0;
-}
-
-template
-int MarlinSerial::peek() {
- const ring_buffer_pos_t h = atomic_read_rx_head(), t = rx_buffer.tail;
- return h == t ? -1 : rx_buffer.buffer[t];
-}
-
-template
-int MarlinSerial::read() {
- const ring_buffer_pos_t h = atomic_read_rx_head();
-
- // Read the tail. Main thread owns it, so it is safe to directly read it
- ring_buffer_pos_t t = rx_buffer.tail;
-
- // If nothing to read, return now
- if (h == t) return -1;
-
- // Get the next char
- const int v = rx_buffer.buffer[t];
- t = (ring_buffer_pos_t)(t + 1) & (Cfg::RX_SIZE - 1);
-
- // Advance tail - Making sure the RX ISR will always get an stable value, even
- // if it interrupts the writing of the value of that variable in the middle.
- atomic_set_rx_tail(t);
-
- if (Cfg::XONOFF) {
- // If the XOFF char was sent, or about to be sent...
- if ((xon_xoff_state & XON_XOFF_CHAR_MASK) == XOFF_CHAR) {
- // Get count of bytes in the RX buffer
- const ring_buffer_pos_t rx_count = (ring_buffer_pos_t)(h - t) & (ring_buffer_pos_t)(Cfg::RX_SIZE - 1);
- if (rx_count < (Cfg::RX_SIZE) / 10) {
- if (Cfg::TX_SIZE > 0) {
- // Signal we want an XON character to be sent.
- xon_xoff_state = XON_CHAR;
- // Enable TX ISR. Non atomic, but it will eventually enable them
- B_UDRIE = 1;
- }
- else {
- // If not using TX interrupts, we must send the XON char now
- xon_xoff_state = XON_CHAR | XON_XOFF_CHAR_SENT;
- while (!B_UDRE) sw_barrier();
- R_UDR = XON_CHAR;
- }
- }
- }
- }
-
- return v;
-}
-
-template
-typename MarlinSerial::ring_buffer_pos_t MarlinSerial::available() {
- const ring_buffer_pos_t h = atomic_read_rx_head(), t = rx_buffer.tail;
- return (ring_buffer_pos_t)(Cfg::RX_SIZE + h - t) & (Cfg::RX_SIZE - 1);
-}
-
-template
-void MarlinSerial::flush() {
-
- // Set the tail to the head:
- // - Read the RX head index in a safe way. (See atomic_read_rx_head.)
- // - Set the tail, making sure the RX ISR will always get a stable value, even
- // if it interrupts the writing of the value of that variable in the middle.
- atomic_set_rx_tail(atomic_read_rx_head());
-
- if (Cfg::XONOFF) {
- // If the XOFF char was sent, or about to be sent...
- if ((xon_xoff_state & XON_XOFF_CHAR_MASK) == XOFF_CHAR) {
- if (Cfg::TX_SIZE > 0) {
- // Signal we want an XON character to be sent.
- xon_xoff_state = XON_CHAR;
- // Enable TX ISR. Non atomic, but it will eventually enable it.
- B_UDRIE = 1;
- }
- else {
- // If not using TX interrupts, we must send the XON char now
- xon_xoff_state = XON_CHAR | XON_XOFF_CHAR_SENT;
- while (!B_UDRE) sw_barrier();
- R_UDR = XON_CHAR;
- }
- }
- }
-}
-
-template
-void MarlinSerial::write(const uint8_t c) {
- if (Cfg::TX_SIZE == 0) {
-
- _written = true;
- while (!B_UDRE) sw_barrier();
- R_UDR = c;
-
- }
- else {
-
- _written = true;
-
- // If the TX interrupts are disabled and the data register
- // is empty, just write the byte to the data register and
- // be done. This shortcut helps significantly improve the
- // effective datarate at high (>500kbit/s) bitrates, where
- // interrupt overhead becomes a slowdown.
- // Yes, there is a race condition between the sending of the
- // XOFF char at the RX ISR, but it is properly handled there
- if (!B_UDRIE && B_UDRE) {
- R_UDR = c;
-
- // clear the TXC bit -- "can be cleared by writing a one to its bit
- // location". This makes sure flush() won't return until the bytes
- // actually got written
- B_TXC = 1;
- return;
- }
-
- const uint8_t i = (tx_buffer.head + 1) & (Cfg::TX_SIZE - 1);
-
- // If global interrupts are disabled (as the result of being called from an ISR)...
- if (!ISRS_ENABLED()) {
-
- // Make room by polling if it is possible to transmit, and do so!
- while (i == tx_buffer.tail) {
-
- // If we can transmit another byte, do it.
- if (B_UDRE) _tx_udr_empty_irq();
-
- // Make sure compiler rereads tx_buffer.tail
- sw_barrier();
- }
- }
- else {
- // Interrupts are enabled, just wait until there is space
- while (i == tx_buffer.tail) sw_barrier();
- }
-
- // Store new char. head is always safe to move
- tx_buffer.buffer[tx_buffer.head] = c;
- tx_buffer.head = i;
-
- // Enable TX ISR - Non atomic, but it will eventually enable TX ISR
- B_UDRIE = 1;
- }
-}
-
-template
-void MarlinSerial::flushTX() {
-
- if (Cfg::TX_SIZE == 0) {
- // No bytes written, no need to flush. This special case is needed since there's
- // no way to force the TXC (transmit complete) bit to 1 during initialization.
- if (!_written) return;
-
- // Wait until everything was transmitted
- while (!B_TXC) sw_barrier();
-
- // At this point nothing is queued anymore (DRIE is disabled) and
- // the hardware finished transmission (TXC is set).
-
- }
- else {
-
- // No bytes written, no need to flush. This special case is needed since there's
- // no way to force the TXC (transmit complete) bit to 1 during initialization.
- if (!_written) return;
-
- // If global interrupts are disabled (as the result of being called from an ISR)...
- if (!ISRS_ENABLED()) {
-
- // Wait until everything was transmitted - We must do polling, as interrupts are disabled
- while (tx_buffer.head != tx_buffer.tail || !B_TXC) {
-
- // If there is more space, send an extra character
- if (B_UDRE) _tx_udr_empty_irq();
-
- sw_barrier();
- }
-
- }
- else {
- // Wait until everything was transmitted
- while (tx_buffer.head != tx_buffer.tail || !B_TXC) sw_barrier();
- }
-
- // At this point nothing is queued anymore (DRIE is disabled) and
- // the hardware finished transmission (TXC is set).
- }
-}
-
-/**
- * Imports from print.h
- */
-
-template
-void MarlinSerial::print(char c, int base) {
- print((long)c, base);
-}
-
-template
-void MarlinSerial::print(unsigned char b, int base) {
- print((unsigned long)b, base);
-}
-
-template
-void MarlinSerial::print(int n, int base) {
- print((long)n, base);
-}
-
-template
-void MarlinSerial::print(unsigned int n, int base) {
- print((unsigned long)n, base);
-}
-
-template
-void MarlinSerial::print(long n, int base) {
- if (base == 0) write(n);
- else if (base == 10) {
- if (n < 0) { print('-'); n = -n; }
- printNumber(n, 10);
- }
- else
- printNumber(n, base);
-}
-
-template
-void MarlinSerial::print(unsigned long n, int base) {
- if (base == 0) write(n);
- else printNumber(n, base);
-}
-
-template
-void MarlinSerial::print(double n, int digits) {
- printFloat(n, digits);
-}
-
-template
-void MarlinSerial::println() {
- print('\r');
- print('\n');
-}
-
-template
-void MarlinSerial::println(const String& s) {
- print(s);
- println();
-}
-
-template
-void MarlinSerial::println(const char c[]) {
- print(c);
- println();
-}
-
-template
-void MarlinSerial::println(char c, int base) {
- print(c, base);
- println();
-}
-
-template
-void MarlinSerial::println(unsigned char b, int base) {
- print(b, base);
- println();
-}
-
-template
-void MarlinSerial::println(int n, int base) {
- print(n, base);
- println();
-}
-
-template
-void MarlinSerial::println(unsigned int n, int base) {
- print(n, base);
- println();
-}
-
-template
-void MarlinSerial::println(long n, int base) {
- print(n, base);
- println();
-}
-
-template
-void MarlinSerial::println(unsigned long n, int base) {
- print(n, base);
- println();
-}
-
-template
-void MarlinSerial::println(double n, int digits) {
- print(n, digits);
- println();
-}
-
-// Private Methods
-
-template
-void MarlinSerial::printNumber(unsigned long n, uint8_t base) {
- if (n) {
- unsigned char buf[8 * sizeof(long)]; // Enough space for base 2
- int8_t i = 0;
- while (n) {
- buf[i++] = n % base;
- n /= base;
- }
- while (i--)
- print((char)(buf[i] + (buf[i] < 10 ? '0' : 'A' - 10)));
- }
- else
- print('0');
-}
-
-template
-void MarlinSerial::printFloat(double number, uint8_t digits) {
- // Handle negative numbers
- if (number < 0.0) {
- print('-');
- number = -number;
- }
-
- // Round correctly so that print(1.999, 2) prints as "2.00"
- double rounding = 0.5;
- LOOP_L_N(i, digits) rounding *= 0.1;
- number += rounding;
-
- // Extract the integer part of the number and print it
- unsigned long int_part = (unsigned long)number;
- double remainder = number - (double)int_part;
- print(int_part);
-
- // Print the decimal point, but only if there are digits beyond
- if (digits) {
- print('.');
- // Extract digits from the remainder one at a time
- while (digits--) {
- remainder *= 10.0;
- int toPrint = int(remainder);
- print(toPrint);
- remainder -= toPrint;
- }
- }
-}
-
-// Hookup ISR handlers
-ISR(SERIAL_REGNAME(USART, SERIAL_PORT, _RX_vect)) {
- MarlinSerial>::store_rxd_char();
-}
-
-ISR(SERIAL_REGNAME(USART, SERIAL_PORT, _UDRE_vect)) {
- MarlinSerial>::_tx_udr_empty_irq();
-}
-
-// Preinstantiate
-template class MarlinSerial>;
-
-// Instantiate
-MarlinSerial> customizedSerial1;
-
-#ifdef SERIAL_PORT_2
-
- // Hookup ISR handlers
- ISR(SERIAL_REGNAME(USART, SERIAL_PORT_2, _RX_vect)) {
- MarlinSerial>::store_rxd_char();
- }
-
- ISR(SERIAL_REGNAME(USART, SERIAL_PORT_2, _UDRE_vect)) {
- MarlinSerial>::_tx_udr_empty_irq();
- }
-
- // Preinstantiate
- template class MarlinSerial>;
-
- // Instantiate
- MarlinSerial> customizedSerial2;
-
-#endif
-
-#ifdef MMU2_SERIAL_PORT
-
- ISR(SERIAL_REGNAME(USART, MMU2_SERIAL_PORT, _RX_vect)) {
- MarlinSerial>::store_rxd_char();
- }
-
- ISR(SERIAL_REGNAME(USART, MMU2_SERIAL_PORT, _UDRE_vect)) {
- MarlinSerial>::_tx_udr_empty_irq();
- }
-
- // Preinstantiate
- template class MarlinSerial>;
-
- // Instantiate
- MarlinSerial> mmuSerial;
-
-#endif
-
-#ifdef LCD_SERIAL_PORT
-
- ISR(SERIAL_REGNAME(USART, LCD_SERIAL_PORT, _RX_vect)) {
- MarlinSerial>::store_rxd_char();
- }
-
- ISR(SERIAL_REGNAME(USART, LCD_SERIAL_PORT, _UDRE_vect)) {
- MarlinSerial>::_tx_udr_empty_irq();
- }
-
- // Preinstantiate
- template class MarlinSerial>;
-
- // Instantiate
- MarlinSerial> lcdSerial;
-
- #if HAS_DGUS_LCD
- template
- typename MarlinSerial::ring_buffer_pos_t MarlinSerial::get_tx_buffer_free() {
- const ring_buffer_pos_t t = tx_buffer.tail, // next byte to send.
- h = tx_buffer.head; // next pos for queue.
- int ret = t - h - 1;
- if (ret < 0) ret += Cfg::TX_SIZE + 1;
- return ret;
- }
- #endif
-
-#endif
-
-#endif // !IS_AT90USB && (UBRRH || UBRR0H || UBRR1H || UBRR2H || UBRR3H)
-
-// For AT90USB targets use the UART for BT interfacing
-#if BOTH(IS_AT90USB, BLUETOOTH)
- HardwareSerial bluetoothSerial;
-#endif
-
-#endif // __AVR__
diff --git a/Marlin/src/HAL/AVR/MarlinSerial.h b/Marlin/src/HAL/AVR/MarlinSerial.h
deleted file mode 100644
index 3850e2a47e..0000000000
--- a/Marlin/src/HAL/AVR/MarlinSerial.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-/**
- * MarlinSerial.h - Hardware serial library for Wiring
- * Copyright (c) 2006 Nicholas Zambetti. All right reserved.
- *
- * Modified 28 September 2010 by Mark Sproul
- * Modified 14 February 2016 by Andreas Hardtung (added tx buffer)
- * Modified 01 October 2017 by Eduardo José Tagle (added XON/XOFF)
- * Templatized 01 October 2018 by Eduardo José Tagle to allow multiple instances
- */
-
-#include
-
-#include "../../inc/MarlinConfigPre.h"
-
-#ifndef SERIAL_PORT
- #define SERIAL_PORT 0
-#endif
-
-#ifndef USBCON
-
- // The presence of the UBRRH register is used to detect a UART.
- #define UART_PRESENT(port) ((port == 0 && (defined(UBRRH) || defined(UBRR0H))) || \
- (port == 1 && defined(UBRR1H)) || (port == 2 && defined(UBRR2H)) || \
- (port == 3 && defined(UBRR3H)))
-
- // These are macros to build serial port register names for the selected SERIAL_PORT (C preprocessor
- // requires two levels of indirection to expand macro values properly)
- #define SERIAL_REGNAME(registerbase,number,suffix) _SERIAL_REGNAME(registerbase,number,suffix)
- #if SERIAL_PORT == 0 && (!defined(UBRR0H) || !defined(UDR0)) // use un-numbered registers if necessary
- #define _SERIAL_REGNAME(registerbase,number,suffix) registerbase##suffix
- #else
- #define _SERIAL_REGNAME(registerbase,number,suffix) registerbase##number##suffix
- #endif
-
- // Registers used by MarlinSerial class (expanded depending on selected serial port)
-
- // Templated 8bit register (generic)
- #define UART_REGISTER_DECL_BASE(registerbase, suffix) \
- template struct R_##registerbase##x##suffix {}
-
- // Templated 8bit register (specialization for each port)
- #define UART_REGISTER_DECL(port, registerbase, suffix) \
- template<> struct R_##registerbase##x##suffix { \
- constexpr R_##registerbase##x##suffix(int) {} \
- FORCE_INLINE void operator=(uint8_t newVal) const { SERIAL_REGNAME(registerbase,port,suffix) = newVal; } \
- FORCE_INLINE operator uint8_t() const { return SERIAL_REGNAME(registerbase,port,suffix); } \
- }
-
- // Templated 1bit register (generic)
- #define UART_BIT_DECL_BASE(registerbase, suffix, bit) \
- templatestruct B_##bit##x {}
-
- // Templated 1bit register (specialization for each port)
- #define UART_BIT_DECL(port, registerbase, suffix, bit) \
- template<> struct B_##bit##x { \
- constexpr B_##bit##x(int) {} \
- FORCE_INLINE void operator=(int newVal) const { \
- if (newVal) \
- SBI(SERIAL_REGNAME(registerbase,port,suffix),SERIAL_REGNAME(bit,port,)); \
- else \
- CBI(SERIAL_REGNAME(registerbase,port,suffix),SERIAL_REGNAME(bit,port,)); \
- } \
- FORCE_INLINE operator bool() const { return TEST(SERIAL_REGNAME(registerbase,port,suffix),SERIAL_REGNAME(bit,port,)); } \
- }
-
- #define UART_DECL_BASE() \
- UART_REGISTER_DECL_BASE(UCSR,A);\
- UART_REGISTER_DECL_BASE(UDR,);\
- UART_REGISTER_DECL_BASE(UBRR,H);\
- UART_REGISTER_DECL_BASE(UBRR,L);\
- UART_BIT_DECL_BASE(UCSR,B,RXEN);\
- UART_BIT_DECL_BASE(UCSR,B,TXEN);\
- UART_BIT_DECL_BASE(UCSR,A,TXC);\
- UART_BIT_DECL_BASE(UCSR,B,RXCIE);\
- UART_BIT_DECL_BASE(UCSR,A,UDRE);\
- UART_BIT_DECL_BASE(UCSR,A,FE);\
- UART_BIT_DECL_BASE(UCSR,A,DOR);\
- UART_BIT_DECL_BASE(UCSR,B,UDRIE);\
- UART_BIT_DECL_BASE(UCSR,A,RXC);\
- UART_BIT_DECL_BASE(UCSR,A,U2X)
-
- #define UART_DECL(port) \
- UART_REGISTER_DECL(port,UCSR,A);\
- UART_REGISTER_DECL(port,UDR,);\
- UART_REGISTER_DECL(port,UBRR,H);\
- UART_REGISTER_DECL(port,UBRR,L);\
- UART_BIT_DECL(port,UCSR,B,RXEN);\
- UART_BIT_DECL(port,UCSR,B,TXEN);\
- UART_BIT_DECL(port,UCSR,A,TXC);\
- UART_BIT_DECL(port,UCSR,B,RXCIE);\
- UART_BIT_DECL(port,UCSR,A,UDRE);\
- UART_BIT_DECL(port,UCSR,A,FE);\
- UART_BIT_DECL(port,UCSR,A,DOR);\
- UART_BIT_DECL(port,UCSR,B,UDRIE);\
- UART_BIT_DECL(port,UCSR,A,RXC);\
- UART_BIT_DECL(port,UCSR,A,U2X)
-
- // Declare empty templates
- UART_DECL_BASE();
-
- // And all the specializations for each possible serial port
- #if UART_PRESENT(0)
- UART_DECL(0);
- #endif
- #if UART_PRESENT(1)
- UART_DECL(1);
- #endif
- #if UART_PRESENT(2)
- UART_DECL(2);
- #endif
- #if UART_PRESENT(3)
- UART_DECL(3);
- #endif
-
- #define DEC 10
- #define HEX 16
- #define OCT 8
- #define BIN 2
- #define BYTE 0
-
- // Templated type selector
- template struct TypeSelector { typedef T type;} ;
- template struct TypeSelector { typedef F type; };
-
- template
- class MarlinSerial {
- protected:
- // Registers
- static constexpr R_UCSRxA R_UCSRA = 0;
- static constexpr R_UDRx R_UDR = 0;
- static constexpr R_UBRRxH R_UBRRH = 0;
- static constexpr R_UBRRxL R_UBRRL = 0;
-
- // Bits
- static constexpr B_RXENx B_RXEN = 0;
- static constexpr B_TXENx B_TXEN = 0;
- static constexpr B_TXCx B_TXC = 0;
- static constexpr B_RXCIEx B_RXCIE = 0;
- static constexpr B_UDREx B_UDRE = 0;
- static constexpr B_FEx B_FE = 0;
- static constexpr B_DORx B_DOR = 0;
- static constexpr B_UDRIEx B_UDRIE = 0;
- static constexpr B_RXCx B_RXC = 0;
- static constexpr B_U2Xx B_U2X = 0;
-
- // Base size of type on buffer size
- typedef typename TypeSelector<(Cfg::RX_SIZE>256), uint16_t, uint8_t>::type ring_buffer_pos_t;
-
- struct ring_buffer_r {
- volatile ring_buffer_pos_t head, tail;
- unsigned char buffer[Cfg::RX_SIZE];
- };
-
- struct ring_buffer_t {
- volatile uint8_t head, tail;
- unsigned char buffer[Cfg::TX_SIZE];
- };
-
- static ring_buffer_r rx_buffer;
- static ring_buffer_t tx_buffer;
- static bool _written;
-
- static constexpr uint8_t XON_XOFF_CHAR_SENT = 0x80, // XON / XOFF Character was sent
- XON_XOFF_CHAR_MASK = 0x1F; // XON / XOFF character to send
-
- // XON / XOFF character definitions
- static constexpr uint8_t XON_CHAR = 17, XOFF_CHAR = 19;
- static uint8_t xon_xoff_state,
- rx_dropped_bytes,
- rx_buffer_overruns,
- rx_framing_errors;
- static ring_buffer_pos_t rx_max_enqueued;
-
- static FORCE_INLINE ring_buffer_pos_t atomic_read_rx_head();
-
- static volatile bool rx_tail_value_not_stable;
- static volatile uint16_t rx_tail_value_backup;
-
- static FORCE_INLINE void atomic_set_rx_tail(ring_buffer_pos_t value);
- static FORCE_INLINE ring_buffer_pos_t atomic_read_rx_tail();
-
- public:
-
- FORCE_INLINE static void store_rxd_char();
- FORCE_INLINE static void _tx_udr_empty_irq();
-
- public:
- MarlinSerial() {};
- static void begin(const long);
- static void end();
- static int peek();
- static int read();
- static void flush();
- static ring_buffer_pos_t available();
- static void write(const uint8_t c);
- static void flushTX();
- #if HAS_DGUS_LCD
- static ring_buffer_pos_t get_tx_buffer_free();
- #endif
-
- static inline bool emergency_parser_enabled() { return Cfg::EMERGENCYPARSER; }
-
- FORCE_INLINE static uint8_t dropped() { return Cfg::DROPPED_RX ? rx_dropped_bytes : 0; }
- FORCE_INLINE static uint8_t buffer_overruns() { return Cfg::RX_OVERRUNS ? rx_buffer_overruns : 0; }
- FORCE_INLINE static uint8_t framing_errors() { return Cfg::RX_FRAMING_ERRORS ? rx_framing_errors : 0; }
- FORCE_INLINE static ring_buffer_pos_t rxMaxEnqueued() { return Cfg::MAX_RX_QUEUED ? rx_max_enqueued : 0; }
-
- FORCE_INLINE static void write(const char* str) { while (*str) write(*str++); }
- FORCE_INLINE static void write(const uint8_t* buffer, size_t size) { while (size--) write(*buffer++); }
- FORCE_INLINE static void print(const String& s) { for (int i = 0; i < (int)s.length(); i++) write(s[i]); }
- FORCE_INLINE static void print(const char* str) { write(str); }
-
- static void print(char, int = BYTE);
- static void print(unsigned char, int = BYTE);
- static void print(int, int = DEC);
- static void print(unsigned int, int = DEC);
- static void print(long, int = DEC);
- static void print(unsigned long, int = DEC);
- static void print(double, int = 2);
-
- static void println(const String& s);
- static void println(const char[]);
- static void println(char, int = BYTE);
- static void println(unsigned char, int = BYTE);
- static void println(int, int = DEC);
- static void println(unsigned int, int = DEC);
- static void println(long, int = DEC);
- static void println(unsigned long, int = DEC);
- static void println(double, int = 2);
- static void println();
- operator bool() { return true; }
-
- private:
- static void printNumber(unsigned long, const uint8_t);
- static void printFloat(double, uint8_t);
- };
-
- template
- struct MarlinSerialCfg {
- static constexpr int PORT = serial;
- static constexpr unsigned int RX_SIZE = RX_BUFFER_SIZE;
- static constexpr unsigned int TX_SIZE = TX_BUFFER_SIZE;
- static constexpr bool XONOFF = ENABLED(SERIAL_XON_XOFF);
- static constexpr bool EMERGENCYPARSER = ENABLED(EMERGENCY_PARSER);
- static constexpr bool DROPPED_RX = ENABLED(SERIAL_STATS_DROPPED_RX);
- static constexpr bool RX_OVERRUNS = ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS);
- static constexpr bool RX_FRAMING_ERRORS = ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS);
- static constexpr bool MAX_RX_QUEUED = ENABLED(SERIAL_STATS_MAX_RX_QUEUED);
- };
- extern MarlinSerial> customizedSerial1;
-
- #ifdef SERIAL_PORT_2
-
- extern MarlinSerial> customizedSerial2;
-
- #endif
-
-#endif // !USBCON
-
-#ifdef MMU2_SERIAL_PORT
- template
- struct MMU2SerialCfg {
- static constexpr int PORT = serial;
- static constexpr bool XONOFF = false;
- static constexpr bool EMERGENCYPARSER = false;
- static constexpr bool DROPPED_RX = false;
- static constexpr bool RX_FRAMING_ERRORS = false;
- static constexpr bool MAX_RX_QUEUED = false;
- static constexpr unsigned int RX_SIZE = 32;
- static constexpr unsigned int TX_SIZE = 32;
- static constexpr bool RX_OVERRUNS = false;
- };
-
- extern MarlinSerial> mmuSerial;
-#endif
-
-#ifdef LCD_SERIAL_PORT
-
- template
- struct LCDSerialCfg {
- static constexpr int PORT = serial;
- static constexpr bool XONOFF = false;
- static constexpr bool EMERGENCYPARSER = ENABLED(EMERGENCY_PARSER);
- static constexpr bool DROPPED_RX = false;
- static constexpr bool RX_FRAMING_ERRORS = false;
- static constexpr bool MAX_RX_QUEUED = false;
- #if HAS_DGUS_LCD
- static constexpr unsigned int RX_SIZE = DGUS_RX_BUFFER_SIZE;
- static constexpr unsigned int TX_SIZE = DGUS_TX_BUFFER_SIZE;
- static constexpr bool RX_OVERRUNS = ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS);
- #elif EITHER(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON)
- static constexpr unsigned int RX_SIZE = 64;
- static constexpr unsigned int TX_SIZE = 128;
- static constexpr bool RX_OVERRUNS = false;
- #else
- static constexpr unsigned int RX_SIZE = 64;
- static constexpr unsigned int TX_SIZE = 128;
- static constexpr bool RX_OVERRUNS = false
- #endif
- };
-
- extern MarlinSerial> lcdSerial;
-
-#endif
-
-// Use the UART for Bluetooth in AT90USB configurations
-#if BOTH(IS_AT90USB, BLUETOOTH)
- extern HardwareSerial bluetoothSerial;
-#endif
diff --git a/Marlin/src/HAL/AVR/Servo.cpp b/Marlin/src/HAL/AVR/Servo.cpp
deleted file mode 100644
index 526352b773..0000000000
--- a/Marlin/src/HAL/AVR/Servo.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-/**
- * servo.cpp - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
- * Copyright (c) 2009 Michael Margolis. All right reserved.
- */
-
-/**
- * A servo is activated by creating an instance of the Servo class passing the desired pin to the attach() method.
- * The servos are pulsed in the background using the value most recently written using the write() method
- *
- * Note that analogWrite of PWM on pins associated with the timer are disabled when the first servo is attached.
- * Timers are seized as needed in groups of 12 servos - 24 servos use two timers, 48 servos will use four.
- *
- * The methods are:
- *
- * Servo - Class for manipulating servo motors connected to Arduino pins.
- *
- * attach(pin) - Attach a servo motor to an i/o pin.
- * attach(pin, min, max) - Attach to a pin, setting min and max values in microseconds
- * Default min is 544, max is 2400
- *
- * write() - Set the servo angle in degrees. (Invalid angles —over MIN_PULSE_WIDTH— are treated as µs.)
- * writeMicroseconds() - Set the servo pulse width in microseconds.
- * move(pin, angle) - Sequence of attach(pin), write(angle), safe_delay(servo_delay[servoIndex]).
- * With DEACTIVATE_SERVOS_AFTER_MOVE it detaches after servo_delay[servoIndex].
- * read() - Get the last-written servo pulse width as an angle between 0 and 180.
- * readMicroseconds() - Get the last-written servo pulse width in microseconds.
- * attached() - Return true if a servo is attached.
- * detach() - Stop an attached servo from pulsing its i/o pin.
- */
-
-#ifdef __AVR__
-
-#include "../../inc/MarlinConfig.h"
-
-#if HAS_SERVOS
-
-#include
-
-#include "../shared/servo.h"
-#include "../shared/servo_private.h"
-
-static volatile int8_t Channel[_Nbr_16timers]; // counter for the servo being pulsed for each timer (or -1 if refresh interval)
-
-
-/************ static functions common to all instances ***********************/
-
-static inline void handle_interrupts(timer16_Sequence_t timer, volatile uint16_t* TCNTn, volatile uint16_t* OCRnA) {
- if (Channel[timer] < 0)
- *TCNTn = 0; // channel set to -1 indicated that refresh interval completed so reset the timer
- else {
- if (SERVO_INDEX(timer, Channel[timer]) < ServoCount && SERVO(timer, Channel[timer]).Pin.isActive)
- extDigitalWrite(SERVO(timer, Channel[timer]).Pin.nbr, LOW); // pulse this channel low if activated
- }
-
- Channel[timer]++; // increment to the next channel
- if (SERVO_INDEX(timer, Channel[timer]) < ServoCount && Channel[timer] < SERVOS_PER_TIMER) {
- *OCRnA = *TCNTn + SERVO(timer, Channel[timer]).ticks;
- if (SERVO(timer, Channel[timer]).Pin.isActive) // check if activated
- extDigitalWrite(SERVO(timer, Channel[timer]).Pin.nbr, HIGH); // it's an active channel so pulse it high
- }
- else {
- // finished all channels so wait for the refresh period to expire before starting over
- if (((unsigned)*TCNTn) + 4 < usToTicks(REFRESH_INTERVAL)) // allow a few ticks to ensure the next OCR1A not missed
- *OCRnA = (unsigned int)usToTicks(REFRESH_INTERVAL);
- else
- *OCRnA = *TCNTn + 4; // at least REFRESH_INTERVAL has elapsed
- Channel[timer] = -1; // this will get incremented at the end of the refresh period to start again at the first channel
- }
-}
-
-#ifndef WIRING // Wiring pre-defines signal handlers so don't define any if compiling for the Wiring platform
-
- // Interrupt handlers for Arduino
- #ifdef _useTimer1
- SIGNAL(TIMER1_COMPA_vect) { handle_interrupts(_timer1, &TCNT1, &OCR1A); }
- #endif
-
- #ifdef _useTimer3
- SIGNAL(TIMER3_COMPA_vect) { handle_interrupts(_timer3, &TCNT3, &OCR3A); }
- #endif
-
- #ifdef _useTimer4
- SIGNAL(TIMER4_COMPA_vect) { handle_interrupts(_timer4, &TCNT4, &OCR4A); }
- #endif
-
- #ifdef _useTimer5
- SIGNAL(TIMER5_COMPA_vect) { handle_interrupts(_timer5, &TCNT5, &OCR5A); }
- #endif
-
-#else // WIRING
-
- // Interrupt handlers for Wiring
- #ifdef _useTimer1
- void Timer1Service() { handle_interrupts(_timer1, &TCNT1, &OCR1A); }
- #endif
- #ifdef _useTimer3
- void Timer3Service() { handle_interrupts(_timer3, &TCNT3, &OCR3A); }
- #endif
-
-#endif // WIRING
-
-/****************** end of static functions ******************************/
-
-void initISR(timer16_Sequence_t timer) {
- #ifdef _useTimer1
- if (timer == _timer1) {
- TCCR1A = 0; // normal counting mode
- TCCR1B = _BV(CS11); // set prescaler of 8
- TCNT1 = 0; // clear the timer count
- #if defined(__AVR_ATmega8__) || defined(__AVR_ATmega128__)
- SBI(TIFR, OCF1A); // clear any pending interrupts;
- SBI(TIMSK, OCIE1A); // enable the output compare interrupt
- #else
- // here if not ATmega8 or ATmega128
- SBI(TIFR1, OCF1A); // clear any pending interrupts;
- SBI(TIMSK1, OCIE1A); // enable the output compare interrupt
- #endif
- #ifdef WIRING
- timerAttach(TIMER1OUTCOMPAREA_INT, Timer1Service);
- #endif
- }
- #endif
-
- #ifdef _useTimer3
- if (timer == _timer3) {
- TCCR3A = 0; // normal counting mode
- TCCR3B = _BV(CS31); // set prescaler of 8
- TCNT3 = 0; // clear the timer count
- #ifdef __AVR_ATmega128__
- SBI(TIFR, OCF3A); // clear any pending interrupts;
- SBI(ETIMSK, OCIE3A); // enable the output compare interrupt
- #else
- SBI(TIFR3, OCF3A); // clear any pending interrupts;
- SBI(TIMSK3, OCIE3A); // enable the output compare interrupt
- #endif
- #ifdef WIRING
- timerAttach(TIMER3OUTCOMPAREA_INT, Timer3Service); // for Wiring platform only
- #endif
- }
- #endif
-
- #ifdef _useTimer4
- if (timer == _timer4) {
- TCCR4A = 0; // normal counting mode
- TCCR4B = _BV(CS41); // set prescaler of 8
- TCNT4 = 0; // clear the timer count
- TIFR4 = _BV(OCF4A); // clear any pending interrupts;
- TIMSK4 = _BV(OCIE4A); // enable the output compare interrupt
- }
- #endif
-
- #ifdef _useTimer5
- if (timer == _timer5) {
- TCCR5A = 0; // normal counting mode
- TCCR5B = _BV(CS51); // set prescaler of 8
- TCNT5 = 0; // clear the timer count
- TIFR5 = _BV(OCF5A); // clear any pending interrupts;
- TIMSK5 = _BV(OCIE5A); // enable the output compare interrupt
- }
- #endif
-}
-
-void finISR(timer16_Sequence_t timer) {
- // Disable use of the given timer
- #ifdef WIRING
- if (timer == _timer1) {
- CBI(
- #if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
- TIMSK1
- #else
- TIMSK
- #endif
- , OCIE1A); // disable timer 1 output compare interrupt
- timerDetach(TIMER1OUTCOMPAREA_INT);
- }
- else if (timer == _timer3) {
- CBI(
- #if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
- TIMSK3
- #else
- ETIMSK
- #endif
- , OCIE3A); // disable the timer3 output compare A interrupt
- timerDetach(TIMER3OUTCOMPAREA_INT);
- }
- #else // !WIRING
- // For arduino - in future: call here to a currently undefined function to reset the timer
- UNUSED(timer);
- #endif
-}
-
-#endif // HAS_SERVOS
-
-#endif // __AVR__
diff --git a/Marlin/src/HAL/AVR/ServoTimers.h b/Marlin/src/HAL/AVR/ServoTimers.h
deleted file mode 100644
index 436b28141f..0000000000
--- a/Marlin/src/HAL/AVR/ServoTimers.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-/**
- * ServoTimers.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
- * Copyright (c) 2009 Michael Margolis. All right reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * Defines for 16 bit timers used with Servo library
- *
- * If _useTimerX is defined then TimerX is a 16 bit timer on the current board
- * timer16_Sequence_t enumerates the sequence that the timers should be allocated
- * _Nbr_16timers indicates how many 16 bit timers are available.
- */
-
-/**
- * AVR Only definitions
- * --------------------
- */
-
-#define TRIM_DURATION 2 // compensation ticks to trim adjust for digitalWrite delays
-#define SERVO_TIMER_PRESCALER 8 // timer prescaler
-
-// Say which 16 bit timers can be used and in what order
-#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
- //#define _useTimer1
- #define _useTimer4
- #if NUM_SERVOS > SERVOS_PER_TIMER
- #define _useTimer3
- #if !HAS_MOTOR_CURRENT_PWM && SERVOS > 2 * SERVOS_PER_TIMER
- #define _useTimer5 // Timer 5 is used for motor current PWM and can't be used for servos.
- #endif
- #endif
-#elif defined(__AVR_ATmega32U4__)
- #define _useTimer3
-#elif defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)
- #define _useTimer3
-#elif defined(__AVR_ATmega128__) || defined(__AVR_ATmega1281__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega2561__)
- #define _useTimer3
-#else
- // everything else
-#endif
-
-typedef enum {
- #ifdef _useTimer1
- _timer1,
- #endif
- #ifdef _useTimer3
- _timer3,
- #endif
- #ifdef _useTimer4
- _timer4,
- #endif
- #ifdef _useTimer5
- _timer5,
- #endif
- _Nbr_16timers
-} timer16_Sequence_t;
diff --git a/Marlin/src/HAL/AVR/eeprom.cpp b/Marlin/src/HAL/AVR/eeprom.cpp
deleted file mode 100644
index c7906985eb..0000000000
--- a/Marlin/src/HAL/AVR/eeprom.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#ifdef __AVR__
-
-#include "../../inc/MarlinConfig.h"
-
-#if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
-
-/**
- * PersistentStore for Arduino-style EEPROM interface
- * with implementations supplied by the framework.
- */
-
-#include "../shared/eeprom_api.h"
-
-#ifndef MARLIN_EEPROM_SIZE
- #define MARLIN_EEPROM_SIZE size_t(E2END + 1)
-#endif
-size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE; }
-bool PersistentStore::access_start() { return true; }
-bool PersistentStore::access_finish() { return true; }
-
-bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
- while (size--) {
- uint8_t * const p = (uint8_t * const)pos;
- uint8_t v = *value;
- // EEPROM has only ~100,000 write cycles,
- // so only write bytes that have changed!
- if (v != eeprom_read_byte(p)) {
- eeprom_write_byte(p, v);
- if (eeprom_read_byte(p) != v) {
- SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
- return true;
- }
- }
- crc16(crc, &v, 1);
- pos++;
- value++;
- }
- return false;
-}
-
-bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
- do {
- uint8_t c = eeprom_read_byte((uint8_t*)pos);
- if (writing) *value = c;
- crc16(crc, &c, 1);
- pos++;
- value++;
- } while (--size);
- return false; // always assume success for AVR's
-}
-
-#endif // EEPROM_SETTINGS || SD_FIRMWARE_UPDATE
-#endif // __AVR__
diff --git a/Marlin/src/HAL/AVR/endstop_interrupts.h b/Marlin/src/HAL/AVR/endstop_interrupts.h
deleted file mode 100644
index ae9a605acc..0000000000
--- a/Marlin/src/HAL/AVR/endstop_interrupts.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-/**
- * Endstop Interrupts
- *
- * Without endstop interrupts the endstop pins must be polled continually in
- * the temperature-ISR via endstops.update(), most of the time finding no change.
- * With this feature endstops.update() is called only when we know that at
- * least one endstop has changed state, saving valuable CPU cycles.
- *
- * This feature only works when all used endstop pins can generate either an
- * 'external interrupt' or a 'pin change interrupt'.
- *
- * Test whether pins issue interrupts on your board by flashing 'pin_interrupt_test.ino'.
- * (Located in Marlin/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino)
- */
-
-#include "../../module/endstops.h"
-
-#include
-
-// One ISR for all EXT-Interrupts
-void endstop_ISR() { endstops.update(); }
-
-/**
- * Patch for pins_arduino.h (...\Arduino\hardware\arduino\avr\variants\mega\pins_arduino.h)
- *
- * These macros for the Arduino MEGA do not include the two connected pins on Port J (D14, D15).
- * So we extend them here because these are the normal pins for Y_MIN and Y_MAX on RAMPS.
- * There are more PCI-enabled processor pins on Port J, but they are not connected to Arduino MEGA.
- */
-#if defined(ARDUINO_AVR_MEGA2560) || defined(ARDUINO_AVR_MEGA)
-
- #define digitalPinHasPCICR(p) (WITHIN(p, 10, 15) || WITHIN(p, 50, 53) || WITHIN(p, 62, 69))
-
- #undef digitalPinToPCICR
- #define digitalPinToPCICR(p) (digitalPinHasPCICR(p) ? (&PCICR) : nullptr)
-
- #undef digitalPinToPCICRbit
- #define digitalPinToPCICRbit(p) (WITHIN(p, 10, 13) || WITHIN(p, 50, 53) ? 0 : \
- WITHIN(p, 14, 15) ? 1 : \
- WITHIN(p, 62, 69) ? 2 : \
- 0)
-
- #undef digitalPinToPCMSK
- #define digitalPinToPCMSK(p) (WITHIN(p, 10, 13) || WITHIN(p, 50, 53) ? (&PCMSK0) : \
- WITHIN(p, 14, 15) ? (&PCMSK1) : \
- WITHIN(p, 62, 69) ? (&PCMSK2) : \
- nullptr)
-
- #undef digitalPinToPCMSKbit
- #define digitalPinToPCMSKbit(p) (WITHIN(p, 10, 13) ? ((p) - 6) : \
- (p) == 14 || (p) == 51 ? 2 : \
- (p) == 15 || (p) == 52 ? 1 : \
- (p) == 50 ? 3 : \
- (p) == 53 ? 0 : \
- WITHIN(p, 62, 69) ? ((p) - 62) : \
- 0)
-
-#elif defined(__AVR_ATmega164A__) || defined(__AVR_ATmega164P__) || defined(__AVR_ATmega324A__) || \
- defined(__AVR_ATmega324P__) || defined(__AVR_ATmega324PA__) || defined(__AVR_ATmega324PB__) || \
- defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega1284__) || \
- defined(__AVR_ATmega1284P__)
-
- #define digitalPinHasPCICR(p) WITHIN(p, 0, NUM_DIGITAL_PINS)
-
-#else
-
- #error "Unsupported AVR variant!"
-
-#endif
-
-
-// Install Pin change interrupt for a pin. Can be called multiple times.
-void pciSetup(const int8_t pin) {
- if (digitalPinHasPCICR(pin)) {
- SBI(*digitalPinToPCMSK(pin), digitalPinToPCMSKbit(pin)); // enable pin
- SBI(PCIFR, digitalPinToPCICRbit(pin)); // clear any outstanding interrupt
- SBI(PCICR, digitalPinToPCICRbit(pin)); // enable interrupt for the group
- }
-}
-
-// Handlers for pin change interrupts
-#ifdef PCINT0_vect
- ISR(PCINT0_vect) { endstop_ISR(); }
-#endif
-
-#ifdef PCINT1_vect
- ISR(PCINT1_vect, ISR_ALIASOF(PCINT0_vect));
-#endif
-
-#ifdef PCINT2_vect
- ISR(PCINT2_vect, ISR_ALIASOF(PCINT0_vect));
-#endif
-
-#ifdef PCINT3_vect
- ISR(PCINT3_vect, ISR_ALIASOF(PCINT0_vect));
-#endif
-
-void setup_endstop_interrupts() {
- #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
- #if HAS_X_MAX
- #if (digitalPinToInterrupt(X_MAX_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(X_MAX_PIN);
- #else
- static_assert(digitalPinHasPCICR(X_MAX_PIN), "X_MAX_PIN is not interrupt-capable");
- pciSetup(X_MAX_PIN);
- #endif
- #endif
- #if HAS_X_MIN
- #if (digitalPinToInterrupt(X_MIN_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(X_MIN_PIN);
- #else
- static_assert(digitalPinHasPCICR(X_MIN_PIN), "X_MIN_PIN is not interrupt-capable");
- pciSetup(X_MIN_PIN);
- #endif
- #endif
- #if HAS_Y_MAX
- #if (digitalPinToInterrupt(Y_MAX_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Y_MAX_PIN);
- #else
- static_assert(digitalPinHasPCICR(Y_MAX_PIN), "Y_MAX_PIN is not interrupt-capable");
- pciSetup(Y_MAX_PIN);
- #endif
- #endif
- #if HAS_Y_MIN
- #if (digitalPinToInterrupt(Y_MIN_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Y_MIN_PIN);
- #else
- static_assert(digitalPinHasPCICR(Y_MIN_PIN), "Y_MIN_PIN is not interrupt-capable");
- pciSetup(Y_MIN_PIN);
- #endif
- #endif
- #if HAS_Z_MAX
- #if (digitalPinToInterrupt(Z_MAX_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Z_MAX_PIN);
- #else
- static_assert(digitalPinHasPCICR(Z_MAX_PIN), "Z_MAX_PIN is not interrupt-capable");
- pciSetup(Z_MAX_PIN);
- #endif
- #endif
- #if HAS_Z_MIN
- #if (digitalPinToInterrupt(Z_MIN_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Z_MIN_PIN);
- #else
- static_assert(digitalPinHasPCICR(Z_MIN_PIN), "Z_MIN_PIN is not interrupt-capable");
- pciSetup(Z_MIN_PIN);
- #endif
- #endif
- #if HAS_X2_MAX
- #if (digitalPinToInterrupt(X2_MAX_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(X2_MAX_PIN);
- #else
- static_assert(digitalPinHasPCICR(X2_MAX_PIN), "X2_MAX_PIN is not interrupt-capable");
- pciSetup(X2_MAX_PIN);
- #endif
- #endif
- #if HAS_X2_MIN
- #if (digitalPinToInterrupt(X2_MIN_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(X2_MIN_PIN);
- #else
- static_assert(digitalPinHasPCICR(X2_MIN_PIN), "X2_MIN_PIN is not interrupt-capable");
- pciSetup(X2_MIN_PIN);
- #endif
- #endif
- #if HAS_Y2_MAX
- #if (digitalPinToInterrupt(Y2_MAX_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Y2_MAX_PIN);
- #else
- static_assert(digitalPinHasPCICR(Y2_MAX_PIN), "Y2_MAX_PIN is not interrupt-capable");
- pciSetup(Y2_MAX_PIN);
- #endif
- #endif
- #if HAS_Y2_MIN
- #if (digitalPinToInterrupt(Y2_MIN_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Y2_MIN_PIN);
- #else
- static_assert(digitalPinHasPCICR(Y2_MIN_PIN), "Y2_MIN_PIN is not interrupt-capable");
- pciSetup(Y2_MIN_PIN);
- #endif
- #endif
- #if HAS_Z2_MAX
- #if (digitalPinToInterrupt(Z2_MAX_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Z2_MAX_PIN);
- #else
- static_assert(digitalPinHasPCICR(Z2_MAX_PIN), "Z2_MAX_PIN is not interrupt-capable");
- pciSetup(Z2_MAX_PIN);
- #endif
- #endif
- #if HAS_Z2_MIN
- #if (digitalPinToInterrupt(Z2_MIN_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Z2_MIN_PIN);
- #else
- static_assert(digitalPinHasPCICR(Z2_MIN_PIN), "Z2_MIN_PIN is not interrupt-capable");
- pciSetup(Z2_MIN_PIN);
- #endif
- #endif
- #if HAS_Z3_MAX
- #if (digitalPinToInterrupt(Z3_MAX_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Z3_MAX_PIN);
- #else
- static_assert(digitalPinHasPCICR(Z3_MAX_PIN), "Z3_MAX_PIN is not interrupt-capable");
- pciSetup(Z3_MAX_PIN);
- #endif
- #endif
- #if HAS_Z3_MIN
- #if (digitalPinToInterrupt(Z3_MIN_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Z3_MIN_PIN);
- #else
- static_assert(digitalPinHasPCICR(Z3_MIN_PIN), "Z3_MIN_PIN is not interrupt-capable");
- pciSetup(Z3_MIN_PIN);
- #endif
- #endif
- #if HAS_Z4_MAX
- #if (digitalPinToInterrupt(Z4_MAX_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Z4_MAX_PIN);
- #else
- static_assert(digitalPinHasPCICR(Z4_MAX_PIN), "Z4_MAX_PIN is not interrupt-capable");
- pciSetup(Z4_MAX_PIN);
- #endif
- #endif
- #if HAS_Z4_MIN
- #if (digitalPinToInterrupt(Z4_MIN_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Z4_MIN_PIN);
- #else
- static_assert(digitalPinHasPCICR(Z4_MIN_PIN), "Z4_MIN_PIN is not interrupt-capable");
- pciSetup(Z4_MIN_PIN);
- #endif
- #endif
- #if HAS_Z_MIN_PROBE_PIN
- #if (digitalPinToInterrupt(Z_MIN_PROBE_PIN) != NOT_AN_INTERRUPT)
- _ATTACH(Z_MIN_PROBE_PIN);
- #else
- static_assert(digitalPinHasPCICR(Z_MIN_PROBE_PIN), "Z_MIN_PROBE_PIN is not interrupt-capable");
- pciSetup(Z_MIN_PROBE_PIN);
- #endif
- #endif
-
- // If we arrive here without raising an assertion, each pin has either an EXT-interrupt or a PCI.
-}
diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
deleted file mode 100644
index 238c1124ad..0000000000
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#ifdef __AVR__
-
-#include "../../inc/MarlinConfigPre.h"
-
-#if NEEDS_HARDWARE_PWM // Specific meta-flag for features that mandate PWM
-
-#include "HAL.h"
-
-struct Timer {
- volatile uint8_t* TCCRnQ[3]; // max 3 TCCR registers per timer
- volatile uint16_t* OCRnQ[3]; // max 3 OCR registers per timer
- volatile uint16_t* ICRn; // max 1 ICR register per timer
- uint8_t n; // the timer number [0->5]
- uint8_t q; // the timer output [0->2] (A->C)
-};
-
-/**
- * get_pwm_timer
- * Get the timer information and register of the provided pin.
- * Return a Timer struct containing this information.
- * Used by set_pwm_frequency, set_pwm_duty
- */
-Timer get_pwm_timer(const pin_t pin) {
- uint8_t q = 0;
- switch (digitalPinToTimer(pin)) {
- // Protect reserved timers (TIMER0 & TIMER1)
- #ifdef TCCR0A
- #if !AVR_AT90USB1286_FAMILY
- case TIMER0A:
- #endif
- case TIMER0B:
- #endif
- #ifdef TCCR1A
- case TIMER1A: case TIMER1B:
- #endif
- break;
- #if defined(TCCR2) || defined(TCCR2A)
- #ifdef TCCR2
- case TIMER2: {
- Timer timer = {
- /*TCCRnQ*/ { &TCCR2, nullptr, nullptr },
- /*OCRnQ*/ { (uint16_t*)&OCR2, nullptr, nullptr },
- /*ICRn*/ nullptr,
- /*n, q*/ 2, 0
- };
- }
- #elif defined(TCCR2A)
- #if ENABLED(USE_OCR2A_AS_TOP)
- case TIMER2A: break; // protect TIMER2A
- case TIMER2B: {
- Timer timer = {
- /*TCCRnQ*/ { &TCCR2A, &TCCR2B, nullptr },
- /*OCRnQ*/ { (uint16_t*)&OCR2A, (uint16_t*)&OCR2B, nullptr },
- /*ICRn*/ nullptr,
- /*n, q*/ 2, 1
- };
- return timer;
- }
- #else
- case TIMER2B: ++q;
- case TIMER2A: {
- Timer timer = {
- /*TCCRnQ*/ { &TCCR2A, &TCCR2B, nullptr },
- /*OCRnQ*/ { (uint16_t*)&OCR2A, (uint16_t*)&OCR2B, nullptr },
- /*ICRn*/ nullptr,
- 2, q
- };
- return timer;
- }
- #endif
- #endif
- #endif
- #ifdef OCR3C
- case TIMER3C: ++q;
- case TIMER3B: ++q;
- case TIMER3A: {
- Timer timer = {
- /*TCCRnQ*/ { &TCCR3A, &TCCR3B, &TCCR3C },
- /*OCRnQ*/ { &OCR3A, &OCR3B, &OCR3C },
- /*ICRn*/ &ICR3,
- /*n, q*/ 3, q
- };
- return timer;
- }
- #elif defined(OCR3B)
- case TIMER3B: ++q;
- case TIMER3A: {
- Timer timer = {
- /*TCCRnQ*/ { &TCCR3A, &TCCR3B, nullptr },
- /*OCRnQ*/ { &OCR3A, &OCR3B, nullptr },
- /*ICRn*/ &ICR3,
- /*n, q*/ 3, q
- };
- return timer;
- }
- #endif
- #ifdef TCCR4A
- case TIMER4C: ++q;
- case TIMER4B: ++q;
- case TIMER4A: {
- Timer timer = {
- /*TCCRnQ*/ { &TCCR4A, &TCCR4B, &TCCR4C },
- /*OCRnQ*/ { &OCR4A, &OCR4B, &OCR4C },
- /*ICRn*/ &ICR4,
- /*n, q*/ 4, q
- };
- return timer;
- }
- #endif
- #ifdef TCCR5A
- case TIMER5C: ++q;
- case TIMER5B: ++q;
- case TIMER5A: {
- Timer timer = {
- /*TCCRnQ*/ { &TCCR5A, &TCCR5B, &TCCR5C },
- /*OCRnQ*/ { &OCR5A, &OCR5B, &OCR5C },
- /*ICRn*/ &ICR5,
- /*n, q*/ 5, q
- };
- return timer;
- }
- #endif
- }
- Timer timer = {
- /*TCCRnQ*/ { nullptr, nullptr, nullptr },
- /*OCRnQ*/ { nullptr, nullptr, nullptr },
- /*ICRn*/ nullptr,
- 0, 0
- };
- return timer;
-}
-
-void set_pwm_frequency(const pin_t pin, int f_desired) {
- Timer timer = get_pwm_timer(pin);
- if (timer.n == 0) return; // Don't proceed if protected timer or not recognised
- uint16_t size;
- if (timer.n == 2) size = 255; else size = 65535;
-
- uint16_t res = 255; // resolution (TOP value)
- uint8_t j = 0; // prescaler index
- uint8_t wgm = 1; // waveform generation mode
-
- // Calculating the prescaler and resolution to use to achieve closest frequency
- if (f_desired != 0) {
- int f = (F_CPU) / (2 * 1024 * size) + 1; // Initialize frequency as lowest (non-zero) achievable
- uint16_t prescaler[] = { 0, 1, 8, /*TIMER2 ONLY*/32, 64, /*TIMER2 ONLY*/128, 256, 1024 };
-
- // loop over prescaler values
- LOOP_S_L_N(i, 1, 8) {
- uint16_t res_temp_fast = 255, res_temp_phase_correct = 255;
- if (timer.n == 2) {
- // No resolution calculation for TIMER2 unless enabled USE_OCR2A_AS_TOP
- #if ENABLED(USE_OCR2A_AS_TOP)
- const uint16_t rtf = (F_CPU) / (prescaler[i] * f_desired);
- res_temp_fast = rtf - 1;
- res_temp_phase_correct = rtf / 2;
- #endif
- }
- else {
- // Skip TIMER2 specific prescalers when not TIMER2
- if (i == 3 || i == 5) continue;
- const uint16_t rtf = (F_CPU) / (prescaler[i] * f_desired);
- res_temp_fast = rtf - 1;
- res_temp_phase_correct = rtf / 2;
- }
-
- LIMIT(res_temp_fast, 1U, size);
- LIMIT(res_temp_phase_correct, 1U, size);
- // Calculate frequencies of test prescaler and resolution values
- const int f_temp_fast = (F_CPU) / (prescaler[i] * (1 + res_temp_fast)),
- f_temp_phase_correct = (F_CPU) / (2 * prescaler[i] * res_temp_phase_correct),
- f_diff = ABS(f - f_desired),
- f_fast_diff = ABS(f_temp_fast - f_desired),
- f_phase_diff = ABS(f_temp_phase_correct - f_desired);
-
- // If FAST values are closest to desired f
- if (f_fast_diff < f_diff && f_fast_diff <= f_phase_diff) {
- // Remember this combination
- f = f_temp_fast;
- res = res_temp_fast;
- j = i;
- // Set the Wave Generation Mode to FAST PWM
- if (timer.n == 2) {
- wgm = (
- #if ENABLED(USE_OCR2A_AS_TOP)
- WGM2_FAST_PWM_OCR2A
- #else
- WGM2_FAST_PWM
- #endif
- );
- }
- else wgm = WGM_FAST_PWM_ICRn;
- }
- // If PHASE CORRECT values are closes to desired f
- else if (f_phase_diff < f_diff) {
- f = f_temp_phase_correct;
- res = res_temp_phase_correct;
- j = i;
- // Set the Wave Generation Mode to PWM PHASE CORRECT
- if (timer.n == 2) {
- wgm = (
- #if ENABLED(USE_OCR2A_AS_TOP)
- WGM2_PWM_PC_OCR2A
- #else
- WGM2_PWM_PC
- #endif
- );
- }
- else wgm = WGM_PWM_PC_ICRn;
- }
- }
- }
- _SET_WGMnQ(timer.TCCRnQ, wgm);
- _SET_CSn(timer.TCCRnQ, j);
-
- if (timer.n == 2) {
- #if ENABLED(USE_OCR2A_AS_TOP)
- _SET_OCRnQ(timer.OCRnQ, 0, res); // Set OCR2A value (TOP) = res
- #endif
- }
- else
- _SET_ICRn(timer.ICRn, res); // Set ICRn value (TOP) = res
-}
-
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
- // If v is 0 or v_size (max), digitalWrite to LOW or HIGH.
- // Note that digitalWrite also disables pwm output for us (sets COM bit to 0)
- if (v == 0)
- digitalWrite(pin, invert);
- else if (v == v_size)
- digitalWrite(pin, !invert);
- else {
- Timer timer = get_pwm_timer(pin);
- if (timer.n == 0) return; // Don't proceed if protected timer or not recognised
- // Set compare output mode to CLEAR -> SET or SET -> CLEAR (if inverted)
- _SET_COMnQ(timer.TCCRnQ, (timer.q
- #ifdef TCCR2
- + (timer.q == 2) // COM20 is on bit 4 of TCCR2, thus requires q + 1 in the macro
- #endif
- ), COM_CLEAR_SET + invert
- );
-
- uint16_t top;
- if (timer.n == 2) { // if TIMER2
- top = (
- #if ENABLED(USE_OCR2A_AS_TOP)
- *timer.OCRnQ[0] // top = OCR2A
- #else
- 255 // top = 0xFF (max)
- #endif
- );
- }
- else
- top = *timer.ICRn; // top = ICRn
-
- _SET_OCRnQ(timer.OCRnQ, timer.q, v * float(top) / float(v_size)); // Scale 8/16-bit v to top value
- }
-}
-
-#endif // NEEDS_HARDWARE_PWM
-#endif // __AVR__
diff --git a/Marlin/src/HAL/AVR/fastio.cpp b/Marlin/src/HAL/AVR/fastio.cpp
deleted file mode 100644
index b51d7f9768..0000000000
--- a/Marlin/src/HAL/AVR/fastio.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-/**
- * Fast I/O for extended pins
- */
-
-#ifdef __AVR__
-
-#include "fastio.h"
-
-#ifdef FASTIO_EXT_START
-
-#include "../shared/Marduino.h"
-
-#define _IS_EXT(P) WITHIN(P, FASTIO_EXT_START, FASTIO_EXT_END)
-
-void extDigitalWrite(const int8_t pin, const uint8_t state) {
- #define _WCASE(N) case N: WRITE(N, state); break
- switch (pin) {
- default: digitalWrite(pin, state);
- #if _IS_EXT(70)
- _WCASE(70);
- #endif
- #if _IS_EXT(71)
- _WCASE(71);
- #endif
- #if _IS_EXT(72)
- _WCASE(72);
- #endif
- #if _IS_EXT(73)
- _WCASE(73);
- #endif
- #if _IS_EXT(74)
- _WCASE(74);
- #endif
- #if _IS_EXT(75)
- _WCASE(75);
- #endif
- #if _IS_EXT(76)
- _WCASE(76);
- #endif
- #if _IS_EXT(77)
- _WCASE(77);
- #endif
- #if _IS_EXT(78)
- _WCASE(78);
- #endif
- #if _IS_EXT(79)
- _WCASE(79);
- #endif
- #if _IS_EXT(80)
- _WCASE(80);
- #endif
- #if _IS_EXT(81)
- _WCASE(81);
- #endif
- #if _IS_EXT(82)
- _WCASE(82);
- #endif
- #if _IS_EXT(83)
- _WCASE(83);
- #endif
- #if _IS_EXT(84)
- _WCASE(84);
- #endif
- #if _IS_EXT(85)
- _WCASE(85);
- #endif
- #if _IS_EXT(86)
- _WCASE(86);
- #endif
- #if _IS_EXT(87)
- _WCASE(87);
- #endif
- #if _IS_EXT(88)
- _WCASE(88);
- #endif
- #if _IS_EXT(89)
- _WCASE(89);
- #endif
- #if _IS_EXT(90)
- _WCASE(90);
- #endif
- #if _IS_EXT(91)
- _WCASE(91);
- #endif
- #if _IS_EXT(92)
- _WCASE(92);
- #endif
- #if _IS_EXT(93)
- _WCASE(93);
- #endif
- #if _IS_EXT(94)
- _WCASE(94);
- #endif
- #if _IS_EXT(95)
- _WCASE(95);
- #endif
- #if _IS_EXT(96)
- _WCASE(96);
- #endif
- #if _IS_EXT(97)
- _WCASE(97);
- #endif
- #if _IS_EXT(98)
- _WCASE(98);
- #endif
- #if _IS_EXT(99)
- _WCASE(99);
- #endif
- #if _IS_EXT(100)
- _WCASE(100);
- #endif
- }
-}
-
-uint8_t extDigitalRead(const int8_t pin) {
- #define _RCASE(N) case N: return READ(N)
- switch (pin) {
- default: return digitalRead(pin);
- #if _IS_EXT(70)
- _RCASE(70);
- #endif
- #if _IS_EXT(71)
- _RCASE(71);
- #endif
- #if _IS_EXT(72)
- _RCASE(72);
- #endif
- #if _IS_EXT(73)
- _RCASE(73);
- #endif
- #if _IS_EXT(74)
- _RCASE(74);
- #endif
- #if _IS_EXT(75)
- _RCASE(75);
- #endif
- #if _IS_EXT(76)
- _RCASE(76);
- #endif
- #if _IS_EXT(77)
- _RCASE(77);
- #endif
- #if _IS_EXT(78)
- _RCASE(78);
- #endif
- #if _IS_EXT(79)
- _RCASE(79);
- #endif
- #if _IS_EXT(80)
- _RCASE(80);
- #endif
- #if _IS_EXT(81)
- _RCASE(81);
- #endif
- #if _IS_EXT(82)
- _RCASE(82);
- #endif
- #if _IS_EXT(83)
- _RCASE(83);
- #endif
- #if _IS_EXT(84)
- _RCASE(84);
- #endif
- #if _IS_EXT(85)
- _RCASE(85);
- #endif
- #if _IS_EXT(86)
- _RCASE(86);
- #endif
- #if _IS_EXT(87)
- _RCASE(87);
- #endif
- #if _IS_EXT(88)
- _RCASE(88);
- #endif
- #if _IS_EXT(89)
- _RCASE(89);
- #endif
- #if _IS_EXT(90)
- _RCASE(90);
- #endif
- #if _IS_EXT(91)
- _RCASE(91);
- #endif
- #if _IS_EXT(92)
- _RCASE(92);
- #endif
- #if _IS_EXT(93)
- _RCASE(93);
- #endif
- #if _IS_EXT(94)
- _RCASE(94);
- #endif
- #if _IS_EXT(95)
- _RCASE(95);
- #endif
- #if _IS_EXT(96)
- _RCASE(96);
- #endif
- #if _IS_EXT(97)
- _RCASE(97);
- #endif
- #if _IS_EXT(98)
- _RCASE(98);
- #endif
- #if _IS_EXT(99)
- _RCASE(99);
- #endif
- #if _IS_EXT(100)
- _RCASE(100);
- #endif
- }
-}
-
-#if 0
-/**
- * Set Timer 5 PWM frequency in Hz, from 3.8Hz up to ~16MHz
- * with a minimum resolution of 100 steps.
- *
- * DC values -1.0 to 1.0. Negative duty cycle inverts the pulse.
- */
-uint16_t set_pwm_frequency_hz(const float &hz, const float dca, const float dcb, const float dcc) {
- float count = 0;
- if (hz > 0 && (dca || dcb || dcc)) {
- count = float(F_CPU) / hz; // 1x prescaler, TOP for 16MHz base freq.
- uint16_t prescaler; // Range of 30.5Hz (65535) 64.5KHz (>31)
-
- if (count >= 255. * 256.) { prescaler = 1024; SET_CS(5, PRESCALER_1024); }
- else if (count >= 255. * 64.) { prescaler = 256; SET_CS(5, PRESCALER_256); }
- else if (count >= 255. * 8.) { prescaler = 64; SET_CS(5, PRESCALER_64); }
- else if (count >= 255.) { prescaler = 8; SET_CS(5, PRESCALER_8); }
- else { prescaler = 1; SET_CS(5, PRESCALER_1); }
-
- count /= float(prescaler);
- const float pwm_top = round(count); // Get the rounded count
-
- ICR5 = (uint16_t)pwm_top - 1; // Subtract 1 for TOP
- OCR5A = pwm_top * ABS(dca); // Update and scale DCs
- OCR5B = pwm_top * ABS(dcb);
- OCR5C = pwm_top * ABS(dcc);
- _SET_COM(5, A, dca ? (dca < 0 ? COM_SET_CLEAR : COM_CLEAR_SET) : COM_NORMAL); // Set compare modes
- _SET_COM(5, B, dcb ? (dcb < 0 ? COM_SET_CLEAR : COM_CLEAR_SET) : COM_NORMAL);
- _SET_COM(5, C, dcc ? (dcc < 0 ? COM_SET_CLEAR : COM_CLEAR_SET) : COM_NORMAL);
-
- SET_WGM(5, FAST_PWM_ICRn); // Fast PWM with ICR5 as TOP
-
- //SERIAL_ECHOLNPGM("Timer 5 Settings:");
- //SERIAL_ECHOLNPAIR(" Prescaler=", prescaler);
- //SERIAL_ECHOLNPAIR(" TOP=", ICR5);
- //SERIAL_ECHOLNPAIR(" OCR5A=", OCR5A);
- //SERIAL_ECHOLNPAIR(" OCR5B=", OCR5B);
- //SERIAL_ECHOLNPAIR(" OCR5C=", OCR5C);
- }
- else {
- // Restore the default for Timer 5
- SET_WGM(5, PWM_PC_8); // PWM 8-bit (Phase Correct)
- SET_COMS(5, NORMAL, NORMAL, NORMAL); // Do nothing
- SET_CS(5, PRESCALER_64); // 16MHz / 64 = 250KHz
- OCR5A = OCR5B = OCR5C = 0;
- }
- return round(count);
-}
-#endif
-
-#endif // FASTIO_EXT_START
-#endif // __AVR__
diff --git a/Marlin/src/HAL/AVR/fastio.h b/Marlin/src/HAL/AVR/fastio.h
deleted file mode 100644
index dd01634661..0000000000
--- a/Marlin/src/HAL/AVR/fastio.h
+++ /dev/null
@@ -1,373 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-/**
- * Fast I/O Routines for AVR
- * Use direct port manipulation to save scads of processor time.
- * Contributed by Triffid_Hunter and modified by Kliment, thinkyhead, Bob-the-Kuhn, et.al.
- */
-
-#include
-
-#if defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1286P__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB646P__) || defined(__AVR_AT90USB647__)
- #define AVR_AT90USB1286_FAMILY 1
-#elif defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__)
- #define AVR_ATmega1284_FAMILY 1
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
- #define AVR_ATmega2560_FAMILY 1
-#elif defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
- #define AVR_ATmega2561_FAMILY 1
-#elif defined(__AVR_ATmega168__) || defined(__AVR_ATmega328__) || defined(__AVR_ATmega328P__)
- #define AVR_ATmega328_FAMILY 1
-#endif
-
-/**
- * Include Ports and Functions
- */
-#if AVR_ATmega328_FAMILY
- #include "fastio/fastio_168.h"
-#elif AVR_ATmega1284_FAMILY
- #include "fastio/fastio_644.h"
-#elif AVR_ATmega2560_FAMILY
- #include "fastio/fastio_1280.h"
-#elif AVR_AT90USB1286_FAMILY
- #include "fastio/fastio_AT90USB.h"
-#elif AVR_ATmega2561_FAMILY
- #include "fastio/fastio_1281.h"
-#else
- #error "No FastIO definition for the selected AVR Board."
-#endif
-
-/**
- * Magic I/O routines
- *
- * Now you can simply SET_OUTPUT(PIN); WRITE(PIN, HIGH); WRITE(PIN, LOW);
- *
- * Why double up on these macros? see https://gcc.gnu.org/onlinedocs/cpp/Stringification.html
- */
-
-#define _READ(IO) TEST(DIO ## IO ## _RPORT, DIO ## IO ## _PIN)
-
-#define _WRITE_NC(IO,V) do{ \
- if (V) SBI(DIO ## IO ## _WPORT, DIO ## IO ## _PIN); \
- else CBI(DIO ## IO ## _WPORT, DIO ## IO ## _PIN); \
-}while(0)
-
-#define _WRITE_C(IO,V) do{ \
- uint8_t port_bits = DIO ## IO ## _WPORT; /* Get a mask from the current port bits */ \
- if (V) port_bits = ~port_bits; /* For setting bits, invert the mask */ \
- DIO ## IO ## _RPORT = port_bits & _BV(DIO ## IO ## _PIN); /* Atomically toggle the output port bits */ \
-}while(0)
-
-#define _WRITE(IO,V) do{ if (&(DIO ## IO ## _RPORT) < (uint8_t*)0x100) _WRITE_NC(IO,V); else _WRITE_C(IO,V); }while(0)
-
-#define _TOGGLE(IO) (DIO ## IO ## _RPORT = _BV(DIO ## IO ## _PIN))
-
-#define _SET_INPUT(IO) CBI(DIO ## IO ## _DDR, DIO ## IO ## _PIN)
-#define _SET_OUTPUT(IO) SBI(DIO ## IO ## _DDR, DIO ## IO ## _PIN)
-
-#define _IS_INPUT(IO) !TEST(DIO ## IO ## _DDR, DIO ## IO ## _PIN)
-#define _IS_OUTPUT(IO) TEST(DIO ## IO ## _DDR, DIO ## IO ## _PIN)
-
-// digitalRead/Write wrappers
-#ifdef FASTIO_EXT_START
- void extDigitalWrite(const int8_t pin, const uint8_t state);
- uint8_t extDigitalRead(const int8_t pin);
-#else
- #define extDigitalWrite(IO,V) digitalWrite(IO,V)
- #define extDigitalRead(IO) digitalRead(IO)
-#endif
-
-#define READ(IO) _READ(IO)
-#define WRITE(IO,V) _WRITE(IO,V)
-#define TOGGLE(IO) _TOGGLE(IO)
-
-#define SET_INPUT(IO) _SET_INPUT(IO)
-#define SET_INPUT_PULLUP(IO) do{ _SET_INPUT(IO); _WRITE(IO, HIGH); }while(0)
-#define SET_INPUT_PULLDOWN SET_INPUT
-#define SET_OUTPUT(IO) _SET_OUTPUT(IO)
-#define SET_PWM SET_OUTPUT
-
-#define IS_INPUT(IO) _IS_INPUT(IO)
-#define IS_OUTPUT(IO) _IS_OUTPUT(IO)
-
-#define OUT_WRITE(IO,V) do{ SET_OUTPUT(IO); WRITE(IO,V); }while(0)
-
-/**
- * Timer and Interrupt Control
- */
-
-// Waveform Generation Modes
-enum WaveGenMode : char {
- WGM_NORMAL, // 0
- WGM_PWM_PC_8, // 1
- WGM_PWM_PC_9, // 2
- WGM_PWM_PC_10, // 3
- WGM_CTC_OCRnA, // 4 COM OCnx
- WGM_FAST_PWM_8, // 5
- WGM_FAST_PWM_9, // 6
- WGM_FAST_PWM_10, // 7
- WGM_PWM_PC_FC_ICRn, // 8
- WGM_PWM_PC_FC_OCRnA, // 9 COM OCnA
- WGM_PWM_PC_ICRn, // 10
- WGM_PWM_PC_OCRnA, // 11 COM OCnA
- WGM_CTC_ICRn, // 12 COM OCnx
- WGM_reserved, // 13
- WGM_FAST_PWM_ICRn, // 14 COM OCnA
- WGM_FAST_PWM_OCRnA // 15 COM OCnA
-};
-
-// Wavefore Generation Modes (Timer 2 only)
-enum WaveGenMode2 : char {
- WGM2_NORMAL, // 0
- WGM2_PWM_PC, // 1
- WGM2_CTC_OCR2A, // 2
- WGM2_FAST_PWM, // 3
- WGM2_reserved_1, // 4
- WGM2_PWM_PC_OCR2A, // 5
- WGM2_reserved_2, // 6
- WGM2_FAST_PWM_OCR2A, // 7
-};
-
-// Compare Modes
-enum CompareMode : char {
- COM_NORMAL, // 0
- COM_TOGGLE, // 1 Non-PWM: OCnx ... Both PWM (WGM 9,11,14,15): OCnA only ... else NORMAL
- COM_CLEAR_SET, // 2 Non-PWM: OCnx ... Fast PWM: OCnx/Bottom ... PF-FC: OCnx Up/Down
- COM_SET_CLEAR // 3 Non-PWM: OCnx ... Fast PWM: OCnx/Bottom ... PF-FC: OCnx Up/Down
-};
-
-// Clock Sources
-enum ClockSource : char {
- CS_NONE, // 0
- CS_PRESCALER_1, // 1
- CS_PRESCALER_8, // 2
- CS_PRESCALER_64, // 3
- CS_PRESCALER_256, // 4
- CS_PRESCALER_1024, // 5
- CS_EXT_FALLING, // 6
- CS_EXT_RISING // 7
-};
-
-// Clock Sources (Timer 2 only)
-enum ClockSource2 : char {
- CS2_NONE, // 0
- CS2_PRESCALER_1, // 1
- CS2_PRESCALER_8, // 2
- CS2_PRESCALER_32, // 3
- CS2_PRESCALER_64, // 4
- CS2_PRESCALER_128, // 5
- CS2_PRESCALER_256, // 6
- CS2_PRESCALER_1024 // 7
-};
-
-// Get interrupt bits in an orderly way
-// Ex: cs = GET_CS(0); coma1 = GET_COM(A,1);
-#define GET_WGM(T) (((TCCR##T##A >> WGM##T##0) & 0x3) | ((TCCR##T##B >> WGM##T##2 << 2) & 0xC))
-#define GET_CS(T) ((TCCR##T##B >> CS##T##0) & 0x7)
-#define GET_COM(T,Q) ((TCCR##T##Q >> COM##T##Q##0) & 0x3)
-#define GET_COMA(T) GET_COM(T,A)
-#define GET_COMB(T) GET_COM(T,B)
-#define GET_COMC(T) GET_COM(T,C)
-#define GET_ICNC(T) (!!(TCCR##T##B & _BV(ICNC##T)))
-#define GET_ICES(T) (!!(TCCR##T##B & _BV(ICES##T)))
-#define GET_FOC(T,Q) (!!(TCCR##T##C & _BV(FOC##T##Q)))
-#define GET_FOCA(T) GET_FOC(T,A)
-#define GET_FOCB(T) GET_FOC(T,B)
-#define GET_FOCC(T) GET_FOC(T,C)
-
-// Set Wave Generation Mode bits
-// Ex: SET_WGM(5,CTC_ICRn);
-#define _SET_WGM(T,V) do{ \
- TCCR##T##A = (TCCR##T##A & ~(0x3 << WGM##T##0)) | (( int(V) & 0x3) << WGM##T##0); \
- TCCR##T##B = (TCCR##T##B & ~(0x3 << WGM##T##2)) | (((int(V) >> 2) & 0x3) << WGM##T##2); \
- }while(0)
-#define SET_WGM(T,V) _SET_WGM(T,WGM_##V)
-// Runtime (see set_pwm_frequency):
-#define _SET_WGMnQ(TCCRnQ, V) do{ \
- *(TCCRnQ)[0] = (*(TCCRnQ)[0] & ~(0x3 << 0)) | (( int(V) & 0x3) << 0); \
- *(TCCRnQ)[1] = (*(TCCRnQ)[1] & ~(0x3 << 3)) | (((int(V) >> 2) & 0x3) << 3); \
- }while(0)
-
-// Set Clock Select bits
-// Ex: SET_CS3(PRESCALER_64);
-#define _SET_CS(T,V) (TCCR##T##B = (TCCR##T##B & ~(0x7 << CS##T##0)) | ((int(V) & 0x7) << CS##T##0))
-#define _SET_CS0(V) _SET_CS(0,V)
-#define _SET_CS1(V) _SET_CS(1,V)
-#ifdef TCCR2
- #define _SET_CS2(V) (TCCR2 = (TCCR2 & ~(0x7 << CS20)) | (int(V) << CS20))
-#else
- #define _SET_CS2(V) _SET_CS(2,V)
-#endif
-#define _SET_CS3(V) _SET_CS(3,V)
-#define _SET_CS4(V) _SET_CS(4,V)
-#define _SET_CS5(V) _SET_CS(5,V)
-#define SET_CS0(V) _SET_CS0(CS_##V)
-#define SET_CS1(V) _SET_CS1(CS_##V)
-#ifdef TCCR2
- #define SET_CS2(V) _SET_CS2(CS2_##V)
-#else
- #define SET_CS2(V) _SET_CS2(CS_##V)
-#endif
-#define SET_CS3(V) _SET_CS3(CS_##V)
-#define SET_CS4(V) _SET_CS4(CS_##V)
-#define SET_CS5(V) _SET_CS5(CS_##V)
-#define SET_CS(T,V) SET_CS##T(V)
-// Runtime (see set_pwm_frequency)
-#define _SET_CSn(TCCRnQ, V) do{ \
- (*(TCCRnQ)[1] = (*(TCCRnQ[1]) & ~(0x7 << 0)) | ((int(V) & 0x7) << 0)); \
- }while(0)
-
-// Set Compare Mode bits
-// Ex: SET_COMS(4,CLEAR_SET,CLEAR_SET,CLEAR_SET);
-#define _SET_COM(T,Q,V) (TCCR##T##Q = (TCCR##T##Q & ~(0x3 << COM##T##Q##0)) | (int(V) << COM##T##Q##0))
-#define SET_COM(T,Q,V) _SET_COM(T,Q,COM_##V)
-#define SET_COMA(T,V) SET_COM(T,A,V)
-#define SET_COMB(T,V) SET_COM(T,B,V)
-#define SET_COMC(T,V) SET_COM(T,C,V)
-#define SET_COMS(T,V1,V2,V3) do{ SET_COMA(T,V1); SET_COMB(T,V2); SET_COMC(T,V3); }while(0)
-// Runtime (see set_pwm_duty)
-#define _SET_COMnQ(TCCRnQ, Q, V) do{ \
- (*(TCCRnQ)[0] = (*(TCCRnQ)[0] & ~(0x3 << (6-2*(Q)))) | (int(V) << (6-2*(Q)))); \
- }while(0)
-
-// Set OCRnQ register
-// Runtime (see set_pwm_duty):
-#define _SET_OCRnQ(OCRnQ, Q, V) do{ \
- (*(OCRnQ)[(Q)] = (0x0000) | (int(V) & 0xFFFF)); \
- }while(0)
-
-// Set ICRn register (one per timer)
-// Runtime (see set_pwm_frequency)
-#define _SET_ICRn(ICRn, V) do{ \
- (*(ICRn) = (0x0000) | (int(V) & 0xFFFF)); \
- }while(0)
-
-// Set Noise Canceler bit
-// Ex: SET_ICNC(2,1)
-#define SET_ICNC(T,V) (TCCR##T##B = (V) ? TCCR##T##B | _BV(ICNC##T) : TCCR##T##B & ~_BV(ICNC##T))
-
-// Set Input Capture Edge Select bit
-// Ex: SET_ICES(5,0)
-#define SET_ICES(T,V) (TCCR##T##B = (V) ? TCCR##T##B | _BV(ICES##T) : TCCR##T##B & ~_BV(ICES##T))
-
-// Set Force Output Compare bit
-// Ex: SET_FOC(3,A,1)
-#define SET_FOC(T,Q,V) (TCCR##T##C = (V) ? TCCR##T##C | _BV(FOC##T##Q) : TCCR##T##C & ~_BV(FOC##T##Q))
-#define SET_FOCA(T,V) SET_FOC(T,A,V)
-#define SET_FOCB(T,V) SET_FOC(T,B,V)
-#define SET_FOCC(T,V) SET_FOC(T,C,V)
-
-#if 0
-
-/**
- * PWM availability macros
- */
-
-// Determine which harware PWMs are already in use
-#define _PWM_CHK_FAN_B(P) (P == E0_AUTO_FAN_PIN || P == E1_AUTO_FAN_PIN || P == E2_AUTO_FAN_PIN || P == E3_AUTO_FAN_PIN || P == E4_AUTO_FAN_PIN || P == E5_AUTO_FAN_PIN || P == E6_AUTO_FAN_PIN || P == E7_AUTO_FAN_PIN || P == CHAMBER_AUTO_FAN_PIN)
-#if PIN_EXISTS(CONTROLLER_FAN)
- #define PWM_CHK_FAN_B(P) (_PWM_CHK_FAN_B(P) || P == CONTROLLER_FAN_PIN)
-#else
- #define PWM_CHK_FAN_B(P) _PWM_CHK_FAN_B(P)
-#endif
-
-#if ANY_PIN(FAN, FAN1, FAN2, FAN3, FAN4, FAN5, FAN6, FAN7)
- #if PIN_EXISTS(FAN7)
- #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN || P == FAN2_PIN || P == FAN3_PIN || P == FAN4_PIN || P == FAN5_PIN || P == FAN6_PIN || P == FAN7_PIN)
- #elif PIN_EXISTS(FAN6)
- #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN || P == FAN2_PIN || P == FAN3_PIN || P == FAN4_PIN || P == FAN5_PIN || P == FAN6_PIN)
- #elif PIN_EXISTS(FAN5)
- #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN || P == FAN2_PIN || P == FAN3_PIN || P == FAN4_PIN || P == FAN5_PIN)
- #elif PIN_EXISTS(FAN4)
- #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN || P == FAN2_PIN || P == FAN3_PIN || P == FAN4_PIN)
- #elif PIN_EXISTS(FAN3)
- #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN || P == FAN2_PIN || P == FAN3_PIN)
- #elif PIN_EXISTS(FAN2)
- #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN || P == FAN2_PIN)
- #elif PIN_EXISTS(FAN1)
- #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN)
- #else
- #define PWM_CHK_FAN_A(P) (P == FAN0_PIN)
- #endif
-#else
- #define PWM_CHK_FAN_A(P) false
-#endif
-
-#if HAS_MOTOR_CURRENT_PWM
- #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
- #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_Z || P == MOTOR_CURRENT_PWM_XY)
- #elif PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
- #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_Z)
- #else
- #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E)
- #endif
-#else
- #define PWM_CHK_MOTOR_CURRENT(P) false
-#endif
-
-#ifdef NUM_SERVOS
- #if AVR_ATmega2560_FAMILY
- #define PWM_CHK_SERVO(P) (P == 5 || (NUM_SERVOS > 12 && P == 6) || (NUM_SERVOS > 24 && P == 46)) // PWMS 3A, 4A & 5A
- #elif AVR_ATmega2561_FAMILY
- #define PWM_CHK_SERVO(P) (P == 5) // PWM3A
- #elif AVR_ATmega1284_FAMILY
- #define PWM_CHK_SERVO(P) false
- #elif AVR_AT90USB1286_FAMILY
- #define PWM_CHK_SERVO(P) (P == 16) // PWM3A
- #elif AVR_ATmega328_FAMILY
- #define PWM_CHK_SERVO(P) false
- #endif
-#else
- #define PWM_CHK_SERVO(P) false
-#endif
-
-#if ENABLED(BARICUDA)
- #if HAS_HEATER_1 && HAS_HEATER_2
- #define PWM_CHK_HEATER(P) (P == HEATER_1_PIN || P == HEATER_2_PIN)
- #elif HAS_HEATER_1
- #define PWM_CHK_HEATER(P) (P == HEATER_1_PIN)
- #endif
-#else
- #define PWM_CHK_HEATER(P) false
-#endif
-
-#define PWM_CHK(P) (PWM_CHK_HEATER(P) || PWM_CHK_SERVO(P) || PWM_CHK_MOTOR_CURRENT(P) || PWM_CHK_FAN_A(P) || PWM_CHK_FAN_B(P))
-
-#endif // PWM_CHK is not used in Marlin
-
-// define which hardware PWMs are available for the current CPU
-// all timer 1 PWMS deleted from this list because they are never available
-#if AVR_ATmega2560_FAMILY
- #define PWM_PIN(P) ((P >= 2 && P <= 10) || P == 13 || P == 44 || P == 45 || P == 46)
-#elif AVR_ATmega2561_FAMILY
- #define PWM_PIN(P) ((P >= 2 && P <= 6) || P == 9)
-#elif AVR_ATmega1284_FAMILY
- #define PWM_PIN(P) (P == 3 || P == 4 || P == 14 || P == 15)
-#elif AVR_AT90USB1286_FAMILY
- #define PWM_PIN(P) (P == 0 || P == 1 || P == 14 || P == 15 || P == 16 || P == 24)
-#elif AVR_ATmega328_FAMILY
- #define PWM_PIN(P) (P == 3 || P == 5 || P == 6 || P == 11)
-#else
- #error "unknown CPU"
-#endif
diff --git a/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h b/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
deleted file mode 100644
index a611ccd7c4..0000000000
--- a/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-#if HAS_SPI_TFT || HAS_FSMC_TFT
- #error "Sorry! TFT displays are not available for HAL/AVR."
-#endif
diff --git a/Marlin/src/HAL/AVR/inc/Conditionals_adv.h b/Marlin/src/HAL/AVR/inc/Conditionals_adv.h
deleted file mode 100644
index 5f1c4b1601..0000000000
--- a/Marlin/src/HAL/AVR/inc/Conditionals_adv.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/AVR/inc/Conditionals_post.h b/Marlin/src/HAL/AVR/inc/Conditionals_post.h
deleted file mode 100644
index 5f1c4b1601..0000000000
--- a/Marlin/src/HAL/AVR/inc/Conditionals_post.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
diff --git a/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
deleted file mode 100644
index 731cf92865..0000000000
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-/**
- * Test AVR-specific configuration values for errors at compile-time.
- */
-
-/**
- * Checks for FAST PWM
- */
-#if ENABLED(FAST_PWM_FAN) && (ENABLED(USE_OCR2A_AS_TOP) && defined(TCCR2))
- #error "USE_OCR2A_AS_TOP does not apply to devices with a single output TIMER2"
-#endif
-
-/**
- * Sanity checks for Spindle / Laser PWM
- */
-#if ENABLED(SPINDLE_LASER_PWM)
- #include "../ServoTimers.h" // Needed to check timer availability (_useTimer3)
- #if SPINDLE_LASER_PWM_PIN == 4 || WITHIN(SPINDLE_LASER_PWM_PIN, 11, 13)
- #error "Counter/Timer for SPINDLE_LASER_PWM_PIN is used by a system interrupt."
- #elif NUM_SERVOS > 0 && defined(_useTimer3) && (WITHIN(SPINDLE_LASER_PWM_PIN, 2, 3) || SPINDLE_LASER_PWM_PIN == 5)
- #error "Counter/Timer for SPINDLE_LASER_PWM_PIN is used by the servo system."
- #endif
-#elif defined(SPINDLE_LASER_FREQUENCY)
- #error "SPINDLE_LASER_FREQUENCY requires SPINDLE_LASER_PWM."
-#endif
-
-/**
- * The Trinamic library includes SoftwareSerial.h, leading to a compile error.
- */
-#if BOTH(HAS_TRINAMIC_CONFIG, ENDSTOP_INTERRUPTS_FEATURE)
- #error "TMCStepper includes SoftwareSerial.h which is incompatible with ENDSTOP_INTERRUPTS_FEATURE. Disable ENDSTOP_INTERRUPTS_FEATURE to continue."
-#endif
-
-#if BOTH(HAS_TMC_SW_SERIAL, MONITOR_DRIVER_STATUS)
- #error "MONITOR_DRIVER_STATUS causes performance issues when used with SoftwareSerial-connected drivers. Disable MONITOR_DRIVER_STATUS or use hardware serial to continue."
-#endif
diff --git a/Marlin/src/HAL/AVR/math.h b/Marlin/src/HAL/AVR/math.h
deleted file mode 100644
index 7ede4accc0..0000000000
--- a/Marlin/src/HAL/AVR/math.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-/**
- * Optimized math functions for AVR
- */
-
-// intRes = longIn1 * longIn2 >> 24
-// uses:
-// A[tmp] to store 0
-// B[tmp] to store bits 16-23 of the 48bit result. The top bit is used to round the two byte result.
-// note that the lower two bytes and the upper byte of the 48bit result are not calculated.
-// this can cause the result to be out by one as the lower bytes may cause carries into the upper ones.
-// B A are bits 24-39 and are the returned value
-// C B A is longIn1
-// D C B A is longIn2
-//
-static FORCE_INLINE uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2) {
- uint8_t tmp1;
- uint8_t tmp2;
- uint16_t intRes;
- __asm__ __volatile__(
- A("clr %[tmp1]")
- A("mul %A[longIn1], %B[longIn2]")
- A("mov %[tmp2], r1")
- A("mul %B[longIn1], %C[longIn2]")
- A("movw %A[intRes], r0")
- A("mul %C[longIn1], %C[longIn2]")
- A("add %B[intRes], r0")
- A("mul %C[longIn1], %B[longIn2]")
- A("add %A[intRes], r0")
- A("adc %B[intRes], r1")
- A("mul %A[longIn1], %C[longIn2]")
- A("add %[tmp2], r0")
- A("adc %A[intRes], r1")
- A("adc %B[intRes], %[tmp1]")
- A("mul %B[longIn1], %B[longIn2]")
- A("add %[tmp2], r0")
- A("adc %A[intRes], r1")
- A("adc %B[intRes], %[tmp1]")
- A("mul %C[longIn1], %A[longIn2]")
- A("add %[tmp2], r0")
- A("adc %A[intRes], r1")
- A("adc %B[intRes], %[tmp1]")
- A("mul %B[longIn1], %A[longIn2]")
- A("add %[tmp2], r1")
- A("adc %A[intRes], %[tmp1]")
- A("adc %B[intRes], %[tmp1]")
- A("lsr %[tmp2]")
- A("adc %A[intRes], %[tmp1]")
- A("adc %B[intRes], %[tmp1]")
- A("mul %D[longIn2], %A[longIn1]")
- A("add %A[intRes], r0")
- A("adc %B[intRes], r1")
- A("mul %D[longIn2], %B[longIn1]")
- A("add %B[intRes], r0")
- A("clr r1")
- : [intRes] "=&r" (intRes),
- [tmp1] "=&r" (tmp1),
- [tmp2] "=&r" (tmp2)
- : [longIn1] "d" (longIn1),
- [longIn2] "d" (longIn2)
- : "cc"
- );
- return intRes;
-}
-
-// intRes = intIn1 * intIn2 >> 16
-// uses:
-// r26 to store 0
-// r27 to store the byte 1 of the 24 bit result
-static FORCE_INLINE uint16_t MultiU16X8toH16(uint8_t charIn1, uint16_t intIn2) {
- uint8_t tmp;
- uint16_t intRes;
- __asm__ __volatile__ (
- A("clr %[tmp]")
- A("mul %[charIn1], %B[intIn2]")
- A("movw %A[intRes], r0")
- A("mul %[charIn1], %A[intIn2]")
- A("add %A[intRes], r1")
- A("adc %B[intRes], %[tmp]")
- A("lsr r0")
- A("adc %A[intRes], %[tmp]")
- A("adc %B[intRes], %[tmp]")
- A("clr r1")
- : [intRes] "=&r" (intRes),
- [tmp] "=&r" (tmp)
- : [charIn1] "d" (charIn1),
- [intIn2] "d" (intIn2)
- : "cc"
- );
- return intRes;
-}
diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
deleted file mode 100644
index dac6b1b150..0000000000
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ /dev/null
@@ -1,403 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-/**
- * PWM print routines for Atmel 8 bit AVR CPUs
- */
-
-#include "../../inc/MarlinConfig.h"
-
-#define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS
-
-#if MB(BQ_ZUM_MEGA_3D, MIGHTYBOARD_REVE, MINIRAMBO, SCOOVO_X9H, TRIGORILLA_14)
- #define AVR_ATmega2560_FAMILY_PLUS_70 1
-#endif
-
-#if AVR_AT90USB1286_FAMILY
-
- // Working with Teensyduino extension so need to re-define some things
- #include "pinsDebug_Teensyduino.h"
- // Can't use the "digitalPinToPort" function from the Teensyduino type IDEs
- // portModeRegister takes a different argument
- #define digitalPinToTimer_DEBUG(p) digitalPinToTimer(p)
- #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask(p)
- #define digitalPinToPort_DEBUG(p) digitalPinToPort_Teensy(p)
- #define GET_PINMODE(pin) (*portModeRegister(pin) & digitalPinToBitMask_DEBUG(pin))
-
-#elif AVR_ATmega2560_FAMILY_PLUS_70 // So we can access/display all the pins on boards using more than 70
-
- #include "pinsDebug_plus_70.h"
- #define digitalPinToTimer_DEBUG(p) digitalPinToTimer_plus_70(p)
- #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask_plus_70(p)
- #define digitalPinToPort_DEBUG(p) digitalPinToPort_plus_70(p)
- bool GET_PINMODE(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
-
-#else
-
- #define digitalPinToTimer_DEBUG(p) digitalPinToTimer(p)
- #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask(p)
- #define digitalPinToPort_DEBUG(p) digitalPinToPort(p)
- bool GET_PINMODE(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
- #define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
-
-#endif
-
-#define VALID_PIN(pin) (pin >= 0 && pin < NUM_DIGITAL_PINS ? 1 : 0)
-#if AVR_ATmega1284_FAMILY
- #define DIGITAL_PIN_TO_ANALOG_PIN(P) int(analogInputToDigitalPin(0) - (P))
- #define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(7) && (P) <= analogInputToDigitalPin(0))
-#else
- #define DIGITAL_PIN_TO_ANALOG_PIN(P) int((P) - analogInputToDigitalPin(0))
- #define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(7)))
-#endif
-#define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
-#define MULTI_NAME_PAD 26 // space needed to be pretty if not first name assigned to a pin
-
-void PRINT_ARRAY_NAME(uint8_t x) {
- char *name_mem_pointer = (char*)pgm_read_ptr(&pin_array[x].name);
- LOOP_L_N(y, MAX_NAME_LENGTH) {
- char temp_char = pgm_read_byte(name_mem_pointer + y);
- if (temp_char != 0)
- SERIAL_CHAR(temp_char);
- else {
- LOOP_L_N(i, MAX_NAME_LENGTH - y) SERIAL_CHAR(' ');
- break;
- }
- }
-}
-
-#define GET_ARRAY_IS_DIGITAL(x) pgm_read_byte(&pin_array[x].is_digital)
-
-
-#if defined(__AVR_ATmega1284P__) // 1284 IDE extensions set this to the number of
- #undef NUM_DIGITAL_PINS // digital only pins while all other CPUs have it
- #define NUM_DIGITAL_PINS 32 // set to digital only + digital/analog
-#endif
-
-#define PWM_PRINT(V) do{ sprintf_P(buffer, PSTR("PWM: %4d"), V); SERIAL_ECHO(buffer); }while(0)
-#define PWM_CASE(N,Z) \
- case TIMER##N##Z: \
- if (TCCR##N##A & (_BV(COM##N##Z##1) | _BV(COM##N##Z##0))) { \
- PWM_PRINT(OCR##N##Z); \
- return true; \
- } else return false
-
-
-
-/**
- * Print a pin's PWM status.
- * Return true if it's currently a PWM pin.
- */
-static bool pwm_status(uint8_t pin) {
- char buffer[20]; // for the sprintf statements
-
- switch (digitalPinToTimer_DEBUG(pin)) {
-
- #if defined(TCCR0A) && defined(COM0A1)
- #ifdef TIMER0A
- #if !AVR_AT90USB1286_FAMILY // not available in Teensyduino type IDEs
- PWM_CASE(0, A);
- #endif
- #endif
- PWM_CASE(0, B);
- #endif
-
- #if defined(TCCR1A) && defined(COM1A1)
- PWM_CASE(1, A);
- PWM_CASE(1, B);
- #if defined(COM1C1) && defined(TIMER1C)
- PWM_CASE(1, C);
- #endif
- #endif
-
- #if defined(TCCR2A) && defined(COM2A1)
- PWM_CASE(2, A);
- PWM_CASE(2, B);
- #endif
-
- #if defined(TCCR3A) && defined(COM3A1)
- PWM_CASE(3, A);
- PWM_CASE(3, B);
- #ifdef COM3C1
- PWM_CASE(3, C);
- #endif
- #endif
-
- #ifdef TCCR4A
- PWM_CASE(4, A);
- PWM_CASE(4, B);
- PWM_CASE(4, C);
- #endif
-
- #if defined(TCCR5A) && defined(COM5A1)
- PWM_CASE(5, A);
- PWM_CASE(5, B);
- PWM_CASE(5, C);
- #endif
-
- case NOT_ON_TIMER:
- default:
- return false;
- }
- SERIAL_ECHO_SP(2);
-} // pwm_status
-
-
-const volatile uint8_t* const PWM_other[][3] PROGMEM = {
- { &TCCR0A, &TCCR0B, &TIMSK0 },
- { &TCCR1A, &TCCR1B, &TIMSK1 },
- #if defined(TCCR2A) && defined(COM2A1)
- { &TCCR2A, &TCCR2B, &TIMSK2 },
- #endif
- #if defined(TCCR3A) && defined(COM3A1)
- { &TCCR3A, &TCCR3B, &TIMSK3 },
- #endif
- #ifdef TCCR4A
- { &TCCR4A, &TCCR4B, &TIMSK4 },
- #endif
- #if defined(TCCR5A) && defined(COM5A1)
- { &TCCR5A, &TCCR5B, &TIMSK5 },
- #endif
-};
-
-
-const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
-
- #ifdef TIMER0A
- { &OCR0A, &OCR0B, 0 },
- #else
- { 0, &OCR0B, 0 },
- #endif
-
- #if defined(COM1C1) && defined(TIMER1C)
- { (const uint8_t*)&OCR1A, (const uint8_t*)&OCR1B, (const uint8_t*)&OCR1C },
- #else
- { (const uint8_t*)&OCR1A, (const uint8_t*)&OCR1B, 0 },
- #endif
-
- #if defined(TCCR2A) && defined(COM2A1)
- { &OCR2A, &OCR2B, 0 },
- #endif
-
- #if defined(TCCR3A) && defined(COM3A1)
- #ifdef COM3C1
- { (const uint8_t*)&OCR3A, (const uint8_t*)&OCR3B, (const uint8_t*)&OCR3C },
- #else
- { (const uint8_t*)&OCR3A, (const uint8_t*)&OCR3B, 0 },
- #endif
- #endif
-
- #ifdef TCCR4A
- { (const uint8_t*)&OCR4A, (const uint8_t*)&OCR4B, (const uint8_t*)&OCR4C },
- #endif
-
- #if defined(TCCR5A) && defined(COM5A1)
- { (const uint8_t*)&OCR5A, (const uint8_t*)&OCR5B, (const uint8_t*)&OCR5C },
- #endif
-};
-
-
-#define TCCR_A(T) pgm_read_word(&PWM_other[T][0])
-#define TCCR_B(T) pgm_read_word(&PWM_other[T][1])
-#define TIMSK(T) pgm_read_word(&PWM_other[T][2])
-#define CS_0 0
-#define CS_1 1
-#define CS_2 2
-#define WGM_0 0
-#define WGM_1 1
-#define WGM_2 3
-#define WGM_3 4
-#define TOIE 0
-
-#define OCR_VAL(T, L) pgm_read_word(&PWM_OCR[T][L])
-
-static void err_is_counter() { SERIAL_ECHOPGM(" non-standard PWM mode"); }
-static void err_is_interrupt() { SERIAL_ECHOPGM(" compare interrupt enabled"); }
-static void err_prob_interrupt() { SERIAL_ECHOPGM(" overflow interrupt enabled"); }
-static void print_is_also_tied() { SERIAL_ECHOPGM(" is also tied to this pin"); SERIAL_ECHO_SP(14); }
-
-inline void com_print(const uint8_t N, const uint8_t Z) {
- const uint8_t *TCCRA = (uint8_t*)TCCR_A(N);
- SERIAL_ECHOPGM(" COM");
- SERIAL_CHAR('0' + N, Z);
- SERIAL_ECHOPAIR(": ", int((*TCCRA >> (6 - Z * 2)) & 0x03));
-}
-
-void timer_prefix(uint8_t T, char L, uint8_t N) { // T - timer L - pwm N - WGM bit layout
- char buffer[20]; // for the sprintf statements
- const uint8_t *TCCRB = (uint8_t*)TCCR_B(T),
- *TCCRA = (uint8_t*)TCCR_A(T);
- uint8_t WGM = (((*TCCRB & _BV(WGM_2)) >> 1) | (*TCCRA & (_BV(WGM_0) | _BV(WGM_1))));
- if (N == 4) WGM |= ((*TCCRB & _BV(WGM_3)) >> 1);
-
- SERIAL_ECHOPGM(" TIMER");
- SERIAL_CHAR(T + '0', L);
- SERIAL_ECHO_SP(3);
-
- if (N == 3) {
- const uint8_t *OCRVAL8 = (uint8_t*)OCR_VAL(T, L - 'A');
- PWM_PRINT(*OCRVAL8);
- }
- else {
- const uint16_t *OCRVAL16 = (uint16_t*)OCR_VAL(T, L - 'A');
- PWM_PRINT(*OCRVAL16);
- }
- SERIAL_ECHOPAIR(" WGM: ", WGM);
- com_print(T,L);
- SERIAL_ECHOPAIR(" CS: ", (*TCCRB & (_BV(CS_0) | _BV(CS_1) | _BV(CS_2)) ));
-
- SERIAL_ECHOPGM(" TCCR");
- SERIAL_CHAR(T + '0');
- SERIAL_ECHOPAIR("A: ", *TCCRA);
-
- SERIAL_ECHOPGM(" TCCR");
- SERIAL_CHAR(T + '0');
- SERIAL_ECHOPAIR("B: ", *TCCRB);
-
- const uint8_t *TMSK = (uint8_t*)TIMSK(T);
- SERIAL_ECHOPGM(" TIMSK");
- SERIAL_CHAR(T + '0');
- SERIAL_ECHOPAIR(": ", *TMSK);
-
- const uint8_t OCIE = L - 'A' + 1;
- if (N == 3) { if (WGM == 0 || WGM == 2 || WGM == 4 || WGM == 6) err_is_counter(); }
- else { if (WGM == 0 || WGM == 4 || WGM == 12 || WGM == 13) err_is_counter(); }
- if (TEST(*TMSK, OCIE)) err_is_interrupt();
- if (TEST(*TMSK, TOIE)) err_prob_interrupt();
-}
-
-static void pwm_details(uint8_t pin) {
- switch (digitalPinToTimer_DEBUG(pin)) {
-
- #if defined(TCCR0A) && defined(COM0A1)
- #ifdef TIMER0A
- #if !AVR_AT90USB1286_FAMILY // not available in Teensyduino type IDEs
- case TIMER0A: timer_prefix(0, 'A', 3); break;
- #endif
- #endif
- case TIMER0B: timer_prefix(0, 'B', 3); break;
- #endif
-
- #if defined(TCCR1A) && defined(COM1A1)
- case TIMER1A: timer_prefix(1, 'A', 4); break;
- case TIMER1B: timer_prefix(1, 'B', 4); break;
- #if defined(COM1C1) && defined(TIMER1C)
- case TIMER1C: timer_prefix(1, 'C', 4); break;
- #endif
- #endif
-
- #if defined(TCCR2A) && defined(COM2A1)
- case TIMER2A: timer_prefix(2, 'A', 3); break;
- case TIMER2B: timer_prefix(2, 'B', 3); break;
- #endif
-
- #if defined(TCCR3A) && defined(COM3A1)
- case TIMER3A: timer_prefix(3, 'A', 4); break;
- case TIMER3B: timer_prefix(3, 'B', 4); break;
- #ifdef COM3C1
- case TIMER3C: timer_prefix(3, 'C', 4); break;
- #endif
- #endif
-
- #ifdef TCCR4A
- case TIMER4A: timer_prefix(4, 'A', 4); break;
- case TIMER4B: timer_prefix(4, 'B', 4); break;
- case TIMER4C: timer_prefix(4, 'C', 4); break;
- #endif
-
- #if defined(TCCR5A) && defined(COM5A1)
- case TIMER5A: timer_prefix(5, 'A', 4); break;
- case TIMER5B: timer_prefix(5, 'B', 4); break;
- case TIMER5C: timer_prefix(5, 'C', 4); break;
- #endif
-
- case NOT_ON_TIMER: break;
-
- }
- SERIAL_ECHOPGM(" ");
-
- // on pins that have two PWMs, print info on second PWM
- #if AVR_ATmega2560_FAMILY || AVR_AT90USB1286_FAMILY
- // looking for port B7 - PWMs 0A and 1C
- if (digitalPinToPort_DEBUG(pin) == 'B' - 64 && 0x80 == digitalPinToBitMask_DEBUG(pin)) {
- #if !AVR_AT90USB1286_FAMILY
- SERIAL_ECHOPGM("\n .");
- SERIAL_ECHO_SP(18);
- SERIAL_ECHOPGM("TIMER1C");
- print_is_also_tied();
- timer_prefix(1, 'C', 4);
- #else
- SERIAL_ECHOPGM("\n .");
- SERIAL_ECHO_SP(18);
- SERIAL_ECHOPGM("TIMER0A");
- print_is_also_tied();
- timer_prefix(0, 'A', 3);
- #endif
- }
- #else
- UNUSED(print_is_also_tied);
- #endif
-} // pwm_details
-
-
-#ifndef digitalRead_mod // Use Teensyduino's version of digitalRead - it doesn't disable the PWMs
- int digitalRead_mod(const int8_t pin) { // same as digitalRead except the PWM stop section has been removed
- const uint8_t port = digitalPinToPort_DEBUG(pin);
- return (port != NOT_A_PIN) && (*portInputRegister(port) & digitalPinToBitMask_DEBUG(pin)) ? HIGH : LOW;
- }
-#endif
-
-#ifndef PRINT_PORT
-
- void print_port(int8_t pin) { // print port number
- #ifdef digitalPinToPort_DEBUG
- uint8_t x;
- SERIAL_ECHOPGM(" Port: ");
- #if AVR_AT90USB1286_FAMILY
- x = (pin == 46 || pin == 47) ? 'E' : digitalPinToPort_DEBUG(pin) + 64;
- #else
- x = digitalPinToPort_DEBUG(pin) + 64;
- #endif
- SERIAL_CHAR(x);
-
- #if AVR_AT90USB1286_FAMILY
- if (pin == 46)
- x = '2';
- else if (pin == 47)
- x = '3';
- else {
- uint8_t temp = digitalPinToBitMask_DEBUG(pin);
- for (x = '0'; x < '9' && temp != 1; x++) temp >>= 1;
- }
- #else
- uint8_t temp = digitalPinToBitMask_DEBUG(pin);
- for (x = '0'; x < '9' && temp != 1; x++) temp >>= 1;
- #endif
- SERIAL_CHAR(x);
- #else
- SERIAL_ECHO_SP(10);
- #endif
- }
-
- #define PRINT_PORT(p) print_port(p)
-
-#endif
-
-#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
diff --git a/Marlin/src/HAL/AVR/spi_pins.h b/Marlin/src/HAL/AVR/spi_pins.h
deleted file mode 100644
index f3fa78e2bf..0000000000
--- a/Marlin/src/HAL/AVR/spi_pins.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-/**
- * Define SPI Pins: SCK, MISO, MOSI, SS
- */
-#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328__) || defined(__AVR_ATmega328P__)
- #define AVR_SCK_PIN 13
- #define AVR_MISO_PIN 12
- #define AVR_MOSI_PIN 11
- #define AVR_SS_PIN 10
-#elif defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__)
- #define AVR_SCK_PIN 7
- #define AVR_MISO_PIN 6
- #define AVR_MOSI_PIN 5
- #define AVR_SS_PIN 4
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
- #define AVR_SCK_PIN 52
- #define AVR_MISO_PIN 50
- #define AVR_MOSI_PIN 51
- #define AVR_SS_PIN 53
-#elif defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__)
- #define AVR_SCK_PIN 21
- #define AVR_MISO_PIN 23
- #define AVR_MOSI_PIN 22
- #define AVR_SS_PIN 20
-#elif defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
- #define AVR_SCK_PIN 10
- #define AVR_MISO_PIN 12
- #define AVR_MOSI_PIN 11
- #define AVR_SS_PIN 16
-#endif
-
-#ifndef SCK_PIN
- #define SCK_PIN AVR_SCK_PIN
-#endif
-#ifndef MISO_PIN
- #define MISO_PIN AVR_MISO_PIN
-#endif
-#ifndef MOSI_PIN
- #define MOSI_PIN AVR_MOSI_PIN
-#endif
-#ifndef SS_PIN
- #define SS_PIN AVR_SS_PIN
-#endif
diff --git a/Marlin/src/HAL/AVR/timers.h b/Marlin/src/HAL/AVR/timers.h
deleted file mode 100644
index 82eb8b14b1..0000000000
--- a/Marlin/src/HAL/AVR/timers.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-#include
-
-// ------------------------
-// Types
-// ------------------------
-
-typedef uint16_t hal_timer_t;
-#define HAL_TIMER_TYPE_MAX 0xFFFF
-
-// ------------------------
-// Defines
-// ------------------------
-
-#define HAL_TIMER_RATE ((F_CPU) / 8) // i.e., 2MHz or 2.5MHz
-
-#ifndef STEP_TIMER_NUM
- #define STEP_TIMER_NUM 1
-#endif
-#ifndef PULSE_TIMER_NUM
- #define PULSE_TIMER_NUM STEP_TIMER_NUM
-#endif
-#ifndef TEMP_TIMER_NUM
- #define TEMP_TIMER_NUM 0
-#endif
-
-#define TEMP_TIMER_FREQUENCY ((F_CPU) / 64.0 / 256.0)
-
-#define STEPPER_TIMER_RATE HAL_TIMER_RATE
-#define STEPPER_TIMER_PRESCALE 8
-#define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000) // Cannot be of type double
-
-#define PULSE_TIMER_RATE STEPPER_TIMER_RATE // frequency of pulse timer
-#define PULSE_TIMER_PRESCALE STEPPER_TIMER_PRESCALE
-#define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
-
-#define ENABLE_STEPPER_DRIVER_INTERRUPT() SBI(TIMSK1, OCIE1A)
-#define DISABLE_STEPPER_DRIVER_INTERRUPT() CBI(TIMSK1, OCIE1A)
-#define STEPPER_ISR_ENABLED() TEST(TIMSK1, OCIE1A)
-
-#define ENABLE_TEMPERATURE_INTERRUPT() SBI(TIMSK0, OCIE0B)
-#define DISABLE_TEMPERATURE_INTERRUPT() CBI(TIMSK0, OCIE0B)
-#define TEMPERATURE_ISR_ENABLED() TEST(TIMSK0, OCIE0B)
-
-FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
- switch (timer_num) {
- case STEP_TIMER_NUM:
- // waveform generation = 0100 = CTC
- SET_WGM(1, CTC_OCRnA);
-
- // output mode = 00 (disconnected)
- SET_COMA(1, NORMAL);
-
- // Set the timer pre-scaler
- // Generally we use a divider of 8, resulting in a 2MHz timer
- // frequency on a 16MHz MCU. If you are going to change this, be
- // sure to regenerate speed_lookuptable.h with
- // create_speed_lookuptable.py
- SET_CS(1, PRESCALER_8); // CS 2 = 1/8 prescaler
-
- // Init Stepper ISR to 122 Hz for quick starting
- // (F_CPU) / (STEPPER_TIMER_PRESCALE) / frequency
- OCR1A = 0x4000;
- TCNT1 = 0;
- break;
-
- case TEMP_TIMER_NUM:
- // Use timer0 for temperature measurement
- // Interleave temperature interrupt with millies interrupt
- OCR0B = 128;
- break;
- }
-}
-
-#define TIMER_OCR_1 OCR1A
-#define TIMER_COUNTER_1 TCNT1
-
-#define TIMER_OCR_0 OCR0A
-#define TIMER_COUNTER_0 TCNT0
-
-#define _CAT(a,V...) a##V
-#define HAL_timer_set_compare(timer, compare) (_CAT(TIMER_OCR_, timer) = compare)
-#define HAL_timer_get_compare(timer) _CAT(TIMER_OCR_, timer)
-#define HAL_timer_get_count(timer) _CAT(TIMER_COUNTER_, timer)
-
-/**
- * On AVR there is no hardware prioritization and preemption of
- * interrupts, so this emulates it. The UART has first priority
- * (otherwise, characters will be lost due to UART overflow).
- * Then: Stepper, Endstops, Temperature, and -finally- all others.
- */
-#define HAL_timer_isr_prologue(TIMER_NUM)
-#define HAL_timer_isr_epilogue(TIMER_NUM)
-
-/* 18 cycles maximum latency */
-#ifndef HAL_STEP_TIMER_ISR
-
-#define HAL_STEP_TIMER_ISR() \
-extern "C" void TIMER1_COMPA_vect() __attribute__ ((signal, naked, used, externally_visible)); \
-extern "C" void TIMER1_COMPA_vect_bottom() asm ("TIMER1_COMPA_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \
-void TIMER1_COMPA_vect() { \
- __asm__ __volatile__ ( \
- A("push r16") /* 2 Save R16 */ \
- A("in r16, __SREG__") /* 1 Get SREG */ \
- A("push r16") /* 2 Save SREG into stack */ \
- A("lds r16, %[timsk0]") /* 2 Load into R0 the Temperature timer Interrupt mask register */ \
- A("push r16") /* 2 Save TIMSK0 into the stack */ \
- A("andi r16,~%[msk0]") /* 1 Disable the temperature ISR */ \
- A("sts %[timsk0], r16") /* 2 And set the new value */ \
- A("lds r16, %[timsk1]") /* 2 Load into R0 the stepper timer Interrupt mask register [TIMSK1] */ \
- A("andi r16,~%[msk1]") /* 1 Disable the stepper ISR */ \
- A("sts %[timsk1], r16") /* 2 And set the new value */ \
- A("push r16") /* 2 Save TIMSK1 into stack */ \
- A("in r16, 0x3B") /* 1 Get RAMPZ register */ \
- A("push r16") /* 2 Save RAMPZ into stack */ \
- A("in r16, 0x3C") /* 1 Get EIND register */ \
- A("push r0") /* C runtime can modify all the following registers without restoring them */ \
- A("push r1") \
- A("push r18") \
- A("push r19") \
- A("push r20") \
- A("push r21") \
- A("push r22") \
- A("push r23") \
- A("push r24") \
- A("push r25") \
- A("push r26") \
- A("push r27") \
- A("push r30") \
- A("push r31") \
- A("clr r1") /* C runtime expects this register to be 0 */ \
- A("call TIMER1_COMPA_vect_bottom") /* Call the bottom handler - No inlining allowed, otherwise registers used are not saved */ \
- A("pop r31") \
- A("pop r30") \
- A("pop r27") \
- A("pop r26") \
- A("pop r25") \
- A("pop r24") \
- A("pop r23") \
- A("pop r22") \
- A("pop r21") \
- A("pop r20") \
- A("pop r19") \
- A("pop r18") \
- A("pop r1") \
- A("pop r0") \
- A("out 0x3C, r16") /* 1 Restore EIND register */ \
- A("pop r16") /* 2 Get the original RAMPZ register value */ \
- A("out 0x3B, r16") /* 1 Restore RAMPZ register to its original value */ \
- A("pop r16") /* 2 Get the original TIMSK1 value but with stepper ISR disabled */ \
- A("ori r16,%[msk1]") /* 1 Reenable the stepper ISR */ \
- A("cli") /* 1 Disable global interrupts - Reenabling Stepper ISR can reenter amd temperature can reenter, and we want that, if it happens, after this ISR has ended */ \
- A("sts %[timsk1], r16") /* 2 And restore the old value - This reenables the stepper ISR */ \
- A("pop r16") /* 2 Get the temperature timer Interrupt mask register [TIMSK0] */ \
- A("sts %[timsk0], r16") /* 2 And restore the old value - This reenables the temperature ISR */ \
- A("pop r16") /* 2 Get the old SREG value */ \
- A("out __SREG__, r16") /* 1 And restore the SREG value */ \
- A("pop r16") /* 2 Restore R16 value */ \
- A("reti") /* 4 Return from interrupt */ \
- : \
- : [timsk0] "i" ((uint16_t)&TIMSK0), \
- [timsk1] "i" ((uint16_t)&TIMSK1), \
- [msk0] "M" ((uint8_t)(1<.
- *
- */
-
-/**
- * Based on u8g_com_st7920_hw_spi.c
- *
- * Universal 8bit Graphics Library
- *
- * Copyright (c) 2011, olikraus@gmail.com
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this list
- * of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice, this
- * list of conditions and the following disclaimer in the documentation and/or other
- * materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if defined(ARDUINO) && !defined(ARDUINO_ARCH_STM32) && !defined(ARDUINO_ARCH_SAM)
-
-#include "../../inc/MarlinConfigPre.h"
-
-#if HAS_MARLINUI_U8GLIB
-
-#include "../shared/Marduino.h"
-#include "../shared/Delay.h"
-
-#include
-
-uint8_t u8g_bitData, u8g_bitNotData, u8g_bitClock, u8g_bitNotClock;
-volatile uint8_t *u8g_outData, *u8g_outClock;
-
-static void u8g_com_arduino_init_shift_out(uint8_t dataPin, uint8_t clockPin) {
- u8g_outData = portOutputRegister(digitalPinToPort(dataPin));
- u8g_outClock = portOutputRegister(digitalPinToPort(clockPin));
- u8g_bitData = digitalPinToBitMask(dataPin);
- u8g_bitClock = digitalPinToBitMask(clockPin);
-
- u8g_bitNotClock = u8g_bitClock;
- u8g_bitNotClock ^= 0xFF;
-
- u8g_bitNotData = u8g_bitData;
- u8g_bitNotData ^= 0xFF;
-}
-
-void u8g_spiSend_sw_AVR_mode_0(uint8_t val) {
- uint8_t bitData = u8g_bitData,
- bitNotData = u8g_bitNotData,
- bitClock = u8g_bitClock,
- bitNotClock = u8g_bitNotClock;
- volatile uint8_t *outData = u8g_outData,
- *outClock = u8g_outClock;
- U8G_ATOMIC_START();
- LOOP_L_N(i, 8) {
- if (val & 0x80)
- *outData |= bitData;
- else
- *outData &= bitNotData;
- *outClock |= bitClock;
- val <<= 1;
- *outClock &= bitNotClock;
- }
- U8G_ATOMIC_END();
-}
-
-void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
- uint8_t bitData = u8g_bitData,
- bitNotData = u8g_bitNotData,
- bitClock = u8g_bitClock,
- bitNotClock = u8g_bitNotClock;
- volatile uint8_t *outData = u8g_outData,
- *outClock = u8g_outClock;
- U8G_ATOMIC_START();
- LOOP_L_N(i, 8) {
- *outClock &= bitNotClock;
- if (val & 0x80)
- *outData |= bitData;
- else
- *outData &= bitNotData;
- *outClock |= bitClock;
- val <<= 1;
- }
- U8G_ATOMIC_END();
-}
-
-
-#if ENABLED(FYSETC_MINI_12864)
- #define SPISEND_SW_AVR u8g_spiSend_sw_AVR_mode_3
-#else
- #define SPISEND_SW_AVR u8g_spiSend_sw_AVR_mode_0
-#endif
-
-uint8_t u8g_com_HAL_AVR_sw_sp_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {
- switch (msg) {
- case U8G_COM_MSG_INIT:
- u8g_com_arduino_init_shift_out(u8g->pin_list[U8G_PI_MOSI], u8g->pin_list[U8G_PI_SCK]);
- u8g_com_arduino_assign_pin_output_high(u8g);
- u8g_com_arduino_digital_write(u8g, U8G_PI_SCK, 0);
- u8g_com_arduino_digital_write(u8g, U8G_PI_MOSI, 0);
- break;
-
- case U8G_COM_MSG_STOP:
- break;
-
- case U8G_COM_MSG_RESET:
- if (U8G_PIN_NONE != u8g->pin_list[U8G_PI_RESET]) u8g_com_arduino_digital_write(u8g, U8G_PI_RESET, arg_val);
- break;
-
- case U8G_COM_MSG_CHIP_SELECT:
- #if ENABLED(FYSETC_MINI_12864) // LCD SPI is running mode 3 while SD card is running mode 0
- if (arg_val) { // SCK idle state needs to be set to the proper idle state before
- // the next chip select goes active
- u8g_com_arduino_digital_write(u8g, U8G_PI_SCK, 1); // Set SCK to mode 3 idle state before CS goes active
- u8g_com_arduino_digital_write(u8g, U8G_PI_CS, LOW);
- }
- else {
- u8g_com_arduino_digital_write(u8g, U8G_PI_CS, HIGH);
- u8g_com_arduino_digital_write(u8g, U8G_PI_SCK, 0); // Set SCK to mode 0 idle state after CS goes inactive
- }
- #else
- u8g_com_arduino_digital_write(u8g, U8G_PI_CS, !arg_val);
- #endif
- break;
-
- case U8G_COM_MSG_WRITE_BYTE:
- SPISEND_SW_AVR(arg_val);
- break;
-
- case U8G_COM_MSG_WRITE_SEQ: {
- uint8_t *ptr = (uint8_t *)arg_ptr;
- while (arg_val > 0) {
- SPISEND_SW_AVR(*ptr++);
- arg_val--;
- }
- }
- break;
-
- case U8G_COM_MSG_WRITE_SEQ_P: {
- uint8_t *ptr = (uint8_t *)arg_ptr;
- while (arg_val > 0) {
- SPISEND_SW_AVR(u8g_pgm_read(ptr));
- ptr++;
- arg_val--;
- }
- }
- break;
-
- case U8G_COM_MSG_ADDRESS: /* define cmd (arg_val = 0) or data mode (arg_val = 1) */
- u8g_com_arduino_digital_write(u8g, U8G_PI_A0, arg_val);
- break;
- }
- return 1;
-}
-
-#endif // HAS_MARLINUI_U8GLIB
-#endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/AVR/watchdog.cpp b/Marlin/src/HAL/AVR/watchdog.cpp
deleted file mode 100644
index 3f10c4adff..0000000000
--- a/Marlin/src/HAL/AVR/watchdog.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#ifdef __AVR__
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(USE_WATCHDOG)
-
-#include "watchdog.h"
-
-#include "../../MarlinCore.h"
-
-// Initialize watchdog with 8s timeout, if possible. Otherwise, make it 4s.
-void watchdog_init() {
- #if ENABLED(WATCHDOG_DURATION_8S) && defined(WDTO_8S)
- #define WDTO_NS WDTO_8S
- #else
- #define WDTO_NS WDTO_4S
- #endif
- #if ENABLED(WATCHDOG_RESET_MANUAL)
- // Enable the watchdog timer, but only for the interrupt.
- // Take care, as this requires the correct order of operation, with interrupts disabled.
- // See the datasheet of any AVR chip for details.
- wdt_reset();
- cli();
- _WD_CONTROL_REG = _BV(_WD_CHANGE_BIT) | _BV(WDE);
- _WD_CONTROL_REG = _BV(WDIE) | (WDTO_NS & 0x07) | ((WDTO_NS & 0x08) << 2); // WDTO_NS directly does not work. bit 0-2 are consecutive in the register but the highest value bit is at bit 5
- // So worked for up to WDTO_2S
- sei();
- wdt_reset();
- #else
- wdt_enable(WDTO_NS); // The function handles the upper bit correct.
- #endif
- //delay(10000); // test it!
-}
-
-//===========================================================================
-//=================================== ISR ===================================
-//===========================================================================
-
-// Watchdog timer interrupt, called if main program blocks >4sec and manual reset is enabled.
-#if ENABLED(WATCHDOG_RESET_MANUAL)
- ISR(WDT_vect) {
- sei(); // With the interrupt driven serial we need to allow interrupts.
- SERIAL_ERROR_MSG(STR_WATCHDOG_FIRED);
- minkill(); // interrupt-safe final kill and infinite loop
- }
-#endif
-
-#endif // USE_WATCHDOG
-#endif // __AVR__
diff --git a/Marlin/src/HAL/AVR/watchdog.h b/Marlin/src/HAL/AVR/watchdog.h
deleted file mode 100644
index a16c88b35e..0000000000
--- a/Marlin/src/HAL/AVR/watchdog.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-#include
-
-// Initialize watchdog with a 4 second interrupt time
-void watchdog_init();
-
-// Reset watchdog. MUST be called at least every 4 seconds after the
-// first watchdog_init or AVR will go into emergency procedures.
-inline void HAL_watchdog_refresh() { wdt_reset(); }
diff --git a/Marlin/src/HAL/DUE/DebugMonitor.cpp b/Marlin/src/HAL/DUE/DebugMonitor.cpp
deleted file mode 100644
index 79759151d8..0000000000
--- a/Marlin/src/HAL/DUE/DebugMonitor.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#ifdef ARDUINO_ARCH_SAM
-
-#include "../../core/macros.h"
-#include "../../core/serial.h"
-
-#include "../shared/backtrace/unwinder.h"
-#include "../shared/backtrace/unwmemaccess.h"
-
-#include
-
-// Debug monitor that dumps to the Programming port all status when
-// an exception or WDT timeout happens - And then resets the board
-
-// All the Monitor routines must run with interrupts disabled and
-// under an ISR execution context. That is why we cannot reuse the
-// Serial interrupt routines or any C runtime, as we don't know the
-// state we are when running them
-
-// A SW memory barrier, to ensure GCC does not overoptimize loops
-#define sw_barrier() __asm__ volatile("": : :"memory");
-
-// (re)initialize UART0 as a monitor output to 250000,n,8,1
-static void TXBegin() {
-
- // Disable UART interrupt in NVIC
- NVIC_DisableIRQ( UART_IRQn );
-
- // We NEED memory barriers to ensure Interrupts are actually disabled!
- // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
- __DSB();
- __ISB();
-
- // Disable clock
- pmc_disable_periph_clk( ID_UART );
-
- // Configure PMC
- pmc_enable_periph_clk( ID_UART );
-
- // Disable PDC channel
- UART->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS;
-
- // Reset and disable receiver and transmitter
- UART->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX | UART_CR_RXDIS | UART_CR_TXDIS;
-
- // Configure mode: 8bit, No parity, 1 bit stop
- UART->UART_MR = UART_MR_CHMODE_NORMAL | US_MR_CHRL_8_BIT | US_MR_NBSTOP_1_BIT | UART_MR_PAR_NO;
-
- // Configure baudrate (asynchronous, no oversampling) to BAUDRATE bauds
- UART->UART_BRGR = (SystemCoreClock / (BAUDRATE << 4));
-
- // Enable receiver and transmitter
- UART->UART_CR = UART_CR_RXEN | UART_CR_TXEN;
-}
-
-// Send character through UART with no interrupts
-static void TX(char c) {
- while (!(UART->UART_SR & UART_SR_TXRDY)) { WDT_Restart(WDT); sw_barrier(); };
- UART->UART_THR = c;
-}
-
-// Send String through UART
-static void TX(const char* s) {
- while (*s) TX(*s++);
-}
-
-static void TXDigit(uint32_t d) {
- if (d < 10) TX((char)(d+'0'));
- else if (d < 16) TX((char)(d+'A'-10));
- else TX('?');
-}
-
-// Send Hex number thru UART
-static void TXHex(uint32_t v) {
- TX("0x");
- for (uint8_t i = 0; i < 8; i++, v <<= 4)
- TXDigit((v >> 28) & 0xF);
-}
-
-// Send Decimal number thru UART
-static void TXDec(uint32_t v) {
- if (!v) {
- TX('0');
- return;
- }
-
- char nbrs[14];
- char *p = &nbrs[0];
- while (v != 0) {
- *p++ = '0' + (v % 10);
- v /= 10;
- }
- do {
- p--;
- TX(*p);
- } while (p != &nbrs[0]);
-}
-
-// Dump a backtrace entry
-static bool UnwReportOut(void* ctx, const UnwReport* bte) {
- int* p = (int*)ctx;
-
- (*p)++;
- TX('#'); TXDec(*p); TX(" : ");
- TX(bte->name?bte->name:"unknown"); TX('@'); TXHex(bte->function);
- TX('+'); TXDec(bte->address - bte->function);
- TX(" PC:");TXHex(bte->address); TX('\n');
- return true;
-}
-
-#ifdef UNW_DEBUG
- void UnwPrintf(const char* format, ...) {
- char dest[256];
- va_list argptr;
- va_start(argptr, format);
- vsprintf(dest, format, argptr);
- va_end(argptr);
- TX(&dest[0]);
- }
-#endif
-
-/* Table of function pointers for passing to the unwinder */
-static const UnwindCallbacks UnwCallbacks = {
- UnwReportOut,
- UnwReadW,
- UnwReadH,
- UnwReadB
- #ifdef UNW_DEBUG
- , UnwPrintf
- #endif
-};
-
-/**
- * HardFaultHandler_C:
- * This is called from the HardFault_HandlerAsm with a pointer the Fault stack
- * as the parameter. We can then read the values from the stack and place them
- * into local variables for ease of reading.
- * We then read the various Fault Status and Address Registers to help decode
- * cause of the fault.
- * The function ends with a BKPT instruction to force control back into the debugger
- */
-extern "C"
-void HardFault_HandlerC(unsigned long *sp, unsigned long lr, unsigned long cause) {
-
- static const char* causestr[] = {
- "NMI","Hard","Mem","Bus","Usage","Debug","WDT","RSTC"
- };
-
- UnwindFrame btf;
-
- // Dump report to the Programming port (interrupts are DISABLED)
- TXBegin();
- TX("\n\n## Software Fault detected ##\n");
- TX("Cause: "); TX(causestr[cause]); TX('\n');
-
- TX("R0 : "); TXHex(((unsigned long)sp[0])); TX('\n');
- TX("R1 : "); TXHex(((unsigned long)sp[1])); TX('\n');
- TX("R2 : "); TXHex(((unsigned long)sp[2])); TX('\n');
- TX("R3 : "); TXHex(((unsigned long)sp[3])); TX('\n');
- TX("R12 : "); TXHex(((unsigned long)sp[4])); TX('\n');
- TX("LR : "); TXHex(((unsigned long)sp[5])); TX('\n');
- TX("PC : "); TXHex(((unsigned long)sp[6])); TX('\n');
- TX("PSR : "); TXHex(((unsigned long)sp[7])); TX('\n');
-
- // Configurable Fault Status Register
- // Consists of MMSR, BFSR and UFSR
- TX("CFSR : "); TXHex((*((volatile unsigned long *)(0xE000ED28)))); TX('\n');
-
- // Hard Fault Status Register
- TX("HFSR : "); TXHex((*((volatile unsigned long *)(0xE000ED2C)))); TX('\n');
-
- // Debug Fault Status Register
- TX("DFSR : "); TXHex((*((volatile unsigned long *)(0xE000ED30)))); TX('\n');
-
- // Auxiliary Fault Status Register
- TX("AFSR : "); TXHex((*((volatile unsigned long *)(0xE000ED3C)))); TX('\n');
-
- // Read the Fault Address Registers. These may not contain valid values.
- // Check BFARVALID/MMARVALID to see if they are valid values
- // MemManage Fault Address Register
- TX("MMAR : "); TXHex((*((volatile unsigned long *)(0xE000ED34)))); TX('\n');
-
- // Bus Fault Address Register
- TX("BFAR : "); TXHex((*((volatile unsigned long *)(0xE000ED38)))); TX('\n');
-
- TX("ExcLR: "); TXHex(lr); TX('\n');
- TX("ExcSP: "); TXHex((unsigned long)sp); TX('\n');
-
- btf.sp = ((unsigned long)sp) + 8*4; // The original stack pointer
- btf.fp = btf.sp;
- btf.lr = ((unsigned long)sp[5]);
- btf.pc = ((unsigned long)sp[6]) | 1; // Force Thumb, as CORTEX only support it
-
- // Perform a backtrace
- TX("\nBacktrace:\n\n");
- int ctr = 0;
- UnwindStart(&btf, &UnwCallbacks, &ctr);
-
- // Disable all NVIC interrupts
- NVIC->ICER[0] = 0xFFFFFFFF;
- NVIC->ICER[1] = 0xFFFFFFFF;
-
- // Relocate VTOR table to default position
- SCB->VTOR = 0;
-
- // Disable USB
- otg_disable();
-
- // Restart watchdog
- WDT_Restart(WDT);
-
- // Reset controller
- NVIC_SystemReset();
- for (;;) WDT_Restart(WDT);
-}
-
-__attribute__((naked)) void NMI_Handler() {
- __asm__ __volatile__ (
- ".syntax unified" "\n\t"
- A("tst lr, #4")
- A("ite eq")
- A("mrseq r0, msp")
- A("mrsne r0, psp")
- A("mov r1,lr")
- A("mov r2,#0")
- A("b HardFault_HandlerC")
- );
-}
-
-__attribute__((naked)) void HardFault_Handler() {
- __asm__ __volatile__ (
- ".syntax unified" "\n\t"
- A("tst lr, #4")
- A("ite eq")
- A("mrseq r0, msp")
- A("mrsne r0, psp")
- A("mov r1,lr")
- A("mov r2,#1")
- A("b HardFault_HandlerC")
- );
-}
-
-__attribute__((naked)) void MemManage_Handler() {
- __asm__ __volatile__ (
- ".syntax unified" "\n\t"
- A("tst lr, #4")
- A("ite eq")
- A("mrseq r0, msp")
- A("mrsne r0, psp")
- A("mov r1,lr")
- A("mov r2,#2")
- A("b HardFault_HandlerC")
- );
-}
-
-__attribute__((naked)) void BusFault_Handler() {
- __asm__ __volatile__ (
- ".syntax unified" "\n\t"
- A("tst lr, #4")
- A("ite eq")
- A("mrseq r0, msp")
- A("mrsne r0, psp")
- A("mov r1,lr")
- A("mov r2,#3")
- A("b HardFault_HandlerC")
- );
-}
-
-__attribute__((naked)) void UsageFault_Handler() {
- __asm__ __volatile__ (
- ".syntax unified" "\n\t"
- A("tst lr, #4")
- A("ite eq")
- A("mrseq r0, msp")
- A("mrsne r0, psp")
- A("mov r1,lr")
- A("mov r2,#4")
- A("b HardFault_HandlerC")
- );
-}
-
-__attribute__((naked)) void DebugMon_Handler() {
- __asm__ __volatile__ (
- ".syntax unified" "\n\t"
- A("tst lr, #4")
- A("ite eq")
- A("mrseq r0, msp")
- A("mrsne r0, psp")
- A("mov r1,lr")
- A("mov r2,#5")
- A("b HardFault_HandlerC")
- );
-}
-
-/* This is NOT an exception, it is an interrupt handler - Nevertheless, the framing is the same */
-__attribute__((naked)) void WDT_Handler() {
- __asm__ __volatile__ (
- ".syntax unified" "\n\t"
- A("tst lr, #4")
- A("ite eq")
- A("mrseq r0, msp")
- A("mrsne r0, psp")
- A("mov r1,lr")
- A("mov r2,#6")
- A("b HardFault_HandlerC")
- );
-}
-
-__attribute__((naked)) void RSTC_Handler() {
- __asm__ __volatile__ (
- ".syntax unified" "\n\t"
- A("tst lr, #4")
- A("ite eq")
- A("mrseq r0, msp")
- A("mrsne r0, psp")
- A("mov r1,lr")
- A("mov r2,#7")
- A("b HardFault_HandlerC")
- );
-}
-
-#endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/DUE/HAL.cpp b/Marlin/src/HAL/DUE/HAL.cpp
deleted file mode 100644
index 6ce85a4643..0000000000
--- a/Marlin/src/HAL/DUE/HAL.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-/**
- * HAL for Arduino Due and compatible (SAM3X8E)
- */
-
-#ifdef ARDUINO_ARCH_SAM
-
-#include "../../inc/MarlinConfig.h"
-#include "HAL.h"
-
-#include
-#include "usb/usb_task.h"
-
-// ------------------------
-// Public Variables
-// ------------------------
-
-uint16_t HAL_adc_result;
-
-// ------------------------
-// Public functions
-// ------------------------
-
-// HAL initialization task
-void HAL_init() {
- // Initialize the USB stack
- #if ENABLED(SDSUPPORT)
- OUT_WRITE(SDSS, HIGH); // Try to set SDSS inactive before any other SPI users start up
- #endif
- usb_task_init();
-}
-
-// HAL idle task
-void HAL_idletask() {
- // Perform USB stack housekeeping
- usb_task_idle();
-}
-
-// Disable interrupts
-void cli() { noInterrupts(); }
-
-// Enable interrupts
-void sei() { interrupts(); }
-
-void HAL_clear_reset_source() { }
-
-uint8_t HAL_get_reset_source() {
- switch ((RSTC->RSTC_SR >> 8) & 0x07) {
- case 0: return RST_POWER_ON;
- case 1: return RST_BACKUP;
- case 2: return RST_WATCHDOG;
- case 3: return RST_SOFTWARE;
- case 4: return RST_EXTERNAL;
- default: return 0;
- }
-}
-
-void _delay_ms(const int delay_ms) {
- // Todo: port for Due?
- delay(delay_ms);
-}
-
-extern "C" {
- extern unsigned int _ebss; // end of bss section
-}
-
-// Return free memory between end of heap (or end bss) and whatever is current
-int freeMemory() {
- int free_memory, heap_end = (int)_sbrk(0);
- return (int)&free_memory - (heap_end ?: (int)&_ebss);
-}
-
-// ------------------------
-// ADC
-// ------------------------
-
-void HAL_adc_start_conversion(const uint8_t ch) {
- HAL_adc_result = analogRead(ch);
-}
-
-uint16_t HAL_adc_get_result() {
- // nop
- return HAL_adc_result;
-}
-
-#endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
deleted file mode 100644
index 88ace59575..0000000000
--- a/Marlin/src/HAL/DUE/HAL.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- *
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
- * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-/**
- * HAL for Arduino Due and compatible (SAM3X8E)
- */
-
-#define CPU_32_BIT
-
-#include "../shared/Marduino.h"
-#include "../shared/eeprom_if.h"
-#include "../shared/math_32bit.h"
-#include "../shared/HAL_SPI.h"
-#include "fastio.h"
-#include "watchdog.h"
-
-#include
-
-#define _MSERIAL(X) Serial##X
-#define MSERIAL(X) _MSERIAL(X)
-#define Serial0 Serial
-
-// Define MYSERIAL0/1 before MarlinSerial includes!
-#if SERIAL_PORT == -1 || ENABLED(EMERGENCY_PARSER)
- #define MYSERIAL0 customizedSerial1
-#elif WITHIN(SERIAL_PORT, 0, 3)
- #define MYSERIAL0 MSERIAL(SERIAL_PORT)
-#else
- #error "The required SERIAL_PORT must be from -1 to 3. Please update your configuration."
-#endif
-
-#ifdef SERIAL_PORT_2
- #if SERIAL_PORT_2 == -1 || ENABLED(EMERGENCY_PARSER)
- #define MYSERIAL1 customizedSerial2
- #elif WITHIN(SERIAL_PORT_2, 0, 3)
- #define MYSERIAL1 MSERIAL(SERIAL_PORT_2)
- #else
- #error "SERIAL_PORT_2 must be from -1 to 3. Please update your configuration."
- #endif
-#endif
-
-#ifdef LCD_SERIAL_PORT
- #if LCD_SERIAL_PORT == -1
- #define LCD_SERIAL lcdSerial
- #elif WITHIN(LCD_SERIAL_PORT, 0, 3)
- #define LCD_SERIAL MSERIAL(LCD_SERIAL_PORT)
- #else
- #error "LCD_SERIAL_PORT must be from -1 to 3. Please update your configuration."
- #endif
-#endif
-
-#include "MarlinSerial.h"
-#include "MarlinSerialUSB.h"
-
-// On AVR this is in math.h?
-#define square(x) ((x)*(x))
-
-#ifndef strncpy_P
- #define strncpy_P(dest, src, num) strncpy((dest), (src), (num))
-#endif
-
-// Fix bug in pgm_read_ptr
-#undef pgm_read_ptr
-#define pgm_read_ptr(addr) (*((void**)(addr)))
-#undef pgm_read_word
-#define pgm_read_word(addr) (*((uint16_t*)(addr)))
-
-typedef int8_t pin_t;
-
-#define SHARED_SERVOS HAS_SERVOS
-#define HAL_SERVO_LIB Servo
-
-//
-// Interrupts
-//
-#define CRITICAL_SECTION_START() uint32_t primask = __get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END() if (!primask) __enable_irq()
-#define ISRS_ENABLED() (!__get_PRIMASK())
-#define ENABLE_ISRS() __enable_irq()
-#define DISABLE_ISRS() __disable_irq()
-
-void cli(); // Disable interrupts
-void sei(); // Enable interrupts
-
-void HAL_clear_reset_source(); // clear reset reason
-uint8_t HAL_get_reset_source(); // get reset reason
-
-inline void HAL_reboot() {} // reboot the board or restart the bootloader
-
-//
-// ADC
-//
-extern uint16_t HAL_adc_result; // result of last ADC conversion
-
-#ifndef analogInputToDigitalPin
- #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
-#endif
-
-#define HAL_ANALOG_SELECT(ch)
-
-inline void HAL_adc_init() {}//todo
-
-#define HAL_ADC_VREF 3.3
-#define HAL_ADC_RESOLUTION 10
-#define HAL_START_ADC(ch) HAL_adc_start_conversion(ch)
-#define HAL_READ_ADC() HAL_adc_result
-#define HAL_ADC_READY() true
-
-void HAL_adc_start_conversion(const uint8_t ch);
-uint16_t HAL_adc_get_result();
-
-//
-// Pin Map
-//
-#define GET_PIN_MAP_PIN(index) index
-#define GET_PIN_MAP_INDEX(pin) pin
-#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
-
-//
-// Tone
-//
-void toneInit();
-void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
-void noTone(const pin_t _pin);
-
-// Enable hooks into idle and setup for HAL
-#define HAL_IDLETASK 1
-void HAL_idletask();
-void HAL_init();
-
-//
-// Utility functions
-//
-void _delay_ms(const int delay);
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-int freeMemory();
-#pragma GCC diagnostic pop
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s);
-#ifdef __cplusplus
- }
-#endif
diff --git a/Marlin/src/HAL/DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
deleted file mode 100644
index 0451d8bcc4..0000000000
--- a/Marlin/src/HAL/DUE/HAL_SPI.cpp
+++ /dev/null
@@ -1,825 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-/**
- * Software SPI functions originally from Arduino Sd2Card Library
- * Copyright (c) 2009 by William Greiman
- *
- * Completely rewritten and tuned by Eduardo José Tagle in 2017/2018
- * in ARM thumb2 inline assembler and tuned for maximum speed and performance
- * allowing SPI clocks of up to 12 Mhz to increase SD card read/write performance
- */
-
-/**
- * HAL for Arduino Due and compatible (SAM3X8E)
- *
- * For ARDUINO_ARCH_SAM
- */
-
-#ifdef ARDUINO_ARCH_SAM
-
-#include "../../inc/MarlinConfig.h"
-#include "../shared/Delay.h"
-
-// ------------------------
-// Public functions
-// ------------------------
-
-#if EITHER(DUE_SOFTWARE_SPI, FORCE_SOFT_SPI)
-
- // ------------------------
- // Software SPI
- // ------------------------
-
- // Make sure GCC optimizes this file.
- // Note that this line triggers a bug in GCC which is fixed by casting.
- // See the note below.
- #pragma GCC optimize (3)
-
- typedef uint8_t (*pfnSpiTransfer)(uint8_t b);
- typedef void (*pfnSpiRxBlock)(uint8_t* buf, uint32_t nbyte);
- typedef void (*pfnSpiTxBlock)(const uint8_t* buf, uint32_t nbyte);
-
- /* ---------------- Macros to be able to access definitions from asm */
- #define _PORT(IO) DIO ## IO ## _WPORT
- #define _PIN_MASK(IO) MASK(DIO ## IO ## _PIN)
- #define _PIN_SHIFT(IO) DIO ## IO ## _PIN
- #define PORT(IO) _PORT(IO)
- #define PIN_MASK(IO) _PIN_MASK(IO)
- #define PIN_SHIFT(IO) _PIN_SHIFT(IO)
-
- // run at ~8 .. ~10Mhz - Tx version (Rx data discarded)
- static uint8_t spiTransferTx0(uint8_t bout) { // using Mode 0
- uint32_t MOSI_PORT_PLUS30 = ((uint32_t) PORT(MOSI_PIN)) + 0x30; /* SODR of port */
- uint32_t MOSI_MASK = PIN_MASK(MOSI_PIN);
- uint32_t SCK_PORT_PLUS30 = ((uint32_t) PORT(SCK_PIN)) + 0x30; /* SODR of port */
- uint32_t SCK_MASK = PIN_MASK(SCK_PIN);
- uint32_t idx = 0;
-
- /* Negate bout, as the assembler requires a negated value */
- bout = ~bout;
-
- /* The software SPI routine */
- __asm__ __volatile__(
- A(".syntax unified") // is to prevent CM0,CM1 non-unified syntax
-
- /* Bit 7 */
- A("ubfx %[idx],%[txval],#7,#1") /* Place bit 7 in bit 0 of idx*/
-
- A("str %[mosi_mask],[%[mosi_port], %[idx],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[idx],%[txval],#6,#1") /* Place bit 6 in bit 0 of idx*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 6 */
- A("str %[mosi_mask],[%[mosi_port], %[idx],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[idx],%[txval],#5,#1") /* Place bit 5 in bit 0 of idx*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 5 */
- A("str %[mosi_mask],[%[mosi_port], %[idx],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[idx],%[txval],#4,#1") /* Place bit 4 in bit 0 of idx*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 4 */
- A("str %[mosi_mask],[%[mosi_port], %[idx],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[idx],%[txval],#3,#1") /* Place bit 3 in bit 0 of idx*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 3 */
- A("str %[mosi_mask],[%[mosi_port], %[idx],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[idx],%[txval],#2,#1") /* Place bit 2 in bit 0 of idx*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 2 */
- A("str %[mosi_mask],[%[mosi_port], %[idx],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[idx],%[txval],#1,#1") /* Place bit 1 in bit 0 of idx*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 1 */
- A("str %[mosi_mask],[%[mosi_port], %[idx],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[idx],%[txval],#0,#1") /* Place bit 0 in bit 0 of idx*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 0 */
- A("str %[mosi_mask],[%[mosi_port], %[idx],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("nop") /* Result will be 0 */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- : [idx]"+r"( idx )
- : [txval]"r"( bout ) ,
- [mosi_mask]"r"( MOSI_MASK ),
- [mosi_port]"r"( MOSI_PORT_PLUS30 ),
- [sck_mask]"r"( SCK_MASK ),
- [sck_port]"r"( SCK_PORT_PLUS30 )
- : "cc"
- );
-
- return 0;
- }
-
- // Calculates the bit band alias address and returns a pointer address to word.
- // addr: The byte address of bitbanding bit.
- // bit: The bit position of bitbanding bit.
- #define BITBAND_ADDRESS(addr, bit) \
- (((uint32_t)(addr) & 0xF0000000) + 0x02000000 + ((uint32_t)(addr)&0xFFFFF)*32 + (bit)*4)
-
- // run at ~8 .. ~10Mhz - Rx version (Tx line not altered)
- static uint8_t spiTransferRx0(uint8_t) { // using Mode 0
- uint32_t bin = 0;
- uint32_t work = 0;
- uint32_t BITBAND_MISO_PORT = BITBAND_ADDRESS( ((uint32_t)PORT(MISO_PIN))+0x3C, PIN_SHIFT(MISO_PIN)); /* PDSR of port in bitband area */
- uint32_t SCK_PORT_PLUS30 = ((uint32_t) PORT(SCK_PIN)) + 0x30; /* SODR of port */
- uint32_t SCK_MASK = PIN_MASK(SCK_PIN);
-
- /* The software SPI routine */
- __asm__ __volatile__(
- A(".syntax unified") // is to prevent CM0,CM1 non-unified syntax
-
- /* bit 7 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#7,#1") /* Store read bit as the bit 7 */
-
- /* bit 6 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#6,#1") /* Store read bit as the bit 6 */
-
- /* bit 5 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#5,#1") /* Store read bit as the bit 5 */
-
- /* bit 4 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#4,#1") /* Store read bit as the bit 4 */
-
- /* bit 3 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#3,#1") /* Store read bit as the bit 3 */
-
- /* bit 2 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#2,#1") /* Store read bit as the bit 2 */
-
- /* bit 1 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#1,#1") /* Store read bit as the bit 1 */
-
- /* bit 0 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#0,#1") /* Store read bit as the bit 0 */
-
- : [bin]"+r"(bin),
- [work]"+r"(work)
- : [bitband_miso_port]"r"( BITBAND_MISO_PORT ),
- [sck_mask]"r"( SCK_MASK ),
- [sck_port]"r"( SCK_PORT_PLUS30 )
- : "cc"
- );
-
- return bin;
- }
-
- // run at ~4Mhz
- static uint8_t spiTransfer1(uint8_t b) { // using Mode 0
- int bits = 8;
- do {
- WRITE(MOSI_PIN, b & 0x80);
- b <<= 1; // little setup time
-
- WRITE(SCK_PIN, HIGH);
- DELAY_NS(125); // 10 cycles @ 84mhz
-
- b |= (READ(MISO_PIN) != 0);
-
- WRITE(SCK_PIN, LOW);
- DELAY_NS(125); // 10 cycles @ 84mhz
- } while (--bits);
- return b;
- }
-
- // all the others
- static uint32_t spiDelayCyclesX4 = (F_CPU) / 1000000; // 4µs => 125khz
-
- static uint8_t spiTransferX(uint8_t b) { // using Mode 0
- int bits = 8;
- do {
- WRITE(MOSI_PIN, b & 0x80);
- b <<= 1; // little setup time
-
- WRITE(SCK_PIN, HIGH);
- __delay_4cycles(spiDelayCyclesX4);
-
- b |= (READ(MISO_PIN) != 0);
-
- WRITE(SCK_PIN, LOW);
- __delay_4cycles(spiDelayCyclesX4);
- } while (--bits);
- return b;
- }
-
- // Pointers to generic functions for byte transfers
-
- /**
- * Note: The cast is unnecessary, but without it, this file triggers a GCC 4.8.3-2014 bug.
- * Later GCC versions do not have this problem, but at this time (May 2018) Arduino still
- * uses that buggy and obsolete GCC version!!
- */
- static pfnSpiTransfer spiTransferRx = (pfnSpiTransfer)spiTransferX;
- static pfnSpiTransfer spiTransferTx = (pfnSpiTransfer)spiTransferX;
-
- // Block transfers run at ~8 .. ~10Mhz - Tx version (Rx data discarded)
- static void spiTxBlock0(const uint8_t* ptr, uint32_t todo) {
- uint32_t MOSI_PORT_PLUS30 = ((uint32_t) PORT(MOSI_PIN)) + 0x30; /* SODR of port */
- uint32_t MOSI_MASK = PIN_MASK(MOSI_PIN);
- uint32_t SCK_PORT_PLUS30 = ((uint32_t) PORT(SCK_PIN)) + 0x30; /* SODR of port */
- uint32_t SCK_MASK = PIN_MASK(SCK_PIN);
- uint32_t work = 0;
- uint32_t txval = 0;
-
- /* The software SPI routine */
- __asm__ __volatile__(
- A(".syntax unified") // is to prevent CM0,CM1 non-unified syntax
-
- L("loop%=")
- A("ldrb.w %[txval], [%[ptr]], #1") /* Load value to send, increment buffer */
- A("mvn %[txval],%[txval]") /* Negate value */
-
- /* Bit 7 */
- A("ubfx %[work],%[txval],#7,#1") /* Place bit 7 in bit 0 of work*/
-
- A("str %[mosi_mask],[%[mosi_port], %[work],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[work],%[txval],#6,#1") /* Place bit 6 in bit 0 of work*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 6 */
- A("str %[mosi_mask],[%[mosi_port], %[work],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[work],%[txval],#5,#1") /* Place bit 5 in bit 0 of work*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 5 */
- A("str %[mosi_mask],[%[mosi_port], %[work],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[work],%[txval],#4,#1") /* Place bit 4 in bit 0 of work*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 4 */
- A("str %[mosi_mask],[%[mosi_port], %[work],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[work],%[txval],#3,#1") /* Place bit 3 in bit 0 of work*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 3 */
- A("str %[mosi_mask],[%[mosi_port], %[work],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[work],%[txval],#2,#1") /* Place bit 2 in bit 0 of work*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 2 */
- A("str %[mosi_mask],[%[mosi_port], %[work],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[work],%[txval],#1,#1") /* Place bit 1 in bit 0 of work*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 1 */
- A("str %[mosi_mask],[%[mosi_port], %[work],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ubfx %[work],%[txval],#0,#1") /* Place bit 0 in bit 0 of work*/
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
-
- /* Bit 0 */
- A("str %[mosi_mask],[%[mosi_port], %[work],LSL #2]") /* Access the proper SODR or CODR registers based on that bit */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("subs %[todo],#1") /* Decrement count of pending words to send, update status */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bne.n loop%=") /* Repeat until done */
-
- : [ptr]"+r" ( ptr ) ,
- [todo]"+r" ( todo ) ,
- [work]"+r"( work ) ,
- [txval]"+r"( txval )
- : [mosi_mask]"r"( MOSI_MASK ),
- [mosi_port]"r"( MOSI_PORT_PLUS30 ),
- [sck_mask]"r"( SCK_MASK ),
- [sck_port]"r"( SCK_PORT_PLUS30 )
- : "cc"
- );
- }
-
- static void spiRxBlock0(uint8_t* ptr, uint32_t todo) {
- uint32_t bin = 0;
- uint32_t work = 0;
- uint32_t BITBAND_MISO_PORT = BITBAND_ADDRESS( ((uint32_t)PORT(MISO_PIN))+0x3C, PIN_SHIFT(MISO_PIN)); /* PDSR of port in bitband area */
- uint32_t SCK_PORT_PLUS30 = ((uint32_t) PORT(SCK_PIN)) + 0x30; /* SODR of port */
- uint32_t SCK_MASK = PIN_MASK(SCK_PIN);
-
- /* The software SPI routine */
- __asm__ __volatile__(
- A(".syntax unified") // is to prevent CM0,CM1 non-unified syntax
-
- L("loop%=")
-
- /* bit 7 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#7,#1") /* Store read bit as the bit 7 */
-
- /* bit 6 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#6,#1") /* Store read bit as the bit 6 */
-
- /* bit 5 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#5,#1") /* Store read bit as the bit 5 */
-
- /* bit 4 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#4,#1") /* Store read bit as the bit 4 */
-
- /* bit 3 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#3,#1") /* Store read bit as the bit 3 */
-
- /* bit 2 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#2,#1") /* Store read bit as the bit 2 */
-
- /* bit 1 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#1,#1") /* Store read bit as the bit 1 */
-
- /* bit 0 */
- A("str %[sck_mask],[%[sck_port]]") /* SODR */
- A("ldr %[work],[%[bitband_miso_port]]") /* PDSR on bitband area for required bit: work will be 1 or 0 based on port */
- A("str %[sck_mask],[%[sck_port],#0x4]") /* CODR */
- A("bfi %[bin],%[work],#0,#1") /* Store read bit as the bit 0 */
-
- A("subs %[todo],#1") /* Decrement count of pending words to send, update status */
- A("strb.w %[bin], [%[ptr]], #1") /* Store read value into buffer, increment buffer pointer */
- A("bne.n loop%=") /* Repeat until done */
-
- : [ptr]"+r"(ptr),
- [todo]"+r"(todo),
- [bin]"+r"(bin),
- [work]"+r"(work)
- : [bitband_miso_port]"r"( BITBAND_MISO_PORT ),
- [sck_mask]"r"( SCK_MASK ),
- [sck_port]"r"( SCK_PORT_PLUS30 )
- : "cc"
- );
- }
-
- static void spiTxBlockX(const uint8_t* buf, uint32_t todo) {
- do {
- (void)spiTransferTx(*buf++);
- } while (--todo);
- }
-
- static void spiRxBlockX(uint8_t* buf, uint32_t todo) {
- do {
- *buf++ = spiTransferRx(0xFF);
- } while (--todo);
- }
-
- // Pointers to generic functions for block tranfers
- static pfnSpiTxBlock spiTxBlock = (pfnSpiTxBlock)spiTxBlockX;
- static pfnSpiRxBlock spiRxBlock = (pfnSpiRxBlock)spiRxBlockX;
-
- #if MB(ALLIGATOR)
- #define _SS_WRITE(S) WRITE(SS_PIN, S)
- #else
- #define _SS_WRITE(S) NOOP
- #endif
-
- void spiBegin() {
- SET_OUTPUT(SS_PIN);
- _SS_WRITE(HIGH);
- SET_OUTPUT(SCK_PIN);
- SET_INPUT(MISO_PIN);
- SET_OUTPUT(MOSI_PIN);
- }
-
- uint8_t spiRec() {
- _SS_WRITE(LOW);
- WRITE(MOSI_PIN, HIGH); // Output 1s 1
- uint8_t b = spiTransferRx(0xFF);
- _SS_WRITE(HIGH);
- return b;
- }
-
- void spiRead(uint8_t* buf, uint16_t nbyte) {
- if (nbyte) {
- _SS_WRITE(LOW);
- WRITE(MOSI_PIN, HIGH); // Output 1s 1
- spiRxBlock(buf, nbyte);
- _SS_WRITE(HIGH);
- }
- }
-
- void spiSend(uint8_t b) {
- _SS_WRITE(LOW);
- (void)spiTransferTx(b);
- _SS_WRITE(HIGH);
- }
-
- void spiSendBlock(uint8_t token, const uint8_t* buf) {
- _SS_WRITE(LOW);
- (void)spiTransferTx(token);
- spiTxBlock(buf, 512);
- _SS_WRITE(HIGH);
- }
-
- /**
- * spiRate should be
- * 0 : 8 - 10 MHz
- * 1 : 4 - 5 MHz
- * 2 : 2 - 2.5 MHz
- * 3 : 1 - 1.25 MHz
- * 4 : 500 - 625 kHz
- * 5 : 250 - 312 kHz
- * 6 : 125 - 156 kHz
- */
- void spiInit(uint8_t spiRate) {
- switch (spiRate) {
- case 0:
- spiTransferTx = (pfnSpiTransfer)spiTransferTx0;
- spiTransferRx = (pfnSpiTransfer)spiTransferRx0;
- spiTxBlock = (pfnSpiTxBlock)spiTxBlock0;
- spiRxBlock = (pfnSpiRxBlock)spiRxBlock0;
- break;
- case 1:
- spiTransferTx = (pfnSpiTransfer)spiTransfer1;
- spiTransferRx = (pfnSpiTransfer)spiTransfer1;
- spiTxBlock = (pfnSpiTxBlock)spiTxBlockX;
- spiRxBlock = (pfnSpiRxBlock)spiRxBlockX;
- break;
- default:
- spiDelayCyclesX4 = ((F_CPU) / 1000000) >> (6 - spiRate);
- spiTransferTx = (pfnSpiTransfer)spiTransferX;
- spiTransferRx = (pfnSpiTransfer)spiTransferX;
- spiTxBlock = (pfnSpiTxBlock)spiTxBlockX;
- spiRxBlock = (pfnSpiRxBlock)spiRxBlockX;
- break;
- }
-
- _SS_WRITE(HIGH);
- WRITE(MOSI_PIN, HIGH);
- WRITE(SCK_PIN, LOW);
- }
-
- /** Begin SPI transaction, set clock, bit order, data mode */
- void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode) {
- // TODO: to be implemented
- }
-
- #pragma GCC reset_options
-
-#else // !SOFTWARE_SPI
-
- #define WHILE_TX(N) while ((SPI0->SPI_SR & SPI_SR_TDRE) == (N))
- #define WHILE_RX(N) while ((SPI0->SPI_SR & SPI_SR_RDRF) == (N))
- #define FLUSH_TX() do{ WHILE_RX(1) SPI0->SPI_RDR; }while(0)
-
- #if MB(ALLIGATOR)
-
- // slave selects controlled by SPI controller
- // doesn't support changing SPI speeds for SD card
-
- // ------------------------
- // hardware SPI
- // ------------------------
- static bool spiInitialized = false;
-
- void spiInit(uint8_t spiRate) {
- if (spiInitialized) return;
-
- // 8.4 MHz, 4 MHz, 2 MHz, 1 MHz, 0.5 MHz, 0.329 MHz, 0.329 MHz
- constexpr int spiDivider[] = { 10, 21, 42, 84, 168, 255, 255 };
- if (spiRate > 6) spiRate = 1;
-
- // Set SPI mode 1, clock, select not active after transfer, with delay between transfers
- SPI_ConfigureNPCS(SPI0, SPI_CHAN_DAC,
- SPI_CSR_CSAAT | SPI_CSR_SCBR(spiDivider[spiRate]) |
- SPI_CSR_DLYBCT(1));
- // Set SPI mode 0, clock, select not active after transfer, with delay between transfers
- SPI_ConfigureNPCS(SPI0, SPI_CHAN_EEPROM1, SPI_CSR_NCPHA |
- SPI_CSR_CSAAT | SPI_CSR_SCBR(spiDivider[spiRate]) |
- SPI_CSR_DLYBCT(1));
-
- // Set SPI mode 0, clock, select not active after transfer, with delay between transfers
- SPI_ConfigureNPCS(SPI0, SPI_CHAN, SPI_CSR_NCPHA |
- SPI_CSR_CSAAT | SPI_CSR_SCBR(spiDivider[spiRate]) |
- SPI_CSR_DLYBCT(1));
- SPI_Enable(SPI0);
- spiInitialized = true;
- }
-
- void spiBegin() {
- if (spiInitialized) return;
-
- // Configure SPI pins
- PIO_Configure(
- g_APinDescription[SCK_PIN].pPort,
- g_APinDescription[SCK_PIN].ulPinType,
- g_APinDescription[SCK_PIN].ulPin,
- g_APinDescription[SCK_PIN].ulPinConfiguration);
- PIO_Configure(
- g_APinDescription[MOSI_PIN].pPort,
- g_APinDescription[MOSI_PIN].ulPinType,
- g_APinDescription[MOSI_PIN].ulPin,
- g_APinDescription[MOSI_PIN].ulPinConfiguration);
- PIO_Configure(
- g_APinDescription[MISO_PIN].pPort,
- g_APinDescription[MISO_PIN].ulPinType,
- g_APinDescription[MISO_PIN].ulPin,
- g_APinDescription[MISO_PIN].ulPinConfiguration);
-
- // set master mode, peripheral select, fault detection
- SPI_Configure(SPI0, ID_SPI0, SPI_MR_MSTR | SPI_MR_MODFDIS | SPI_MR_PS);
- SPI_Enable(SPI0);
-
- SET_OUTPUT(DAC0_SYNC);
- #if HAS_MULTI_EXTRUDER
- SET_OUTPUT(DAC1_SYNC);
- WRITE(DAC1_SYNC, HIGH);
- #endif
- SET_OUTPUT(SPI_EEPROM1_CS);
- SET_OUTPUT(SPI_EEPROM2_CS);
- SET_OUTPUT(SPI_FLASH_CS);
- WRITE(DAC0_SYNC, HIGH);
- WRITE(SPI_EEPROM1_CS, HIGH);
- WRITE(SPI_EEPROM2_CS, HIGH);
- WRITE(SPI_FLASH_CS, HIGH);
- WRITE(SS_PIN, HIGH);
-
- OUT_WRITE(SDSS, LOW);
-
- PIO_Configure(
- g_APinDescription[SPI_PIN].pPort,
- g_APinDescription[SPI_PIN].ulPinType,
- g_APinDescription[SPI_PIN].ulPin,
- g_APinDescription[SPI_PIN].ulPinConfiguration
- );
-
- spiInit(1);
- }
-
- // Read single byte from SPI
- uint8_t spiRec() {
- // write dummy byte with address and end transmission flag
- SPI0->SPI_TDR = 0x000000FF | SPI_PCS(SPI_CHAN) | SPI_TDR_LASTXFER;
-
- WHILE_TX(0);
- WHILE_RX(0);
-
- //DELAY_US(1U);
- return SPI0->SPI_RDR;
- }
-
- uint8_t spiRec(uint32_t chan) {
-
- WHILE_TX(0);
- FLUSH_RX();
-
- // write dummy byte with address and end transmission flag
- SPI0->SPI_TDR = 0x000000FF | SPI_PCS(chan) | SPI_TDR_LASTXFER;
- WHILE_RX(0);
-
- return SPI0->SPI_RDR;
- }
-
- // Read from SPI into buffer
- void spiRead(uint8_t* buf, uint16_t nbyte) {
- if (!nbyte) return;
- --nbyte;
- for (int i = 0; i < nbyte; i++) {
- //WHILE_TX(0);
- SPI0->SPI_TDR = 0x000000FF | SPI_PCS(SPI_CHAN);
- WHILE_RX(0);
- buf[i] = SPI0->SPI_RDR;
- //DELAY_US(1U);
- }
- buf[nbyte] = spiRec();
- }
-
- // Write single byte to SPI
- void spiSend(const byte b) {
- // write byte with address and end transmission flag
- SPI0->SPI_TDR = (uint32_t)b | SPI_PCS(SPI_CHAN) | SPI_TDR_LASTXFER;
- WHILE_TX(0);
- WHILE_RX(0);
- SPI0->SPI_RDR;
- //DELAY_US(1U);
- }
-
- void spiSend(const uint8_t* buf, size_t nbyte) {
- if (!nbyte) return;
- --nbyte;
- for (size_t i = 0; i < nbyte; i++) {
- SPI0->SPI_TDR = (uint32_t)buf[i] | SPI_PCS(SPI_CHAN);
- WHILE_TX(0);
- WHILE_RX(0);
- SPI0->SPI_RDR;
- //DELAY_US(1U);
- }
- spiSend(buf[nbyte]);
- }
-
- void spiSend(uint32_t chan, byte b) {
- WHILE_TX(0);
- // write byte with address and end transmission flag
- SPI0->SPI_TDR = (uint32_t)b | SPI_PCS(chan) | SPI_TDR_LASTXFER;
- WHILE_RX(0);
- FLUSH_RX();
- }
-
- void spiSend(uint32_t chan, const uint8_t* buf, size_t nbyte) {
- if (!nbyte) return;
- --nbyte;
- for (size_t i = 0; i < nbyte; i++) {
- WHILE_TX(0);
- SPI0->SPI_TDR = (uint32_t)buf[i] | SPI_PCS(chan);
- WHILE_RX(0);
- FLUSH_RX();
- }
- spiSend(chan, buf[nbyte]);
- }
-
- // Write from buffer to SPI
- void spiSendBlock(uint8_t token, const uint8_t* buf) {
- SPI0->SPI_TDR = (uint32_t)token | SPI_PCS(SPI_CHAN);
- WHILE_TX(0);
- //WHILE_RX(0);
- //SPI0->SPI_RDR;
- for (int i = 0; i < 511; i++) {
- SPI0->SPI_TDR = (uint32_t)buf[i] | SPI_PCS(SPI_CHAN);
- WHILE_TX(0);
- WHILE_RX(0);
- SPI0->SPI_RDR;
- //DELAY_US(1U);
- }
- spiSend(buf[511]);
- }
-
- /** Begin SPI transaction, set clock, bit order, data mode */
- void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode) {
- // TODO: to be implemented
- }
-
- #else // U8G compatible hardware SPI
-
- #define SPI_MODE_0_DUE_HW 2 // DUE CPHA control bit is inverted
- #define SPI_MODE_1_DUE_HW 3
- #define SPI_MODE_2_DUE_HW 0
- #define SPI_MODE_3_DUE_HW 1
-
- /**
- * The DUE SPI controller is set up so the upper word of the longword
- * written to the transmit data register selects which SPI Chip Select
- * Register is used. This allows different streams to have different SPI
- * settings.
- *
- * In practice it's spooky. Some combinations hang the system, while others
- * upset the peripheral device.
- *
- * SPI mode should be the same for all streams. The FYSETC_MINI_12864 gets
- * upset if the clock phase changes after chip select goes active.
- *
- * SPI_CSR_CSAAT should be set for all streams. If not the WHILE_TX(0)
- * macro returns immediately which can result in the SPI chip select going
- * inactive before all the data has been sent.
- *
- * The TMC2130 library uses SPI0->SPI_CSR[3].
- *
- * The U8G hardware SPI uses SPI0->SPI_CSR[0]. The system hangs and/or the
- * FYSETC_MINI_12864 gets upset if lower baud rates are used and the SD card
- * is inserted or removed.
- *
- * The SD card uses SPI0->SPI_CSR[3]. Efforts were made to use [1] and [2]
- * but they all resulted in hangs or garbage on the LCD.
- *
- * The SPI controlled chip selects are NOT enabled in the GPIO controller.
- * The application must control the chip select.
- *
- * All of the above can be avoided by defining FORCE_SOFT_SPI to force the
- * display to use software SPI.
- */
-
- void spiInit(uint8_t spiRate=6) { // Default to slowest rate if not specified)
- // Also sets U8G SPI rate to 4MHz and the SPI mode to 3
-
- // 8.4 MHz, 4 MHz, 2 MHz, 1 MHz, 0.5 MHz, 0.329 MHz, 0.329 MHz
- constexpr int spiDivider[] = { 10, 21, 42, 84, 168, 255, 255 };
- if (spiRate > 6) spiRate = 1;
-
- // Enable PIOA and SPI0
- REG_PMC_PCER0 = (1UL << ID_PIOA) | (1UL << ID_SPI0);
-
- // Disable PIO on A26 and A27
- REG_PIOA_PDR = 0x0C000000;
- OUT_WRITE(SDSS, HIGH);
-
- // Reset SPI0 (from sam lib)
- SPI0->SPI_CR = SPI_CR_SPIDIS;
- SPI0->SPI_CR = SPI_CR_SWRST;
- SPI0->SPI_CR = SPI_CR_SWRST;
- SPI0->SPI_CR = SPI_CR_SPIEN;
-
- // TMC2103 compatible setup
- // Master mode, no fault detection, PCS bits in data written to TDR select CSR register
- SPI0->SPI_MR = SPI_MR_MSTR | SPI_MR_PS | SPI_MR_MODFDIS;
- // SPI mode 3, 8 Bit data transfer, baud rate
- SPI0->SPI_CSR[3] = SPI_CSR_SCBR(spiDivider[spiRate]) | SPI_CSR_CSAAT | SPI_MODE_3_DUE_HW; // use same CSR as TMC2130
- SPI0->SPI_CSR[0] = SPI_CSR_SCBR(spiDivider[1]) | SPI_CSR_CSAAT | SPI_MODE_3_DUE_HW; // U8G default to 4MHz
- }
-
- void spiBegin() { spiInit(); }
-
- static uint8_t spiTransfer(uint8_t data) {
- WHILE_TX(0);
- SPI0->SPI_TDR = (uint32_t)data | 0x00070000UL; // Add TMC2130 PCS bits to every byte (use SPI0->SPI_CSR[3])
- WHILE_TX(0);
- WHILE_RX(0);
- return SPI0->SPI_RDR;
- }
-
- uint8_t spiRec() { return (uint8_t)spiTransfer(0xFF); }
-
- void spiRead(uint8_t* buf, uint16_t nbyte) {
- for (int i = 0; i < nbyte; i++)
- buf[i] = spiTransfer(0xFF);
- }
-
- void spiSend(uint8_t data) { spiTransfer(data); }
-
- void spiSend(const uint8_t* buf, size_t nbyte) {
- for (uint16_t i = 0; i < nbyte; i++)
- spiTransfer(buf[i]);
- }
-
- void spiSendBlock(uint8_t token, const uint8_t* buf) {
- spiTransfer(token);
- for (uint16_t i = 0; i < 512; i++)
- spiTransfer(buf[i]);
- }
-
- #endif // !ALLIGATOR
-#endif // !SOFTWARE_SPI
-
-#endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/DUE/InterruptVectors.cpp b/Marlin/src/HAL/DUE/InterruptVectors.cpp
deleted file mode 100644
index e4e0ce99f2..0000000000
--- a/Marlin/src/HAL/DUE/InterruptVectors.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-/**
- * InterruptVectors_Due.cpp - This module relocates the Interrupt vector table to SRAM,
- * allowing to register new interrupt handlers at runtime. Specially valuable and needed
- * because Arduino runtime allocates some interrupt handlers that we NEED to override to
- * properly support extended functionality, as for example, USB host or USB device (MSD, MTP)
- * and custom serial port handlers, and we don't actually want to modify and/or recompile the
- * Arduino runtime. We just want to run as much as possible on Stock Arduino
- *
- * Copyright (c) 2017 Eduardo José Tagle. All right reserved
- */
-#ifdef ARDUINO_ARCH_SAM
-
-#include "../../inc/MarlinConfig.h"
-#include "HAL.h"
-#include "InterruptVectors.h"
-
-/* The relocated Exception/Interrupt Table - According to the ARM
- reference manual, alignment to 128 bytes should suffice, but in
- practice, we need alignment to 256 bytes to make this work in all
- cases */
-__attribute__ ((aligned(256)))
-static DeviceVectors ram_tab = { nullptr };
-
-/**
- * This function checks if the exception/interrupt table is already in SRAM or not.
- * If it is not, then it copies the ROM table to the SRAM and relocates the table
- * by reprogramming the NVIC registers
- */
-static pfnISR_Handler* get_relocated_table_addr() {
- // Get the address of the interrupt/exception table
- uint32_t isrtab = SCB->VTOR;
-
- // If already relocated, we are done!
- if (isrtab >= IRAM0_ADDR)
- return (pfnISR_Handler*)isrtab;
-
- // Get the address of the table stored in FLASH
- const pfnISR_Handler* romtab = (const pfnISR_Handler*)isrtab;
-
- // Copy it to SRAM
- memcpy(&ram_tab, romtab, sizeof(ram_tab));
-
- // Disable global interrupts
- CRITICAL_SECTION_START();
-
- // Set the vector table base address to the SRAM copy
- SCB->VTOR = (uint32_t)(&ram_tab);
-
- // Reenable interrupts
- CRITICAL_SECTION_END();
-
- // Return the address of the table
- return (pfnISR_Handler*)(&ram_tab);
-}
-
-pfnISR_Handler install_isr(IRQn_Type irq, pfnISR_Handler newHandler) {
- // Get the address of the relocated table
- pfnISR_Handler *isrtab = get_relocated_table_addr();
-
- // Disable global interrupts
- CRITICAL_SECTION_START();
-
- // Get the original handler
- pfnISR_Handler oldHandler = isrtab[irq + 16];
-
- // Install the new one
- isrtab[irq + 16] = newHandler;
-
- // Reenable interrupts
- CRITICAL_SECTION_END();
-
- // Return the original one
- return oldHandler;
-}
-
-#endif
diff --git a/Marlin/src/HAL/DUE/InterruptVectors.h b/Marlin/src/HAL/DUE/InterruptVectors.h
deleted file mode 100644
index 6faeb34b7a..0000000000
--- a/Marlin/src/HAL/DUE/InterruptVectors.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-/**
- * InterruptVectors_Due.h
- *
- * This module relocates the Interrupt vector table to SRAM, allowing new
- * interrupt handlers to be added at runtime. This is required because the
- * Arduino runtime steals interrupt handlers that Marlin MUST use to support
- * extended functionality such as USB hosts and USB devices (MSD, MTP) and
- * custom serial port handlers. Rather than modifying and/or recompiling the
- * Arduino runtime, We just want to run as much as possible on Stock Arduino.
- *
- * Copyright (c) 2017 Eduardo José Tagle. All right reserved
- */
-
-#ifdef ARDUINO_ARCH_SAM
-
-// ISR handler type
-typedef void (*pfnISR_Handler)();
-
-// Install a new interrupt vector handler for the given irq, returning the old one
-pfnISR_Handler install_isr(IRQn_Type irq, pfnISR_Handler newHandler);
-
-#endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/DUE/MarlinSerial.cpp b/Marlin/src/HAL/DUE/MarlinSerial.cpp
deleted file mode 100644
index c9a372eeb1..0000000000
--- a/Marlin/src/HAL/DUE/MarlinSerial.cpp
+++ /dev/null
@@ -1,641 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-/**
- * MarlinSerial_Due.cpp - Hardware serial library for Arduino DUE
- * Copyright (c) 2017 Eduardo José Tagle. All right reserved
- * Based on MarlinSerial for AVR, copyright (c) 2006 Nicholas Zambetti. All right reserved.
- */
-#ifdef ARDUINO_ARCH_SAM
-
-#include "../../inc/MarlinConfig.h"
-
-#include "MarlinSerial.h"
-#include "InterruptVectors.h"
-#include "../../MarlinCore.h"
-
-template typename MarlinSerial::ring_buffer_r MarlinSerial::rx_buffer = { 0, 0, { 0 } };
-template typename MarlinSerial::ring_buffer_t MarlinSerial::tx_buffer = { 0 };
-template bool MarlinSerial::_written = false;
-template uint8_t MarlinSerial::xon_xoff_state = MarlinSerial::XON_XOFF_CHAR_SENT | MarlinSerial::XON_CHAR;
-template uint8_t MarlinSerial::rx_dropped_bytes = 0;
-template uint8_t MarlinSerial::rx_buffer_overruns = 0;
-template uint8_t MarlinSerial::rx_framing_errors = 0;
-template typename MarlinSerial::ring_buffer_pos_t MarlinSerial::rx_max_enqueued = 0;
-
-// A SW memory barrier, to ensure GCC does not overoptimize loops
-#define sw_barrier() asm volatile("": : :"memory");
-
-#include "../../feature/e_parser.h"
-
-// (called with RX interrupts disabled)
-template
-FORCE_INLINE void MarlinSerial::store_rxd_char() {
-
- static EmergencyParser::State emergency_state; // = EP_RESET
-
- // Get the tail - Nothing can alter its value while we are at this ISR
- const ring_buffer_pos_t t = rx_buffer.tail;
-
- // Get the head pointer
- ring_buffer_pos_t h = rx_buffer.head;
-
- // Get the next element
- ring_buffer_pos_t i = (ring_buffer_pos_t)(h + 1) & (ring_buffer_pos_t)(Cfg::RX_SIZE - 1);
-
- // Read the character from the USART
- uint8_t c = HWUART->UART_RHR;
-
- if (Cfg::EMERGENCYPARSER) emergency_parser.update(emergency_state, c);
-
- // If the character is to be stored at the index just before the tail
- // (such that the head would advance to the current tail), the RX FIFO is
- // full, so don't write the character or advance the head.
- if (i != t) {
- rx_buffer.buffer[h] = c;
- h = i;
- }
- else if (Cfg::DROPPED_RX && !++rx_dropped_bytes)
- --rx_dropped_bytes;
-
- const ring_buffer_pos_t rx_count = (ring_buffer_pos_t)(h - t) & (ring_buffer_pos_t)(Cfg::RX_SIZE - 1);
- // Calculate count of bytes stored into the RX buffer
-
- // Keep track of the maximum count of enqueued bytes
- if (Cfg::MAX_RX_QUEUED) NOLESS(rx_max_enqueued, rx_count);
-
- if (Cfg::XONOFF) {
- // If the last char that was sent was an XON
- if ((xon_xoff_state & XON_XOFF_CHAR_MASK) == XON_CHAR) {
-
- // Bytes stored into the RX buffer
- const ring_buffer_pos_t rx_count = (ring_buffer_pos_t)(h - t) & (ring_buffer_pos_t)(Cfg::RX_SIZE - 1);
-
- // If over 12.5% of RX buffer capacity, send XOFF before running out of
- // RX buffer space .. 325 bytes @ 250kbits/s needed to let the host react
- // and stop sending bytes. This translates to 13mS propagation time.
- if (rx_count >= (Cfg::RX_SIZE) / 8) {
-
- // At this point, definitely no TX interrupt was executing, since the TX isr can't be preempted.
- // Don't enable the TX interrupt here as a means to trigger the XOFF char, because if it happens
- // to be in the middle of trying to disable the RX interrupt in the main program, eventually the
- // enabling of the TX interrupt could be undone. The ONLY reliable thing this can do to ensure
- // the sending of the XOFF char is to send it HERE AND NOW.
-
- // About to send the XOFF char
- xon_xoff_state = XOFF_CHAR | XON_XOFF_CHAR_SENT;
-
- // Wait until the TX register becomes empty and send it - Here there could be a problem
- // - While waiting for the TX register to empty, the RX register could receive a new
- // character. This must also handle that situation!
- uint32_t status;
- while (!((status = HWUART->UART_SR) & UART_SR_TXRDY)) {
-
- if (status & UART_SR_RXRDY) {
- // We received a char while waiting for the TX buffer to be empty - Receive and process it!
-
- i = (ring_buffer_pos_t)(h + 1) & (ring_buffer_pos_t)(Cfg::RX_SIZE - 1);
-
- // Read the character from the USART
- c = HWUART->UART_RHR;
-
- if (Cfg::EMERGENCYPARSER) emergency_parser.update(emergency_state, c);
-
- // If the character is to be stored at the index just before the tail
- // (such that the head would advance to the current tail), the FIFO is
- // full, so don't write the character or advance the head.
- if (i != t) {
- rx_buffer.buffer[h] = c;
- h = i;
- }
- else if (Cfg::DROPPED_RX && !++rx_dropped_bytes)
- --rx_dropped_bytes;
- }
- sw_barrier();
- }
-
- HWUART->UART_THR = XOFF_CHAR;
-
- // At this point there could be a race condition between the write() function
- // and this sending of the XOFF char. This interrupt could happen between the
- // wait to be empty TX buffer loop and the actual write of the character. Since
- // the TX buffer is full because it's sending the XOFF char, the only way to be
- // sure the write() function will succeed is to wait for the XOFF char to be
- // completely sent. Since an extra character could be received during the wait
- // it must also be handled!
- while (!((status = HWUART->UART_SR) & UART_SR_TXRDY)) {
-
- if (status & UART_SR_RXRDY) {
- // A char arrived while waiting for the TX buffer to be empty - Receive and process it!
-
- i = (ring_buffer_pos_t)(h + 1) & (ring_buffer_pos_t)(Cfg::RX_SIZE - 1);
-
- // Read the character from the USART
- c = HWUART->UART_RHR;
-
- if (Cfg::EMERGENCYPARSER) emergency_parser.update(emergency_state, c);
-
- // If the character is to be stored at the index just before the tail
- // (such that the head would advance to the current tail), the FIFO is
- // full, so don't write the character or advance the head.
- if (i != t) {
- rx_buffer.buffer[h] = c;
- h = i;
- }
- else if (Cfg::DROPPED_RX && !++rx_dropped_bytes)
- --rx_dropped_bytes;
- }
- sw_barrier();
- }
-
- // At this point everything is ready. The write() function won't
- // have any issues writing to the UART TX register if it needs to!
- }
- }
- }
-
- // Store the new head value
- rx_buffer.head = h;
-}
-
-template
-FORCE_INLINE void MarlinSerial::_tx_thr_empty_irq() {
- if (Cfg::TX_SIZE > 0) {
- // Read positions
- uint8_t t = tx_buffer.tail;
- const uint8_t h = tx_buffer.head;
-
- if (Cfg::XONOFF) {
- // If an XON char is pending to be sent, do it now
- if (xon_xoff_state == XON_CHAR) {
-
- // Send the character
- HWUART->UART_THR = XON_CHAR;
-
- // Remember we sent it.
- xon_xoff_state = XON_CHAR | XON_XOFF_CHAR_SENT;
-
- // If nothing else to transmit, just disable TX interrupts.
- if (h == t) HWUART->UART_IDR = UART_IDR_TXRDY;
-
- return;
- }
- }
-
- // If nothing to transmit, just disable TX interrupts. This could
- // happen as the result of the non atomicity of the disabling of RX
- // interrupts that could end reenabling TX interrupts as a side effect.
- if (h == t) {
- HWUART->UART_IDR = UART_IDR_TXRDY;
- return;
- }
-
- // There is something to TX, Send the next byte
- const uint8_t c = tx_buffer.buffer[t];
- t = (t + 1) & (Cfg::TX_SIZE - 1);
- HWUART->UART_THR = c;
- tx_buffer.tail = t;
-
- // Disable interrupts if there is nothing to transmit following this byte
- if (h == t) HWUART->UART_IDR = UART_IDR_TXRDY;
- }
-}
-
-template
-void MarlinSerial::UART_ISR() {
- const uint32_t status = HWUART->UART_SR;
-
- // Data received?
- if (status & UART_SR_RXRDY) store_rxd_char();
-
- if (Cfg::TX_SIZE > 0) {
- // Something to send, and TX interrupts are enabled (meaning something to send)?
- if ((status & UART_SR_TXRDY) && (HWUART->UART_IMR & UART_IMR_TXRDY)) _tx_thr_empty_irq();
- }
-
- // Acknowledge errors
- if ((status & UART_SR_OVRE) || (status & UART_SR_FRAME)) {
- if (Cfg::DROPPED_RX && (status & UART_SR_OVRE) && !++rx_dropped_bytes) --rx_dropped_bytes;
- if (Cfg::RX_OVERRUNS && (status & UART_SR_OVRE) && !++rx_buffer_overruns) --rx_buffer_overruns;
- if (Cfg::RX_FRAMING_ERRORS && (status & UART_SR_FRAME) && !++rx_framing_errors) --rx_framing_errors;
-
- // TODO: error reporting outside ISR
- HWUART->UART_CR = UART_CR_RSTSTA;
- }
-}
-
-// Public Methods
-template
-void MarlinSerial::begin(const long baud_setting) {
-
- // Disable UART interrupt in NVIC
- NVIC_DisableIRQ( HWUART_IRQ );
-
- // We NEED memory barriers to ensure Interrupts are actually disabled!
- // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
- __DSB();
- __ISB();
-
- // Disable clock
- pmc_disable_periph_clk( HWUART_IRQ_ID );
-
- // Configure PMC
- pmc_enable_periph_clk( HWUART_IRQ_ID );
-
- // Disable PDC channel
- HWUART->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS;
-
- // Reset and disable receiver and transmitter
- HWUART->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX | UART_CR_RXDIS | UART_CR_TXDIS;
-
- // Configure mode: 8bit, No parity, 1 bit stop
- HWUART->UART_MR = UART_MR_CHMODE_NORMAL | US_MR_CHRL_8_BIT | US_MR_NBSTOP_1_BIT | UART_MR_PAR_NO;
-
- // Configure baudrate (asynchronous, no oversampling)
- HWUART->UART_BRGR = (SystemCoreClock / (baud_setting << 4));
-
- // Configure interrupts
- HWUART->UART_IDR = 0xFFFFFFFF;
- HWUART->UART_IER = UART_IER_RXRDY | UART_IER_OVRE | UART_IER_FRAME;
-
- // Install interrupt handler
- install_isr(HWUART_IRQ, UART_ISR);
-
- // Configure priority. We need a very high priority to avoid losing characters
- // and we need to be able to preempt the Stepper ISR and everything else!
- // (this could probably be fixed by using DMA with the Serial port)
- NVIC_SetPriority(HWUART_IRQ, 1);
-
- // Enable UART interrupt in NVIC
- NVIC_EnableIRQ(HWUART_IRQ);
-
- // Enable receiver and transmitter
- HWUART->UART_CR = UART_CR_RXEN | UART_CR_TXEN;
-
- if (Cfg::TX_SIZE > 0) _written = false;
-}
-
-template
-void MarlinSerial::end() {
- // Disable UART interrupt in NVIC
- NVIC_DisableIRQ( HWUART_IRQ );
-
- // We NEED memory barriers to ensure Interrupts are actually disabled!
- // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
- __DSB();
- __ISB();
-
- pmc_disable_periph_clk( HWUART_IRQ_ID );
-}
-
-template
-int MarlinSerial::peek() {
- const int v = rx_buffer.head == rx_buffer.tail ? -1 : rx_buffer.buffer[rx_buffer.tail];
- return v;
-}
-
-template
-int MarlinSerial::read() {
-
- const ring_buffer_pos_t h = rx_buffer.head;
- ring_buffer_pos_t t = rx_buffer.tail;
-
- if (h == t) return -1;
-
- int v = rx_buffer.buffer[t];
- t = (ring_buffer_pos_t)(t + 1) & (Cfg::RX_SIZE - 1);
-
- // Advance tail
- rx_buffer.tail = t;
-
- if (Cfg::XONOFF) {
- // If the XOFF char was sent, or about to be sent...
- if ((xon_xoff_state & XON_XOFF_CHAR_MASK) == XOFF_CHAR) {
- // Get count of bytes in the RX buffer
- const ring_buffer_pos_t rx_count = (ring_buffer_pos_t)(h - t) & (ring_buffer_pos_t)(Cfg::RX_SIZE - 1);
- // When below 10% of RX buffer capacity, send XON before running out of RX buffer bytes
- if (rx_count < (Cfg::RX_SIZE) / 10) {
- if (Cfg::TX_SIZE > 0) {
- // Signal we want an XON character to be sent.
- xon_xoff_state = XON_CHAR;
- // Enable TX isr.
- HWUART->UART_IER = UART_IER_TXRDY;
- }
- else {
- // If not using TX interrupts, we must send the XON char now
- xon_xoff_state = XON_CHAR | XON_XOFF_CHAR_SENT;
- while (!(HWUART->UART_SR & UART_SR_TXRDY)) sw_barrier();
- HWUART->UART_THR = XON_CHAR;
- }
- }
- }
- }
-
- return v;
-}
-
-template
-typename MarlinSerial::ring_buffer_pos_t MarlinSerial::available() {
- const ring_buffer_pos_t h = rx_buffer.head, t = rx_buffer.tail;
- return (ring_buffer_pos_t)(Cfg::RX_SIZE + h - t) & (Cfg::RX_SIZE - 1);
-}
-
-template
-void MarlinSerial::flush() {
- rx_buffer.tail = rx_buffer.head;
-
- if (Cfg::XONOFF) {
- if ((xon_xoff_state & XON_XOFF_CHAR_MASK) == XOFF_CHAR) {
- if (Cfg::TX_SIZE > 0) {
- // Signal we want an XON character to be sent.
- xon_xoff_state = XON_CHAR;
- // Enable TX isr.
- HWUART->UART_IER = UART_IER_TXRDY;
- }
- else {
- // If not using TX interrupts, we must send the XON char now
- xon_xoff_state = XON_CHAR | XON_XOFF_CHAR_SENT;
- while (!(HWUART->UART_SR & UART_SR_TXRDY)) sw_barrier();
- HWUART->UART_THR = XON_CHAR;
- }
- }
- }
-}
-
-template
-void MarlinSerial::write(const uint8_t c) {
- _written = true;
-
- if (Cfg::TX_SIZE == 0) {
- while (!(HWUART->UART_SR & UART_SR_TXRDY)) sw_barrier();
- HWUART->UART_THR = c;
- }
- else {
-
- // If the TX interrupts are disabled and the data register
- // is empty, just write the byte to the data register and
- // be done. This shortcut helps significantly improve the
- // effective datarate at high (>500kbit/s) bitrates, where
- // interrupt overhead becomes a slowdown.
- // Yes, there is a race condition between the sending of the
- // XOFF char at the RX isr, but it is properly handled there
- if (!(HWUART->UART_IMR & UART_IMR_TXRDY) && (HWUART->UART_SR & UART_SR_TXRDY)) {
- HWUART->UART_THR = c;
- return;
- }
-
- const uint8_t i = (tx_buffer.head + 1) & (Cfg::TX_SIZE - 1);
-
- // If global interrupts are disabled (as the result of being called from an ISR)...
- if (!ISRS_ENABLED()) {
-
- // Make room by polling if it is possible to transmit, and do so!
- while (i == tx_buffer.tail) {
- // If we can transmit another byte, do it.
- if (HWUART->UART_SR & UART_SR_TXRDY) _tx_thr_empty_irq();
- // Make sure compiler rereads tx_buffer.tail
- sw_barrier();
- }
- }
- else {
- // Interrupts are enabled, just wait until there is space
- while (i == tx_buffer.tail) sw_barrier();
- }
-
- // Store new char. head is always safe to move
- tx_buffer.buffer[tx_buffer.head] = c;
- tx_buffer.head = i;
-
- // Enable TX isr - Non atomic, but it will eventually enable TX isr
- HWUART->UART_IER = UART_IER_TXRDY;
- }
-}
-
-template
-void MarlinSerial::flushTX() {
- // TX
-
- if (Cfg::TX_SIZE == 0) {
- // No bytes written, no need to flush. This special case is needed since there's
- // no way to force the TXC (transmit complete) bit to 1 during initialization.
- if (!_written) return;
-
- // Wait until everything was transmitted
- while (!(HWUART->UART_SR & UART_SR_TXEMPTY)) sw_barrier();
-
- // At this point nothing is queued anymore (DRIE is disabled) and
- // the hardware finished transmission (TXC is set).
-
- }
- else {
- // If we have never written a byte, no need to flush. This special
- // case is needed since there is no way to force the TXC (transmit
- // complete) bit to 1 during initialization
- if (!_written) return;
-
- // If global interrupts are disabled (as the result of being called from an ISR)...
- if (!ISRS_ENABLED()) {
-
- // Wait until everything was transmitted - We must do polling, as interrupts are disabled
- while (tx_buffer.head != tx_buffer.tail || !(HWUART->UART_SR & UART_SR_TXEMPTY)) {
- // If there is more space, send an extra character
- if (HWUART->UART_SR & UART_SR_TXRDY) _tx_thr_empty_irq();
- sw_barrier();
- }
-
- }
- else {
- // Wait until everything was transmitted
- while (tx_buffer.head != tx_buffer.tail || !(HWUART->UART_SR & UART_SR_TXEMPTY)) sw_barrier();
- }
-
- // At this point nothing is queued anymore (DRIE is disabled) and
- // the hardware finished transmission (TXC is set).
- }
-}
-
-/**
- * Imports from print.h
- */
-
-template
-void MarlinSerial::print(char c, int base) {
- print((long)c, base);
-}
-
-template
-void MarlinSerial::print(unsigned char b, int base) {
- print((unsigned long)b, base);
-}
-
-template
-void MarlinSerial::print(int n, int base) {
- print((long)n, base);
-}
-
-template
-void MarlinSerial::print(unsigned int n, int base) {
- print((unsigned long)n, base);
-}
-
-template
-void MarlinSerial::print(long n, int base) {
- if (base == 0) write(n);
- else if (base == 10) {
- if (n < 0) { print('-'); n = -n; }
- printNumber(n, 10);
- }
- else
- printNumber(n, base);
-}
-
-template
-void MarlinSerial::print(unsigned long n, int base) {
- if (base == 0) write(n);
- else printNumber(n, base);
-}
-
-template