diff --git a/2.0.5-bigTreeTech/.github/ISSUE_TEMPLATE/bug_report.md b/2.0.5-bigTreeTech/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 48beca2..0000000 --- a/2.0.5-bigTreeTech/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,43 +0,0 @@ ---- -name: Bug report -about: Report a bug in Marlin -title: "[BUG] (short description)" -labels: '' -assignees: '' - ---- - - - -### Bug Description - - - -### My Configurations - -**Required:** Please include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files. - -### 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 - -* 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/2.0.5-bigTreeTech/.github/ISSUE_TEMPLATE/config.yml b/2.0.5-bigTreeTech/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 4b283d2..0000000 --- a/2.0.5-bigTreeTech/.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/2.0.5-bigTreeTech/.github/ISSUE_TEMPLATE/feature_request.md b/2.0.5-bigTreeTech/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index ff3b6b0..0000000 --- a/2.0.5-bigTreeTech/.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: '' -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/2.0.5-bigTreeTech/.github/issue_template.md b/2.0.5-bigTreeTech/.github/issue_template.md deleted file mode 100644 index f45bd71..0000000 --- a/2.0.5-bigTreeTech/.github/issue_template.md +++ /dev/null @@ -1,16 +0,0 @@ -# NO SUPPORT REQUESTS PLEASE - -Support Requests posted here will be automatically closed! - -This Issue Queue is for Marlin bug reports and development-related issues, and we prefer not to handle user-support questions here. See https://github.com/MarlinFirmware/Marlin/blob/1.1.x/.github/contributing.md#i-dont-want-to-read-this-whole-thing-i-just-have-a-question. - -For best results getting help with configuration and troubleshooting, please use the following resources: - -- RepRap.org Marlin Forum http://forums.reprap.org/list.php?415 -- Tom's 3D Forums https://discuss.toms3d.org/ -- Facebook Group "Marlin Firmware" https://www.facebook.com/groups/1049718498464482/ -- Facebook Group "Marlin Firmware for 3D Printers" https://www.facebook.com/groups/3Dtechtalk/ -- Marlin Configuration https://www.youtube.com/results?search_query=marlin+configuration on YouTube -- Marlin Discord server. Join link: https://discord.gg/n5NJ59y - -After seeking help from the community, if the consensus points to to a bug in Marlin, then you should post a Bug Report at https://github.com/MarlinFirmware/Marlin/issues/new/choose). diff --git a/2.0.5-bigTreeTech/.github/workflows/bad-target.md b/2.0.5-bigTreeTech/.github/workflows/bad-target.md deleted file mode 100644 index 048e56c..0000000 --- a/2.0.5-bigTreeTech/.github/workflows/bad-target.md +++ /dev/null @@ -1,7 +0,0 @@ -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/2.0.5-bigTreeTech/.github/workflows/bump-date.yml b/2.0.5-bigTreeTech/.github/workflows/bump-date.yml deleted file mode 100644 index ecf4a4f..0000000 --- a/2.0.5-bigTreeTech/.github/workflows/bump-date.yml +++ /dev/null @@ -1,34 +0,0 @@ -# -# bump-date.yml -# Bump the distribution date once per day -# - -name: Bump Distribution Date - -on: - schedule: - - cron: '0 0 * * *' - -jobs: - bump_date: - - 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 - [[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0 - 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/2.0.5-bigTreeTech/.github/workflows/check-pr.yml b/2.0.5-bigTreeTech/.github/workflows/check-pr.yml deleted file mode 100644 index a6246a3..0000000 --- a/2.0.5-bigTreeTech/.github/workflows/check-pr.yml +++ /dev/null @@ -1,27 +0,0 @@ -# -# comment-pr.yml -# Add a comment to any PR directed to a release branch -# - -name: PR Bad Target - -on: - pull_request: - branches: - - 1.0.x - - 1.1.x - - 2.0.x - -jobs: - bad_target: - - name: PR Bad Target - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - uses: harupy/comment-on-pr@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - filename: bad-target.md diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp b/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp deleted file mode 100644 index 672932f..0000000 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp +++ /dev/null @@ -1,206 +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 . - * - */ - -/** - * The PWM module is only used to generate interrupts at specified times. It - * is NOT used to directly toggle pins. The ISR writes to the pin assigned to - * that interrupt. - * - * All PWMs use the same repetition rate. The G2 needs about 10KHz min in order to - * not have obvious ripple on the Vref signals. - * - * The data structures are setup to minimize the computation done by the ISR which - * minimizes ISR execution time. Execution times are 0.8 to 1.1 microseconds. - * - * FIve PWM interrupt sources are used. Channel 0 sets the base period. All Vref - * signals are set active when this counter overflows and resets to zero. The compare - * values in channels 1-4 are set to give the desired duty cycle for that Vref pin. - * When counter 0 matches the compare value then that channel generates an interrupt. - * The ISR checks the source of the interrupt and sets the corresponding pin inactive. - * - * Some jitter in the Vref signal is OK so the interrupt priority is left at its default value. - */ - -#include "../../../inc/MarlinConfig.h" - -#if MB(PRINTRBOARD_G2) - -#include "G2_PWM.h" - -#if PIN_EXISTS(MOTOR_CURRENT_PWM_X) - #define G2_PWM_X 1 -#else - #define G2_PWM_X 0 -#endif -#if PIN_EXISTS(MOTOR_CURRENT_PWM_Y) - #define G2_PWM_Y 1 -#else - #define G2_PWM_Y 0 -#endif -#if PIN_EXISTS(MOTOR_CURRENT_PWM_Z) - #define G2_PWM_Z 1 -#else - #define G2_PWM_Z 0 -#endif -#if PIN_EXISTS(MOTOR_CURRENT_PWM_E) - #define G2_PWM_E 1 -#else - #define G2_PWM_E 0 -#endif -#define G2_MASK_X(V) (G2_PWM_X * (V)) -#define G2_MASK_Y(V) (G2_PWM_Y * (V)) -#define G2_MASK_Z(V) (G2_PWM_Z * (V)) -#define G2_MASK_E(V) (G2_PWM_E * (V)) - -volatile uint32_t *SODR_A = &PIOA->PIO_SODR, - *SODR_B = &PIOB->PIO_SODR, - *CODR_A = &PIOA->PIO_CODR, - *CODR_B = &PIOB->PIO_CODR; - -PWM_map ISR_table[NUM_PWMS] = PWM_MAP_INIT; - -void Stepper::digipot_init() { - - #if PIN_EXISTS(MOTOR_CURRENT_PWM_X) - OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, 0); // init pins - #endif - #if PIN_EXISTS(MOTOR_CURRENT_PWM_Y) - OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, 0); - #endif - #if G2_PWM_Z - OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, 0); - #endif - #if G2_PWM_E - OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, 0); - #endif - - #define WPKEY (0x50574D << 8) // “PWM” in ASCII - #define WPCMD_DIS_SW 0 // command to disable Write Protect SW - #define WPRG_ALL (PWM_WPCR_WPRG0 | PWM_WPCR_WPRG1 | PWM_WPCR_WPRG2 | PWM_WPCR_WPRG3 | PWM_WPCR_WPRG4 | PWM_WPCR_WPRG5) // all Write Protect Groups - - #define PWM_CLOCK_F F_CPU / 1000000UL // set clock to 1MHz - - PMC->PMC_PCER1 = PMC_PCER1_PID36; // enable PWM controller clock (disabled on power up) - - PWM->PWM_WPCR = WPKEY | WPRG_ALL | WPCMD_DIS_SW; // enable setting of all PWM registers - PWM->PWM_CLK = PWM_CLOCK_F; // enable CLK_A and set it to 1MHz, leave CLK_B disabled - PWM->PWM_CH_NUM[0].PWM_CMR = 0b1011; // set channel 0 to Clock A input & to left aligned - if (G2_PWM_X) PWM->PWM_CH_NUM[1].PWM_CMR = 0b1011; // set channel 1 to Clock A input & to left aligned - if (G2_PWM_Y) PWM->PWM_CH_NUM[2].PWM_CMR = 0b1011; // set channel 2 to Clock A input & to left aligned - if (G2_PWM_Z) PWM->PWM_CH_NUM[3].PWM_CMR = 0b1011; // set channel 3 to Clock A input & to left aligned - if (G2_PWM_E) PWM->PWM_CH_NUM[4].PWM_CMR = 0b1011; // set channel 4 to Clock A input & to left aligned - - PWM->PWM_CH_NUM[0].PWM_CPRD = PWM_PERIOD_US; // set channel 0 Period - - PWM->PWM_IER2 = PWM_IER1_CHID0; // generate interrupt when counter0 overflows - PWM->PWM_IER2 = PWM_IER2_CMPM0 - | G2_MASK_X(PWM_IER2_CMPM1) - | G2_MASK_Y(PWM_IER2_CMPM2) - | G2_MASK_Z(PWM_IER2_CMPM3) - | G2_MASK_E(PWM_IER2_CMPM4) - ; // generate interrupt on compare event - - if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0])); // interrupt when counter0 == CMPV - used to set Motor 1 PWM inactive - if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0])); // interrupt when counter0 == CMPV - used to set Motor 2 PWM inactive - if (G2_PWM_Z) PWM->PWM_CMP[3].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[1])); // interrupt when counter0 == CMPV - used to set Motor 3 PWM inactive - if (G2_PWM_E) PWM->PWM_CMP[4].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[2])); // interrupt when counter0 == CMPV - used to set Motor 4 PWM inactive - - if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPM = 0x0001; // enable compare event - if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPM = 0x0001; // enable compare event - if (G2_PWM_Z) PWM->PWM_CMP[3].PWM_CMPM = 0x0001; // enable compare event - if (G2_PWM_E) PWM->PWM_CMP[4].PWM_CMPM = 0x0001; // enable compare event - - PWM->PWM_SCM = PWM_SCM_UPDM_MODE0 | PWM_SCM_SYNC0 - | G2_MASK_X(PWM_SCM_SYNC1) - | G2_MASK_Y(PWM_SCM_SYNC2) - | G2_MASK_Z(PWM_SCM_SYNC3) - | G2_MASK_E(PWM_SCM_SYNC4) - ; // sync 1-4 with 0, use mode 0 for updates - - PWM->PWM_ENA = PWM_ENA_CHID0 - | G2_MASK_X(PWM_ENA_CHID1) - | G2_MASK_Y(PWM_ENA_CHID2) - | G2_MASK_Z(PWM_ENA_CHID3) - | G2_MASK_E(PWM_ENA_CHID4) - ; // enable channels used by G2 - - PWM->PWM_IER1 = PWM_IER1_CHID0 - | G2_MASK_X(PWM_IER1_CHID1) - | G2_MASK_Y(PWM_IER1_CHID2) - | G2_MASK_Z(PWM_IER1_CHID3) - | G2_MASK_E(PWM_IER1_CHID4) - ; // enable interrupts for channels used by G2 - - NVIC_EnableIRQ(PWM_IRQn); // Enable interrupt handler - NVIC_SetPriority(PWM_IRQn, NVIC_EncodePriority(0, 10, 0)); // normal priority for PWM module (can stand some jitter on the Vref signals) -} - -void Stepper::digipot_current(const uint8_t driver, const int16_t current) { - - if (!(PWM->PWM_CH_NUM[0].PWM_CPRD == PWM_PERIOD_US)) digipot_init(); // Init PWM system if needed - - switch (driver) { - case 0: - if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); // update X & Y - if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); - if (G2_PWM_X) PWM->PWM_CMP[1].PWM_CMPMUPD = 0x0001; // enable compare event - if (G2_PWM_Y) PWM->PWM_CMP[2].PWM_CMPMUPD = 0x0001; // enable compare event - if (G2_PWM_X || G2_PWM_Y) PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle - break; - case 1: - if (G2_PWM_Z) { - PWM->PWM_CMP[3].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); // update Z - PWM->PWM_CMP[3].PWM_CMPMUPD = 0x0001; // enable compare event - PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle - } - break; - default: - if (G2_PWM_E) { - PWM->PWM_CMP[4].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); // update E - PWM->PWM_CMP[4].PWM_CMPMUPD = 0x0001; // enable compare event - PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle - } - break; - } -} - -volatile uint32_t PWM_ISR1_STATUS, PWM_ISR2_STATUS; - -void PWM_Handler() { - PWM_ISR1_STATUS = PWM->PWM_ISR1; - PWM_ISR2_STATUS = PWM->PWM_ISR2; - if (PWM_ISR1_STATUS & PWM_IER1_CHID0) { // CHAN_0 interrupt - if (G2_PWM_X) *ISR_table[0].set_register = ISR_table[0].write_mask; // set X to active - if (G2_PWM_Y) *ISR_table[1].set_register = ISR_table[1].write_mask; // set Y to active - if (G2_PWM_Z) *ISR_table[2].set_register = ISR_table[2].write_mask; // set Z to active - if (G2_PWM_E) *ISR_table[3].set_register = ISR_table[3].write_mask; // set E to active - } - else { - if (G2_PWM_X && (PWM_ISR2_STATUS & PWM_IER2_CMPM1)) *ISR_table[0].clr_register = ISR_table[0].write_mask; // set X to inactive - if (G2_PWM_Y && (PWM_ISR2_STATUS & PWM_IER2_CMPM2)) *ISR_table[1].clr_register = ISR_table[1].write_mask; // set Y to inactive - if (G2_PWM_Z && (PWM_ISR2_STATUS & PWM_IER2_CMPM3)) *ISR_table[2].clr_register = ISR_table[2].write_mask; // set Z to inactive - if (G2_PWM_E && (PWM_ISR2_STATUS & PWM_IER2_CMPM4)) *ISR_table[3].clr_register = ISR_table[3].write_mask; // set E to inactive - } - return; -} - -#endif // PRINTRBOARD_G2 diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/QSPIFlash.cpp b/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/QSPIFlash.cpp deleted file mode 100644 index 76a3329..0000000 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/QSPIFlash.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 . - * - */ - -#include "../../inc/MarlinConfig.h" - -#if ENABLED(QSPI_EEPROM) - -#include "QSPIFlash.h" - -#define INVALID_ADDR 0xffffffff -#define SECTOR_OF(a) (a & ~(SFLASH_SECTOR_SIZE - 1)) -#define OFFSET_OF(a) (a & (SFLASH_SECTOR_SIZE - 1)) - -Adafruit_SPIFlashBase * QSPIFlash::_flashBase = nullptr; -uint8_t QSPIFlash::_buf[SFLASH_SECTOR_SIZE]; -uint32_t QSPIFlash::_addr = INVALID_ADDR; - -void QSPIFlash::begin() { - if (_flashBase != nullptr) return; - - _flashBase = new Adafruit_SPIFlashBase(new Adafruit_FlashTransport_QSPI()); - _flashBase->begin(NULL); -} - -size_t QSPIFlash::size() { - return _flashBase->size(); -} - -uint8_t QSPIFlash::readByte(const uint32_t address) { - if (SECTOR_OF(address) == _addr) return _buf[OFFSET_OF(address)]; - - return _flashBase->read8(address); -} - -void QSPIFlash::writeByte(const uint32_t address, const uint8_t value) { - uint32_t const sector_addr = SECTOR_OF(address); - - // Page changes, flush old and update new cache - if (sector_addr != _addr) { - flush(); - _addr = sector_addr; - - // read a whole page from flash - _flashBase->readBuffer(sector_addr, _buf, SFLASH_SECTOR_SIZE); - } - - _buf[OFFSET_OF(address)] = value; -} - -void QSPIFlash::flush() { - if (_addr == INVALID_ADDR) return; - - _flashBase->eraseSector(_addr / SFLASH_SECTOR_SIZE); - _flashBase->writeBuffer(_addr, _buf, SFLASH_SECTOR_SIZE); - - _addr = INVALID_ADDR; -} - -#endif // QSPI_EEPROM diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/QSPIFlash.h b/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/QSPIFlash.h deleted file mode 100644 index 7f75286..0000000 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/QSPIFlash.h +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @file QSPIFlash.h - * - * The MIT License (MIT) - * - * Copyright (c) 2019 Ha Thach and Dean Miller for Adafruit Industries LLC - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - * Derived from Adafruit_SPIFlash class with no SdFat references - * - */ - -#pragma once - -#include "Adafruit_SPIFlashBase.h" - -// This class extends Adafruit_SPIFlashBase by adding caching support. -// -// This class will use 4096 Bytes of RAM as a block cache. -class QSPIFlash { - public: - static void begin(); - static size_t size(); - static uint8_t readByte(const uint32_t address); - static void writeByte(const uint32_t address, const uint8_t v); - static void flush(); - - private: - static Adafruit_SPIFlashBase * _flashBase; - static uint8_t _buf[SFLASH_SECTOR_SIZE]; - static uint32_t _addr; -}; - -extern QSPIFlash qspi; diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/eeprom.cpp b/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/eeprom.cpp deleted file mode 100644 index e167515..0000000 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/eeprom.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Marlin 3D Printer Firmware - * - * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] - * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician) - * - * 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 __SAMD51__ - -#include "../../inc/MarlinConfig.h" - -#if ENABLED(EEPROM_SETTINGS) && NONE(QSPI_EEPROM, FLASH_EEPROM_EMULATION) - -#include "../shared/eeprom_api.h" - -size_t PersistentStore::capacity() { return E2END + 1; } - -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--) { - const uint8_t v = *value; - uint8_t * const p = (uint8_t * const)pos; - if (v != eeprom_read_byte(p)) { - eeprom_write_byte(p, v); - delay(2); - 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*/) { - while (size--) { - uint8_t c = eeprom_read_byte((uint8_t*)pos); - if (writing) *value = c; - crc16(crc, &c, 1); - pos++; - value++; - } - return false; -} - -#endif // EEPROM_SETTINGS && !(QSPI_EEPROM || FLASH_EEPROM_EMULATION) -#endif // __SAMD51__ diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/eeprom_flash.cpp b/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/eeprom_flash.cpp deleted file mode 100644 index fd89733..0000000 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/eeprom_flash.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Marlin 3D Printer Firmware - * - * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] - * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician) - * - * 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 __SAMD51__ - -#include "../../inc/MarlinConfig.h" - -#if ENABLED(FLASH_EEPROM_EMULATION) - -#include "../shared/eeprom_api.h" - -#define NVMCTRL_CMD(c) do{ \ - SYNC(!NVMCTRL->STATUS.bit.READY); \ - NVMCTRL->INTFLAG.bit.DONE = true; \ - NVMCTRL->CTRLB.reg = c | NVMCTRL_CTRLB_CMDEX_KEY; \ - SYNC(NVMCTRL->INTFLAG.bit.DONE); \ - }while(0) -#define NVMCTRL_FLUSH() do{ \ - if (NVMCTRL->SEESTAT.bit.LOAD) \ - NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_SEEFLUSH); \ - }while(0) - -size_t PersistentStore::capacity() { - const uint8_t psz = NVMCTRL->SEESTAT.bit.PSZ, - sblk = NVMCTRL->SEESTAT.bit.SBLK; - - return (!psz && !sblk) ? 0 - : (psz <= 2) ? (0x200 << psz) - : (sblk == 1 || psz == 3) ? 4096 - : (sblk == 2 || psz == 4) ? 8192 - : (sblk <= 4 || psz == 5) ? 16384 - : (sblk >= 9 && psz == 7) ? 65536 - : 32768; -} - -bool PersistentStore::access_start() { - NVMCTRL->SEECFG.reg = NVMCTRL_SEECFG_WMODE_BUFFERED; // Buffered mode and segment reallocation active - if (NVMCTRL->SEESTAT.bit.RLOCK) - NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_USEE); // Unlock E2P data write access - return true; -} - -bool PersistentStore::access_finish() { - NVMCTRL_FLUSH(); - if (!NVMCTRL->SEESTAT.bit.LOCK) - NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_LSEE); // Lock E2P data write access - return true; -} - -bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) { - while (size--) { - const uint8_t v = *value; - SYNC(NVMCTRL->SEESTAT.bit.BUSY); - if (NVMCTRL->INTFLAG.bit.SEESFULL) - NVMCTRL_FLUSH(); // Next write will trigger a sector reallocation. I need to flush 'pagebuffer' - ((volatile uint8_t *)SEEPROM_ADDR)[pos] = v; - SYNC(!NVMCTRL->INTFLAG.bit.SEEWRC); - 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*/) { - while (size--) { - SYNC(NVMCTRL->SEESTAT.bit.BUSY); - uint8_t c = ((volatile uint8_t *)SEEPROM_ADDR)[pos]; - if (writing) *value = c; - crc16(crc, &c, 1); - pos++; - value++; - } - return false; -} - -#endif // FLASH_EEPROM_EMULATION -#endif // __SAMD51__ diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp b/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp deleted file mode 100644 index c6aa383..0000000 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Marlin 3D Printer Firmware - * - * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] - * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician) - * - * 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 __SAMD51__ - -#include "../../inc/MarlinConfig.h" - -#if ENABLED(QSPI_EEPROM) - -#include "../shared/eeprom_api.h" - -#include "QSPIFlash.h" - -static bool initialized; - -size_t PersistentStore::capacity() { return qspi.size(); } - -bool PersistentStore::access_start() { - if (!initialized) { - qspi.begin(); - initialized = true; - } - return true; -} - -bool PersistentStore::access_finish() { - qspi.flush(); - return true; -} - -bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) { - while (size--) { - const uint8_t v = *value; - qspi.writeByte(pos, v); - 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*/) { - while (size--) { - uint8_t c = qspi.readByte(pos); - if (writing) *value = c; - crc16(crc, &c, 1); - pos++; - value++; - } - return false; -} - -#endif // QSPI_EEPROM -#endif // __SAMD51__ diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M1001.cpp b/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M1001.cpp deleted file mode 100644 index 4261b57..0000000 --- a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M1001.cpp +++ /dev/null @@ -1,109 +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 . - * - */ - -#include "../../inc/MarlinConfig.h" - -#if ENABLED(SDSUPPORT) - -#include "../gcode.h" -#include "../../module/printcounter.h" - -#if EITHER(LCD_SET_PROGRESS_MANUALLY, SD_REPRINT_LAST_SELECTED_FILE) - #include "../../lcd/ultralcd.h" -#endif - -#if ENABLED(POWER_LOSS_RECOVERY) - #include "../../feature/powerloss.h" -#endif - -#if HAS_LEDS_OFF_FLAG - #include "../../feature/leds/printer_event_leds.h" -#endif - -#if ENABLED(EXTENSIBLE_UI) - #include "../../lcd/extui/ui_api.h" -#endif - -#if ENABLED(HOST_ACTION_COMMANDS) - #include "../../feature/host_actions.h" -#endif - -#if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND) - #include "../../module/planner.h" -#endif - -#ifndef PE_LEDS_COMPLETED_TIME - #define PE_LEDS_COMPLETED_TIME (30*60) -#endif - -/** - * M1001: Execute actions for SD print completion - */ -void GcodeSuite::M1001() { - - // Report total print time - const bool long_print = print_job_timer.duration() > 60; - if (long_print) gcode.process_subcommands_now_P(PSTR("M31")); - - // Stop the print job timer - gcode.process_subcommands_now_P(PSTR("M77")); - - // Set the progress bar "done" state - #if ENABLED(LCD_SET_PROGRESS_MANUALLY) - ui.set_progress_done(); - #endif - - // Purge the recovery file - #if ENABLED(POWER_LOSS_RECOVERY) - recovery.purge(); - #endif - - // Announce SD file completion - SERIAL_ECHOLNPGM(STR_FILE_PRINTED); - - // Update the status LED color - #if HAS_LEDS_OFF_FLAG - if (long_print) { - printerEventLEDs.onPrintCompleted(); - #if ENABLED(EXTENSIBLE_UI) - ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PRINT_DONE)); - #endif - #if ENABLED(HOST_PROMPT_SUPPORT) - host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_PRINT_DONE), CONTINUE_STR); - #endif - wait_for_user_response(1000UL * TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30)); - printerEventLEDs.onResumeAfterWait(); - } - #endif - - // Wait for the queue to empty (and "clean"), inject SD_FINISHED_RELEASECOMMAND - #if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND) - planner.finish_and_disable(); - #endif - - // Re-select the last printed file in the UI - #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE) - ui.reselect_last_file(); - #endif -} - -#endif // SDSUPPORT diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp b/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp deleted file mode 100644 index 5d165ed..0000000 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp +++ /dev/null @@ -1,165 +0,0 @@ -/***************** - * main_menu.cpp * - *****************/ - -/**************************************************************************** - * Written By Mark Pelletier 2017 - Aleph Objects, Inc. * - * Written By Marcio Teixeira 2018 - Aleph Objects, Inc. * - * Written By Marcio Teixeira 2019 - Cocoa Press * - * * - * 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. * - * * - * To view a copy of the GNU General Public License, go to the following * - * location: . * - ****************************************************************************/ - -#include "../config.h" - -#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO) - -#include "screens.h" - -using namespace FTDI; -using namespace Theme; - -void MainMenu::onRedraw(draw_mode_t what) { - if (what & BACKGROUND) { - CommandProcessor cmd; - cmd.cmd(CLEAR_COLOR_RGB(Theme::bg_color)) - .cmd(CLEAR(true,true,true)); - } - - #ifdef TOUCH_UI_PORTRAIT - #define GRID_ROWS 8 - #define GRID_COLS 2 - #define ABOUT_PRINTER_POS BTN_POS(1,1), BTN_SIZE(2,1) - #define ADVANCED_SETTINGS_POS BTN_POS(1,2), BTN_SIZE(2,1) - #define FILAMENTCHANGE_POS BTN_POS(1,3), BTN_SIZE(2,1) - #define TEMPERATURE_POS BTN_POS(1,4), BTN_SIZE(2,1) - #define MOVE_AXIS_POS BTN_POS(1,5), BTN_SIZE(1,1) - #define DISABLE_STEPPERS_POS BTN_POS(2,5), BTN_SIZE(1,1) - #define AUTO_HOME_POS BTN_POS(1,6), BTN_SIZE(1,1) - #define CLEAN_NOZZLE_POS BTN_POS(2,6), BTN_SIZE(1,1) - #define LEVEL_BED_POS BTN_POS(1,7), BTN_SIZE(1,1) - #define LEVEL_AXIS_POS BTN_POS(2,7), BTN_SIZE(1,1) - #define BACK_POS BTN_POS(1,8), BTN_SIZE(2,1) - #else - #define GRID_ROWS 6 - #define GRID_COLS 2 - #define ADVANCED_SETTINGS_POS BTN_POS(1,1), BTN_SIZE(1,1) - #define ABOUT_PRINTER_POS BTN_POS(2,1), BTN_SIZE(1,1) - #define AUTO_HOME_POS BTN_POS(1,2), BTN_SIZE(1,1) - #define CLEAN_NOZZLE_POS BTN_POS(2,2), BTN_SIZE(1,1) - #define MOVE_AXIS_POS BTN_POS(1,3), BTN_SIZE(1,1) - #define DISABLE_STEPPERS_POS BTN_POS(2,3), BTN_SIZE(1,1) - #define TEMPERATURE_POS BTN_POS(1,4), BTN_SIZE(1,1) - #define FILAMENTCHANGE_POS BTN_POS(2,4), BTN_SIZE(1,1) - #define LEVEL_BED_POS BTN_POS(1,5), BTN_SIZE(1,1) - #define LEVEL_AXIS_POS BTN_POS(2,5), BTN_SIZE(1,1) - #define BACK_POS BTN_POS(1,6), BTN_SIZE(2,1) - #endif - - if (what & FOREGROUND) { - CommandProcessor cmd; - cmd.colors(normal_btn) - .font(Theme::font_medium) - .tag(2).button( AUTO_HOME_POS, GET_TEXT_F(MSG_AUTO_HOME)) - .enabled( - #if ANY(NOZZLE_CLEAN_FEATURE, TOUCH_UI_COCOA_PRESS) - 1 - #endif - ) - .tag(3).button( CLEAN_NOZZLE_POS, GET_TEXT_F( - #if ENABLED(TOUCH_UI_COCOA_PRESS) - MSG_PREHEAT_1 - #else - MSG_CLEAN_NOZZLE - #endif - )) - .tag(4).button( MOVE_AXIS_POS, GET_TEXT_F(MSG_MOVE_AXIS)) - .tag(5).button( DISABLE_STEPPERS_POS, GET_TEXT_F(MSG_DISABLE_STEPPERS)) - .tag(6).button( TEMPERATURE_POS, GET_TEXT_F(MSG_TEMPERATURE)) - .enabled( - #if DISABLED(TOUCH_UI_LULZBOT_BIO) - 1 - #endif - ) - .tag(7).button( FILAMENTCHANGE_POS, GET_TEXT_F( - #if ENABLED(TOUCH_UI_COCOA_PRESS) - MSG_CASE_LIGHT - #else - MSG_FILAMENTCHANGE - #endif - )) - .tag(8).button( ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS)) - .enabled( - #ifdef PRINTCOUNTER - 1 - #endif - ) - .enabled( - #ifdef AXIS_LEVELING_COMMANDS - 1 - #endif - ) - .tag(9).button( LEVEL_AXIS_POS, GET_TEXT_F(MSG_AUTOLEVEL_X_AXIS)) - .enabled( - #ifdef HAS_LEVELING - 1 - #endif - ) - .tag(10).button( LEVEL_BED_POS, GET_TEXT_F(MSG_LEVEL_BED)) - .tag(11).button( ABOUT_PRINTER_POS, GET_TEXT_F(MSG_INFO_MENU)) - .colors(action_btn) - .tag(1).button( BACK_POS, GET_TEXT_F(MSG_BACK)); - } -} - -bool MainMenu::onTouchEnd(uint8_t tag) { - using namespace ExtUI; - - switch (tag) { - case 1: SaveSettingsDialogBox::promptToSaveSettings(); break; - case 2: SpinnerDialogBox::enqueueAndWait_P(F("G28")); break; - #if ENABLED(TOUCH_UI_COCOA_PRESS) - case 3: GOTO_SCREEN(PreheatMenu); break; - #elif ENABLED(NOZZLE_CLEAN_FEATURE) - case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break; - #endif - case 4: GOTO_SCREEN(MoveAxisScreen); break; - case 5: injectCommands_P(PSTR("M84")); break; - case 6: GOTO_SCREEN(TemperatureScreen); break; - #if ENABLED(TOUCH_UI_COCOA_PRESS) && HAS_CASE_LIGHT - case 7: GOTO_SCREEN(CaseLightScreen); break; - #else - case 7: GOTO_SCREEN(ChangeFilamentScreen); break; - #endif - case 8: GOTO_SCREEN(AdvancedSettingsMenu); break; - #ifdef AXIS_LEVELING_COMMANDS - case 9: SpinnerDialogBox::enqueueAndWait_P(F(AXIS_LEVELING_COMMANDS)); break; - #endif - #ifdef HAS_LEVELING - case 10: SpinnerDialogBox::enqueueAndWait_P(F( - #ifdef BED_LEVELING_COMMANDS - BED_LEVELING_COMMANDS - #else - "G29" - #endif - )); break; - #endif - case 11: GOTO_SCREEN(AboutScreen); break; - default: - return false; - } - return true; -} - -#endif // TOUCH_UI_FTDI_EVE diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp b/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp deleted file mode 100644 index f0b5dd8..0000000 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_menu.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/******************** - * preheat_menu.cpp * - ********************/ - -/**************************************************************************** - * Written By Marcio Teixeira 2020 - Cocoa Press * - * * - * 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. * - * * - * To view a copy of the GNU General Public License, go to the following * - * location: . * - ****************************************************************************/ - -#include "../config.h" - -#if ENABLED(TOUCH_UI_FTDI_EVE) && defined(TOUCH_UI_COCOA_PRESS) - -#include "screens.h" - -using namespace FTDI; -using namespace ExtUI; -using namespace Theme; - -void PreheatMenu::onRedraw(draw_mode_t what) { - if (what & BACKGROUND) { - CommandProcessor cmd; - cmd.cmd(CLEAR_COLOR_RGB(Theme::bg_color)) - .cmd(CLEAR(true,true,true)) - .tag(0); - } - - #define GRID_ROWS 3 - #define GRID_COLS 2 - - if (what & FOREGROUND) { - CommandProcessor cmd; - cmd.cmd(COLOR_RGB(bg_text_enabled)) - .font(Theme::font_medium) - .text ( BTN_POS(1,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_PREHEAT_1)) - .colors(normal_btn) - .tag(2).button( BTN_POS(1,2), BTN_SIZE(1,1), F("Dark Chocolate")) - .tag(3).button( BTN_POS(2,2), BTN_SIZE(1,1), F("Milk Chocolate")) - .tag(4).button( BTN_POS(1,3), BTN_SIZE(1,1), F("White Chocolate")) - .colors(action_btn) - .tag(1) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK)); - } -} - -bool PreheatMenu::onTouchEnd(uint8_t tag) { - switch (tag) { - case 1: GOTO_PREVIOUS(); break; - case 2: - #ifdef COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_SCRIPT - injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_SCRIPT)); - #endif - GOTO_SCREEN(PreheatTimerScreen); - break; - case 3: - #ifdef COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_SCRIPT - injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_SCRIPT)); - #endif - GOTO_SCREEN(PreheatTimerScreen); - break; - case 4: - #ifdef COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_SCRIPT - injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_SCRIPT)); - #endif - GOTO_SCREEN(PreheatTimerScreen); - break; - default: return false; - } - return true; -} - -#endif // TOUCH_UI_FTDI_EVE diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h b/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h deleted file mode 100644 index e2770d8..0000000 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h +++ /dev/null @@ -1,177 +0,0 @@ -/************ - * colors.h * - ************/ - -/**************************************************************************** - * Written By Mark Pelletier 2017 - Aleph Objects, Inc. * - * Written By Marcio Teixeira 2018 - Aleph Objects, Inc. * - * Written By Marcio Teixeira 2019 - Cocoa Press * - * * - * 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. * - * * - * To view a copy of the GNU General Public License, go to the following * - * location: . * - ****************************************************************************/ - -#pragma once - -namespace Theme { - #if ENABLED(TOUCH_UI_COCOA_THEME) - constexpr int accent_hue = 23; - - // Browns and Oranges - constexpr uint32_t accent_color_1 = hsl_to_rgb(12.8,0.597,0.263); // Darkest - constexpr uint32_t accent_color_2 = hsl_to_rgb(12.8,0.597,0.263); - constexpr uint32_t accent_color_3 = hsl_to_rgb( 9.6,0.664,0.443); - constexpr uint32_t accent_color_4 = hsl_to_rgb(16.3,0.873,0.537); - constexpr uint32_t accent_color_5 = hsl_to_rgb(23.0,0.889,0.539); - constexpr uint32_t accent_color_6 = hsl_to_rgb(23.0,0.889,0.539); // Lightest - #else - // Use linear accent colors - - #if ANY(TOUCH_UI_ROYAL_THEME, TOUCH_UI_FROZEN_THEME) - // Dark blue accent colors - constexpr int accent_hue = 216; - constexpr float accent_sat = 0.7; - #else - // Green accent colors - constexpr int accent_hue = 68; - constexpr float accent_sat = 0.68; - #endif - - // Shades of accent color - constexpr uint32_t accent_color_0 = hsl_to_rgb(accent_hue, accent_sat, 0.15); // Darkest - constexpr uint32_t accent_color_1 = hsl_to_rgb(accent_hue, accent_sat, 0.26); - constexpr uint32_t accent_color_2 = hsl_to_rgb(accent_hue, accent_sat, 0.39); - constexpr uint32_t accent_color_3 = hsl_to_rgb(accent_hue, accent_sat, 0.52); - constexpr uint32_t accent_color_4 = hsl_to_rgb(accent_hue, accent_sat, 0.65); - constexpr uint32_t accent_color_5 = hsl_to_rgb(accent_hue, accent_sat, 0.78); - constexpr uint32_t accent_color_6 = hsl_to_rgb(accent_hue, accent_sat, 0.91); // Lightest - #endif - - // Shades of gray - - constexpr float gray_sat = 0.14; - constexpr uint32_t gray_color_0 = hsl_to_rgb(accent_hue, gray_sat, 0.15); // Darkest - constexpr uint32_t gray_color_1 = hsl_to_rgb(accent_hue, gray_sat, 0.26); - constexpr uint32_t gray_color_2 = hsl_to_rgb(accent_hue, gray_sat, 0.39); - constexpr uint32_t gray_color_3 = hsl_to_rgb(accent_hue, gray_sat, 0.52); - constexpr uint32_t gray_color_4 = hsl_to_rgb(accent_hue, gray_sat, 0.65); - constexpr uint32_t gray_color_5 = hsl_to_rgb(accent_hue, gray_sat, 0.78); - constexpr uint32_t gray_color_6 = hsl_to_rgb(accent_hue, gray_sat, 0.91); // Lightest - - #if ENABLED(TOUCH_UI_ROYAL_THEME) - constexpr uint32_t theme_darkest = accent_color_1; - constexpr uint32_t theme_dark = accent_color_4; - - constexpr uint32_t bg_color = gray_color_0; - constexpr uint32_t axis_label = gray_color_1; - - constexpr uint32_t bg_text_enabled = accent_color_6; - constexpr uint32_t bg_text_disabled = gray_color_0; - constexpr uint32_t bg_normal = accent_color_4; - constexpr uint32_t fg_disabled = gray_color_0; - constexpr uint32_t fg_normal = accent_color_0; - constexpr uint32_t fg_action = accent_color_1; - - constexpr uint32_t logo_bg_rgb = accent_color_1; - constexpr uint32_t logo_fill_rgb = accent_color_0; - constexpr uint32_t logo_stroke_rgb = accent_color_4; - #elif ANY(TOUCH_UI_COCOA_THEME, TOUCH_UI_FROZEN_THEME) - constexpr uint32_t theme_darkest = accent_color_1; - constexpr uint32_t theme_dark = accent_color_4; - - constexpr uint32_t bg_color = 0xFFFFFF; - constexpr uint32_t axis_label = gray_color_5; - - constexpr uint32_t bg_text_enabled = accent_color_1; - constexpr uint32_t bg_text_disabled = gray_color_1; - constexpr uint32_t bg_normal = accent_color_4; - constexpr uint32_t fg_disabled = gray_color_6; - constexpr uint32_t fg_normal = accent_color_1; - constexpr uint32_t fg_action = accent_color_4; - - constexpr uint32_t logo_bg_rgb = accent_color_5; - constexpr uint32_t logo_fill_rgb = accent_color_6; - constexpr uint32_t logo_stroke_rgb = accent_color_2; - #else - constexpr uint32_t theme_darkest = gray_color_1; - constexpr uint32_t theme_dark = gray_color_2; - - constexpr uint32_t bg_color = gray_color_1; - constexpr uint32_t axis_label = gray_color_2; - - constexpr uint32_t bg_text_enabled = 0xFFFFFF; - constexpr uint32_t bg_text_disabled = gray_color_2; - constexpr uint32_t bg_normal = gray_color_1; - constexpr uint32_t fg_disabled = gray_color_1; - constexpr uint32_t fg_normal = gray_color_2; - constexpr uint32_t fg_action = accent_color_2; - - constexpr uint32_t logo_bg_rgb = accent_color_4; - constexpr uint32_t logo_fill_rgb = accent_color_3; - constexpr uint32_t logo_stroke_rgb = 0x000000; - #endif - - constexpr uint32_t shadow_rgb = gray_color_6; - constexpr uint32_t stroke_rgb = accent_color_1; - constexpr uint32_t fill_rgb = accent_color_3; - constexpr uint32_t syringe_rgb = accent_color_5; - - #if ENABLED(TOUCH_UI_ROYAL_THEME) - constexpr uint32_t x_axis = hsl_to_rgb(0, 1.00, 0.26); - constexpr uint32_t y_axis = hsl_to_rgb(120, 1.00, 0.13); - constexpr uint32_t z_axis = hsl_to_rgb(240, 1.00, 0.10); - #else - constexpr uint32_t x_axis = hsl_to_rgb(0, 1.00, 0.5); - constexpr uint32_t y_axis = hsl_to_rgb(120, 1.00, 0.37); - constexpr uint32_t z_axis = hsl_to_rgb(240, 1.00, 0.37); - #endif - constexpr uint32_t e_axis = axis_label; - constexpr uint32_t feedrate = axis_label; - constexpr uint32_t other = axis_label; - - // Status screen - constexpr uint32_t progress = axis_label; - constexpr uint32_t status_msg = axis_label; - #if ENABLED(TOUCH_UI_ROYAL_THEME) - constexpr uint32_t fan_speed = hsl_to_rgb(240, 0.5, 0.13); - constexpr uint32_t temp = hsl_to_rgb(343, 1.0, 0.23); - #else - constexpr uint32_t fan_speed = hsl_to_rgb(204, 0.47, 0.41); - constexpr uint32_t temp = hsl_to_rgb(311, 0.51, 0.35); - #endif - - constexpr uint32_t disabled_icon = gray_color_1; - - // Calibration Registers Screen - constexpr uint32_t transformA = 0x3010D0; - constexpr uint32_t transformB = 0x4010D0; - constexpr uint32_t transformC = 0x5010D0; - constexpr uint32_t transformD = 0x6010D0; - constexpr uint32_t transformE = 0x7010D0; - constexpr uint32_t transformF = 0x8010D0; - constexpr uint32_t transformVal = 0x104010; - - constexpr btn_colors disabled_btn = {.bg = bg_color, .grad = fg_disabled, .fg = fg_disabled, .rgb = fg_disabled }; - constexpr btn_colors normal_btn = {.bg = fg_action, .grad = 0xFFFFFF, .fg = fg_normal, .rgb = 0xFFFFFF }; - constexpr btn_colors action_btn = {.bg = bg_color, .grad = 0xFFFFFF, .fg = fg_action, .rgb = 0xFFFFFF }; - constexpr btn_colors red_btn = {.bg = 0xFF5555, .grad = 0xFFFFFF, .fg = 0xFF0000, .rgb = 0xFFFFFF }; - constexpr btn_colors ui_slider = {.bg = theme_darkest, .grad = 0xFFFFFF, .fg = theme_dark, .rgb = accent_color_3 }; - constexpr btn_colors ui_toggle = {.bg = theme_darkest, .grad = 0xFFFFFF, .fg = theme_dark, .rgb = 0xFFFFFF }; - - // Temperature color scale - - const rgb_t cool_rgb ( 0, 0, 0); - const rgb_t low_rgb (128, 0, 0); - const rgb_t med_rgb (255, 128, 0); - const rgb_t high_rgb (255, 255, 128); -}; diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_INTAMSYS40.h b/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_INTAMSYS40.h deleted file mode 100644 index c688823..0000000 --- a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_INTAMSYS40.h +++ /dev/null @@ -1,152 +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 - -/** - * Intamsys Funmat HT V4.0 Mainboard - * 4988 Drivers Tested - * 2208 version exists and may or may not work - */ - -#ifndef __AVR_ATmega2560__ - #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'" -#endif - -#define BOARD_INFO_NAME "Intamsys 4.0" - -// -// Servos -// -#define SERVO0_PIN 12 // Uses High Temp Present Jumper Pin - -// -// Limit Switches -// -#define X_STOP_PIN 22 -#define Y_STOP_PIN 26 -#define Z_MIN_PIN 29 -#define Z_MAX_PIN 69 - -#ifndef Z_MIN_PROBE_PIN - #define Z_MIN_PROBE_PIN 69 -#endif - -#define FIL_RUNOUT_PIN 10 - -// -// Steppers -// -#define X_STEP_PIN 25 -#define X_DIR_PIN 23 -#define X_ENABLE_PIN 27 // 44 - -#define Y_STEP_PIN 32 // 33 -#define Y_DIR_PIN 33 // 31, 32 -#define Y_ENABLE_PIN 31 // 32 - -#define Z_STEP_PIN 35 // 35 -#define Z_DIR_PIN 36 -#define Z_ENABLE_PIN 34 // 34 - -#define E0_STEP_PIN 42 -#define E0_DIR_PIN 43 -#define E0_ENABLE_PIN 37 - -#define E1_STEP_PIN 49 -#define E1_DIR_PIN 47 -#define E1_ENABLE_PIN 48 - -#define MOTOR_CURRENT_PWM_X_PIN 11 -#define MOTOR_CURRENT_PWM_Y_PIN 44 -#define MOTOR_CURRENT_PWM_Z_PIN 45 -#define MOTOR_CURRENT_PWM_E_PIN 46 - -// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range -#ifndef MOTOR_CURRENT_PWM_RANGE - #define MOTOR_CURRENT_PWM_RANGE 2000 -#endif -#define DEFAULT_PWM_MOTOR_CURRENT { 1300, 1300, 1250 } - -// -// Temperature Sensors -// -#define TEMP_0_PIN 8 // Analog Input D62 -#define TEMP_BED_PIN 10 // Analog Input D64 - -#define TEMP_CHAMBER_PIN 9 // Analog Input D63 - -// -// Heaters / Fans -// -#define HEATER_0_PIN 2 // PWM -#define HEATER_BED_PIN 4 // PWM -#define HEATER_CHAMBER_PIN 3 // PWM -#define FAN_PIN 7 // PWM - -// -// Misc. Functions -// -#define SDSS 53 -#define SD_DETECT_PIN 39 - -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 8 -#endif - -#if ENABLED(PSU_CONTROL) - #define PS_ON_PIN 38 // UPS Module -#endif - -// -// LCD Controller -// - -#define BEEPER_PIN 18 - -#if HAS_SPI_LCD - #define LCD_PINS_RS 20 - #define LCD_PINS_ENABLE 30 - #define LCD_PINS_D4 14 - #define LCD_PINS_D5 21 - #define LCD_PINS_D6 5 - #define LCD_PINS_D7 6 - #define BTN_EN1 40 - #define BTN_EN2 41 - #define BTN_ENC 19 -#endif - -///////////////////// SPARE HEADERS ////////////// - -/** - * - * J25 - * 1 D54 - * 2 D55 - * 3 D56 - * 4 D57 - * 5 D58 - * 6 D59 - * 7 D60 - * 8 D61 - -Hotend High Temp Connected : D12 -*/ diff --git a/2.0.5-bigTreeTech/README.md b/2.0.5-bigTreeTech/README.md deleted file mode 100644 index 5ec9452..0000000 --- a/2.0.5-bigTreeTech/README.md +++ /dev/null @@ -1,76 +0,0 @@ -# Marlin 3D Printer Firmware - -![GitHub](https://img.shields.io/github/license/marlinfirmware/marlin.svg) -![GitHub contributors](https://img.shields.io/github/contributors/marlinfirmware/marlin.svg) -![GitHub Release Date](https://img.shields.io/github/release-date/marlinfirmware/marlin.svg) -[![Build Status](https://github.com/MarlinFirmware/Marlin/workflows/CI/badge.svg?branch=bugfix-2.0.x)](https://github.com/MarlinFirmware/Marlin/actions) - - - -Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/). -Please let us know if Marlin misbehaves in any way. Volunteers are standing by! - -## Marlin 2.0 - -Marlin 2.0 takes this popular RepRap firmware to the next level by adding support for much faster 32-bit and ARM-based boards while improving support for 8-bit AVR boards. Read about Marlin's decision to use a "Hardware Abstraction Layer" below. - -Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases). - -## Building Marlin 2.0 - -To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino.cc/en/main/software) or [PlatformIO](http://docs.platformio.org/en/latest/ide.html#platformio-ide). Detailed build and install instructions are posted at: - - - [Installing Marlin (Arduino)](http://marlinfw.org/docs/basics/install_arduino.html) - - [Installing Marlin (VSCode)](http://marlinfw.org/docs/basics/install_platformio_vscode.html). - -### Supported Platforms - - Platform|MCU|Example Boards - --------|---|------- - [Arduino AVR](https://www.arduino.cc/)|ATmega|RAMPS, Melzi, RAMBo - [Teensy++ 2.0](http://www.microchip.com/wwwproducts/en/AT90USB1286)|AT90USB1286|Printrboard - [Arduino Due](https://www.arduino.cc/en/Guide/ArduinoDue)|SAM3X8E|RAMPS-FD, RADDS, RAMPS4DUE - [LPC1768](http://www.nxp.com/products/microcontrollers-and-processors/arm-based-processors-and-mcus/lpc-cortex-m-mcus/lpc1700-cortex-m3/512kb-flash-64kb-sram-ethernet-usb-lqfp100-package:LPC1768FBD100)|ARM® Cortex-M3|MKS SBASE, Re-ARM, Selena Compact - [LPC1769](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/512kb-flash-64kb-sram-ethernet-usb-lqfp100-package:LPC1769FBD100)|ARM® Cortex-M3|Smoothieboard, Azteeg X5 mini, TH3D EZBoard - [STM32F103](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html)|ARM® Cortex-M3|Malyan M200, GTM32 Pro, MKS Robin, BTT SKR Mini - [STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)|ARM® Cortex-M4|ARMED, Rumba32, SKR Pro, Lerdge, FYSETC S6 - [STM32F7x6](https://www.st.com/en/microcontrollers-microprocessors/stm32f7x6.html)|ARM® Cortex-M7|The Borg, RemRam V1 - [SAMD51P20A](https://www.adafruit.com/product/4064)|ARM® Cortex-M4|Adafruit Grand Central M4 - [Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|ARM® Cortex-M4| - [Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|ARM® Cortex-M4| - -## Submitting Changes - -- Submit **Bug Fixes** as Pull Requests to the ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)) branch. -- Submit **New Features** to the ([dev-2.1.x](https://github.com/MarlinFirmware/Marlin/tree/dev-2.1.x)) branch. -- Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers. -- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues). - -## Marlin Support - -For best results getting help with configuration and troubleshooting, please use the following resources: - -- [Marlin Documentation](http://marlinfw.org) - Official Marlin documentation -- [Marlin Discord](https://discord.gg/n5NJ59y) - Discuss issues with Marlin users and developers -- Facebook Group ["Marlin Firmware"](https://www.facebook.com/groups/1049718498464482/) -- RepRap.org [Marlin Forum](http://forums.reprap.org/list.php?415) -- [Tom's 3D Forums](https://discuss.toms3d.org/) -- Facebook Group ["Marlin Firmware for 3D Printers"](https://www.facebook.com/groups/3Dtechtalk/) -- [Marlin Configuration](https://www.youtube.com/results?search_query=marlin+configuration) on YouTube - -## Credits - -The current Marlin dev team consists of: - - - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA   [Donate](http://www.thinkyhead.com/donate-to-marlin) / Flattr: [![Flattr Scott](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) - - Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - USA - - Chris Pepper [[@p3p](https://github.com/p3p)] - UK - - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA - - João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portugal - - Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)] - Netherlands   [![Flattr Erik](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) - -## License - -Marlin is published under the [GPL license](/LICENSE) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork. - -While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own. diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/rambo-tests b/2.0.5-bigTreeTech/buildroot/share/tests/rambo-tests deleted file mode 100644 index 8092059..0000000 --- a/2.0.5-bigTreeTech/buildroot/share/tests/rambo-tests +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env bash -# -# Build tests for AVR ATmega2560 RAMBo -# - -# exit on first failure -set -e - -# -# Build with the default configurations -# -restore_configs -opt_set MOTHERBOARD BOARD_EINSY_RAMBO -opt_set X_DRIVER_TYPE TMC2130 -opt_set Y_DRIVER_TYPE TMC2130 -opt_set Z_DRIVER_TYPE TMC2130 -opt_set E0_DRIVER_TYPE TMC2130 -exec_test $1 $2 "Default Configuration" - -# -# Full size Rambo Dual Endstop CNC -# -restore_configs -opt_set MOTHERBOARD BOARD_RAMBO -opt_set EXTRUDERS 0 -opt_set TEMP_SENSOR_0 999 -opt_set DUMMY_THERMISTOR_999_VALUE 170 -opt_set DIGIPOT_MOTOR_CURRENT '{ 120, 120, 120, 120, 120 }' -opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \ - REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER REVERSE_ENCODER_DIRECTION SDSUPPORT EEPROM_SETTINGS \ - S_CURVE_ACCELERATION X_DUAL_STEPPER_DRIVERS X_DUAL_ENDSTOPS Y_DUAL_STEPPER_DRIVERS Y_DUAL_ENDSTOPS \ - ADAPTIVE_STEP_SMOOTHING CNC_COORDINATE_SYSTEMS GCODE_MOTION_MODES -opt_disable MIN_SOFTWARE_ENDSTOP_Z MAX_SOFTWARE_ENDSTOPS -exec_test $1 $2 "Rambo CNC Configuration" - -# -# Lots of options - Formerly the first Mega2560 test -# -restore_configs -opt_set MOTHERBOARD BOARD_RAMBO -opt_set EXTRUDERS 2 -opt_set TEMP_SENSOR_0 -2 -opt_set TEMP_SENSOR_1 1 -opt_set TEMP_SENSOR_BED 2 -opt_set TEMP_SENSOR_PROBE 1 -opt_add TEMP_PROBE_PIN 12 -opt_set TEMP_SENSOR_CHAMBER 3 -opt_add HEATER_CHAMBER_PIN 45 -opt_set GRID_MAX_POINTS_X 16 -opt_set FANMUX0_PIN 53 -opt_disable USE_WATCHDOG -opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \ - FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING PIDTEMPBED \ - PROBING_HEATERS_OFF PROBING_FANS_OFF PROBING_STEPPERS_OFF WAIT_FOR_BED_HEATER \ - EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \ - BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \ - NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \ - PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU LCD_SHOW_E_TOTAL \ - PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 LEVEL_BED_CORNERS \ - NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \ - ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \ - AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DISTINCT_E_FACTORS \ - SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \ - BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \ - FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \ - PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \ - SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \ - HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL -exec_test $1 $2 "RAMBO | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..." - -# clean up -restore_configs diff --git a/2.0.5-bigTreeTech/config/README.md b/2.0.5-bigTreeTech/config/README.md deleted file mode 100644 index f4dfd9a..0000000 --- a/2.0.5-bigTreeTech/config/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Where have all the configurations gone? - -## https://github.com/MarlinFirmware/Configurations/archive/release-2.0.5.zip diff --git a/2.0.5-bigTreeTech/.editorconfig b/Marlin-2.0.x-SKR-mini-E3-V2.0/.editorconfig similarity index 100% rename from 2.0.5-bigTreeTech/.editorconfig rename to Marlin-2.0.x-SKR-mini-E3-V2.0/.editorconfig diff --git a/2.0.5-bigTreeTech/.gitattributes b/Marlin-2.0.x-SKR-mini-E3-V2.0/.gitattributes similarity index 100% rename from 2.0.5-bigTreeTech/.gitattributes rename to Marlin-2.0.x-SKR-mini-E3-V2.0/.gitattributes diff --git a/2.0.5-bigTreeTech/.github/FUNDING.yml b/Marlin-2.0.x-SKR-mini-E3-V2.0/.github/FUNDING.yml similarity index 100% rename from 2.0.5-bigTreeTech/.github/FUNDING.yml rename to Marlin-2.0.x-SKR-mini-E3-V2.0/.github/FUNDING.yml diff --git a/2.0.5-bigTreeTech/.github/code_of_conduct.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/.github/code_of_conduct.md similarity index 100% rename from 2.0.5-bigTreeTech/.github/code_of_conduct.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/.github/code_of_conduct.md diff --git a/2.0.5-bigTreeTech/.github/contributing.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/.github/contributing.md similarity index 100% rename from 2.0.5-bigTreeTech/.github/contributing.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/.github/contributing.md diff --git a/Marlin-2.0.x-SKR-mini-E3-V2.0/.github/issue_template.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/.github/issue_template.md new file mode 100644 index 0000000..ecfb36f --- /dev/null +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/.github/issue_template.md @@ -0,0 +1,31 @@ + + +### 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/2.0.5-bigTreeTech/.github/pull_request_template.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/.github/pull_request_template.md similarity index 100% rename from 2.0.5-bigTreeTech/.github/pull_request_template.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/.github/pull_request_template.md diff --git a/2.0.5-bigTreeTech/.github/workflows/test-builds.yml b/Marlin-2.0.x-SKR-mini-E3-V2.0/.github/workflows/test-builds.yml similarity index 100% rename from 2.0.5-bigTreeTech/.github/workflows/test-builds.yml rename to Marlin-2.0.x-SKR-mini-E3-V2.0/.github/workflows/test-builds.yml diff --git a/2.0.5-bigTreeTech/.gitignore b/Marlin-2.0.x-SKR-mini-E3-V2.0/.gitignore similarity index 100% rename from 2.0.5-bigTreeTech/.gitignore rename to Marlin-2.0.x-SKR-mini-E3-V2.0/.gitignore diff --git a/2.0.5-bigTreeTech/LICENSE b/Marlin-2.0.x-SKR-mini-E3-V2.0/LICENSE similarity index 100% rename from 2.0.5-bigTreeTech/LICENSE rename to Marlin-2.0.x-SKR-mini-E3-V2.0/LICENSE diff --git a/2.0.5-bigTreeTech/Marlin/Configuration.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Configuration.h similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/Configuration.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Configuration.h index 2a8d9a1..905b69f 100644 --- a/2.0.5-bigTreeTech/Marlin/Configuration.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Configuration.h @@ -71,7 +71,7 @@ // @section info // Author info of this build printed to the host during boot and M115 -#define STRING_CONFIG_H_AUTHOR "(BIGTREETECH, Ender-3)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(BIGTREETECH, SKR-mini-E3-V2.0)" // Who made the changes. //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) /** @@ -108,6 +108,7 @@ /** * Select a secondary serial port on the board to use for communication with the host. + * * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] */ #define SERIAL_PORT_2 -1 @@ -128,11 +129,11 @@ // Choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_2 + #define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V2_0 #endif // Name displayed in the LCD "Ready" message and Info menu -#define CUSTOM_MACHINE_NAME "Ender-3" +#define CUSTOM_MACHINE_NAME "SKR-mini-E3-V2.0" // Printer's unique ID, used by some programs to differentiate between machines. // Choose your own or use a service like http://www.uuidgenerator.net/version4 @@ -323,7 +324,7 @@ //#define PSU_NAME "Power Supply" #if ENABLED(PSU_CONTROL) - #define PSU_ACTIVE_HIGH false // Set 'false' for ATX, 'true' for X-Box + #define PSU_ACTIVE_HIGH true // Set 'false' for ATX, 'true' for X-Box //#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80 //#define PSU_POWERUP_DELAY 100 // (ms) Delay for the PSU to warm up to full power @@ -473,7 +474,7 @@ #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_DEBUG // Sends debug data to the serial port. Use 'M303 D' to toggle activation. + //#define PID_DEBUG // Sends debug data to the serial port. Use M303 D to toggle activation. //#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) @@ -482,7 +483,6 @@ // 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 - // Creality Ender-3 #define DEFAULT_Kp 21.73 #define DEFAULT_Ki 1.54 @@ -525,9 +525,9 @@ //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 + //#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 @@ -536,6 +536,9 @@ //#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. + #define DEFAULT_bedKp 50.71 + #define DEFAULT_bedKi 9.88 + #define DEFAULT_bedKd 173.43 #endif // PIDTEMPBED // @section extruder @@ -610,7 +613,7 @@ //#define USE_ZMAX_PLUG // Enable pullup for all endstops to prevent a floating state -//#define ENDSTOPPULLUPS +#define ENDSTOPPULLUPS #if DISABLED(ENDSTOPPULLUPS) // Disable ENDSTOPPULLUPS to set pullups individually //#define ENDSTOPPULLUP_XMAX @@ -791,7 +794,7 @@ * http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html */ #if DISABLED(CLASSIC_JERK) - #define JUNCTION_DEVIATION_MM 0.08 // (mm) Distance from real junction edge + #define JUNCTION_DEVIATION_MM 0.08 // (mm) Distance from real junction edge #endif /** @@ -818,7 +821,7 @@ * * Enable this option for a probe connected to the Z Min endstop pin. */ -//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN /** * Z_MIN_PROBE_PIN @@ -874,7 +877,7 @@ /** * The BLTouch probe uses a Hall effect sensor and emulates a servo. */ -//#define BLTOUCH +#define BLTOUCH /** * Touch-MI Probe by hotends.fr @@ -946,11 +949,11 @@ * * Specify a Probe position as { X, Y, Z } */ -#define NOZZLE_TO_PROBE_OFFSET {-25,-20, -1.85 } +#define NOZZLE_TO_PROBE_OFFSET { -40, -10, -2.0 } // 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 MIN_PROBE_EDGE 20 +#define MIN_PROBE_EDGE 10 // X and Y axis travel speed (mm/m) between probes #define XY_PROBE_SPEED 8000 @@ -1133,7 +1136,7 @@ //#define FILAMENT_RUNOUT_SENSOR #if ENABLED(FILAMENT_RUNOUT_SENSOR) #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_INVERTING true // 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. @@ -1144,7 +1147,7 @@ // 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 + //#define FILAMENT_RUNOUT_DISTANCE_MM 7 #ifdef FILAMENT_RUNOUT_DISTANCE_MM // Enable this option to use an encoder disc that toggles the runout pin @@ -1194,15 +1197,15 @@ */ //#define AUTO_BED_LEVELING_3POINT //#define AUTO_BED_LEVELING_LINEAR -//#define AUTO_BED_LEVELING_BILINEAR +#define AUTO_BED_LEVELING_BILINEAR //#define AUTO_BED_LEVELING_UBL -#define MESH_BED_LEVELING +//#define MESH_BED_LEVELING /** * Normally G28 leaves leveling disabled on completion. Enable * this option to have G28 restore the prior leveling state. */ -#define RESTORE_LEVELING_AFTER_G28 +//#define RESTORE_LEVELING_AFTER_G28 /** * Enable detailed logging of G28, G29, M48, etc. @@ -1241,7 +1244,7 @@ #if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR) // Set the number of grid points per dimension. - #define GRID_MAX_POINTS_X 3 + #define GRID_MAX_POINTS_X 5 #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X // Probe along the Y axis, advancing X after each column @@ -1301,7 +1304,7 @@ * Add a bed leveling sub-menu for ABL or MBL. * Include a guided procedure if manual probing is enabled. */ -#define LCD_BED_LEVELING +//#define LCD_BED_LEVELING #if ENABLED(LCD_BED_LEVELING) #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. @@ -1310,7 +1313,7 @@ #endif // Add a menu item to move between bed corners for manual bed adjustment -#define LEVEL_BED_CORNERS +//#define LEVEL_BED_CORNERS #if ENABLED(LEVEL_BED_CORNERS) #define LEVEL_CORNERS_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets @@ -1346,7 +1349,7 @@ // - 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 +#define Z_SAFE_HOMING #if ENABLED(Z_SAFE_HOMING) #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28). @@ -1354,7 +1357,7 @@ #endif // Homing speeds (mm/m) -#define HOMING_FEEDRATE_XY (20*60) +#define HOMING_FEEDRATE_XY (50*60) #define HOMING_FEEDRATE_Z (4*60) // Validate that endstops are triggered on homing moves @@ -1432,7 +1435,7 @@ * 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 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 @@ -1446,9 +1449,9 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages -#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 +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#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 // // G20/G21 Inch mode support @@ -1464,7 +1467,7 @@ // Preheat Constants #define PREHEAT_1_LABEL "PLA" -#define PREHEAT_1_TEMP_HOTEND 180 +#define PREHEAT_1_TEMP_HOTEND 185 #define PREHEAT_1_TEMP_BED 45 #define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255 @@ -1484,7 +1487,7 @@ * P1 Raise the nozzle always to Z-park height. * P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS. */ -//#define NOZZLE_PARK_FEATURE +#define NOZZLE_PARK_FEATURE #if ENABLED(NOZZLE_PARK_FEATURE) // Specify a park position as { X, Y, Z_raise } @@ -1588,7 +1591,7 @@ * * View the current statistics with M78. */ -#define PRINTCOUNTER +//#define PRINTCOUNTER //============================================================================= //============================= LCD and SD support ============================ @@ -1663,7 +1666,7 @@ * * Use CRC checks and retries on the SD communication. */ -#define SD_CHECK_AND_RETRY +//#define SD_CHECK_AND_RETRY /** * LCD Menu Items @@ -1726,7 +1729,7 @@ // // Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu. // -#define INDIVIDUAL_AXIS_HOMING_MENU +//#define INDIVIDUAL_AXIS_HOMING_MENU // // SPEAKER/BUZZER @@ -2190,13 +2193,13 @@ #endif // Support for Adafruit Neopixel LED driver -//#define NEOPIXEL_LED +#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 NEOPIXEL_TYPE NEO_GRB // 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, larger of 2 strips if 2 neopixel strips are used + #define NEOPIXEL_PIXELS 10 // Number of LEDs in the strip, larger of 2 strips if 2 neopixel strips are used #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 diff --git a/2.0.5-bigTreeTech/Marlin/Configuration_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Configuration_adv.h similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/Configuration_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Configuration_adv.h index 69ee3e6..5a3f62e 100644 --- a/2.0.5-bigTreeTech/Marlin/Configuration_adv.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Configuration_adv.h @@ -277,7 +277,7 @@ #endif // Extra options for the M114 "Current Position" report -//#define M114_DETAIL // Use 'M114` for details to check planner calculations +#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. @@ -340,9 +340,8 @@ * * The fan turns on automatically whenever any driver is enabled and turns * off (or reduces to idle speed) shortly after drivers are turned off. - * */ -//#define USE_CONTROLLER_FAN +#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 @@ -350,7 +349,7 @@ #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 + #define CONTROLLER_FAN_EDITABLE // Enable M710 configurable settings #if ENABLED(CONTROLLER_FAN_EDITABLE) #define CONTROLLER_FAN_MENU // Enable the Controller Fan submenu #endif @@ -595,7 +594,7 @@ #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 QUICK_HOME // If homing includes X and Y, do a diagonal move initially //#define HOMING_BACKOFF_MM { 2, 2, 2 } // (mm) Move away from the endstops after homing // When G28 is called, this option will make Y home before X @@ -680,7 +679,7 @@ // 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 } } + //#define Z_STEPPER_ALIGN_XY { { 10, 190 }, { 100, 10 }, { 190, 190 } } /** * Orientation for the automatically-calculated probe positions. @@ -715,14 +714,14 @@ // 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! + // Amplification factor. Used to scale the correction step up or down. + // In case the stepper (spindle) position is further out than the test point. + // Use a value > 1. NOTE: This may cause instability + #define Z_STEPPER_ALIGN_AMP 1.0 #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_ITERATIONS 3 // 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? @@ -760,6 +759,7 @@ // Minimum time that a segment needs to take if the buffer is emptied #define DEFAULT_MINSEGMENTTIME 20000 // (ms) +// If defined the movements slow down when the look ahead buffer is only half full // Slow down the machine if the look ahead buffer is (by default) half full. // Increase the slowdown divisor for larger buffer sizes. #define SLOWDOWN @@ -976,7 +976,7 @@ * LED Control Menu * Add LED Control to the LCD menu */ - //#define LED_CONTROL_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) @@ -1049,10 +1049,6 @@ #define EVENT_GCODE_SD_STOP "G28XY" // G-code to run on Stop 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 - /** * Continue after Power-Loss (Creality3D) * @@ -1060,17 +1056,14 @@ * during SD printing. If the recovery file is found at boot time, present * an option on the LCD screen to continue the print from the last-known * point in the file. - * - * If the machine reboots when resuming a print you may need to replace or - * reformat the SD card. (Bad sectors delay startup triggering the watchdog.) */ #define POWER_LOSS_RECOVERY #if ENABLED(POWER_LOSS_RECOVERY) - #define PLR_ENABLED_DEFAULT true // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500) + #define PLR_ENABLED_DEFAULT true // 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_ZRAISE 2 // (mm) Z axis raise on resume (on power loss with UPS) - //#define POWER_LOSS_PIN PC12 // Pin to detect power loss. Set to -1 to disable default pin on boards without module. - //#define POWER_LOSS_STATE LOW // State of pin indicating power loss + //#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. @@ -1132,7 +1125,7 @@ * 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 SD_ABORT_ON_ENDSTOP_HIT /** * This option makes it easier to print the same SD Card file again. @@ -1197,16 +1190,18 @@ // 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 ONBOARD + #if HAS_SDCARD_CONNECTION + /** + * 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 ONBOARD + #endif #endif // SDSUPPORT @@ -1477,7 +1472,7 @@ #define BABYSTEP_MULTIPLICATOR_Z 1 // Babysteps are very small. Increase for faster motion. #define BABYSTEP_MULTIPLICATOR_XY 1 - #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. + #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. @@ -1515,7 +1510,7 @@ * 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 +//#define LIN_ADVANCE #if ENABLED(LIN_ADVANCE) //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants #define LIN_ADVANCE_K 0.0 // Unit: mm compression per 1mm/s extruder speed @@ -1629,7 +1624,7 @@ // // 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 @@ -1716,16 +1711,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 + #define BLOCK_BUFFER_SIZE 32 // SD,LCD,Buttons take more memory, block buffer needs to be smaller #else - #define BLOCK_BUFFER_SIZE 16 // maximize block buffer + #define BLOCK_BUFFER_SIZE 32 // maximize block buffer #endif // @section serial // The ASCII buffer for serial input #define MAX_CMD_SIZE 96 -#define BUFSIZE 4 +#define BUFSIZE 32 // Transmission to Host Buffer Size // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0. @@ -1734,7 +1729,7 @@ // For debug-echo: 128 bytes for the optimal speed. // Other output doesn't need to be that speedy. // :[0, 2, 4, 8, 16, 32, 64, 128, 256] -#define TX_BUFFER_SIZE 0 +#define TX_BUFFER_SIZE 32 // Host Receive Buffer Size // Without XON/XOFF flow control (see SERIAL_XON_XOFF below) 32 bytes should be enough. @@ -1868,7 +1863,7 @@ * Requires NOZZLE_PARK_FEATURE. * This feature is required for the default FILAMENT_RUNOUT_SCRIPT. */ -//#define ADVANCED_PAUSE_FEATURE +#define ADVANCED_PAUSE_FEATURE #if ENABLED(ADVANCED_PAUSE_FEATURE) #define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate. #define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract. @@ -1906,7 +1901,7 @@ #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 PARK_HEAD_ON_PAUSE // Park the nozzle during pause and 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. @@ -2046,7 +2041,7 @@ #if AXIS_IS_TMC(X) #define X_CURRENT 580 // (mA) RMS current. Multiply by 1.414 for peak current. - #define X_CURRENT_HOME X_CURRENT // (mA) RMS current for sensorless homing + #define X_CURRENT_HOME 1000 // (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, ... @@ -2062,7 +2057,7 @@ #if AXIS_IS_TMC(Y) #define Y_CURRENT 580 - #define Y_CURRENT_HOME Y_CURRENT + #define Y_CURRENT_HOME 1000 #define Y_MICROSTEPS 16 #define Y_RSENSE 0.11 #define Y_CHAIN_POS -1 @@ -2078,7 +2073,7 @@ #if AXIS_IS_TMC(Z) #define Z_CURRENT 580 - #define Z_CURRENT_HOME Z_CURRENT + #define Z_CURRENT_HOME 1000 #define Z_MICROSTEPS 16 #define Z_RSENSE 0.11 #define Z_CHAIN_POS -1 @@ -2207,14 +2202,14 @@ * 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 Y_SLAVE_ADDRESS 2 + #define Z_SLAVE_ADDRESS 1 #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 E0_SLAVE_ADDRESS 3 #define E1_SLAVE_ADDRESS 0 #define E2_SLAVE_ADDRESS 0 #define E3_SLAVE_ADDRESS 0 @@ -2288,7 +2283,7 @@ #define X2_HYBRID_THRESHOLD 100 #define Y_HYBRID_THRESHOLD 100 #define Y2_HYBRID_THRESHOLD 100 - #define Z_HYBRID_THRESHOLD 3 + #define Z_HYBRID_THRESHOLD 10 #define Z2_HYBRID_THRESHOLD 3 #define Z3_HYBRID_THRESHOLD 3 #define Z4_HYBRID_THRESHOLD 3 @@ -2328,12 +2323,12 @@ #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING) // TMC2209: 0...255. TMC2130: -64...63 - #define X_STALL_SENSITIVITY 8 + #define X_STALL_SENSITIVITY 75 #define X2_STALL_SENSITIVITY X_STALL_SENSITIVITY - #define Y_STALL_SENSITIVITY 8 - //#define Z_STALL_SENSITIVITY 8 + #define Y_STALL_SENSITIVITY 75 + #define Z_STALL_SENSITIVITY 65 //#define SPI_ENDSTOPS // TMC2130 only - //#define IMPROVE_HOMING_RELIABILITY + #define IMPROVE_HOMING_RELIABILITY #endif /** @@ -2346,7 +2341,7 @@ * Enable M122 debugging command for TMC stepper drivers. * M122 S0/1 will enable continous reporting. */ - #define TMC_DEBUG + //#define TMC_DEBUG /** * You can set your own advanced settings by filling in predefined functions. diff --git a/2.0.5-bigTreeTech/Marlin/Makefile b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Makefile similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/Makefile rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Makefile diff --git a/2.0.5-bigTreeTech/Marlin/Marlin.ino b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Marlin.ino similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/Marlin.ino rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Marlin.ino diff --git a/2.0.5-bigTreeTech/Marlin/Version.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Version.h similarity index 96% rename from 2.0.5-bigTreeTech/Marlin/Version.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Version.h index b4e5184..c278860 100644 --- a/2.0.5-bigTreeTech/Marlin/Version.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -//#define SHORT_BUILD_VERSION "2.0.5.3" +//#define SHORT_BUILD_VERSION "bugfix-2.0.x" /** * Verbose version identifier which should contain a reference to the location @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2020-01-31" +//#define STRING_DISTRIBUTION_DATE "2019-07-10" /** * Defines a generic printer name to be output to the LCD after booting Marlin. diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/HAL.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/HAL.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/HAL.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/HAL.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/HAL.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/HAL.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/HAL_SPI.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/HAL_SPI.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/HAL_SPI.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/HAL_SPI.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/MarlinSerial.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/MarlinSerial.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/MarlinSerial.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/MarlinSerial.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/MarlinSerial.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/MarlinSerial.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/MarlinSerial.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/MarlinSerial.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/Servo.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/Servo.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/Servo.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/Servo.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/ServoTimers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/ServoTimers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/ServoTimers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/ServoTimers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/endstop_interrupts.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/endstop_interrupts.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/endstop_interrupts.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/endstop_interrupts.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fast_pwm.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fast_pwm.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fast_pwm.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio.h index a45e0f2..2246a0f 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio.h @@ -98,9 +98,9 @@ #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 SET_PWM(IO) SET_OUTPUT(IO) #define IS_INPUT(IO) _IS_INPUT(IO) #define IS_OUTPUT(IO) _IS_OUTPUT(IO) diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio/fastio_1280.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio/fastio_1280.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio/fastio_1280.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio/fastio_1280.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio/fastio_1281.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio/fastio_1281.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio/fastio_1281.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio/fastio_1281.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio/fastio_168.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio/fastio_168.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio/fastio_168.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio/fastio_168.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio/fastio_644.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio/fastio_644.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio/fastio_644.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio/fastio_644.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/inc/Conditionals_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/inc/Conditionals_adv.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/inc/Conditionals_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/inc/Conditionals_adv.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/inc/Conditionals_post.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/inc/Conditionals_post.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/inc/Conditionals_post.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/inc/Conditionals_post.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/inc/SanityCheck.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/inc/SanityCheck.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/inc/SanityCheck.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/math.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/math.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/math.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/math.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/eeprom.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/persistent_store_eeprom.cpp similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/eeprom.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/persistent_store_eeprom.cpp index ee416b7..1ae37f8 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/eeprom.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/persistent_store_eeprom.cpp @@ -25,7 +25,7 @@ #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE) -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" bool PersistentStore::access_start() { return true; } bool PersistentStore::access_finish() { return true; } diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/pinsDebug.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/pinsDebug.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/pinsDebug.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/pinsDebug_plus_70.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/pinsDebug_plus_70.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/pinsDebug_plus_70.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/pinsDebug_plus_70.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/spi_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/spi_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/spi_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/spi_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/watchdog.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/watchdog.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/watchdog.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/watchdog.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/AVR/watchdog.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/watchdog.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/AVR/watchdog.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/AVR/watchdog.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/DebugMonitor.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/DebugMonitor.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/DebugMonitor.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/DebugMonitor.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/EepromEmulation.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/EepromEmulation.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/EepromEmulation.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/EepromEmulation.cpp index 66af50c..f1ae224 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/EepromEmulation.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/EepromEmulation.cpp @@ -57,7 +57,7 @@ #if ENABLED(FLASH_EEPROM_EMULATION) #include "../shared/Marduino.h" -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" #define EEPROMSize 4096 #define PagesPerGroup 128 diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/HAL.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/HAL.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/HAL.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/HAL.h similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/HAL.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/HAL.h index 42f6f17..97b94b5 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/HAL.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/HAL.h @@ -39,7 +39,7 @@ #include // Define MYSERIAL0/1 before MarlinSerial includes! -#if SERIAL_PORT == -1 || ENABLED(EMERGENCY_PARSER) +#if SERIAL_PORT == -1 #define MYSERIAL0 customizedSerial1 #elif SERIAL_PORT == 0 #define MYSERIAL0 Serial @@ -56,7 +56,7 @@ #ifdef SERIAL_PORT_2 #if SERIAL_PORT_2 == SERIAL_PORT #error "SERIAL_PORT_2 must be different from SERIAL_PORT. Please update your configuration." - #elif SERIAL_PORT_2 == -1 || ENABLED(EMERGENCY_PARSER) + #elif SERIAL_PORT_2 == -1 #define MYSERIAL1 customizedSerial2 #elif SERIAL_PORT_2 == 0 #define MYSERIAL1 Serial @@ -94,6 +94,7 @@ #endif #endif + #include "MarlinSerial.h" #include "MarlinSerialUSB.h" diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/HAL_SPI.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/HAL_SPI.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/HAL_SPI.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/HAL_SPI.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/InterruptVectors.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/InterruptVectors.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/InterruptVectors.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/InterruptVectors.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/InterruptVectors.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/InterruptVectors.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/InterruptVectors.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/InterruptVectors.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/MarlinSerial.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/MarlinSerial.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/MarlinSerial.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/MarlinSerial.cpp index d114c75..d827def 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/MarlinSerial.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/MarlinSerial.cpp @@ -629,13 +629,23 @@ void MarlinSerial::printFloat(double number, uint8_t digits) { // If not using the USB port as serial port #if SERIAL_PORT >= 0 - template class MarlinSerial>; // Define - MarlinSerial> customizedSerial1; // Instantiate + + // Preinstantiate + template class MarlinSerial>; + + // Instantiate + MarlinSerial> customizedSerial1; + #endif -#if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0 - template class MarlinSerial>; // Define - MarlinSerial> customizedSerial2; // Instantiate +#ifdef SERIAL_PORT_2 + + // Preinstantiate + template class MarlinSerial>; + + // Instantiate + MarlinSerial> customizedSerial2; + #endif #endif // ARDUINO_ARCH_SAM diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/MarlinSerial.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/MarlinSerial.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/MarlinSerial.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/MarlinSerial.h index fa6a2c7..eb26a56 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/MarlinSerial.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/MarlinSerial.h @@ -172,9 +172,13 @@ struct MarlinSerialCfg { }; #if SERIAL_PORT >= 0 - extern MarlinSerial> customizedSerial1; -#endif -#if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0 + extern MarlinSerial> customizedSerial1; + +#endif // SERIAL_PORT >= 0 + +#ifdef SERIAL_PORT_2 + extern MarlinSerial> customizedSerial2; + #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp index 7a020bb..41ffb52 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp @@ -29,7 +29,7 @@ #include "../../inc/MarlinConfig.h" -#if HAS_USB_SERIAL +#if SERIAL_PORT == -1 #include "MarlinSerialUSB.h" @@ -283,12 +283,8 @@ void MarlinSerialUSB::printFloat(double number, uint8_t digits) { } // Preinstantiate -#if SERIAL_PORT == -1 - MarlinSerialUSB customizedSerial1; -#endif -#if SERIAL_PORT_2 == -1 - MarlinSerialUSB customizedSerial2; -#endif +MarlinSerialUSB customizedSerial1; + +#endif // SERIAL_PORT == -1 -#endif // HAS_USB_SERIAL #endif // ARDUINO_ARCH_SAM diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/MarlinSerialUSB.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/MarlinSerialUSB.h similarity index 94% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/MarlinSerialUSB.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/MarlinSerialUSB.h index 9aece90..d8b051d 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/MarlinSerialUSB.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/MarlinSerialUSB.h @@ -28,7 +28,7 @@ #include "../../inc/MarlinConfig.h" -#if HAS_USB_SERIAL +#if SERIAL_PORT == -1 #include @@ -88,12 +88,6 @@ private: static void printFloat(double, uint8_t); }; -#if SERIAL_PORT == -1 - extern MarlinSerialUSB customizedSerial1; -#endif +extern MarlinSerialUSB customizedSerial1; -#if SERIAL_PORT_2 == -1 - extern MarlinSerialUSB customizedSerial2; -#endif - -#endif // HAS_USB_SERIAL +#endif // SERIAL_PORT == -1 diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/Servo.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/Servo.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/Servo.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/Servo.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/ServoTimers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/ServoTimers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/ServoTimers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/ServoTimers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/Tone.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/Tone.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/Tone.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/Tone.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/endstop_interrupts.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/endstop_interrupts.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/endstop_interrupts.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/endstop_interrupts.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/fastio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/fastio.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/fastio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/fastio.h index 01abd82..6f1f8d8 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/fastio.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/fastio.h @@ -166,7 +166,7 @@ // Set pin as output (wrapper) - reads the pin and sets the output to that value #define SET_OUTPUT(IO) _SET_OUTPUT(IO) // Set pin as PWM -#define SET_PWM SET_OUTPUT +#define SET_PWM(IO) SET_OUTPUT(IO) // Check if pin is an input #define IS_INPUT(IO) ((digitalPinToPort(IO)->PIO_OSR & digitalPinToBitMask(IO)) == 0) diff --git a/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp new file mode 100644 index 0000000..fd2c6cc --- /dev/null +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp @@ -0,0 +1,145 @@ +/** + * 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 . + * + */ + +/** + * The PWM module is only used to generate interrupts at specified times. It + * is NOT used to directly toggle pins. The ISR writes to the pin assigned to + * that interrupt. + * + * All PWMs use the same repetition rate. The G2 needs about 10KHz min in order to + * not have obvious ripple on the Vref signals. + * + * The data structures are setup to minimize the computation done by the ISR which + * minimizes ISR execution time. Execution times are 0.8 to 1.1 microseconds. + * + * FIve PWM interrupt sources are used. Channel 0 sets the base period. All Vref + * signals are set active when this counter overflows and resets to zero. The compare + * values in channels 1-4 are set to give the desired duty cycle for that Vref pin. + * When counter 0 matches the compare value then that channel generates an interrupt. + * The ISR checks the source of the interrupt and sets the corresponding pin inactive. + * + * Some jitter in the Vref signal is OK so the interrupt priority is left at its default value. + */ + +#include "../../../inc/MarlinConfig.h" + +#if MB(PRINTRBOARD_G2) + +#include "G2_PWM.h" + +volatile uint32_t *SODR_A = &PIOA->PIO_SODR, + *SODR_B = &PIOB->PIO_SODR, + *CODR_A = &PIOA->PIO_CODR, + *CODR_B = &PIOB->PIO_CODR; + +PWM_map ISR_table[NUM_PWMS] = PWM_MAP_INIT; + +void Stepper::digipot_init() { + + OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, 0); // init pins + OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, 0); + OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, 0); + OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, 0); + + #define WPKEY (0x50574D << 8) // “PWM” in ASCII + #define WPCMD_DIS_SW 0 // command to disable Write Protect SW + #define WPRG_ALL (PWM_WPCR_WPRG0 | PWM_WPCR_WPRG1 | PWM_WPCR_WPRG2 | PWM_WPCR_WPRG3 | PWM_WPCR_WPRG4 | PWM_WPCR_WPRG5) // all Write Protect Groups + + #define PWM_CLOCK_F F_CPU / 1000000UL // set clock to 1MHz + + PMC->PMC_PCER1 = PMC_PCER1_PID36; // enable PWM controller clock (disabled on power up) + + PWM->PWM_WPCR = WPKEY | WPRG_ALL | WPCMD_DIS_SW; // enable setting of all PWM registers + PWM->PWM_CLK = PWM_CLOCK_F; // enable CLK_A and set it to 1MHz, leave CLK_B disabled + PWM->PWM_CH_NUM[0].PWM_CMR = 0b1011; // set channel 0 to Clock A input & to left aligned + PWM->PWM_CH_NUM[1].PWM_CMR = 0b1011; // set channel 1 to Clock A input & to left aligned + PWM->PWM_CH_NUM[2].PWM_CMR = 0b1011; // set channel 2 to Clock A input & to left aligned + PWM->PWM_CH_NUM[3].PWM_CMR = 0b1011; // set channel 3 to Clock A input & to left aligned + PWM->PWM_CH_NUM[4].PWM_CMR = 0b1011; // set channel 4 to Clock A input & to left aligned + + PWM->PWM_CH_NUM[0].PWM_CPRD = PWM_PERIOD_US; // set channel 0 Period + + PWM->PWM_IER2 = PWM_IER1_CHID0; // generate interrupt when counter0 overflows + PWM->PWM_IER2 = PWM_IER2_CMPM0 | PWM_IER2_CMPM1 | PWM_IER2_CMPM2 | PWM_IER2_CMPM3 | PWM_IER2_CMPM4; // generate interrupt on compare event + + PWM->PWM_CMP[1].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0])); // interrupt when counter0 == CMPV - used to set Motor 1 PWM inactive + PWM->PWM_CMP[2].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[0])); // interrupt when counter0 == CMPV - used to set Motor 2 PWM inactive + PWM->PWM_CMP[3].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[1])); // interrupt when counter0 == CMPV - used to set Motor 3 PWM inactive + PWM->PWM_CMP[4].PWM_CMPV = 0x010000000LL | G2_VREF_COUNT(G2_VREF(motor_current_setting[2])); // interrupt when counter0 == CMPV - used to set Motor 4 PWM inactive + + PWM->PWM_CMP[1].PWM_CMPM = 0x0001; // enable compare event + PWM->PWM_CMP[2].PWM_CMPM = 0x0001; // enable compare event + PWM->PWM_CMP[3].PWM_CMPM = 0x0001; // enable compare event + PWM->PWM_CMP[4].PWM_CMPM = 0x0001; // enable compare event + + PWM->PWM_SCM = PWM_SCM_UPDM_MODE0 | PWM_SCM_SYNC0 | PWM_SCM_SYNC1 | PWM_SCM_SYNC2 | PWM_SCM_SYNC3 | PWM_SCM_SYNC4; // sync 1-4 with 0, use mode 0 for updates + + PWM->PWM_ENA = PWM_ENA_CHID0 | PWM_ENA_CHID1 | PWM_ENA_CHID2 | PWM_ENA_CHID3 | PWM_ENA_CHID4; // enable the channels used by G2 + PWM->PWM_IER1 = PWM_IER1_CHID0 | PWM_IER1_CHID1 | PWM_IER1_CHID2 | PWM_IER1_CHID3 | PWM_IER1_CHID4; // enable interrupts for the channels used by G2 + + NVIC_EnableIRQ(PWM_IRQn); // Enable interrupt handler + NVIC_SetPriority(PWM_IRQn, NVIC_EncodePriority(0, 10, 0)); // normal priority for PWM module (can stand some jitter on the Vref signals) +} + +void Stepper::digipot_current(const uint8_t driver, const int16_t current) { + + if (!(PWM->PWM_CH_NUM[0].PWM_CPRD == PWM_PERIOD_US)) digipot_init(); // Init PWM system if needed + + switch (driver) { + case 0: PWM->PWM_CMP[1].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); // update X & Y + PWM->PWM_CMP[2].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); + PWM->PWM_CMP[1].PWM_CMPMUPD = 0x0001; // enable compare event + PWM->PWM_CMP[2].PWM_CMPMUPD = 0x0001; // enable compare event + PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle + break; + case 1: PWM->PWM_CMP[3].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); // update Z + PWM->PWM_CMP[3].PWM_CMPMUPD = 0x0001; // enable compare event + PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle + break; + default:PWM->PWM_CMP[4].PWM_CMPVUPD = 0x010000000LL | G2_VREF_COUNT(G2_VREF(current)); // update E + PWM->PWM_CMP[4].PWM_CMPMUPD = 0x0001; // enable compare event + PWM->PWM_SCUC = PWM_SCUC_UPDULOCK; // tell the PWM controller to update the values on the next cycle + break; + } +} + +volatile uint32_t PWM_ISR1_STATUS, PWM_ISR2_STATUS; + +void PWM_Handler() { + PWM_ISR1_STATUS = PWM->PWM_ISR1; + PWM_ISR2_STATUS = PWM->PWM_ISR2; + if (PWM_ISR1_STATUS & PWM_IER1_CHID0) { // CHAN_0 interrupt + *ISR_table[0].set_register = ISR_table[0].write_mask; // set X to active + *ISR_table[1].set_register = ISR_table[1].write_mask; // set Y to active + *ISR_table[2].set_register = ISR_table[2].write_mask; // set Z to active + *ISR_table[3].set_register = ISR_table[3].write_mask; // set E to active + } + else { + if (PWM_ISR2_STATUS & PWM_IER2_CMPM1) *ISR_table[0].clr_register = ISR_table[0].write_mask; // set X to inactive + if (PWM_ISR2_STATUS & PWM_IER2_CMPM2) *ISR_table[1].clr_register = ISR_table[1].write_mask; // set Y to inactive + if (PWM_ISR2_STATUS & PWM_IER2_CMPM3) *ISR_table[2].clr_register = ISR_table[2].write_mask; // set Z to inactive + if (PWM_ISR2_STATUS & PWM_IER2_CMPM4) *ISR_table[3].clr_register = ISR_table[3].write_mask; // set E to inactive + } + return; +} + +#endif // PRINTRBOARD_G2 diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/fastio/G2_PWM.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/fastio/G2_PWM.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/fastio/G2_PWM.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/fastio/G2_PWM.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/fastio/G2_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/fastio/G2_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/fastio/G2_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/fastio/G2_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/inc/Conditionals_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/inc/Conditionals_adv.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/inc/Conditionals_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/inc/Conditionals_adv.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/inc/Conditionals_post.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/inc/Conditionals_post.h similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/inc/Conditionals_post.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/inc/Conditionals_post.h index 8a30500..b52462f 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/inc/Conditionals_post.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/inc/Conditionals_post.h @@ -21,7 +21,7 @@ */ #pragma once -#if USE_FALLBACK_EEPROM +#if USE_EMULATED_EEPROM #undef SRAM_EEPROM_EMULATION #undef SDCARD_EEPROM_EMULATION #define FLASH_EEPROM_EMULATION diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/inc/SanityCheck.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/inc/SanityCheck.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/inc/SanityCheck.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/inc/SanityCheck.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/eeprom.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/persistent_store_eeprom.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/eeprom.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/persistent_store_eeprom.cpp index ec9ef51..fbdc760 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/eeprom.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/persistent_store_eeprom.cpp @@ -27,7 +27,7 @@ #if ENABLED(EEPROM_SETTINGS) #include "../../inc/MarlinConfig.h" -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" #if !defined(E2END) && ENABLED(FLASH_EEPROM_EMULATION) #define E2END 0xFFF // Default to Flash emulated EEPROM size (EepromEmulation_Due.cpp) diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/pinsDebug.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/pinsDebug.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/pinsDebug.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/pinsDebug.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/spi_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/spi_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/spi_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/spi_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/timers.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/timers.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/timers.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/timers.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/timers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/timers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/timers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/timers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/arduino_due_x.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/arduino_due_x.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/arduino_due_x.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/arduino_due_x.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/compiler.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/compiler.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/compiler.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/compiler.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/conf_access.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/conf_access.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/conf_access.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/conf_access.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/conf_clock.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/conf_clock.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/conf_clock.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/conf_clock.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/conf_usb.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/conf_usb.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/conf_usb.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/conf_usb.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/ctrl_access.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/ctrl_access.c similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/ctrl_access.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/ctrl_access.c diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/ctrl_access.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/ctrl_access.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/ctrl_access.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/ctrl_access.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/genclk.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/genclk.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/genclk.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/genclk.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/mrepeat.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/mrepeat.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/mrepeat.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/mrepeat.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/osc.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/osc.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/osc.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/osc.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/pll.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/pll.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/pll.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/pll.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/preprocessor.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/preprocessor.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/preprocessor.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/preprocessor.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/sbc_protocol.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/sbc_protocol.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/sbc_protocol.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/sbc_protocol.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/spc_protocol.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/spc_protocol.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/spc_protocol.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/spc_protocol.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/stringz.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/stringz.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/stringz.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/stringz.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/sysclk.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/sysclk.c similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/sysclk.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/sysclk.c diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/sysclk.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/sysclk.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/sysclk.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/sysclk.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/tpaste.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/tpaste.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/tpaste.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/tpaste.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udc.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udc.c similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udc.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udc.c diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udc.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udc.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udc.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udc.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udc_desc.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udc_desc.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udc_desc.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udc_desc.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udd.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udd.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udd.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udd.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_cdc.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_cdc.c similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_cdc.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_cdc.c diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_cdc.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_cdc.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_cdc.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_cdc.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_cdc_conf.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_cdc_conf.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_cdc_conf.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_cdc_conf.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_cdc_desc.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_cdc_desc.c similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_cdc_desc.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_cdc_desc.c diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_composite_desc.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_composite_desc.c similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_composite_desc.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_composite_desc.c diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_msc.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_msc.c similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_msc.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_msc.c diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_msc.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_msc.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/udi_msc.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/udi_msc.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/uotghs_device_due.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/uotghs_device_due.c similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/uotghs_device_due.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/uotghs_device_due.c diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/uotghs_device_due.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/uotghs_device_due.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/uotghs_device_due.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/uotghs_device_due.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/uotghs_otg.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/uotghs_otg.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/uotghs_otg.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/uotghs_otg.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/usb_protocol.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/usb_protocol.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/usb_protocol.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/usb_protocol.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/usb_protocol_msc.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/usb_protocol_msc.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/usb_protocol_msc.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/usb_protocol_msc.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/usb_task.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/usb_task.c similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/usb_task.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/usb_task.c diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/usb_task.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/usb_task.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/usb/usb_task.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/usb/usb_task.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/watchdog.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/watchdog.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/watchdog.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/watchdog.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/DUE/watchdog.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/watchdog.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/DUE/watchdog.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/DUE/watchdog.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/FlushableHardwareSerial.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/FlushableHardwareSerial.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/FlushableHardwareSerial.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/FlushableHardwareSerial.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/FlushableHardwareSerial.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/FlushableHardwareSerial.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/FlushableHardwareSerial.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/FlushableHardwareSerial.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/HAL.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/HAL.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/HAL.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/HAL.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/HAL.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/HAL.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/HAL_SPI.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/HAL_SPI.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/HAL_SPI.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/HAL_SPI.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/Servo.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/Servo.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/Servo.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/Servo.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/Servo.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/Servo.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/Servo.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/Servo.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/WebSocketSerial.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/WebSocketSerial.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/WebSocketSerial.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/WebSocketSerial.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/WebSocketSerial.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/WebSocketSerial.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/WebSocketSerial.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/WebSocketSerial.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/endstop_interrupts.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/endstop_interrupts.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/endstop_interrupts.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/endstop_interrupts.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/fastio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/fastio.h similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/fastio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/fastio.h index 0993019..9c4efae 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/fastio.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/fastio.h @@ -56,7 +56,7 @@ #define SET_OUTPUT(IO) do{ _SET_OUTPUT(IO); }while(0) // Set pin as PWM -#define SET_PWM SET_OUTPUT +#define SET_PWM(IO) SET_OUTPUT(IO) // Set pin as output and init #define OUT_WRITE(IO,V) do{ _SET_OUTPUT(IO); WRITE(IO,V); }while(0) diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/i2s.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/i2s.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/i2s.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/i2s.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/i2s.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/i2s.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/i2s.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/i2s.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/inc/Conditionals_LCD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/inc/Conditionals_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/inc/Conditionals_adv.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/inc/Conditionals_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/inc/Conditionals_adv.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/inc/Conditionals_post.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/inc/Conditionals_post.h similarity index 90% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/inc/Conditionals_post.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/inc/Conditionals_post.h index 11603c9..e51b556 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/inc/Conditionals_post.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/inc/Conditionals_post.h @@ -22,6 +22,6 @@ #pragma once // If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation -#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) +#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) #define SDCARD_EEPROM_EMULATION #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/inc/SanityCheck.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/inc/SanityCheck.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/inc/SanityCheck.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/inc/SanityCheck.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/ota.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/ota.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/ota.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/ota.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/ota.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/ota.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/ota.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/ota.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/eeprom_impl.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/persistent_store_impl.cpp similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/eeprom_impl.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/persistent_store_impl.cpp index dbfee14..7113b68 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/eeprom_impl.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/persistent_store_impl.cpp @@ -26,7 +26,7 @@ #if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION) -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" #include "EEPROM.h" #define EEPROM_SIZE 4096 diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/servotimers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/servotimers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/servotimers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/servotimers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/spi_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/spi_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/spi_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/spi_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/spiffs.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/spiffs.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/spiffs.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/spiffs.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/spiffs.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/spiffs.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/spiffs.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/spiffs.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/timers.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/timers.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/timers.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/timers.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/timers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/timers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/timers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/timers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/watchdog.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/watchdog.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/watchdog.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/watchdog.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/watchdog.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/watchdog.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/watchdog.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/watchdog.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/web.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/web.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/web.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/web.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/web.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/web.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/web.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/web.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/wifi.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/wifi.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/wifi.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/wifi.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/wifi.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/wifi.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/wifi.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/ESP32/wifi.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/HAL.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/HAL.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/HAL.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/HAL.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/HAL.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/HAL.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/HAL.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/HAL.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/HAL.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/HAL.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/arduino.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/arduino.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/arduino.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/arduino.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/fastio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/fastio.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/fastio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/fastio.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Clock.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Clock.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Clock.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Clock.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Clock.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Clock.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Clock.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Clock.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Gpio.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Gpio.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Gpio.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Gpio.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Gpio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Gpio.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Gpio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Gpio.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Heater.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Heater.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Heater.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Heater.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Heater.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Heater.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Heater.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Heater.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/LinearAxis.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/LinearAxis.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/LinearAxis.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/LinearAxis.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Timer.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Timer.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Timer.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Timer.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Timer.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Timer.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/hardware/Timer.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/hardware/Timer.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/inc/Conditionals_LCD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/inc/Conditionals_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/inc/Conditionals_adv.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/inc/Conditionals_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/inc/Conditionals_adv.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/inc/Conditionals_post.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/inc/Conditionals_post.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/inc/Conditionals_post.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/inc/Conditionals_post.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/inc/SanityCheck.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/inc/SanityCheck.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/inc/SanityCheck.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/inc/SanityCheck.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/include/Arduino.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/include/Arduino.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/include/Arduino.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/include/Arduino.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/include/pinmapping.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/include/pinmapping.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/include/pinmapping.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/include/pinmapping.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/include/pinmapping.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/include/pinmapping.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/include/pinmapping.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/include/pinmapping.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/include/serial.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/include/serial.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/include/serial.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/include/serial.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/main.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/main.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/main.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/main.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/eeprom_impl.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/persistent_store_impl.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/eeprom_impl.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/persistent_store_impl.cpp index 4745f05..660ecd5 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/eeprom_impl.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/persistent_store_impl.cpp @@ -26,7 +26,7 @@ #if ENABLED(EEPROM_SETTINGS) -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" #include #define LINUX_EEPROM_SIZE (E2END + 1) diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/pinsDebug.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/pinsDebug.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/pinsDebug.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/pinsDebug.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/servo_private.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/servo_private.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/servo_private.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/servo_private.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/spi_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/spi_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/spi_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/spi_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/timers.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/timers.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/timers.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/timers.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/timers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/timers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/timers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/timers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/watchdog.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/watchdog.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/watchdog.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/watchdog.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/watchdog.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/watchdog.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LINUX/watchdog.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LINUX/watchdog.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/DebugMonitor.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/DebugMonitor.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/DebugMonitor.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/DebugMonitor.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/HAL.cpp similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/HAL.cpp index f206ce7..f0559d2 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/HAL.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/HAL.cpp @@ -67,7 +67,9 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) { return ind > -1 ? ind : dval; } -void flashFirmware(const int16_t) { NVIC_SystemReset(); } +void flashFirmware(int16_t value) { + NVIC_SystemReset(); +} void HAL_clear_reset_source(void) { #if ENABLED(USE_WATCHDOG) diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/HAL.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/HAL.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/HAL.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/HAL.h index f5ea629..c727877 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/HAL.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/HAL.h @@ -195,7 +195,7 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval); void HAL_idletask(); #define PLATFORM_M997_SUPPORT -void flashFirmware(const int16_t); +void flashFirmware(int16_t value); /** * set_pwm_frequency diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/HAL_SPI.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/HAL_SPI.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/HAL_SPI.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/HAL_SPI.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/MarlinSerial.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/MarlinSerial.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/MarlinSerial.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/MarlinSerial.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/MarlinSerial.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/MarlinSerial.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/MarlinSerial.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/MarlinSerial.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/Servo.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/Servo.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/Servo.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/Servo.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/endstop_interrupts.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/endstop_interrupts.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/endstop_interrupts.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/endstop_interrupts.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/fast_pwm.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/fast_pwm.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/fast_pwm.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/fast_pwm.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/fastio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/fastio.h similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/fastio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/fastio.h index 8e8e66d..48de5b8 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/fastio.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/fastio.h @@ -104,7 +104,7 @@ /// set pin as output wrapper - reads the pin and sets the output to that value #define SET_OUTPUT(IO) do{ _WRITE(IO, _READ(IO)); _SET_OUTPUT(IO); }while(0) // set pin as PWM -#define SET_PWM SET_OUTPUT +#define SET_PWM(IO) SET_OUTPUT(IO) /// check if pin is an input wrapper #define IS_INPUT(IO) _IS_INPUT(IO) diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/inc/Conditionals_LCD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/inc/Conditionals_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/inc/Conditionals_adv.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/inc/Conditionals_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/inc/Conditionals_adv.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h similarity index 93% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h index 490cfd5..a8d102e 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h @@ -21,6 +21,6 @@ */ #pragma once -#if USE_FALLBACK_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) +#if USE_EMULATED_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) #define FLASH_EEPROM_EMULATION #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/inc/SanityCheck.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/inc/SanityCheck.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/inc/SanityCheck.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/inc/SanityCheck.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/include/SPI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/include/SPI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/include/SPI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/include/SPI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/include/i2c_util.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/include/i2c_util.c similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/include/i2c_util.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/include/i2c_util.c diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/include/i2c_util.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/include/i2c_util.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/include/i2c_util.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/include/i2c_util.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/main.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/main.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/main.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/main.cpp index d7b05dc..fb73943 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/main.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/main.cpp @@ -90,7 +90,7 @@ void HAL_init() { //debug_frmwrk_init(); //_DBG("\n\nDebug running\n"); - // Initialize the SD card chip select pins as soon as possible + // Initialise the SD card chip select pins as soon as possible #if PIN_EXISTS(SS) OUT_WRITE(SS_PIN, HIGH); #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/eeprom_api.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/persistent_store_api.h similarity index 95% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/eeprom_api.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/persistent_store_api.h index f874eac..55a58fd 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/eeprom_api.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/persistent_store_api.h @@ -21,6 +21,6 @@ */ #pragma once -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" #define FLASH_EEPROM_EMULATION diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/eeprom_flash.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/eeprom_flash.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp index 9225807..e166858 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/eeprom_flash.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp @@ -40,7 +40,7 @@ #if ENABLED(FLASH_EEPROM_EMULATION) -#include "eeprom_api.h" +#include "persistent_store_api.h" extern "C" { #include diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/persistent_store_sdcard.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/persistent_store_sdcard.cpp index d982bd6..aa61938 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/persistent_store_sdcard.cpp @@ -26,7 +26,7 @@ #if ENABLED(SDCARD_EEPROM_EMULATION) -#include "eeprom_api.h" +#include "persistent_store_api.h" #include #include diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/pinsDebug.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/pinsDebug.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/pinsDebug.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/pinsDebug.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/spi_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/spi_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/spi_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/spi_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/timers.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/timers.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/timers.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/timers.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/timers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/timers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/timers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/timers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/LCD_defines.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/LCD_defines.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/LCD_defines.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/LCD_defines.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/LCD_delay.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/LCD_delay.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/LCD_delay.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/LCD_delay.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/upload_extra_script.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/upload_extra_script.py similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/upload_extra_script.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/upload_extra_script.py diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/usb_serial.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/usb_serial.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/usb_serial.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/usb_serial.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/watchdog.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/watchdog.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/watchdog.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/watchdog.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/watchdog.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/watchdog.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/watchdog.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/watchdog.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/win_usb_driver/lpc176x_usb_driver.inf b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/win_usb_driver/lpc176x_usb_driver.inf similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/win_usb_driver/lpc176x_usb_driver.inf rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/LPC1768/win_usb_driver/lpc176x_usb_driver.inf diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/HAL.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/HAL.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/HAL.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/HAL.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/HAL.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/HAL.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/HAL_SPI.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/HAL_SPI.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/HAL_SPI.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/HAL_SPI.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/SAMD51.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/SAMD51.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/SAMD51.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/SAMD51.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/Servo.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/Servo.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/Servo.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/Servo.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/ServoTimers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/ServoTimers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/ServoTimers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/ServoTimers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/endstop_interrupts.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/endstop_interrupts.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/endstop_interrupts.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/endstop_interrupts.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/fastio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/fastio.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/fastio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/fastio.h index d3b3dc1..f6a2675 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/fastio.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/fastio.h @@ -100,9 +100,9 @@ PORT->Group[port].DIRCLR.reg = MASK(pin); \ }while(0) // Set pin as PWM (push pull) -#define SET_PWM SET_OUTPUT +#define SET_PWM(IO) SET_OUTPUT(IO) // Set pin as PWM (open drain) -#define SET_PWM_OD SET_OUTPUT_OD +#define SET_PWM_OD(IO) SET_OUTPUT_OD(IO) // check if pin is an output #define IS_OUTPUT(IO) ((PORT->Group[(EPortType)GET_SAMD_PORT(IO)].DIR.reg & MASK(GET_SAMD_PIN(IO))) \ diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/inc/Conditionals_LCD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/inc/Conditionals_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/inc/Conditionals_adv.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/inc/Conditionals_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/inc/Conditionals_adv.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h similarity index 91% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h index 490cfd5..b52462f 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h @@ -21,6 +21,8 @@ */ #pragma once -#if USE_FALLBACK_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) +#if USE_EMULATED_EEPROM + #undef SRAM_EEPROM_EMULATION + #undef SDCARD_EEPROM_EMULATION #define FLASH_EEPROM_EMULATION #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/inc/SanityCheck.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/inc/SanityCheck.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/inc/SanityCheck.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/inc/SanityCheck.h diff --git a/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/persistent_store_eeprom.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/persistent_store_eeprom.cpp new file mode 100644 index 0000000..6b7326b --- /dev/null +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/persistent_store_eeprom.cpp @@ -0,0 +1,129 @@ +/** + * Marlin 3D Printer Firmware + * + * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician) + * + * 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 __SAMD51__ + +#include "../../inc/MarlinConfig.h" + +#if ENABLED(EEPROM_SETTINGS) + +#include "../shared/persistent_store_api.h" + +#if ENABLED(FLASH_EEPROM_EMULATION) + #define NVMCTRL_CMD(c) do{ \ + SYNC(!NVMCTRL->STATUS.bit.READY); \ + NVMCTRL->INTFLAG.bit.DONE = true; \ + NVMCTRL->CTRLB.reg = c | NVMCTRL_CTRLB_CMDEX_KEY; \ + SYNC(NVMCTRL->INTFLAG.bit.DONE); \ + }while(0) + #define NVMCTRL_FLUSH() do{ \ + if (NVMCTRL->SEESTAT.bit.LOAD) \ + NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_SEEFLUSH); \ + }while(0) +#endif + +bool PersistentStore::access_start() { + #if ENABLED(FLASH_EEPROM_EMULATION) + NVMCTRL->SEECFG.reg = NVMCTRL_SEECFG_WMODE_BUFFERED; // Buffered mode and segment reallocation active + #endif + + return true; +} + +bool PersistentStore::access_finish() { + #if ENABLED(FLASH_EEPROM_EMULATION) + NVMCTRL_FLUSH(); + if (!NVMCTRL->SEESTAT.bit.LOCK) + NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_LSEE); // Lock E2P data write access + #endif + + return true; +} + +bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) { + #if ENABLED(FLASH_EEPROM_EMULATION) + if (NVMCTRL->SEESTAT.bit.RLOCK) + NVMCTRL_CMD(NVMCTRL_CTRLB_CMD_USEE); // Unlock E2P data write access + #endif + + while (size--) { + const uint8_t v = *value; + #if ENABLED(FLASH_EEPROM_EMULATION) + SYNC(NVMCTRL->SEESTAT.bit.BUSY); + if (NVMCTRL->INTFLAG.bit.SEESFULL) + NVMCTRL_FLUSH(); // Next write will trigger a sector reallocation. I need to flush 'pagebuffer' + ((volatile uint8_t *)SEEPROM_ADDR)[pos] = v; + SYNC(!NVMCTRL->INTFLAG.bit.SEEWRC); + #else + uint8_t * const p = (uint8_t * const)pos; + if (v != eeprom_read_byte(p)) { + eeprom_write_byte(p, v); + delay(2); + if (eeprom_read_byte(p) != v) { + SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE); + return true; + } + } + #endif + 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*/) { + while (size--) { + uint8_t c; + #if ENABLED(FLASH_EEPROM_EMULATION) + SYNC(NVMCTRL->SEESTAT.bit.BUSY); + c = ((volatile uint8_t *)SEEPROM_ADDR)[pos]; + #else + c = eeprom_read_byte((uint8_t*)pos); + #endif + if (writing) *value = c; + crc16(crc, &c, 1); + pos++; + value++; + } + return false; +} + +size_t PersistentStore::capacity() { + #if ENABLED(FLASH_EEPROM_EMULATION) + const uint8_t psz = NVMCTRL->SEESTAT.bit.PSZ, + sblk = NVMCTRL->SEESTAT.bit.SBLK; + + if (!psz && !sblk) return 0; + else if (psz <= 2) return (0x200 << psz); + else if (sblk == 1 || psz == 3) return 4096; + else if (sblk == 2 || psz == 4) return 8192; + else if (sblk <= 4 || psz == 5) return 16384; + else if (sblk >= 9 && psz == 7) return 65536; + else return 32768; + #else + return E2END + 1; + #endif +} + +#endif // EEPROM_SETTINGS + +#endif // __SAMD51__ diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/pinsDebug.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/pinsDebug.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/pinsDebug.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/pinsDebug.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/spi_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/spi_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/spi_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/spi_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/timers.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/timers.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/timers.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/timers.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/timers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/timers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/timers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/timers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/watchdog.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/watchdog.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/watchdog.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/watchdog.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/watchdog.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/watchdog.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/SAMD51/watchdog.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/SAMD51/watchdog.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/HAL.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/HAL.cpp index 77f8d27..5d8c686 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/HAL.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/HAL.cpp @@ -133,6 +133,6 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) { HAL_adc_result = analogRe uint16_t HAL_adc_get_result() { return HAL_adc_result; } -void flashFirmware(const int16_t) { NVIC_SystemReset(); } +void flashFirmware(int16_t) { NVIC_SystemReset(); } #endif // ARDUINO_ARCH_STM32 && !STM32GENERIC diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/HAL.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/HAL.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/HAL.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/HAL.h index c310cca..9fb40d6 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/HAL.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/HAL.h @@ -223,4 +223,4 @@ uint16_t HAL_adc_get_result(); #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval) #define PLATFORM_M997_SUPPORT -void flashFirmware(const int16_t); +void flashFirmware(int16_t value); diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/HAL_SPI.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/HAL_SPI.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/HAL_SPI.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/HAL_SPI.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/README.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/README.md similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/README.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/README.md diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/Servo.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/Servo.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/Servo.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/Servo.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/Servo.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/Servo.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/Servo.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/Servo.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/SoftwareSerial.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/SoftwareSerial.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/SoftwareSerial.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/SoftwareSerial.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/SoftwareSerial.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/SoftwareSerial.h similarity index 96% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/SoftwareSerial.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/SoftwareSerial.h index 504bd69..3799701 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/SoftwareSerial.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/SoftwareSerial.h @@ -29,7 +29,9 @@ * The latest version of this library can always be found at * http://arduiniana.org. */ -#pragma once + +#ifndef SOFTWARESERIAL_H +#define SOFTWARESERIAL_H #include @@ -62,6 +64,7 @@ class SoftwareSerial : public Stream { uint32_t delta_start = 0; // static data + static bool initialised; static HardwareTimer timer; static const IRQn_Type timer_interrupt_number; static uint32_t timer_interrupt_priority; @@ -88,7 +91,7 @@ class SoftwareSerial : public Stream { public: // public methods - SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool inverse_logic=false); + SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool inverse_logic = false); virtual ~SoftwareSerial(); void begin(long speed); bool listen(); @@ -112,3 +115,5 @@ class SoftwareSerial : public Stream { using Print::write; }; + +#endif // SOFTWARESERIAL_H diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/endstop_interrupts.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/endstop_interrupts.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/endstop_interrupts.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/endstop_interrupts.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/fastio.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/fastio.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/fastio.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/fastio.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/fastio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/fastio.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/fastio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/fastio.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/inc/Conditionals_LCD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/inc/Conditionals_LCD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/inc/Conditionals_LCD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/inc/Conditionals_LCD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/inc/Conditionals_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/inc/Conditionals_adv.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/inc/Conditionals_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/inc/Conditionals_adv.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/inc/Conditionals_post.h similarity index 90% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/inc/Conditionals_post.h index 11603c9..e51b556 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/inc/Conditionals_post.h @@ -22,6 +22,6 @@ #pragma once // If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation -#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) +#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) #define SDCARD_EEPROM_EMULATION #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/inc/SanityCheck.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/inc/SanityCheck.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/inc/SanityCheck.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/inc/SanityCheck.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/persistent_store_flash.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/eeprom_flash.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/persistent_store_flash.cpp index 39012f8..80ef901 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/eeprom_flash.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/persistent_store_flash.cpp @@ -27,7 +27,7 @@ #if BOTH(EEPROM_SETTINGS, FLASH_EEPROM_EMULATION) -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" // Only STM32F4 can support wear leveling at this time diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/eeprom_impl.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/persistent_store_impl.cpp similarity index 91% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/eeprom_impl.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/persistent_store_impl.cpp index cd0f93e..d953874 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/eeprom_impl.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/persistent_store_impl.cpp @@ -24,9 +24,9 @@ #include "../../inc/MarlinConfig.h" -#if EITHER(USE_WIRED_EEPROM, SRAM_EEPROM_EMULATION) +#if EITHER(USE_REAL_EEPROM, SRAM_EEPROM_EMULATION) -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" bool PersistentStore::access_start() { return true; @@ -41,7 +41,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui uint8_t v = *value; // Save to either external EEPROM, program flash or Backup SRAM - #if USE_WIRED_EEPROM + #if USE_REAL_EEPROM // EEPROM has only ~100,000 write cycles, // so only write bytes that have changed! uint8_t * const p = (uint8_t * const)pos; @@ -68,7 +68,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t do { // Read from either external EEPROM, program flash or Backup SRAM const uint8_t c = ( - #if USE_WIRED_EEPROM + #if USE_REAL_EEPROM eeprom_read_byte((uint8_t*)pos) #else (*(__IO uint8_t *)(BKPSRAM_BASE + ((uint8_t*)pos))) @@ -85,7 +85,7 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t size_t PersistentStore::capacity() { return ( - #if USE_WIRED_EEPROM + #if USE_REAL_EEPROM E2END + 1 #else 4096 // 4kB @@ -93,5 +93,5 @@ size_t PersistentStore::capacity() { ); } -#endif // USE_WIRED_EEPROM || SRAM_EEPROM_EMULATION +#endif // USE_REAL_EEPROM || SRAM_EEPROM_EMULATION #endif // ARDUINO_ARCH_STM32 && !STM32GENERIC diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/eeprom_sdcard.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/persistent_store_sdcard.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/eeprom_sdcard.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/persistent_store_sdcard.cpp index 2b89c21..c5afc55 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/eeprom_sdcard.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/persistent_store_sdcard.cpp @@ -30,7 +30,7 @@ #if ENABLED(SDCARD_EEPROM_EMULATION) -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" #ifndef E2END #define E2END 0xFFF // 4KB diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/pinsDebug.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/pinsDebug.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/pinsDebug.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/pinsDebug.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/pinsDebug_STM32duino.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/pinsDebug_STM32duino.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/pinsDebug_STM32duino.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/pinsDebug_STM32duino.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/pins_Xref.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/pins_Xref.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/pins_Xref.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/pins_Xref.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/spi_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/spi_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/spi_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/spi_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/timers.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/timers.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/timers.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/timers.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/timers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/timers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/timers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/timers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/watchdog.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/watchdog.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/watchdog.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/watchdog.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32/watchdog.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/watchdog.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32/watchdog.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32/watchdog.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/HAL.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/HAL.cpp index 01fd2c8..bc5479b 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/HAL.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/HAL.cpp @@ -388,6 +388,6 @@ void analogWrite(pin_t pin, int pwm_val8) { analogWrite(uint8_t(pin), pwm_val8); } -void flashFirmware(const int16_t) { nvic_sys_reset(); } +void flashFirmware(int16_t value) { nvic_sys_reset(); } #endif // __STM32F1__ diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/HAL.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/HAL.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/HAL.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/HAL.h index ff42beb..c97abf4 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/HAL.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/HAL.h @@ -160,7 +160,6 @@ void HAL_idletask(); #ifndef digitalPinHasPWM #define digitalPinHasPWM(P) (PIN_MAP[P].timer_device != nullptr) - #define NO_COMPILE_TIME_PWM #endif #define CRITICAL_SECTION_START() uint32_t primask = __get_primask(); (void)__iCliRetVal() @@ -288,4 +287,4 @@ void analogWrite(pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!? #define JTAGSWD_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE) #define PLATFORM_M997_SUPPORT -void flashFirmware(const int16_t); +void flashFirmware(int16_t value); diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/HAL_SPI.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/HAL_SPI.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/HAL_SPI.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/HAL_SPI.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/README.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/README.md similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/README.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/README.md diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/SPI.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/SPI.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/SPI.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/SPI.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/SPI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/SPI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/SPI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/SPI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/Servo.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/Servo.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/Servo.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/Servo.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/Servo.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/Servo.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/Servo.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/Servo.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/SoftwareSerial.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/SoftwareSerial.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/SoftwareSerial.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/SoftwareSerial.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/SoftwareSerial.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/SoftwareSerial.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/SoftwareSerial.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/SoftwareSerial.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/build_flags.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/build_flags.py similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/build_flags.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/build_flags.py diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_fsmc.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/endstop_interrupts.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/endstop_interrupts.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/endstop_interrupts.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/endstop_interrupts.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/fastio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/fastio.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/fastio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/fastio.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/inc/Conditionals_LCD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/inc/Conditionals_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/inc/Conditionals_adv.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/inc/Conditionals_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/inc/Conditionals_adv.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/inc/Conditionals_post.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/inc/Conditionals_post.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/inc/Conditionals_post.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/inc/Conditionals_post.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/inc/SanityCheck.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/inc/SanityCheck.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/inc/SanityCheck.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/inc/SanityCheck.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/maple_win_usb_driver/maple_serial.inf b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/maple_win_usb_driver/maple_serial.inf similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/maple_win_usb_driver/maple_serial.inf rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/maple_win_usb_driver/maple_serial.inf diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/msc_sd.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/msc_sd.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/msc_sd.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/msc_sd.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/msc_sd.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/msc_sd.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/msc_sd.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/msc_sd.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/onboard_sd.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/onboard_sd.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/onboard_sd.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/onboard_sd.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/onboard_sd.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/onboard_sd.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/onboard_sd.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/onboard_sd.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/eeprom.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/persistent_store_eeprom.cpp similarity index 95% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/eeprom.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/persistent_store_eeprom.cpp index ed5d50c..1b3714c 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/eeprom.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/persistent_store_eeprom.cpp @@ -22,9 +22,9 @@ #include "../../inc/MarlinConfig.h" -#if USE_WIRED_EEPROM +#if USE_REAL_EEPROM -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" bool PersistentStore::access_start() { #if ENABLED(SPI_EEPROM) @@ -73,5 +73,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t size_t PersistentStore::capacity() { return E2END + 1; } -#endif // USE_WIRED_EEPROM +#endif // USE_REAL_EEPROM #endif // __STM32F1__ diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/eeprom_flash.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/persistent_store_flash.cpp similarity index 95% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/eeprom_flash.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/persistent_store_flash.cpp index 9c81730..3d6a3b4 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/eeprom_flash.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/persistent_store_flash.cpp @@ -31,9 +31,10 @@ #include "../../inc/MarlinConfig.h" -#if ENABLED(FLASH_EEPROM_EMULATION) +// This is for EEPROM emulation in flash +#if BOTH(EEPROM_SETTINGS, FLASH_EEPROM_EMULATION) -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" #include #include @@ -107,5 +108,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin size_t PersistentStore::capacity() { return EEPROM_SIZE; } -#endif // FLASH_EEPROM_EMULATION +#endif // EEPROM_SETTINGS && EEPROM FLASH #endif // __STM32F1__ diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/persistent_store_sdcard.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/persistent_store_sdcard.cpp index 7894e69..8b5d89a 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/persistent_store_sdcard.cpp @@ -31,7 +31,7 @@ #if ENABLED(SDCARD_EEPROM_EMULATION) -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" #ifndef E2END #define E2END 0xFFF // 4KB @@ -101,4 +101,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, const size_t size, uin size_t PersistentStore::capacity() { return HAL_EEPROM_SIZE; } #endif // SDCARD_EEPROM_EMULATION + #endif // __STM32F1__ diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/pinsDebug.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/pinsDebug.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/pinsDebug.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/pinsDebug.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/sdio.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/sdio.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/sdio.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/sdio.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/sdio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/sdio.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/sdio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/sdio.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/spi_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/spi_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/spi_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/spi_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/timers.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/timers.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/timers.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/timers.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/timers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/timers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/timers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/timers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/watchdog.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/watchdog.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/watchdog.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/watchdog.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/watchdog.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/watchdog.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32F1/watchdog.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32F1/watchdog.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/EmulatedEeprom.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/HAL.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/HAL.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/HAL.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/HAL.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/HAL.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/HAL.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/HAL_SPI.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/README.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/README.md similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/README.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/README.md diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F4/README.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F4/README.md similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F4/README.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F4/README.md diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F4/timers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F7/README.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F7/README.md similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F7/README.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F7/README.md diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F7/TMC2660.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/STM32F7/timers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/Servo.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/Servo.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/Servo.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/Servo.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/Servo.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/Servo.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/Servo.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/Servo.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/eeprom_emul.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/endstop_interrupts.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/endstop_interrupts.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/endstop_interrupts.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/endstop_interrupts.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/fastio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/fastio.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/fastio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/fastio.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_LCD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_adv.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_adv.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h index d216249..5a19034 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h @@ -22,7 +22,7 @@ #pragma once #if ENABLED(EEPROM_SETTINGS) && defined(STM32F7) - #undef USE_WIRED_EEPROM + #undef USE_REAL_EEPROM #undef SRAM_EEPROM_EMULATION #undef SDCARD_EEPROM_EMULATION #define FLASH_EEPROM_EMULATION diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/inc/SanityCheck.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/inc/SanityCheck.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/inc/SanityCheck.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/inc/SanityCheck.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/eeprom.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/persistent_store_eeprom.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/eeprom.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/persistent_store_eeprom.cpp index b957aae..2ffbc60 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/eeprom.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/persistent_store_eeprom.cpp @@ -27,7 +27,7 @@ #if ENABLED(EEPROM_SETTINGS) -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" bool PersistentStore::access_start() { return true; } bool PersistentStore::access_finish() { return true; } diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/pinsDebug.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/pinsDebug.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/pinsDebug.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/pinsDebug.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/spi_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/spi_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/spi_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/spi_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/timers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/timers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/timers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/timers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/watchdog.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/watchdog.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/watchdog.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/watchdog.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/watchdog.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/watchdog.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/STM32_F4_F7/watchdog.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/STM32_F4_F7/watchdog.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/HAL.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/HAL.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/HAL.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/HAL.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/HAL.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/Servo.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/Servo.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/Servo.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/Servo.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/Servo.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/Servo.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/Servo.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/Servo.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/fastio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/fastio.h similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/fastio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/fastio.h index e74920d..8547fe2 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/fastio.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/fastio.h @@ -76,9 +76,8 @@ #define SET_INPUT(IO) _SET_INPUT(IO) #define SET_INPUT_PULLUP(IO) _SET_INPUT_PULLUP(IO) -#define SET_INPUT_PULLDOWN SET_INPUT #define SET_OUTPUT(IO) _SET_OUTPUT(IO) -#define SET_PWM SET_OUTPUT +#define SET_PWM(IO) SET_OUTPUT(IO) #define IS_INPUT(IO) _IS_INPUT(IO) #define IS_OUTPUT(IO) _IS_OUTPUT(IO) diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_LCD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_adv.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_adv.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/inc/Conditionals_post.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h similarity index 90% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/inc/Conditionals_post.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h index 11603c9..e51b556 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/ESP32/inc/Conditionals_post.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h @@ -22,6 +22,6 @@ #pragma once // If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation -#if ENABLED(EEPROM_SETTINGS) && NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) +#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) #define SDCARD_EEPROM_EMULATION #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/persistent_store_impl.cpp similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/persistent_store_impl.cpp index 96499d4..6a179cd 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/eeprom_impl.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/persistent_store_impl.cpp @@ -22,7 +22,7 @@ #if ENABLED(EEPROM_SETTINGS) -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" bool PersistentStore::access_start() { return true; } bool PersistentStore::access_finish() { return true; } diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/pinsDebug.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/pinsDebug.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/pinsDebug.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/pinsDebug.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/spi_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/spi_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/spi_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/spi_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/timers.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/timers.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/timers.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/timers.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/timers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/timers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/timers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/timers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/watchdog.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/watchdog.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/watchdog.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/watchdog.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/watchdog.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/watchdog.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/watchdog.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY31_32/watchdog.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/HAL.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/HAL.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/HAL.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/HAL.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/HAL.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/Servo.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/Servo.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/Servo.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/Servo.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/Servo.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/Servo.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/Servo.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/Servo.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/fastio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/fastio.h similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/fastio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/fastio.h index e74920d..8547fe2 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY31_32/fastio.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/fastio.h @@ -76,9 +76,8 @@ #define SET_INPUT(IO) _SET_INPUT(IO) #define SET_INPUT_PULLUP(IO) _SET_INPUT_PULLUP(IO) -#define SET_INPUT_PULLDOWN SET_INPUT #define SET_OUTPUT(IO) _SET_OUTPUT(IO) -#define SET_PWM SET_OUTPUT +#define SET_PWM(IO) SET_OUTPUT(IO) #define IS_INPUT(IO) _IS_INPUT(IO) #define IS_OUTPUT(IO) _IS_OUTPUT(IO) diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_LCD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_adv.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_adv.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_post.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_post.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_post.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/inc/Conditionals_post.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/eeprom.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/persistent_store_eeprom.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/eeprom.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/persistent_store_eeprom.cpp index c66a45e..32b215e 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/eeprom.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/persistent_store_eeprom.cpp @@ -27,7 +27,7 @@ #if ENABLED(EEPROM_SETTINGS) -#include "../shared/eeprom_api.h" +#include "../shared/persistent_store_api.h" #include bool PersistentStore::access_start() { return true; } diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/pinsDebug.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/pinsDebug.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/pinsDebug.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/pinsDebug.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/spi_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/spi_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/spi_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/spi_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/timers.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/timers.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/timers.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/timers.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/timers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/timers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/timers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/timers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/watchdog.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/watchdog.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/watchdog.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/watchdog.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/watchdog.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/watchdog.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/TEENSY35_36/watchdog.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/TEENSY35_36/watchdog.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/platforms.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/platforms.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/platforms.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/platforms.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/Delay.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/Delay.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/Delay.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/Delay.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/HAL_SPI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/HAL_SPI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/HAL_SPI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/HAL_SPI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/HAL_ST7920.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/HAL_ST7920.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/HAL_ST7920.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/HAL_ST7920.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/HAL_spi_L6470.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/HAL_spi_L6470.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/HAL_spi_L6470.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/HAL_spi_L6470.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/Marduino.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/Marduino.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/Marduino.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/Marduino.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/backtrace.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/backtrace.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/backtrace.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/backtrace.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/backtrace.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/backtrace.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/backtrace.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/backtrace.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarm.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarm.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarm.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarm.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarm.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarm.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarm.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarm.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarm_arm.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarm_arm.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarm_arm.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarm_arm.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarm_thumb.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarm_thumb.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarm_thumb.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarm_thumb.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarmbytab.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarmbytab.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarmbytab.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarmbytab.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarmmem.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarmmem.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarmmem.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarmmem.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarmmem.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarmmem.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwarmmem.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwarmmem.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwinder.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwinder.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwinder.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwinder.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwinder.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwinder.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwinder.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwinder.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwmemaccess.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwmemaccess.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/backtrace/unwmemaccess.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/backtrace/unwmemaccess.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/eeprom_i2c.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/eeprom_i2c.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/eeprom_i2c.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/eeprom_i2c.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/eeprom_spi.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/eeprom_spi.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/eeprom_spi.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/eeprom_spi.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/math_32bit.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/math_32bit.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/math_32bit.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/math_32bit.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/eeprom_api.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/persistent_store_api.cpp similarity index 96% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/eeprom_api.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/persistent_store_api.cpp index d8839e3..735fa42 100644 --- a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/eeprom_api.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/persistent_store_api.cpp @@ -24,7 +24,7 @@ #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE) - #include "eeprom_api.h" + #include "persistent_store_api.h" PersistentStore persistentStore; #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/eeprom_api.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/persistent_store_api.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/eeprom_api.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/persistent_store_api.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/servo.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/servo.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/servo.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/servo.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/servo.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/servo.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/servo.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/servo.h diff --git a/2.0.5-bigTreeTech/Marlin/src/HAL/shared/servo_private.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/servo_private.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/HAL/shared/servo_private.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/HAL/shared/servo_private.h diff --git a/2.0.5-bigTreeTech/Marlin/src/MarlinCore.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/MarlinCore.cpp similarity index 95% rename from 2.0.5-bigTreeTech/Marlin/src/MarlinCore.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/MarlinCore.cpp index 8130aff..0ea1a22 100644 --- a/2.0.5-bigTreeTech/Marlin/src/MarlinCore.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/MarlinCore.cpp @@ -210,24 +210,6 @@ bool wait_for_heatup = true; // For M0/M1, this flag may be cleared (by M108) to exit the wait-for-user loop #if HAS_RESUME_CONTINUE bool wait_for_user; // = false; - - void wait_for_user_response(millis_t ms/*=0*/, const bool no_sleep/*=false*/) { - #if DISABLED(ADVANCED_PAUSE_FEATURE) - UNUSED(no_sleep); - #endif - KEEPALIVE_STATE(PAUSED_FOR_USER); - wait_for_user = true; - if (ms) ms += millis(); // expire time - while (wait_for_user && !(ms && ELAPSED(millis(), ms))) { - idle( - #if ENABLED(ADVANCED_PAUSE_FEATURE) - no_sleep - #endif - ); - } - wait_for_user = false; - } - #endif // Inactivity shutdown @@ -436,8 +418,52 @@ void startOrResumeJob() { } inline void finishSDPrinting() { - if (queue.enqueue_one_P(PSTR("M1001"))) - marlin_state = MF_RUNNING; + + bool did_state = true; + switch (card.sdprinting_done_state) { + + case 1: + did_state = print_job_timer.duration() < 60 || queue.enqueue_one_P(PSTR("M31")); + break; + + case 2: + did_state = queue.enqueue_one_P(PSTR("M77")); + break; + + case 3: + #if ENABLED(LCD_SET_PROGRESS_MANUALLY) + ui.set_progress_done(); + #endif + break; + + case 4: // Display "Click to Continue..." + #if HAS_RESUME_CONTINUE // 30 min timeout with LCD, 1 min without + did_state = queue.enqueue_one_P( + print_job_timer.duration() < 60 ? PSTR("M0Q1P1") : PSTR("M0Q1S" TERN(HAS_LCD_MENU, "1800", "60")) + ); + #endif + break; + + case 5: + #if ENABLED(POWER_LOSS_RECOVERY) + recovery.purge(); + #endif + + #if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND) + planner.finish_and_disable(); + #endif + + #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE) + ui.reselect_last_file(); + #endif + + SERIAL_ECHOLNPGM(STR_FILE_PRINTED); + + default: + did_state = false; + card.sdprinting_done_state = 0; + } + if (did_state) ++card.sdprinting_done_state; } #endif // SDSUPPORT @@ -1182,7 +1208,7 @@ void loop() { #if ENABLED(SDSUPPORT) card.checkautostart(); if (card.flag.abort_sd_printing) abortSDPrinting(); - if (marlin_state == MF_SD_COMPLETE) finishSDPrinting(); + if (card.sdprinting_done_state) finishSDPrinting(); #endif queue.advance(); diff --git a/2.0.5-bigTreeTech/Marlin/src/MarlinCore.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/MarlinCore.h similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/MarlinCore.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/MarlinCore.h index e6678c5..3bce72a 100644 --- a/2.0.5-bigTreeTech/Marlin/src/MarlinCore.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/MarlinCore.h @@ -83,7 +83,6 @@ enum MarlinState : uint8_t { MF_PAUSED = _BV(1), MF_WAITING = _BV(2), MF_STOPPED = _BV(3), - MF_SD_COMPLETE = _BV(4), MF_KILLED = _BV(7) }; @@ -99,7 +98,6 @@ extern bool wait_for_heatup; #if HAS_RESUME_CONTINUE extern bool wait_for_user; - void wait_for_user_response(millis_t ms=0, const bool no_sleep=false); #endif // Inactivity shutdown timer diff --git a/2.0.5-bigTreeTech/Marlin/src/core/boards.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/boards.h similarity index 96% rename from 2.0.5-bigTreeTech/Marlin/src/core/boards.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/boards.h index 30c2d3e..5608568 100644 --- a/2.0.5-bigTreeTech/Marlin/src/core/boards.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/boards.h @@ -144,7 +144,6 @@ #define BOARD_LEAPFROG_XEED2015 1321 // Leapfrog Xeed 2015 #define BOARD_PICA_REVB 1322 // PICA Shield (original version) #define BOARD_PICA 1323 // PICA Shield (rev C or later) -#define BOARD_INTAMSYS40 1324 // Intamsys 4.0 (Funmat HT) // // ATmega1281, ATmega2561 @@ -289,15 +288,16 @@ #define BOARD_BTT_SKR_MINI_V1_1 4012 // BigTreeTech SKR Mini v1.1 (STM32F103RC) #define BOARD_BTT_SKR_MINI_E3_V1_0 4013 // BigTreeTech SKR Mini E3 (STM32F103RC) #define BOARD_BTT_SKR_MINI_E3_V1_2 4014 // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC) -#define BOARD_BTT_SKR_E3_DIP 4015 // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE) -#define BOARD_JGAURORA_A5S_A1 4016 // JGAurora A5S A1 (STM32F103ZET6) -#define BOARD_FYSETC_AIO_II 4017 // FYSETC AIO_II -#define BOARD_FYSETC_CHEETAH 4018 // FYSETC Cheetah -#define BOARD_FYSETC_CHEETAH_V12 4019 // FYSETC Cheetah V1.2 -#define BOARD_LONGER3D_LK 4020 // Alfawise U20/U20+/U30 (Longer3D LK1/2) / STM32F103VET6 -#define BOARD_GTM32_MINI 4021 // STM32F103VET6 controller -#define BOARD_GTM32_MINI_A30 4022 // STM32F103VET6 controller -#define BOARD_GTM32_REV_B 4023 // STM32F103VET6 controller +#define BOARD_BTT_SKR_MINI_E3_V2_0 4015 // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC) +#define BOARD_BTT_SKR_E3_DIP 4016 // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE) +#define BOARD_JGAURORA_A5S_A1 4017 // JGAurora A5S A1 (STM32F103ZET6) +#define BOARD_FYSETC_AIO_II 4018 // FYSETC AIO_II +#define BOARD_FYSETC_CHEETAH 4019 // FYSETC Cheetah +#define BOARD_FYSETC_CHEETAH_V12 4020 // FYSETC Cheetah V1.2 +#define BOARD_LONGER3D_LK 4021 // Alfawise U20/U20+/U30 (Longer3D LK1/2) / STM32F103VET6 +#define BOARD_GTM32_MINI 4022 // STM32F103VET6 controller +#define BOARD_GTM32_MINI_A30 4023 // STM32F103VET6 controller +#define BOARD_GTM32_REV_B 4024 // STM32F103VET6 controller // // ARM Cortex-M4F diff --git a/2.0.5-bigTreeTech/Marlin/src/core/debug_out.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/debug_out.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/core/debug_out.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/debug_out.h diff --git a/2.0.5-bigTreeTech/Marlin/src/core/drivers.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/drivers.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/core/drivers.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/drivers.h diff --git a/2.0.5-bigTreeTech/Marlin/src/core/language.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/language.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/core/language.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/language.h diff --git a/2.0.5-bigTreeTech/Marlin/src/core/macros.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/macros.h similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/core/macros.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/macros.h index 899baf7..bcee642 100644 --- a/2.0.5-bigTreeTech/Marlin/src/core/macros.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/macros.h @@ -194,9 +194,6 @@ #define DISABLED(V...) DO(DIS,&&,V) #define TERN(O,A,B) _TERN(_ENA_1(O),B,A) // OPTION converted to '0' or '1' -#define TERN0(O,A) _TERN(_ENA_1(O),0,A) // OPTION converted to A or '0' -#define TERN1(O,A) _TERN(_ENA_1(O),1,A) // OPTION converted to A or '1' -#define TERN_(O,A) _TERN(_ENA_1(O),,A) // OPTION converted to A or '' #define _TERN(E,V...) __TERN(_CAT(T_,E),V) // Prepend 'T_' to get 'T_0' or 'T_1' #define __TERN(T,V...) ___TERN(_CAT(_NO,T),V) // Prepend '_NO' to get '_NOT_0' or '_NOT_1' #define ___TERN(P,V...) THIRD(P,V) // If first argument has a comma, A. Else B. diff --git a/2.0.5-bigTreeTech/Marlin/src/core/millis_t.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/millis_t.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/core/millis_t.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/millis_t.h diff --git a/2.0.5-bigTreeTech/Marlin/src/core/multi_language.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/multi_language.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/core/multi_language.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/multi_language.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/core/multi_language.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/multi_language.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/core/multi_language.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/multi_language.h diff --git a/2.0.5-bigTreeTech/Marlin/src/core/serial.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/serial.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/core/serial.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/serial.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/core/serial.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/serial.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/core/serial.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/serial.h diff --git a/2.0.5-bigTreeTech/Marlin/src/core/types.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/types.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/core/types.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/types.h diff --git a/2.0.5-bigTreeTech/Marlin/src/core/utility.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/utility.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/core/utility.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/utility.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/core/utility.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/utility.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/core/utility.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/core/utility.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/babystep.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/babystep.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/babystep.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/babystep.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/babystep.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/babystep.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/babystep.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/babystep.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/backlash.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/backlash.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/feature/backlash.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/backlash.cpp index bc33ae3..84cd0a8 100644 --- a/2.0.5-bigTreeTech/Marlin/src/feature/backlash.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/backlash.cpp @@ -113,7 +113,7 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const error_correction = 0; // Don't take up any backlash in this segment, as it would subtract steps } #endif - // Making a correction reduces the residual error and adds block steps + // Making a correction reduces the residual error and modifies delta_mm if (error_correction) { block->steps[axis] += ABS(error_correction); residual_error[axis] -= error_correction; diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/backlash.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/backlash.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/backlash.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/backlash.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/baricuda.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/baricuda.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/baricuda.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/baricuda.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/baricuda.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/baricuda.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/baricuda.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/baricuda.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/abl/abl.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/abl/abl.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/abl/abl.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/abl/abl.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/abl/abl.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/abl/abl.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/abl/abl.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/abl/abl.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/bedlevel.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/bedlevel.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/bedlevel.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/bedlevel.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/bedlevel.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/bedlevel.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/bedlevel.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/ubl/ubl.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/ubl/ubl.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/ubl/ubl.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/ubl/ubl.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/ubl/ubl.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/ubl/ubl.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp index 217d894..1ac036e 100644 --- a/2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp @@ -27,7 +27,7 @@ #include "../bedlevel.h" #include "../../../MarlinCore.h" - #include "../../../HAL/shared/eeprom_api.h" + #include "../../../HAL/shared/persistent_store_api.h" #include "../../../libs/hex_print_routines.h" #include "../../../module/configuration_store.h" #include "../../../lcd/ultralcd.h" diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/binary_protocol.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/binary_protocol.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/binary_protocol.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/binary_protocol.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/binary_protocol.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/binary_protocol.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/binary_protocol.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/binary_protocol.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/bltouch.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bltouch.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/bltouch.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bltouch.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/bltouch.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bltouch.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/bltouch.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/bltouch.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/cancel_object.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/cancel_object.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/cancel_object.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/cancel_object.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/cancel_object.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/cancel_object.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/cancel_object.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/cancel_object.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/caselight.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/caselight.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/caselight.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/caselight.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/caselight.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/caselight.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/caselight.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/caselight.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/closedloop.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/closedloop.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/closedloop.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/closedloop.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/closedloop.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/closedloop.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/closedloop.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/closedloop.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/controllerfan.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/controllerfan.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/controllerfan.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/controllerfan.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/controllerfan.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/controllerfan.h similarity index 96% rename from 2.0.5-bigTreeTech/Marlin/src/feature/controllerfan.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/controllerfan.h index cd56ff8..bc48a6e 100644 --- a/2.0.5-bigTreeTech/Marlin/src/feature/controllerfan.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/controllerfan.h @@ -58,7 +58,7 @@ class ControllerFan { #if ENABLED(CONTROLLER_FAN_EDITABLE) static controllerFan_settings_t settings; #else - static const controllerFan_settings_t constexpr &settings = controllerFan_defaults; + static const controllerFan_settings_t &settings = controllerFan_defaults; #endif static inline bool state() { return speed > 0; } static inline void init() { reset(); } diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/dac/dac_dac084s085.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/dac/dac_dac084s085.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/dac/dac_dac084s085.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/dac/dac_dac084s085.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/dac/dac_dac084s085.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/dac/dac_dac084s085.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/dac/dac_dac084s085.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/dac/dac_dac084s085.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/dac/dac_mcp4728.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/dac/dac_mcp4728.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/dac/dac_mcp4728.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/dac/dac_mcp4728.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/dac/dac_mcp4728.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/dac/dac_mcp4728.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/dac/dac_mcp4728.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/dac/dac_mcp4728.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/dac/stepper_dac.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/dac/stepper_dac.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/dac/stepper_dac.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/dac/stepper_dac.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/dac/stepper_dac.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/dac/stepper_dac.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/dac/stepper_dac.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/digipot/digipot.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/digipot/digipot.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/digipot/digipot.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/digipot/digipot.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/digipot/digipot_mcp4018.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/digipot/digipot_mcp4018.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/digipot/digipot_mcp4018.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/digipot/digipot_mcp4018.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/digipot/digipot_mcp4451.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/digipot/digipot_mcp4451.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/digipot/digipot_mcp4451.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/digipot/digipot_mcp4451.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/e_parser.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/e_parser.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/e_parser.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/e_parser.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/e_parser.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/e_parser.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/e_parser.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/e_parser.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/encoder_i2c.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/encoder_i2c.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/encoder_i2c.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/encoder_i2c.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/encoder_i2c.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/encoder_i2c.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/encoder_i2c.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/encoder_i2c.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/fanmux.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/fanmux.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/fanmux.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/fanmux.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/fanmux.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/fanmux.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/fanmux.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/fanmux.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/filwidth.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/filwidth.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/filwidth.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/filwidth.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/filwidth.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/filwidth.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/filwidth.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/filwidth.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/fwretract.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/fwretract.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/fwretract.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/fwretract.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/fwretract.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/fwretract.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/fwretract.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/fwretract.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/host_actions.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/host_actions.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/host_actions.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/host_actions.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/host_actions.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/host_actions.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/host_actions.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/host_actions.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/joystick.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/joystick.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/joystick.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/joystick.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/joystick.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/joystick.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/joystick.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/joystick.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/leds/blinkm.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/blinkm.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/leds/blinkm.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/blinkm.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/leds/blinkm.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/blinkm.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/leds/blinkm.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/blinkm.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/leds/leds.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/leds.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/leds/leds.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/leds.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/leds/leds.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/leds.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/leds/leds.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/leds.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/leds/neopixel.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/neopixel.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/leds/neopixel.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/neopixel.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/leds/neopixel.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/neopixel.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/leds/neopixel.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/neopixel.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/leds/pca9632.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/pca9632.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/leds/pca9632.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/pca9632.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/leds/pca9632.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/pca9632.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/leds/pca9632.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/pca9632.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/leds/printer_event_leds.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/printer_event_leds.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/leds/printer_event_leds.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/printer_event_leds.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/leds/printer_event_leds.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/printer_event_leds.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/leds/printer_event_leds.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/printer_event_leds.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/leds/tempstat.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/tempstat.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/leds/tempstat.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/tempstat.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/leds/tempstat.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/tempstat.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/leds/tempstat.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/leds/tempstat.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/max7219.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/max7219.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/feature/max7219.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/max7219.cpp index a012aeb..2ec23f0 100644 --- a/2.0.5-bigTreeTech/Marlin/src/feature/max7219.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/max7219.cpp @@ -121,7 +121,7 @@ uint8_t Max7219::suspended; // = 0; #define CRITICAL_SECTION_START() NOOP #define CRITICAL_SECTION_END() NOOP #else - #define SIG_DELAY() DELAY_NS(250) + #define SIG_DELAY() DELAY_NS(188) // Delay for 0.1875µs (16MHz AVR) or 0.15µs (20MHz AVR) #endif void Max7219::error(const char * const func, const int32_t v1, const int32_t v2/*=-1*/) { diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/max7219.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/max7219.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/max7219.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/max7219.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/mixing.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/mixing.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/mixing.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/mixing.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/mixing.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/mixing.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/mixing.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/mixing.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/mmu2/mmu2.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/mmu2/mmu2.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/feature/mmu2/mmu2.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/mmu2/mmu2.cpp index 4506883..2df3417 100644 --- a/2.0.5-bigTreeTech/Marlin/src/feature/mmu2/mmu2.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/mmu2/mmu2.cpp @@ -707,13 +707,14 @@ void MMU2::filament_runout() { if (recover) { LCD_MESSAGEPGM(MSG_MMU2_EJECT_RECOVER); BUZZ(200, 404); + wait_for_user = true; #if ENABLED(HOST_PROMPT_SUPPORT) host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), CONTINUE_STR); #endif #if ENABLED(EXTENSIBLE_UI) ExtUI::onUserConfirmRequired_P(PSTR("MMU2 Eject Recover")); #endif - wait_for_user_response(); + while (wait_for_user) idle(); BUZZ(200, 404); BUZZ(200, 404); diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/mmu2/mmu2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/mmu2/mmu2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/mmu2/mmu2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/mmu2/mmu2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/mmu2/serial-protocol.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/mmu2/serial-protocol.md similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/mmu2/serial-protocol.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/mmu2/serial-protocol.md diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/pause.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/pause.cpp similarity index 94% rename from 2.0.5-bigTreeTech/Marlin/src/feature/pause.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/pause.cpp index 9c615b6..fb69803 100644 --- a/2.0.5-bigTreeTech/Marlin/src/feature/pause.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/pause.cpp @@ -134,6 +134,15 @@ static bool ensure_safe_temperature(const PauseMode mode=PAUSE_MODE_SAME) { return thermalManager.wait_for_hotend(active_extruder); } +void do_pause_e_move(const float &length, const feedRate_t &fr_mm_s) { + #if HAS_FILAMENT_SENSOR + runout.reset(); + #endif + current_position.e += length / planner.e_factor[active_extruder]; + line_to_current_position(fr_mm_s); + planner.synchronize(); +} + /** * Load filament into the hotend * @@ -175,6 +184,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l #endif KEEPALIVE_STATE(PAUSED_FOR_USER); + wait_for_user = true; // LCD click or M108 will clear this #if ENABLED(HOST_PROMPT_SUPPORT) const char tool = '0' #if NUM_RUNOUT_SENSORS > 1 @@ -208,7 +218,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l #endif // Slow Load filament - if (slow_load_length) unscaled_e_move(slow_load_length, FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE); + if (slow_load_length) do_pause_e_move(slow_load_length, FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE); // Fast Load Filament if (fast_load_length) { @@ -217,7 +227,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l planner.settings.retract_acceleration = FILAMENT_CHANGE_FAST_LOAD_ACCEL; #endif - unscaled_e_move(fast_load_length, FILAMENT_CHANGE_FAST_LOAD_FEEDRATE); + do_pause_e_move(fast_load_length, FILAMENT_CHANGE_FAST_LOAD_FEEDRATE); #if FILAMENT_CHANGE_FAST_LOAD_ACCEL > 0 planner.settings.retract_acceleration = saved_acceleration; @@ -236,15 +246,15 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l if (show_lcd) lcd_pause_show_message(PAUSE_MESSAGE_PURGE); #endif + wait_for_user = true; #if ENABLED(HOST_PROMPT_SUPPORT) host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purging..."), CONTINUE_STR); #endif #if ENABLED(EXTENSIBLE_UI) ExtUI::onUserConfirmRequired_P(PSTR("Filament Purging...")); #endif - wait_for_user = true; // A click or M108 breaks the purge_length loop for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count) - unscaled_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE); + do_pause_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE); wait_for_user = false; #else @@ -257,7 +267,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l #endif // Extrude filament to get into hotend - unscaled_e_move(purge_length, ADVANCED_PAUSE_PURGE_FEEDRATE); + do_pause_e_move(purge_length, ADVANCED_PAUSE_PURGE_FEEDRATE); } #if ENABLED(HOST_PROMPT_SUPPORT) @@ -322,13 +332,13 @@ bool unload_filament(const float &unload_length, const bool show_lcd/*=false*/, #endif // Retract filament - unscaled_e_move(-(FILAMENT_UNLOAD_PURGE_RETRACT) * mix_multiplier, (PAUSE_PARK_RETRACT_FEEDRATE) * mix_multiplier); + do_pause_e_move(-(FILAMENT_UNLOAD_PURGE_RETRACT) * mix_multiplier, (PAUSE_PARK_RETRACT_FEEDRATE) * mix_multiplier); // Wait for filament to cool safe_delay(FILAMENT_UNLOAD_PURGE_DELAY); // Quickly purge - unscaled_e_move((FILAMENT_UNLOAD_PURGE_RETRACT + FILAMENT_UNLOAD_PURGE_LENGTH) * mix_multiplier, + do_pause_e_move((FILAMENT_UNLOAD_PURGE_RETRACT + FILAMENT_UNLOAD_PURGE_LENGTH) * mix_multiplier, (FILAMENT_UNLOAD_PURGE_FEEDRATE) * mix_multiplier); // Unload filament @@ -337,7 +347,7 @@ bool unload_filament(const float &unload_length, const bool show_lcd/*=false*/, planner.settings.retract_acceleration = FILAMENT_CHANGE_UNLOAD_ACCEL; #endif - unscaled_e_move(unload_length * mix_multiplier, (FILAMENT_CHANGE_UNLOAD_FEEDRATE) * mix_multiplier); + do_pause_e_move(unload_length * mix_multiplier, (FILAMENT_CHANGE_UNLOAD_FEEDRATE) * mix_multiplier); #if FILAMENT_CHANGE_FAST_LOAD_ACCEL > 0 planner.settings.retract_acceleration = saved_acceleration; @@ -427,7 +437,7 @@ bool pause_print(const float &retract, const xyz_pos_t &park_point, const float // Initial retract before move to filament change position if (retract && thermalManager.hotEnoughToExtrude(active_extruder)) - unscaled_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE); + do_pause_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE); // Park the nozzle by moving up by z_lift and then moving to (x_pos, y_pos) if (!axes_need_homing()) @@ -498,13 +508,13 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep // Wait for filament insert by user and press button KEEPALIVE_STATE(PAUSED_FOR_USER); + wait_for_user = true; // LCD click or M108 will clear this #if ENABLED(HOST_PROMPT_SUPPORT) host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Nozzle Parked"), CONTINUE_STR); #endif #if ENABLED(EXTENSIBLE_UI) ExtUI::onUserConfirmRequired_P(PSTR("Nozzle Parked")); #endif - wait_for_user = true; // LCD click or M108 will clear this while (wait_for_user) { #if HAS_BUZZER filament_change_beep(max_beep_count); @@ -530,7 +540,8 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep ExtUI::onUserConfirmRequired_P(PSTR("HeaterTimeout")); #endif - wait_for_user_response(0, true); // Wait for LCD click or M108 + // Wait for LCD click or M108 + while (wait_for_user) idle_no_sleep(); #if ENABLED(HOST_PROMPT_SUPPORT) host_prompt_do(PROMPT_INFO, PSTR("Reheating")); @@ -622,11 +633,11 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le #if ENABLED(FWRETRACT) // If retracted before goto pause if (fwretract.retracted[active_extruder]) - unscaled_e_move(-fwretract.settings.retract_length, fwretract.settings.retract_feedrate_mm_s); + do_pause_e_move(-fwretract.settings.retract_length, fwretract.settings.retract_feedrate_mm_s); #endif // If resume_position is negative - if (resume_position.e < 0) unscaled_e_move(resume_position.e, feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE)); + if (resume_position.e < 0) do_pause_e_move(resume_position.e, feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE)); // Move XY to starting position, then Z do_blocking_move_to_xy(resume_position, feedRate_t(NOZZLE_PARK_XY_FEEDRATE)); @@ -635,7 +646,7 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le do_blocking_move_to_z(resume_position.z, feedRate_t(NOZZLE_PARK_Z_FEEDRATE)); #if ADVANCED_PAUSE_RESUME_PRIME != 0 - unscaled_e_move(ADVANCED_PAUSE_RESUME_PRIME, feedRate_t(ADVANCED_PAUSE_PURGE_FEEDRATE)); + do_pause_e_move(ADVANCED_PAUSE_RESUME_PRIME, feedRate_t(ADVANCED_PAUSE_PURGE_FEEDRATE)); #endif // Now all extrusion positions are resumed and ready to be confirmed diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/pause.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/pause.h similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/feature/pause.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/pause.h index f1c8eed..5ac67a5 100644 --- a/2.0.5-bigTreeTech/Marlin/src/feature/pause.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/pause.h @@ -83,6 +83,8 @@ extern uint8_t did_pause_print; #define DXC_PASS #endif +void do_pause_e_move(const float &length, const feedRate_t &fr_mm_s); + bool pause_print(const float &retract, const xyz_pos_t &park_point, const float &unload_length=0, const bool show_lcd=false DXC_PARAMS); void wait_for_confirmation(const bool is_reload=false, const int8_t max_beep_count=0 DXC_PARAMS); diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/power.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/power.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/power.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/power.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/power.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/power.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/power.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/power.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/powerloss.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/powerloss.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/feature/powerloss.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/powerloss.cpp index 1dc74a2..bb0062d 100644 --- a/2.0.5-bigTreeTech/Marlin/src/feature/powerloss.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/powerloss.cpp @@ -270,6 +270,7 @@ void PrintJobRecovery::save(const bool force/*=false*/) { * Save the recovery info the recovery file */ void PrintJobRecovery::write() { + debug(PSTR("Write")); open(false); diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/powerloss.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/powerloss.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/feature/powerloss.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/powerloss.h index 5709923..0496560 100644 --- a/2.0.5-bigTreeTech/Marlin/src/feature/powerloss.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/powerloss.h @@ -36,7 +36,7 @@ #define POWER_LOSS_STATE HIGH #endif -#define DEBUG_POWER_LOSS_RECOVERY +//#define DEBUG_POWER_LOSS_RECOVERY //#define SAVE_EACH_CMD_MODE //#define SAVE_INFO_INTERVAL_MS 0 diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/probe_temp_comp.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/probe_temp_comp.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/probe_temp_comp.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/probe_temp_comp.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/probe_temp_comp.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/probe_temp_comp.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/probe_temp_comp.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/probe_temp_comp.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/runout.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/runout.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/runout.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/runout.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/runout.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/runout.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/runout.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/runout.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/snmm.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/snmm.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/snmm.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/snmm.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/snmm.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/snmm.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/snmm.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/snmm.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/solenoid.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/solenoid.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/solenoid.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/solenoid.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/solenoid.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/solenoid.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/solenoid.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/solenoid.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/spindle_laser.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/spindle_laser.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/spindle_laser.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/spindle_laser.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/spindle_laser.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/spindle_laser.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/spindle_laser.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/spindle_laser.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/tmc_util.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/tmc_util.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/tmc_util.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/tmc_util.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/tmc_util.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/tmc_util.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/tmc_util.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/tmc_util.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/touch/xpt2046.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/touch/xpt2046.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/touch/xpt2046.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/touch/xpt2046.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/touch/xpt2046.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/touch/xpt2046.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/touch/xpt2046.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/touch/xpt2046.h diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/twibus.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/twibus.cpp similarity index 76% rename from 2.0.5-bigTreeTech/Marlin/src/feature/twibus.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/twibus.cpp index 9dbb1de..60d7801 100644 --- a/2.0.5-bigTreeTech/Marlin/src/feature/twibus.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/twibus.cpp @@ -49,27 +49,37 @@ void TWIBus::address(const uint8_t adr) { addr = adr; - debug(PSTR("address"), adr); + #if ENABLED(DEBUG_TWIBUS) + debug(PSTR("address"), adr); + #endif } void TWIBus::addbyte(const char c) { if (buffer_s >= COUNT(buffer)) return; buffer[buffer_s++] = c; - debug(PSTR("addbyte"), c); + #if ENABLED(DEBUG_TWIBUS) + debug(PSTR("addbyte"), c); + #endif } void TWIBus::addbytes(char src[], uint8_t bytes) { - debug(PSTR("addbytes"), bytes); + #if ENABLED(DEBUG_TWIBUS) + debug(PSTR("addbytes"), bytes); + #endif while (bytes--) addbyte(*src++); } void TWIBus::addstring(char str[]) { - debug(PSTR("addstring"), str); + #if ENABLED(DEBUG_TWIBUS) + debug(PSTR("addstring"), str); + #endif while (char c = *str++) addbyte(c); } void TWIBus::send() { - debug(PSTR("send"), addr); + #if ENABLED(DEBUG_TWIBUS) + debug(PSTR("send"), addr); + #endif Wire.beginTransmission(I2C_ADDRESS(addr)); Wire.write(buffer, buffer_s); @@ -79,21 +89,21 @@ void TWIBus::send() { } // static -void TWIBus::echoprefix(uint8_t bytes, const char pref[], uint8_t adr) { +void TWIBus::echoprefix(uint8_t bytes, const char prefix[], uint8_t adr) { SERIAL_ECHO_START(); - serialprintPGM(pref); + serialprintPGM(prefix); SERIAL_ECHOPAIR(": from:", adr, " bytes:", bytes, " data:"); } // static -void TWIBus::echodata(uint8_t bytes, const char pref[], uint8_t adr) { - echoprefix(bytes, pref, adr); +void TWIBus::echodata(uint8_t bytes, const char prefix[], uint8_t adr) { + echoprefix(bytes, prefix, adr); while (bytes-- && Wire.available()) SERIAL_CHAR(Wire.read()); SERIAL_EOL(); } -void TWIBus::echobuffer(const char pref[], uint8_t adr) { - echoprefix(buffer_s, pref, adr); +void TWIBus::echobuffer(const char prefix[], uint8_t adr) { + echoprefix(buffer_s, prefix, adr); LOOP_L_N(i, buffer_s) SERIAL_CHAR(buffer[i]); SERIAL_EOL(); } @@ -101,11 +111,15 @@ void TWIBus::echobuffer(const char pref[], uint8_t adr) { bool TWIBus::request(const uint8_t bytes) { if (!addr) return false; - debug(PSTR("request"), bytes); + #if ENABLED(DEBUG_TWIBUS) + debug(PSTR("request"), bytes); + #endif // requestFrom() is a blocking function if (Wire.requestFrom(addr, bytes) == 0) { - debug("request fail", addr); + #if ENABLED(DEBUG_TWIBUS) + debug("request fail", addr); + #endif return false; } @@ -113,7 +127,9 @@ bool TWIBus::request(const uint8_t bytes) { } void TWIBus::relay(const uint8_t bytes) { - debug(PSTR("relay"), bytes); + #if ENABLED(DEBUG_TWIBUS) + debug(PSTR("relay"), bytes); + #endif if (request(bytes)) echodata(bytes, PSTR("i2c-reply"), addr); @@ -125,7 +141,9 @@ uint8_t TWIBus::capture(char *dst, const uint8_t bytes) { while (count < bytes && Wire.available()) dst[count++] = Wire.read(); - debug(PSTR("capture"), count); + #if ENABLED(DEBUG_TWIBUS) + debug(PSTR("capture"), count); + #endif return count; } @@ -138,12 +156,16 @@ void TWIBus::flush() { #if I2C_SLAVE_ADDRESS > 0 void TWIBus::receive(uint8_t bytes) { - debug(PSTR("receive"), bytes); + #if ENABLED(DEBUG_TWIBUS) + debug(PSTR("receive"), bytes); + #endif echodata(bytes, PSTR("i2c-receive"), 0); } void TWIBus::reply(char str[]/*=nullptr*/) { - debug(PSTR("reply"), str); + #if ENABLED(DEBUG_TWIBUS) + debug(PSTR("reply"), str); + #endif if (str) { reset(); diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/twibus.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/twibus.h similarity index 96% rename from 2.0.5-bigTreeTech/Marlin/src/feature/twibus.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/twibus.h index 2c1b20d..faf9eb3 100644 --- a/2.0.5-bigTreeTech/Marlin/src/feature/twibus.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/twibus.h @@ -223,6 +223,7 @@ class TWIBus { #endif #if ENABLED(DEBUG_TWIBUS) + /** * @brief Prints a debug message * @details Prints a simple debug message "TWIBus::function: value" @@ -232,10 +233,6 @@ class TWIBus { static void debug(const char func[], char c); static void debug(const char func[], char adr[]); static inline void debug(const char func[], uint8_t v) { debug(func, (uint32_t)v); } - #else - static inline void debug(const char[], uint32_t) {} - static inline void debug(const char[], char) {} - static inline void debug(const char[], char[]) {} - static inline void debug(const char[], uint8_t) {} + #endif }; diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/z_stepper_align.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/z_stepper_align.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/z_stepper_align.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/z_stepper_align.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/feature/z_stepper_align.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/z_stepper_align.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/feature/z_stepper_align.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/feature/z_stepper_align.h diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/G26.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/G26.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/G26.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/G42.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/G42.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/G42.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/G42.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/M420.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/M420.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/M420.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/abl/G29.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/abl/G29.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/abl/G29.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/abl/M421.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/abl/M421.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/abl/M421.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/abl/M421.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/mbl/G29.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/mbl/G29.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/mbl/G29.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/mbl/M421.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/mbl/M421.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/mbl/M421.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/mbl/M421.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/ubl/G29.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/ubl/G29.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/ubl/G29.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/ubl/G29.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/ubl/M421.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/bedlevel/ubl/M421.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/bedlevel/ubl/M421.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/G28.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/G28.cpp similarity index 95% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/G28.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/G28.cpp index fafce9a..4603c76 100644 --- a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/G28.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/G28.cpp @@ -255,28 +255,28 @@ void GcodeSuite::G28() { #define HAS_HOMING_CURRENT (HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2)) #if HAS_HOMING_CURRENT - auto debug_current = [](PGM_P const s, const int16_t a, const int16_t b){ - serialprintPGM(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b); + auto debug_current = [](const char * const s, const int16_t a, const int16_t b){ + DEBUG_ECHO(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b); }; #if HAS_CURRENT_HOME(X) const int16_t tmc_save_current_X = stepperX.getMilliamps(); stepperX.rms_current(X_CURRENT_HOME); - if (DEBUGGING(LEVELING)) debug_current(PSTR("X"), tmc_save_current_X, X_CURRENT_HOME); + if (DEBUGGING(LEVELING)) debug_current("X", tmc_save_current_X, X_CURRENT_HOME); #endif #if HAS_CURRENT_HOME(X2) const int16_t tmc_save_current_X2 = stepperX2.getMilliamps(); stepperX2.rms_current(X2_CURRENT_HOME); - if (DEBUGGING(LEVELING)) debug_current(PSTR("X2"), tmc_save_current_X2, X2_CURRENT_HOME); + if (DEBUGGING(LEVELING)) debug_current("X2", tmc_save_current_X2, X2_CURRENT_HOME); #endif #if HAS_CURRENT_HOME(Y) const int16_t tmc_save_current_Y = stepperY.getMilliamps(); stepperY.rms_current(Y_CURRENT_HOME); - if (DEBUGGING(LEVELING)) debug_current(PSTR("Y"), tmc_save_current_Y, Y_CURRENT_HOME); + if (DEBUGGING(LEVELING)) debug_current("Y", tmc_save_current_Y, Y_CURRENT_HOME); #endif #if HAS_CURRENT_HOME(Y2) const int16_t tmc_save_current_Y2 = stepperY2.getMilliamps(); stepperY2.rms_current(Y2_CURRENT_HOME); - if (DEBUGGING(LEVELING)) debug_current(PSTR("Y2"), tmc_save_current_Y2, Y2_CURRENT_HOME); + if (DEBUGGING(LEVELING)) debug_current("Y2", tmc_save_current_Y2, Y2_CURRENT_HOME); #endif #endif @@ -345,8 +345,12 @@ void GcodeSuite::G28() { #endif // Home Y (before X) - if (ENABLED(HOME_Y_BEFORE_X) && (doY || (ENABLED(CODEPENDENT_XY_HOMING) && doX))) - homeaxis(Y_AXIS); + #if ENABLED(HOME_Y_BEFORE_X) + + if (doY || (doX && ENABLED(CODEPENDENT_XY_HOMING))) + homeaxis(Y_AXIS); + + #endif // Home X if (doX || (doY && ENABLED(CODEPENDENT_XY_HOMING) && DISABLED(HOME_Y_BEFORE_X))) { diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/G33.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/G33.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/G33.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/G33.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/G34_M422.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/G34_M422.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/G34_M422.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/G425.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/G425.cpp similarity index 83% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/G425.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/G425.cpp index 42c56fe..69fb291 100644 --- a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/G425.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/G425.cpp @@ -37,21 +37,6 @@ #include "../../module/endstops.h" #include "../../feature/bedlevel/bedlevel.h" -#if !AXIS_CAN_CALIBRATE(X) - #undef CALIBRATION_MEASURE_LEFT - #undef CALIBRATION_MEASURE_RIGHT -#endif - -#if !AXIS_CAN_CALIBRATE(Y) - #undef CALIBRATION_MEASURE_FRONT - #undef CALIBRATION_MEASURE_BACK -#endif - -#if !AXIS_CAN_CALIBRATE(Z) - #undef CALIBRATION_MEASURE_AT_TOP_EDGES -#endif - - /** * G425 backs away from the calibration object by various distances * depending on the confidence level: @@ -222,52 +207,42 @@ inline float measure(const AxisEnum axis, const int dir, const bool stop_state, inline void probe_side(measurements_t &m, const float uncertainty, const side_t side, const bool probe_top_at_edge=false) { const xyz_float_t dimensions = CALIBRATION_OBJECT_DIMENSIONS; AxisEnum axis; - float dir = 1; + float dir; park_above_object(m, uncertainty); switch (side) { - #if AXIS_CAN_CALIBRATE(Z) - case TOP: { - const float measurement = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty); - m.obj_center.z = measurement - dimensions.z / 2; - m.obj_side[TOP] = measurement; - return; - } - #endif - #if AXIS_CAN_CALIBRATE(X) - case LEFT: axis = X_AXIS; break; - case RIGHT: axis = X_AXIS; dir = -1; break; - #endif - #if AXIS_CAN_CALIBRATE(Y) - case FRONT: axis = Y_AXIS; break; - case BACK: axis = Y_AXIS; dir = -1; break; - #endif + case TOP: { + const float measurement = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty); + m.obj_center.z = measurement - dimensions.z / 2; + m.obj_side[TOP] = measurement; + return; + } + case RIGHT: axis = X_AXIS; dir = -1; break; + case FRONT: axis = Y_AXIS; dir = 1; break; + case LEFT: axis = X_AXIS; dir = 1; break; + case BACK: axis = Y_AXIS; dir = -1; break; default: return; } if (probe_top_at_edge) { - #if AXIS_CAN_CALIBRATE(Z) - // Probe top nearest the side we are probing - current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 - m.nozzle_outer_dimension[axis]); - calibration_move(); - m.obj_side[TOP] = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty); - m.obj_center.z = m.obj_side[TOP] - dimensions.z / 2; - #endif + // Probe top nearest the side we are probing + current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 - m.nozzle_outer_dimension[axis]); + calibration_move(); + m.obj_side[TOP] = measure(Z_AXIS, -1, true, &m.backlash[TOP], uncertainty); + m.obj_center.z = m.obj_side[TOP] - dimensions.z / 2; } - if (AXIS_CAN_CALIBRATE(X) && axis == X_AXIS || AXIS_CAN_CALIBRATE(Y) && axis == Y_AXIS) { - // Move to safe distance to the side of the calibration object - current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2 + uncertainty); - calibration_move(); + // Move to safe distance to the side of the calibration object + current_position[axis] = m.obj_center[axis] + (-dir) * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2 + uncertainty); + calibration_move(); - // Plunge below the side of the calibration object and measure - current_position.z = m.obj_side[TOP] - (CALIBRATION_NOZZLE_TIP_HEIGHT) * 0.7f; - calibration_move(); - const float measurement = measure(axis, dir, true, &m.backlash[side], uncertainty); - m.obj_center[axis] = measurement + dir * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2); - m.obj_side[side] = measurement; - } + // Plunge below the side of the calibration object and measure + current_position.z = m.obj_side[TOP] - CALIBRATION_NOZZLE_TIP_HEIGHT * 0.7; + calibration_move(); + const float measurement = measure(axis, dir, true, &m.backlash[side], uncertainty); + m.obj_center[axis] = measurement + dir * (dimensions[axis] / 2 + m.nozzle_outer_dimension[axis] / 2); + m.obj_side[side] = measurement; } /** @@ -277,7 +252,7 @@ inline void probe_side(measurements_t &m, const float uncertainty, const side_t * uncertainty in - How far away from the calibration object to begin probing */ inline void probe_sides(measurements_t &m, const float uncertainty) { - #if ENABLED(CALIBRATION_MEASURE_AT_TOP_EDGES) + #ifdef CALIBRATION_MEASURE_AT_TOP_EDGES constexpr bool probe_top_at_edge = true; #else // Probing at the exact center only works if the center is flat. Probing on a washer @@ -286,18 +261,18 @@ inline void probe_sides(measurements_t &m, const float uncertainty) { probe_side(m, uncertainty, TOP); #endif - #if ENABLED(CALIBRATION_MEASURE_RIGHT) + #ifdef CALIBRATION_MEASURE_RIGHT probe_side(m, uncertainty, RIGHT, probe_top_at_edge); #endif - #if ENABLED(CALIBRATION_MEASURE_FRONT) + #ifdef CALIBRATION_MEASURE_FRONT probe_side(m, uncertainty, FRONT, probe_top_at_edge); #endif - #if ENABLED(CALIBRATION_MEASURE_LEFT) + #ifdef CALIBRATION_MEASURE_LEFT probe_side(m, uncertainty, LEFT, probe_top_at_edge); #endif - #if ENABLED(CALIBRATION_MEASURE_BACK) + #ifdef CALIBRATION_MEASURE_BACK probe_side(m, uncertainty, BACK, probe_top_at_edge); #endif @@ -338,9 +313,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) { #if ENABLED(CALIBRATION_REPORTING) inline void report_measured_faces(const measurements_t &m) { SERIAL_ECHOLNPGM("Sides:"); - #if AXIS_CAN_CALIBRATE(Z) - SERIAL_ECHOLNPAIR(" Top: ", m.obj_side[TOP]); - #endif + SERIAL_ECHOLNPAIR(" Top: ", m.obj_side[TOP]); #if ENABLED(CALIBRATION_MEASURE_LEFT) SERIAL_ECHOLNPAIR(" Left: ", m.obj_side[LEFT]); #endif @@ -370,25 +343,19 @@ inline void probe_sides(measurements_t &m, const float uncertainty) { inline void report_measured_backlash(const measurements_t &m) { SERIAL_ECHOLNPGM("Backlash:"); - #if AXIS_CAN_CALIBRATE(X) - #if ENABLED(CALIBRATION_MEASURE_LEFT) - SERIAL_ECHOLNPAIR(" Left: ", m.backlash[LEFT]); - #endif - #if ENABLED(CALIBRATION_MEASURE_RIGHT) - SERIAL_ECHOLNPAIR(" Right: ", m.backlash[RIGHT]); - #endif + #if ENABLED(CALIBRATION_MEASURE_LEFT) + SERIAL_ECHOLNPAIR(" Left: ", m.backlash[LEFT]); #endif - #if AXIS_CAN_CALIBRATE(Y) - #if ENABLED(CALIBRATION_MEASURE_FRONT) - SERIAL_ECHOLNPAIR(" Front: ", m.backlash[FRONT]); - #endif - #if ENABLED(CALIBRATION_MEASURE_BACK) - SERIAL_ECHOLNPAIR(" Back: ", m.backlash[BACK]); - #endif + #if ENABLED(CALIBRATION_MEASURE_RIGHT) + SERIAL_ECHOLNPAIR(" Right: ", m.backlash[RIGHT]); #endif - #if AXIS_CAN_CALIBRATE(Z) - SERIAL_ECHOLNPAIR(" Top: ", m.backlash[TOP]); + #if ENABLED(CALIBRATION_MEASURE_FRONT) + SERIAL_ECHOLNPAIR(" Front: ", m.backlash[FRONT]); #endif + #if ENABLED(CALIBRATION_MEASURE_BACK) + SERIAL_ECHOLNPAIR(" Back: ", m.backlash[BACK]); + #endif + SERIAL_ECHOLNPAIR(" Top: ", m.backlash[TOP]); SERIAL_EOL(); } @@ -402,7 +369,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) { #if HAS_Y_CENTER SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.pos_error.y); #endif - if (AXIS_CAN_CALIBRATE(Z)) SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z); + SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z); SERIAL_EOL(); } @@ -450,7 +417,6 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) { probe_sides(m, uncertainty); #if ENABLED(BACKLASH_GCODE) - #if HAS_X_CENTER backlash.distance_mm.x = (m.backlash[LEFT] + m.backlash[RIGHT]) / 2; #elif ENABLED(CALIBRATION_MEASURE_LEFT) @@ -467,18 +433,18 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) { backlash.distance_mm.y = m.backlash[BACK]; #endif - if (AXIS_CAN_CALIBRATE(Z)) backlash.distance_mm.z = m.backlash[TOP]; + backlash.distance_mm.z = m.backlash[TOP]; #endif } #if ENABLED(BACKLASH_GCODE) // Turn on backlash compensation and move in all - // allowed directions to take up any backlash + // directions to take up any backlash { // New scope for TEMPORARY_BACKLASH_CORRECTION TEMPORARY_BACKLASH_CORRECTION(all_on); TEMPORARY_BACKLASH_SMOOTHING(0.0f); - const xyz_float_t move = { AXIS_CAN_CALIBRATE(X) * 3, AXIS_CAN_CALIBRATE(Y) * 3, AXIS_CAN_CALIBRATE(Z) * 3 }; + const xyz_float_t move = { 3, 3, 3 }; current_position += move; calibration_move(); current_position -= move; calibration_move(); } @@ -516,18 +482,26 @@ inline void calibrate_toolhead(measurements_t &m, const float uncertainty, const // Adjust the hotend offset #if HAS_HOTEND_OFFSET - if (ENABLED(HAS_X_CENTER) && AXIS_CAN_CALIBRATE(X)) hotend_offset[extruder].x += m.pos_error.x; - if (ENABLED(HAS_Y_CENTER) && AXIS_CAN_CALIBRATE(Y)) hotend_offset[extruder].y += m.pos_error.y; - if (AXIS_CAN_CALIBRATE(Z)) hotend_offset[extruder].z += m.pos_error.z; + #if HAS_X_CENTER + hotend_offset[extruder].x += m.pos_error.x; + #endif + #if HAS_Y_CENTER + hotend_offset[extruder].y += m.pos_error.y; + #endif + hotend_offset[extruder].z += m.pos_error.z; normalize_hotend_offsets(); #endif // Correct for positional error, so the object // is at the known actual spot planner.synchronize(); - if (ENABLED(HAS_X_CENTER) && AXIS_CAN_CALIBRATE(X)) update_measurements(m, X_AXIS); - if (ENABLED(HAS_Y_CENTER) && AXIS_CAN_CALIBRATE(Y)) update_measurements(m, Y_AXIS); - if (AXIS_CAN_CALIBRATE(Z)) update_measurements(m, Z_AXIS); + #if HAS_X_CENTER + update_measurements(m, X_AXIS); + #endif + #if HAS_Y_CENTER + update_measurements(m, Y_AXIS); + #endif + update_measurements(m, Z_AXIS); sync_plan_position(); } diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/G76_M871.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/G76_M871.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/G76_M871.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M100.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M100.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M100.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M100.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M12.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M12.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M12.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M12.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M425.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M425.cpp similarity index 94% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M425.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M425.cpp index 980152a..41c80da 100644 --- a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M425.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M425.cpp @@ -47,7 +47,7 @@ void GcodeSuite::M425() { bool noArgs = true; LOOP_XYZ(a) { - if (CAN_CALIBRATE(a) && parser.seen(XYZ_CHAR(a))) { + if (parser.seen(XYZ_CHAR(a))) { planner.synchronize(); backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a)); noArgs = false; @@ -74,7 +74,7 @@ void GcodeSuite::M425() { SERIAL_ECHOLNPGM("active:"); SERIAL_ECHOLNPAIR(" Correction Amount/Fade-out: F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)"); SERIAL_ECHOPGM(" Backlash Distance (mm): "); - LOOP_XYZ(a) if (CAN_CALIBRATE(a)) { + LOOP_XYZ(a) { SERIAL_CHAR(' ', XYZ_CHAR(a)); SERIAL_ECHO(backlash.distance_mm[a]); SERIAL_EOL(); @@ -87,7 +87,7 @@ void GcodeSuite::M425() { #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING) SERIAL_ECHOPGM(" Average measured backlash (mm):"); if (backlash.has_any_measurement()) { - LOOP_XYZ(a) if (CAN_CALIBRATE(a) && backlash.has_measurement(AxisEnum(a))) { + LOOP_XYZ(a) if (backlash.has_measurement(AxisEnum(a))) { SERIAL_CHAR(' ', XYZ_CHAR(a)); SERIAL_ECHO(backlash.get_measurement(AxisEnum(a))); } diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M48.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M48.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M48.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M48.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M665.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M665.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M665.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M665.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M666.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M666.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M666.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M666.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M852.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M852.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/calibrate/M852.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/calibrate/M852.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M200-M205.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M200-M205.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M200-M205.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M200-M205.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M217.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M217.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M217.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M217.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M218.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M218.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M218.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M218.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M220.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M220.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M220.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M220.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M221.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M221.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M221.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M221.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M281.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M281.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M281.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M281.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M301.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M301.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M301.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M301.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M302.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M302.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M302.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M302.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M304.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M304.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M304.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M304.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M305.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M305.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M305.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M305.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M43.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M43.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M43.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M43.cpp index baf5efb..2c28da6 100644 --- a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M43.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M43.cpp @@ -67,11 +67,7 @@ inline void toggle_pins() { else { watchdog_refresh(); report_pin_state_extended(pin, ignore_protection, true, PSTR("Pulsing ")); - #ifdef __STM32F1__ - const auto prior_mode = _GET_MODE(i); - #else - const bool prior_mode = GET_PINMODE(pin); - #endif + const bool prior_mode = GET_PINMODE(pin); #if AVR_AT90USB1286_FAMILY // Teensy IDEs don't know about these pins so must use FASTIO if (pin == TEENSY_E2) { SET_OUTPUT(TEENSY_E2); @@ -100,11 +96,7 @@ inline void toggle_pins() { watchdog_refresh(); } } - #ifdef __STM32F1__ - _SET_MODE(i, prior_mode); - #else - pinMode(pin, prior_mode); - #endif + pinMode(pin, prior_mode); } SERIAL_EOL(); } diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M540.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M540.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M540.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M540.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M575.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M575.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M575.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M575.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M672.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M672.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M672.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M672.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/config/M92.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M92.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/config/M92.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/config/M92.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M108_M112_M410.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M108_M112_M410.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M108_M112_M410.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M108_M112_M410.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M111.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M111.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M111.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M111.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M120_M121.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M120_M121.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M120_M121.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M120_M121.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M17_M18_M84.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M17_M18_M84.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M17_M18_M84.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M211.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M211.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M211.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M211.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M226.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M226.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M226.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M226.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M280.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M280.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M280.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M280.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M3-M5.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M3-M5.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M3-M5.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M3-M5.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M350_M351.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M350_M351.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M350_M351.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M350_M351.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M380_M381.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M380_M381.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M380_M381.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M380_M381.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M400.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M400.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M400.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M400.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M42.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M42.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M42.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M42.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M605.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M605.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M605.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M605.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M7-M9.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M7-M9.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M7-M9.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M7-M9.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M80_M81.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M80_M81.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M80_M81.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M80_M81.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M85.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M85.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M85.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M85.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M997.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M997.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M997.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M997.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/M999.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M999.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/M999.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/M999.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/control/T.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/T.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/control/T.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/control/T.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/eeprom/M500-M504.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/eeprom/M500-M504.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/eeprom/M500-M504.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/eeprom/M500-M504.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/L6470/M122.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/L6470/M122.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/L6470/M122.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/L6470/M122.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/L6470/M906.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/L6470/M906.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/L6470/M906.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/L6470/M916-918.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/L6470/M916-918.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/L6470/M916-918.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/L6470/M916-918.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/advance/M900.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/advance/M900.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/advance/M900.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/baricuda/M126-M129.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/baricuda/M126-M129.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/baricuda/M126-M129.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/baricuda/M126-M129.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/camera/M240.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/camera/M240.cpp similarity index 96% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/camera/M240.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/camera/M240.cpp index 33ef9bf..3c045a7 100644 --- a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/camera/M240.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/camera/M240.cpp @@ -48,8 +48,14 @@ #ifdef PHOTO_RETRACT_MM inline void e_move_m240(const float length, const feedRate_t &fr_mm_s) { - if (length && thermalManager.hotEnoughToExtrude(active_extruder)) - unscaled_e_move(length, fr_mm_s); + if (length && thermalManager.hotEnoughToExtrude(active_extruder)) { + #if ENABLED(ADVANCED_PAUSE_FEATURE) + do_pause_e_move(length, fr_mm_s); + #else + current_position.e += length / planner.e_factor[active_extruder]; + line_to_current_position(fr_mm_s); + #endif + } } #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/cancel/M486.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/cancel/M486.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/cancel/M486.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/cancel/M486.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/caselight/M355.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/caselight/M355.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/caselight/M355.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/caselight/M355.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/clean/G12.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/clean/G12.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/clean/G12.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/clean/G12.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/controllerfan/M710.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/controllerfan/M710.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/controllerfan/M710.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/controllerfan/M710.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/digipot/M907-M910.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/digipot/M907-M910.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/digipot/M907-M910.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/filwidth/M404-M407.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/filwidth/M404-M407.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/filwidth/M404-M407.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/filwidth/M404-M407.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/fwretract/G10_G11.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/fwretract/G10_G11.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/fwretract/G10_G11.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/fwretract/G10_G11.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/fwretract/M207-M209.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/fwretract/M207-M209.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/fwretract/M207-M209.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/fwretract/M207-M209.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/i2c/M260_M261.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/i2c/M260_M261.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/i2c/M260_M261.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/i2c/M260_M261.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/leds/M150.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/leds/M150.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/leds/M150.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/leds/M150.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/leds/M7219.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/leds/M7219.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/leds/M7219.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/leds/M7219.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/macro/M810-M819.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/macro/M810-M819.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/macro/M810-M819.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/macro/M810-M819.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/mixing/M163-M165.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/mixing/M163-M165.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/mixing/M163-M165.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/mixing/M163-M165.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/mixing/M166.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/mixing/M166.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/mixing/M166.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/mixing/M166.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/G27.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/G27.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/G27.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/G27.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/G60.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/G60.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/G60.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/G61.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/G61.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/G61.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/M125.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/M125.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/M125.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/M600.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/M600.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/M600.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/M603.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/M603.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/M603.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/M603.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/M701_M702.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/M701_M702.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/pause/M701_M702.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/pause/M701_M702.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/powerloss/M1000.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/powerloss/M1000.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/powerloss/M1000.cpp index 8d8cdc7..ea2c6e3 100644 --- a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/powerloss/M1000.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/powerloss/M1000.cpp @@ -63,7 +63,7 @@ void GcodeSuite::M1000() { #if HAS_LCD_MENU ui.goto_screen(menu_job_recovery); #elif ENABLED(EXTENSIBLE_UI) - ExtUI::onPowerLossResume(); + ExtUI::OnPowerLossResume(); #else SERIAL_ECHO_MSG("Resume requires LCD."); #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/powerloss/M413.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/powerloss/M413.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/powerloss/M413.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/prusa_MMU2/M403.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/runout/M412.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/runout/M412.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/runout/M412.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/runout/M412.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/trinamic/M122.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/trinamic/M122.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/trinamic/M122.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/trinamic/M569.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/trinamic/M569.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/trinamic/M569.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/trinamic/M906.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/trinamic/M906.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/trinamic/M906.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/trinamic/M911-M914.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/feature/trinamic/M911-M914.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/feature/trinamic/M911-M914.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/gcode.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/gcode.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/gcode.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/gcode.cpp index 1f9d710..1ce1e3d 100644 --- a/2.0.5-bigTreeTech/Marlin/src/gcode/gcode.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/gcode.cpp @@ -857,11 +857,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) { #if ENABLED(POWER_LOSS_RECOVERY) case 413: M413(); break; // M413: Enable/disable/query Power-Loss Recovery - case 1000: M1000(); break; // M1000: [INTERNAL] Resume from power-loss - #endif - - #if ENABLED(SDSUPPORT) - case 1001: M1001(); break; // M1001: [INTERNAL] Handle SD completion + case 1000: M1000(); break; // M1000: Resume from power-loss #endif #if ENABLED(MAX7219_GCODE) diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/gcode.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/gcode.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/gcode.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/gcode.h index 8e5d054..c1024ac 100644 --- a/2.0.5-bigTreeTech/Marlin/src/gcode/gcode.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/gcode.h @@ -968,10 +968,6 @@ private: static void M1000(); #endif - #if ENABLED(SDSUPPORT) - static void M1001(); - #endif - #if ENABLED(MAX7219_GCODE) static void M7219(); #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/geometry/G17-G19.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/geometry/G17-G19.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/geometry/G17-G19.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/geometry/G17-G19.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/geometry/G53-G59.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/geometry/G53-G59.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/geometry/G53-G59.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/geometry/G53-G59.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/geometry/G92.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/geometry/G92.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/geometry/G92.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/geometry/G92.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/geometry/M206_M428.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/geometry/M206_M428.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/geometry/M206_M428.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/host/M110.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M110.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/host/M110.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M110.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/host/M113.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M113.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/host/M113.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M113.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/host/M114.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M114.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/host/M114.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M114.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/host/M115.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M115.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/host/M115.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M115.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/host/M118.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M118.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/host/M118.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M118.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/host/M119.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M119.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/host/M119.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M119.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/host/M16.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M16.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/host/M16.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M16.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/host/M876.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M876.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/host/M876.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/host/M876.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M0_M1.cpp similarity index 77% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M0_M1.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M0_M1.cpp index 190023b..2176693 100644 --- a/2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M0_M1.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M0_M1.cpp @@ -24,19 +24,23 @@ #if HAS_RESUME_CONTINUE -#include "../../inc/MarlinConfig.h" - #include "../gcode.h" +#include "../../module/planner.h" -#include "../../module/planner.h" // for synchronize() -#include "../../MarlinCore.h" // for wait_for_user_response() +#include "../../inc/MarlinConfig.h" #if HAS_LCD_MENU #include "../../lcd/ultralcd.h" -#elif ENABLED(EXTENSIBLE_UI) +#endif + +#if ENABLED(EXTENSIBLE_UI) #include "../../lcd/extui/ui_api.h" #endif +#if HAS_LEDS_OFF_FLAG + #include "../../feature/leds/printer_event_leds.h" +#endif + #if ENABLED(HOST_PROMPT_SUPPORT) #include "../../feature/host_actions.h" #endif @@ -52,11 +56,16 @@ void GcodeSuite::M0_M1() { planner.synchronize(); + const bool seenQ = parser.seen('Q'); + #if HAS_LEDS_OFF_FLAG + if (seenQ) printerEventLEDs.onPrintCompleted(); // Change LED color for Print Completed + #endif + #if HAS_LCD_MENU if (parser.string_arg) ui.set_status(parser.string_arg, true); - else { + else if (!seenQ) { LCD_MESSAGEPGM(MSG_USERWAIT); #if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0 ui.reset_progress_bar_timeout(); @@ -64,10 +73,12 @@ void GcodeSuite::M0_M1() { } #elif ENABLED(EXTENSIBLE_UI) + if (parser.string_arg) ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string?? else ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT)); + #else if (parser.string_arg) { @@ -77,15 +88,25 @@ void GcodeSuite::M0_M1() { #endif + KEEPALIVE_STATE(PAUSED_FOR_USER); + wait_for_user = true; + #if ENABLED(HOST_PROMPT_SUPPORT) host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR); #endif - wait_for_user_response(ms); + if (ms > 0) ms += millis(); // wait until this time for a click + while (wait_for_user && (ms == 0 || PENDING(millis(), ms))) idle(); + + #if HAS_LEDS_OFF_FLAG + printerEventLEDs.onResumeAfterWait(); + #endif #if HAS_LCD_MENU - ui.reset_status(); + if (!seenQ) ui.reset_status(); #endif + + wait_for_user = false; } #endif // HAS_RESUME_CONTINUE diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M117.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M117.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M117.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M117.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M145.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M145.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M145.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M145.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M250.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M250.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M250.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M250.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M300.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M300.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M300.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M300.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M73.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M73.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/lcd/M73.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/lcd/M73.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/G0_G1.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/motion/G0_G1.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/G0_G1.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/G2_G3.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/motion/G2_G3.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/G2_G3.cpp index b0fb299..b11b113 100644 --- a/2.0.5-bigTreeTech/Marlin/src/gcode/motion/G2_G3.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/G2_G3.cpp @@ -236,7 +236,7 @@ void plan_arc( planner.apply_leveling(raw); #endif - planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0 + planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, seg_length #if ENABLED(SCARA_FEEDRATE_SCALING) , inv_duration #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/motion/G4.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/G4.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/motion/G4.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/G4.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/motion/G5.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/G5.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/motion/G5.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/G5.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/motion/G80.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/G80.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/motion/G80.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/G80.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/motion/M290.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/M290.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/motion/M290.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/motion/M290.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/parser.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/parser.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/parser.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/parser.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/parser.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/parser.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/parser.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/parser.h diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/probe/G30.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/probe/G30.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/probe/G30.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/probe/G30.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/probe/G31_G32.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/probe/G31_G32.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/probe/G31_G32.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/probe/G31_G32.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/probe/G38.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/probe/G38.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/probe/G38.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/probe/G38.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/probe/M401_M402.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/probe/M401_M402.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/probe/M401_M402.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/probe/M401_M402.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/probe/M851.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/probe/M851.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/probe/M851.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/probe/M851.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/probe/M951.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/probe/M951.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/probe/M951.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/probe/M951.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/queue.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/queue.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/queue.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/queue.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/queue.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/queue.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/queue.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/queue.h diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/scara/M360-M364.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/scara/M360-M364.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/scara/M360-M364.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/scara/M360-M364.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M20.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M20.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M20.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M20.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M21_M22.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M21_M22.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M21_M22.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M21_M22.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M23.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M23.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M23.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M23.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M24_M25.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M24_M25.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M24_M25.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M24_M25.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M26.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M26.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M26.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M26.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M27.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M27.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M27.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M27.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M28_M29.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M28_M29.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M28_M29.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M28_M29.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M30.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M30.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M30.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M30.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M32.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M32.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M32.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M32.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M33.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M33.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M33.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M33.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M34.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M34.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M34.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M34.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M524.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M524.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M524.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M524.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/sd/M928.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M928.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/sd/M928.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/sd/M928.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/stats/M31.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/stats/M31.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/stats/M31.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/stats/M31.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/stats/M75-M78.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/stats/M75-M78.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/stats/M75-M78.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M104_M109.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/temp/M104_M109.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M104_M109.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/temp/M105.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M105.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/temp/M105.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M105.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M106_M107.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/temp/M106_M107.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M106_M107.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M140_M190.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/temp/M140_M190.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M140_M190.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/temp/M141_M191.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M141_M191.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/temp/M141_M191.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M141_M191.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/temp/M155.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M155.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/temp/M155.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M155.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/temp/M303.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M303.cpp similarity index 70% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/temp/M303.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M303.cpp index 358a143..63dcc3f 100644 --- a/2.0.5-bigTreeTech/Marlin/src/gcode/temp/M303.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/temp/M303.cpp @@ -34,31 +34,12 @@ /** * M303: PID relay autotune * - * S Set the target temperature. (Default: 150C / 70C) - * E Extruder number to tune, or -1 for the bed. (Default: E0) - * C Number of times to repeat the procedure. (Minimum: 3, Default: 5) - * U Flag to apply the result to the current PID values - * - * With PID_DEBUG: - * D Toggle PID debugging and EXIT without further action. + * S sets the target temperature. (default 150C / 70C) + * E (-1 for the bed) (default 0) + * C Minimum 3. Default 5. + * U with a non-zero value will apply the result to current settings */ - -#if ENABLED(PID_DEBUG) - bool pid_debug_flag = 0; -#endif - void GcodeSuite::M303() { - - #if ENABLED(PID_DEBUG) - if (parser.seen('D')) { - pid_debug_flag = !pid_debug_flag; - SERIAL_ECHO_START(); - SERIAL_ECHOPGM("PID Debug "); - serialprintln_onoff(pid_debug_flag); - return; - } - #endif - #if ENABLED(PIDTEMPBED) #define SI H_BED #else @@ -73,7 +54,7 @@ void GcodeSuite::M303() { if (!WITHIN(e, SI, EI)) { SERIAL_ECHOLNPGM(STR_PID_BAD_EXTRUDER_NUM); #if ENABLED(EXTENSIBLE_UI) - ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM); + ExtUI::OnPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM); #endif return; } diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/units/G20_G21.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/units/G20_G21.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/units/G20_G21.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/units/G20_G21.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/units/M149.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/units/M149.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/units/M149.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/units/M149.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/gcode/units/M82_M83.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/units/M82_M83.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/gcode/units/M82_M83.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/gcode/units/M82_M83.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/inc/Conditionals_LCD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/Conditionals_LCD.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/inc/Conditionals_LCD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/Conditionals_LCD.h index dd1f13f..2907694 100644 --- a/2.0.5-bigTreeTech/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/Conditionals_LCD.h @@ -683,10 +683,6 @@ #define SPI_SPEED SPI_FULL_SPEED #endif -#if SERIAL_PORT == -1 || SERIAL_PORT_2 == -1 - #define HAS_USB_SERIAL 1 -#endif - /** * This setting is also used by M109 when trying to calculate * a ballpark safe margin to prevent wait-forever situation. diff --git a/2.0.5-bigTreeTech/Marlin/src/inc/Conditionals_adv.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/Conditionals_adv.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/inc/Conditionals_adv.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/Conditionals_adv.h index a52ae1a..09de5d8 100644 --- a/2.0.5-bigTreeTech/Marlin/src/inc/Conditionals_adv.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/Conditionals_adv.h @@ -93,7 +93,7 @@ #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS) #define HAS_SOFTWARE_ENDSTOPS 1 #endif -#if ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS) +#if ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER) #define HAS_RESUME_CONTINUE 1 #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/inc/Conditionals_post.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/Conditionals_post.h similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/inc/Conditionals_post.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/Conditionals_post.h index 9ea298f..ebc77b9 100644 --- a/2.0.5-bigTreeTech/Marlin/src/inc/Conditionals_post.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/Conditionals_post.h @@ -35,19 +35,16 @@ #define HAS_LINEAR_E_JERK 1 #endif -// Determine which type of 'EEPROM' is in use +// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation #if ENABLED(EEPROM_SETTINGS) - // EEPROM type may be defined by compile flags, configs, HALs, or pins - // Set additional flags to let HALs choose in their Conditionals_post.h - #if NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) && ANY(I2C_EEPROM, SPI_EEPROM, QSPI_EEPROM) - #define USE_WIRED_EEPROM 1 + #if NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) && EITHER(I2C_EEPROM, SPI_EEPROM) + #define USE_REAL_EEPROM 1 #else - #define USE_FALLBACK_EEPROM 1 + #define USE_EMULATED_EEPROM 1 #endif #else #undef I2C_EEPROM #undef SPI_EEPROM - #undef QSPI_EEPROM #undef SDCARD_EEPROM_EMULATION #undef SRAM_EEPROM_EMULATION #undef FLASH_EEPROM_EMULATION @@ -139,19 +136,6 @@ #define CORESIGN(n) (ANY(COREYX, COREZX, COREZY) ? (-(n)) : (n)) #endif -// Calibration codes only for non-core axes -#if EITHER(BACKLASH_GCODE, CALIBRATION_GCODE) - #if IS_CORE - #define X_AXIS_INDEX 0 - #define Y_AXIS_INDEX 1 - #define Z_AXIS_INDEX 2 - #define CAN_CALIBRATE(A,B) (A##_AXIS_INDEX == B##_INDEX) - #else - #define CAN_CALIBRATE(...) 1 - #endif -#endif -#define AXIS_CAN_CALIBRATE(A) CAN_CALIBRATE(A,NORMAL_AXIS) - /** * No adjustable bed on non-cartesians */ diff --git a/2.0.5-bigTreeTech/Marlin/src/inc/MarlinConfig.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/MarlinConfig.h similarity index 95% rename from 2.0.5-bigTreeTech/Marlin/src/inc/MarlinConfig.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/MarlinConfig.h index c165501..d325067 100644 --- a/2.0.5-bigTreeTech/Marlin/src/inc/MarlinConfig.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/MarlinConfig.h @@ -35,12 +35,11 @@ #include "Conditionals_post.h" #include HAL_PATH(../HAL, inc/Conditionals_post.h) -#include "../core/types.h" // Ahead of sanity-checks - #include "SanityCheck.h" #include HAL_PATH(../HAL, inc/SanityCheck.h) // Include all core headers +#include "../core/types.h" #include "../core/language.h" #include "../core/utility.h" #include "../core/serial.h" diff --git a/2.0.5-bigTreeTech/Marlin/src/inc/MarlinConfigPre.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/MarlinConfigPre.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/inc/MarlinConfigPre.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/MarlinConfigPre.h diff --git a/2.0.5-bigTreeTech/Marlin/src/inc/SanityCheck.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/SanityCheck.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/inc/SanityCheck.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/SanityCheck.h index 2fd61d4..89b5336 100644 --- a/2.0.5-bigTreeTech/Marlin/src/inc/SanityCheck.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/SanityCheck.h @@ -272,8 +272,6 @@ #error "CONTROLLERFAN_PIN is now CONTROLLER_FAN_PIN, enabled with USE_CONTROLLER_FAN. Please update your Configuration_adv.h." #elif defined(CONTROLLERFAN_SPEED) #error "CONTROLLERFAN_SPEED is now CONTROLLERFAN_SPEED_ACTIVE. Please update your Configuration_adv.h." -#elif defined(CONTROLLERFAN_SECS) - #error "CONTROLLERFAN_SECS is now CONTROLLERFAN_IDLE_TIME. Please update your Configuration_adv.h." #elif defined(MIN_RETRACT) #error "MIN_RETRACT is now MIN_AUTORETRACT and MAX_AUTORETRACT. Please update your Configuration_adv.h." #elif defined(ADVANCE) @@ -1987,7 +1985,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS /** * Auto Fan check for PWM pins */ -#if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255 && DISABLED(NO_COMPILE_TIME_PWM) +#if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255 #define AF_ERR_SUFF "_AUTO_FAN_PIN is not a PWM pin. Set EXTRUDER_AUTO_FAN_SPEED to 255." #if HAS_AUTO_FAN_0 static_assert(PWM_PIN(E0_AUTO_FAN_PIN), "E0" AF_ERR_SUFF); @@ -2653,14 +2651,14 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2) #endif #if ENABLED(BACKLASH_COMPENSATION) + #if IS_CORE + #error "BACKLASH_COMPENSATION is incompatible with CORE kinematics." + #endif #ifndef BACKLASH_DISTANCE_MM #error "BACKLASH_COMPENSATION requires BACKLASH_DISTANCE_MM" - #elif !defined(BACKLASH_CORRECTION) + #endif + #ifndef BACKLASH_CORRECTION #error "BACKLASH_COMPENSATION requires BACKLASH_CORRECTION" - #elif IS_CORE - constexpr float backlash_arr[] = BACKLASH_DISTANCE_MM; - static_assert(!backlash_arr[CORE_AXIS_1] && !backlash_arr[CORE_AXIS_2], - "BACKLASH_COMPENSATION can only apply to " STRINGIFY(NORMAL_AXIS) " with your CORE system."); #endif #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/inc/Version.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/Version.h similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/inc/Version.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/Version.h index a5960c1..22d2ac7 100644 --- a/2.0.5-bigTreeTech/Marlin/src/inc/Version.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/inc/Version.h @@ -25,7 +25,7 @@ * Release version. Leave the Marlin version or apply a custom scheme. */ #ifndef SHORT_BUILD_VERSION - #define SHORT_BUILD_VERSION "2.0.5.3" + #define SHORT_BUILD_VERSION "bugfix-2.0.x" #endif /** @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2020-03-31" + #define STRING_DISTRIBUTION_DATE "2020-03-23" #endif /** diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/HD44780/ultralcd_HD44780.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/HD44780/ultralcd_HD44780.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/HD44780/ultralcd_HD44780.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/HD44780/ultralcd_HD44780.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/dogm_Bootscreen.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/dogm_Bootscreen.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/dogm_Bootscreen.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/dogm_Bootscreen.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/dogm_Statusscreen.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/dogm_Statusscreen.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/dogm_Statusscreen.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_an.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_an.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_an.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_an.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_bg.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_bg.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_bg.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_bg.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_ca.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_ca.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_ca.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_ca.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_cz.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_cz.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_cz.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_cz.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_da.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_da.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_da.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_da.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_de.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_de.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_de.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_de.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_el.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_el.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_el.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_el.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_en.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_en.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_en.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_en.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_es.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_es.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_es.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_es.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_eu.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_eu.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_eu.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_eu.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_fi.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_fi.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_fi.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_fi.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_fr.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_fr.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_fr.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_fr.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_gl.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_gl.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_gl.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_gl.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_hr.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_hr.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_hr.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_hr.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_it.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_it.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_it.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_it.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_nl.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_nl.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_nl.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_nl.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_pl.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_pl.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_pl.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_pl.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_pt.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_pt.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_pt.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_pt.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_ru.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_ru.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_ru.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_ru.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_sk.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_sk.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_sk.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_sk.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_test.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_test.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_test.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_test.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_tr.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_tr.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_tr.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_tr.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_uk.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_uk.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_uk.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_uk.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_vi.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_vi.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_vi.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_vi.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/lcdprint_u8g.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/lcdprint_u8g.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/lcdprint_u8g.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/lcdprint_u8g.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/status_screen_DOGM.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/status_screen_DOGM.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/status_screen_DOGM.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_fontutf8.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_fontutf8.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_fontutf8.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_fontutf8.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_fontutf8.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_fontutf8.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/u8g_fontutf8.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/u8g_fontutf8.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/ultralcd_DOGM.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/ultralcd_DOGM.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/ultralcd_DOGM.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/ultralcd_DOGM.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp index 6ac84c2..2b40804 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp @@ -30,6 +30,10 @@ #error "More than 2 hotends not implemented on the Display UI design." #endif +#include "DGUSDisplay.h" +#include "DGUSVPVariable.h" +#include "DGUSDisplayDef.h" + #include "../../ui_api.h" #include "../../../../MarlinCore.h" @@ -44,10 +48,6 @@ #include "../../../../feature/powerloss.h" #endif -#include "DGUSDisplay.h" -#include "DGUSVPVariable.h" -#include "DGUSDisplayDef.h" - // Preamble... 2 Bytes, usually 0x5A 0xA5, but configurable constexpr uint8_t DGUS_HEADER1 = 0x5A; constexpr uint8_t DGUS_HEADER2 = 0xA5; @@ -855,7 +855,7 @@ void DGUSScreenVariableHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr) { DEBUG_ECHOLNPGM("HandleProbeOffsetZChanged"); - const float offset = float(int16_t(swap16(*(uint16_t*)val_ptr))) / 100.0f; + const float offset = float(swap16(*(uint16_t*)val_ptr)) / 100.0f; ExtUI::setZOffset_mm(offset); ScreenHandler.skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel return; diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp index 5fbb307..3ccde11 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp @@ -283,13 +283,6 @@ const uint16_t VPList_FLCPrinting[] PROGMEM = { 0x0000 }; -const uint16_t VPList_Z_Offset[] PROGMEM = { - #if HOTENDS >= 1 - VP_SD_Print_ProbeOffsetZ, - #endif - 0x0000 -}; - const struct VPMapping VPMap[] PROGMEM = { { DGUSLCD_SCREEN_BOOT, VPList_Boot }, { DGUSLCD_SCREEN_MAIN, VPList_Main }, @@ -298,7 +291,6 @@ const struct VPMapping VPMap[] PROGMEM = { { DGUSLCD_SCREEN_STATUS2, VPList_Status2 }, { DGUSLCD_SCREEN_PREHEAT, VPList_Preheat }, { DGUSLCD_SCREEN_MANUALMOVE, VPList_ManualMove }, - { DGUSLCD_SCREEN_Z_OFFSET, VPList_Z_Offset }, { DGUSLCD_SCREEN_MANUALEXTRUDE, VPList_ManualExtrude }, { DGUSLCD_SCREEN_FILAMENT_HEATING, VPList_Filament_heating }, { DGUSLCD_SCREEN_FILAMENT_LOADING, VPList_Filament_load_unload }, @@ -369,7 +361,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = { #if HOTENDS >= 1 VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<0>), VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, DGUSScreenVariableHandler::HandleTemperatureChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay), - VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay), + VPHELPER(VP_Flowrate_E0, nullptr, DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay), VPHELPER(VP_EPos, &destination.e, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>), VPHELPER(VP_MOVE_E0, nullptr, &DGUSScreenVariableHandler::HandleManualExtrude, nullptr), VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, &DGUSScreenVariableHandler::HandleHeaterControl, nullptr), diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h index 1bfdf54..dbf7b8f 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h @@ -35,7 +35,6 @@ enum DGUSLCD_Screens : uint8_t { DGUSLCD_SCREEN_FILAMENT_LOADING = 76, DGUSLCD_SCREEN_FILAMENT_UNLOADING = 82, DGUSLCD_SCREEN_MANUALEXTRUDE = 84, - DGUSLCD_SCREEN_Z_OFFSET = 88, DGUSLCD_SCREEN_SDFILELIST = 3, DGUSLCD_SCREEN_SDPRINTMANIPULATION = 7, DGUSLCD_SCREEN_SDPRINTTUNE = 9, diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp similarity index 94% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp index 6621ea3..7f666be 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp @@ -38,11 +38,6 @@ namespace FTDI { SET_OUTPUT(CLCD_SPI_CS); WRITE(CLCD_SPI_CS, 1); - #ifdef CLCD_SPI_EXTRA_CS - SET_OUTPUT(CLCD_SPI_EXTRA_CS); - WRITE(CLCD_SPI_EXTRA_CS, 1); - #endif - #ifdef SPI_FLASH_SS SET_OUTPUT(SPI_FLASH_SS); WRITE(SPI_FLASH_SS, 1); @@ -116,18 +111,12 @@ namespace FTDI { ::SPI.beginTransaction(spi_settings); #endif WRITE(CLCD_SPI_CS, 0); - #ifdef CLCD_SPI_EXTRA_CS - WRITE(CLCD_SPI_EXTRA_CS, 0); - #endif delayMicroseconds(1); } // CLCD SPI - Chip Deselect void SPI::spi_ftdi_deselect() { WRITE(CLCD_SPI_CS, 1); - #ifdef CLCD_SPI_EXTRA_CS - WRITE(CLCD_SPI_EXTRA_CS, 1); - #endif #ifndef CLCD_USE_SOFT_SPI ::SPI.endTransaction(); #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h similarity index 90% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h index 3023a1c..ef2b23a 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h @@ -176,12 +176,11 @@ #undef MAKE_ARDUINO_PINS } // namespace fast_io - #define SET_INPUT(pin) fast_io::pin::set_input() - #define SET_INPUT_PULLUP(pin) do{ fast_io::pin::set_input(); fast_io::pin::set_high(); }while(0) - #define SET_INPUT_PULLDOWN SET_INPUT - #define SET_OUTPUT(pin) fast_io::pin::set_output() - #define READ(pin) fast_io::pin::read() - #define WRITE(pin, value) fast_io::pin::write(value) + #define SET_INPUT(pin) fast_io::pin::set_input() + #define SET_INPUT_PULLUP(pin) fast_io::pin::set_input(); fast_io::pin::set_high() + #define SET_OUTPUT(pin) fast_io::pin::set_output() + #define READ(pin) fast_io::pin::read() + #define WRITE(pin, value) fast_io::pin::write(value) #ifndef pgm_read_word_far #define pgm_read_word_far pgm_read_word @@ -196,11 +195,11 @@ #endif #define SERIAL_ECHO_START() - #define SERIAL_ECHOLNPGM(str) Serial.println(F(str)) - #define SERIAL_ECHOPGM(str) Serial.print(F(str)) - #define SERIAL_ECHO_MSG(str) Serial.println(str) - #define SERIAL_ECHOLNPAIR(str, val) do{ Serial.print(F(str)); Serial.println(val); }while(0) - #define SERIAL_ECHOPAIR(str, val) do{ Serial.print(F(str)); Serial.print(val); }while(0) + #define SERIAL_ECHOLNPGM(str) Serial.println(F(str)) + #define SERIAL_ECHOPGM(str) Serial.print(F(str)) + #define SERIAL_ECHO_MSG(str) Serial.println(str) + #define SERIAL_ECHOLNPAIR(str, val) {Serial.print(F(str)); Serial.println(val);} + #define SERIAL_ECHOPAIR(str, val) {Serial.print(F(str)); Serial.print(val);} #define safe_delay delay diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp index b338758..f0f693b 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp @@ -191,7 +191,7 @@ namespace FTDI { #if ENABLED(TOUCH_UI_DEBUG) SERIAL_ECHO_START(); - SERIAL_ECHOLNPAIR("Touch end: ", pressed_tag); + SERIAL_ECHOLNPAIR("Touch end: ", tag); #endif const uint8_t saved_pressed_tag = pressed_tag; diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/bitmap2cpp.py diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/circular_progress.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/svg2cpp.py diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h similarity index 91% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h index ebd60ae..e59e1d9 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h @@ -70,15 +70,13 @@ namespace Language_en { PROGMEM Language_Str MSG_PRINT_FINISHED = u8"Print finished"; PROGMEM Language_Str MSG_PRINT_ERROR = u8"Print error"; PROGMEM Language_Str MSG_ABOUT_TOUCH_PANEL_1 = u8"Color Touch Panel"; - PROGMEM Language_Str MSG_ABOUT_TOUCH_PANEL_2 = WEBSITE_URL; - PROGMEM Language_Str MSG_LICENSE = u8"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.\n\nTo view a copy of the GNU General " - "Public License, go to the following location: http://www.gnu.org/licenses."; + PROGMEM Language_Str MSG_ABOUT_TOUCH_PANEL_2 = u8"Portions " COPYRIGHT_SIGN " 2019 Aleph Objects, Inc.\n" + "Portions " COPYRIGHT_SIGN " 2019 Cocoa Press"; + PROGMEM Language_Str MSG_FIRMWARE_FOR_TOOLHEAD = u8"Firmware for toolhead:\n%s\n\n"; PROGMEM Language_Str MSG_RUNOUT_1 = u8"Runout 1"; PROGMEM Language_Str MSG_RUNOUT_2 = u8"Runout 2"; PROGMEM Language_Str MSG_DISPLAY_MENU = u8"Display"; - PROGMEM Language_Str MSG_INTERFACE = u8"Interface"; + PROGMEM Language_Str MSG_INTERFACE_SETTINGS = u8"Interface Settings"; PROGMEM Language_Str MSG_MEASURE_AUTOMATICALLY = u8"Measure automatically"; PROGMEM Language_Str MSG_H_OFFSET = u8"H Offset"; PROGMEM Language_Str MSG_V_OFFSET = u8"V Offset"; @@ -131,7 +129,7 @@ namespace Language_en { PROGMEM Language_Str MSG_SOUND_VOLUME = u8"Sound volume"; PROGMEM Language_Str MSG_SCREEN_LOCK = u8"Screen lock"; PROGMEM Language_Str MSG_BOOT_SCREEN = u8"Boot screen"; - PROGMEM Language_Str MSG_SOUNDS = u8"Sounds"; + PROGMEM Language_Str MSG_INTERFACE_SOUNDS = u8"Interface Sounds"; PROGMEM Language_Str MSG_CLICK_SOUNDS = u8"Click sounds"; PROGMEM Language_Str MSG_EEPROM_RESTORED = u8"Settings restored from backup"; PROGMEM Language_Str MSG_EEPROM_RESET = u8"Settings restored to default"; @@ -146,12 +144,12 @@ namespace Language_en { PROGMEM Language_Str MSG_TOUCH_CALIBRATION_START = u8"Release to begin screen calibration"; PROGMEM Language_Str MSG_TOUCH_CALIBRATION_PROMPT = u8"Touch the dots to calibrate"; - PROGMEM Language_Str MSG_AUTOLEVEL_X_AXIS = u8"Level X Axis"; #ifdef TOUCH_UI_LULZBOT_BIO PROGMEM Language_Str MSG_MOVE_TO_HOME = u8"Move to Home"; PROGMEM Language_Str MSG_RAISE_PLUNGER = u8"Raise Plunger"; PROGMEM Language_Str MSG_RELEASE_XY_AXIS = u8"Release X and Y Axis"; + PROGMEM Language_Str MSG_AUTOLEVEL_X_AXIS = u8"Auto-level X Axis"; PROGMEM Language_Str MSG_BED_TEMPERATURE = u8"Bed Temperature"; PROGMEM Language_Str MSG_HOME_XYZ_WARNING = u8"About to move to home position. Ensure the top and the bed of the printer are clear.\n\nContinue?"; PROGMEM Language_Str MSG_HOME_E_WARNING = u8"About to re-home plunger and auto-level. Remove syringe prior to proceeding.\n\nContinue?"; diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp similarity index 96% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp index bed32cc..96845d4 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp @@ -131,14 +131,8 @@ namespace ExtUI { } #endif - #if ENABLED(POWER_LOSS_RECOVERY) - void onPowerLossResume() { - // Called on resume from power-loss - } - #endif - #if HAS_PID_HEATING - void onPidTuning(const result_t rst) { + void OnPidTuning(const result_t rst) { // Called for temperature PID tuning result SERIAL_ECHOLNPAIR("OnPidTuning:", rst); switch (rst) { diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h similarity index 93% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h index b5b0f22..548c6c7 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h @@ -129,13 +129,12 @@ * 9 GND GND GND --> GND * 10 5V 5V 5V --> KILL [3] * - * [1] This configuration allows daisy-chaining of the - * display and SD/USB on EXP2, except for [2] + * [1] This configuration is not compatible with the + * EinsyRetro 1.1a because there is a level shifter + * on MISO enabled by SD/USB chip select. * - * [2] The Ultimachine Einsy boards have a level shifter - * on MISO enabled by SD_CSEL chip select, hence it - * is not possible to run both the display and the - * SD/USB on EXP2. + * [2] This configuration allows daisy-chaining of the + * display and SD/USB on EXP2. * * [3] Archim Rambo provides 5V on this pin. On any other * board, divert this wire from the ribbon cable and @@ -149,8 +148,4 @@ #define CLCD_SPI_CS BTN_EN1 #define CLCD_MOD_RESET BTN_EN2 - - #if MB(EINSY_RAMBO, EINSY_RETRO) && DISABLED(SDSUPPORT) - #define CLCD_SPI_EXTRA_CS SDSS - #endif #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp similarity index 56% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp index 70acc09..afd4402 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp @@ -27,7 +27,7 @@ #include "screens.h" #define GRID_COLS 4 -#define GRID_ROWS 7 +#define GRID_ROWS 9 using namespace FTDI; using namespace Theme; @@ -45,32 +45,7 @@ void AboutScreen::onRedraw(draw_mode_t) { .cmd(COLOR_RGB(bg_text_enabled)) .tag(0); - #define HEADING_POS BTN_POS(1,2), BTN_SIZE(4,1) - #define FW_VERS_POS BTN_POS(1,3), BTN_SIZE(4,1) - #define FW_INFO_POS BTN_POS(1,4), BTN_SIZE(4,1) - #define LICENSE_POS BTN_POS(1,5), BTN_SIZE(4,2) - #define STATS_POS BTN_POS(1,7), BTN_SIZE(2,1) - #define BACK_POS BTN_POS(3,7), BTN_SIZE(2,1) - - #define _INSET_POS(x,y,w,h) x + w/10, y, w - w/5, h - #define INSET_POS(pos) _INSET_POS(pos) - - char about_str[ - strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)) + - strlen_P(TOOLHEAD_NAME) + 1 - ]; - #ifdef TOOLHEAD_NAME - // If MSG_ABOUT_TOUCH_PANEL_2 has %s, substitute in the toolhead name. - // But this is optional, so squelch the compiler warning here. - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wformat-extra-args" - sprintf_P(about_str, GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2), TOOLHEAD_NAME); - #pragma GCC diagnostic pop - #else - strcpy_P(about_str, GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)); - #endif - - draw_text_box(cmd, HEADING_POS, + draw_text_box(cmd, BTN_POS(1,2), BTN_SIZE(4,1), #ifdef CUSTOM_MACHINE_NAME F(CUSTOM_MACHINE_NAME) #else @@ -78,29 +53,42 @@ void AboutScreen::onRedraw(draw_mode_t) { #endif , OPT_CENTER, font_xlarge ); - draw_text_box(cmd, FW_VERS_POS, progmem_str(getFirmwareName_str()), OPT_CENTER, font_medium); - draw_text_box(cmd, FW_INFO_POS, about_str, OPT_CENTER, font_medium); - draw_text_box(cmd, INSET_POS(LICENSE_POS), GET_TEXT_F(MSG_LICENSE), OPT_CENTER, font_tiny); - cmd.font(font_medium) - .colors(normal_btn) - .tag(2).button(STATS_POS, GET_TEXT_F(MSG_INFO_STATS_MENU)) - .colors(action_btn) - .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK)); + #ifdef TOOLHEAD_NAME + char about_str[ + strlen_P(GET_TEXT(FIRMWARE_FOR_TOOLHEAD)) + + strlen_P(TOOLHEAD_NAME) + + strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)) + 1 + ]; + + sprintf_P(about_str, GET_TEXT(MSG_FIRMWARE_FOR_TOOLHEAD), TOOLHEAD_NAME); + strcat_P (about_str, GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)); + #endif + + cmd.tag(2); + draw_text_box(cmd, BTN_POS(1,3), BTN_SIZE(4,3), + #ifdef TOOLHEAD_NAME + about_str + #else + GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_2) + #endif + , OPT_CENTER, font_medium + ); + + cmd.tag(0); + draw_text_box(cmd, BTN_POS(1,6), BTN_SIZE(4,2), progmem_str(getFirmwareName_str()), OPT_CENTER, font_medium); + + cmd.font(font_medium).colors(action_btn).tag(1).button(BTN_POS(2,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_OKAY)); } bool AboutScreen::onTouchEnd(uint8_t tag) { switch (tag) { - case 1: GOTO_PREVIOUS(); break; - #if ENABLED(PRINTCOUNTER) - case 2: GOTO_SCREEN(StatisticsScreen); break; - #endif - #if ENABLED(TOUCH_UI_DEVELOPER_MENU) - case 3: GOTO_SCREEN(DeveloperMenu); break; - #endif - default: return false; + case 1: GOTO_PREVIOUS(); return true; +#if ENABLED(TOUCH_UI_DEVELOPER_MENU) + case 2: GOTO_SCREEN(DeveloperMenu); return true; +#endif + default: return false; } - return true; } #endif // TOUCH_UI_FTDI_EVE diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp similarity index 52% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp index 57137c5..6029382 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp @@ -37,116 +37,127 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) { .cmd(CLEAR(true,true,true)); } - #ifdef TOUCH_UI_PORTRAIT - #if HAS_CASE_LIGHT || ENABLED(SENSORLESS_HOMING) - #define GRID_ROWS 9 - #else - #define GRID_ROWS 8 - #endif - #define GRID_COLS 2 - #define RESTORE_DEFAULTS_POS BTN_POS(1,1), BTN_SIZE(2,1) - #define DISPLAY_POS BTN_POS(1,2), BTN_SIZE(1,1) - #define INTERFACE_POS BTN_POS(2,2), BTN_SIZE(1,1) - #define ZPROBE_ZOFFSET_POS BTN_POS(1,3), BTN_SIZE(1,1) - #define STEPS_PER_MM_POS BTN_POS(2,3), BTN_SIZE(1,1) - #define FILAMENT_POS BTN_POS(1,4), BTN_SIZE(1,1) - #define VELOCITY_POS BTN_POS(2,4), BTN_SIZE(1,1) - #define TMC_CURRENT_POS BTN_POS(1,5), BTN_SIZE(1,1) - #define ACCELERATION_POS BTN_POS(2,5), BTN_SIZE(1,1) - #define ENDSTOPS_POS BTN_POS(1,6), BTN_SIZE(1,1) - #define JERK_POS BTN_POS(2,6), BTN_SIZE(1,1) - #define OFFSETS_POS BTN_POS(1,7), BTN_SIZE(1,1) - #define BACKLASH_POS BTN_POS(2,7), BTN_SIZE(1,1) - #define CASE_LIGHT_POS BTN_POS(1,8), BTN_SIZE(1,1) - #define TMC_HOMING_THRS_POS BTN_POS(2,8), BTN_SIZE(1,1) - #if HAS_CASE_LIGHT || ENABLED(SENSORLESS_HOMING) - #define BACK_POS BTN_POS(1,9), BTN_SIZE(2,1) - #else - #define BACK_POS BTN_POS(1,8), BTN_SIZE(2,1) - #endif - #else - #define GRID_ROWS 6 - #define GRID_COLS 3 - #define ZPROBE_ZOFFSET_POS BTN_POS(1,1), BTN_SIZE(1,1) - #define CASE_LIGHT_POS BTN_POS(1,4), BTN_SIZE(1,1) - #define STEPS_PER_MM_POS BTN_POS(2,1), BTN_SIZE(1,1) - #define TMC_CURRENT_POS BTN_POS(3,1), BTN_SIZE(1,1) - #define TMC_HOMING_THRS_POS BTN_POS(3,2), BTN_SIZE(1,1) - #define BACKLASH_POS BTN_POS(3,3), BTN_SIZE(1,1) - #define FILAMENT_POS BTN_POS(1,3), BTN_SIZE(1,1) - #define ENDSTOPS_POS BTN_POS(3,4), BTN_SIZE(1,1) - #define DISPLAY_POS BTN_POS(3,5), BTN_SIZE(1,1) - #define INTERFACE_POS BTN_POS(1,5), BTN_SIZE(2,1) - #define RESTORE_DEFAULTS_POS BTN_POS(1,6), BTN_SIZE(2,1) - #define VELOCITY_POS BTN_POS(2,2), BTN_SIZE(1,1) - #define ACCELERATION_POS BTN_POS(2,3), BTN_SIZE(1,1) - #define JERK_POS BTN_POS(2,4), BTN_SIZE(1,1) - #define OFFSETS_POS BTN_POS(1,2), BTN_SIZE(1,1) - #define BACK_POS BTN_POS(3,6), BTN_SIZE(1,1) - #endif - if (what & FOREGROUND) { CommandProcessor cmd; cmd.colors(normal_btn) .font(Theme::font_medium) + #ifdef TOUCH_UI_PORTRAIT + #define GRID_ROWS 10 + #define GRID_COLS 2 .enabled( #if HAS_BED_PROBE 1 #endif ) - .tag(2) .button( ZPROBE_ZOFFSET_POS, GET_TEXT_F(MSG_ZPROBE_ZOFFSET)) + .tag(2) .button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_ZPROBE_ZOFFSET)) .enabled( #if HAS_CASE_LIGHT 1 #endif ) - .tag(16).button( CASE_LIGHT_POS, GET_TEXT_F(MSG_CASE_LIGHT)) - .tag(3) .button( STEPS_PER_MM_POS, GET_TEXT_F(MSG_STEPS_PER_MM)) + .tag(16).button( BTN_POS(1,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT)) + .tag(3) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM)) .enabled( #if HAS_TRINAMIC_CONFIG 1 #endif ) - .tag(13).button( TMC_CURRENT_POS, GET_TEXT_F(MSG_TMC_CURRENT)) + .tag(13).button( BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT)) .enabled( - #if ENABLED(SENSORLESS_HOMING) + #if HAS_TRINAMIC_CONFIG 1 #endif ) - .tag(14).button( TMC_HOMING_THRS_POS, GET_TEXT_F(MSG_TMC_HOMING_THRS)) + .tag(14).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_TMC_HOMING_THRS)) .enabled( #if HOTENDS > 1 1 #endif ) - .tag(4) .button( OFFSETS_POS, GET_TEXT_F(MSG_OFFSETS_MENU)) + .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU)) .enabled( #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR) 1 #endif ) - .tag(11).button( FILAMENT_POS, GET_TEXT_F(MSG_FILAMENT)) - .tag(12).button( ENDSTOPS_POS, GET_TEXT_F(MSG_LCD_ENDSTOPS)) - .tag(15).button( DISPLAY_POS, GET_TEXT_F(MSG_DISPLAY_MENU)) - .tag(9) .button( INTERFACE_POS, GET_TEXT_F(MSG_INTERFACE)) - .tag(10).button( RESTORE_DEFAULTS_POS, GET_TEXT_F(MSG_RESTORE_DEFAULTS)) - .tag(5) .button( VELOCITY_POS, GET_TEXT_F(MSG_VELOCITY)) - .tag(6) .button( ACCELERATION_POS, GET_TEXT_F(MSG_ACCELERATION)) - .tag(7) .button( JERK_POS, GET_TEXT_F( - #if DISABLED(CLASSIC_JERK) - MSG_JUNCTION_DEVIATION - #else - JERK_POS - #endif - )) + .tag(11).button( BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENT)) + .tag(12).button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS)) + .tag(15).button( BTN_POS(2,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU)) + .tag(9) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS)) + .tag(10).button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS)) + .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY)) + .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION)) + #if DISABLED(CLASSIC_JERK) + .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION)) + #else + .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK)) + #endif .enabled( #if ENABLED(BACKLASH_GCODE) 1 #endif ) - .tag(8).button( BACKLASH_POS, GET_TEXT_F(MSG_BACKLASH)) + .tag(8).button( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH)) .colors(action_btn) - .tag(1).button( BACK_POS, GET_TEXT_F(MSG_BACK)); + .tag(1) .button( BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK)); + #undef GRID_COLS + #undef GRID_ROWS + #else + #define GRID_ROWS 6 + #define GRID_COLS 3 + .enabled( + #if HAS_BED_PROBE + 1 + #endif + ) + .tag(2) .button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_ZPROBE_ZOFFSET)) + .enabled( + #if HAS_CASE_LIGHT + 1 + #endif + ) + .tag(16).button( BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT)) + .enabled(1) + .tag(3) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM)) + .enabled( + #if HAS_TRINAMIC_CONFIG + 1 + #endif + ) + .tag(13).button( BTN_POS(3,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT)) + .enabled( + #if HAS_TRINAMIC_CONFIG + 1 + #endif + ) + .tag(14).button( BTN_POS(3,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_HOMING_THRS)) + .enabled( + #if ENABLED(BACKLASH_GCODE) + 1 + #endif + ) + .tag(8).button( BTN_POS(3,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH)) + .enabled( + #if HOTENDS > 1 + 1 + #endif + ) + .tag(4) .button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_OFFSETS_MENU)) + .tag(12).button( BTN_POS(3,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS)) + .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY)) + .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION)) + #if DISABLED(CLASSIC_JERK) + .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION)) + #else + .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK)) + #endif + .tag(11).button( BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENT)) + .tag(15).button( BTN_POS(3,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU)) + .tag(9) .button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS)) + .tag(10).button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS)) + .colors(action_btn) + .tag(1) .button( BTN_POS(3,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK)); + #endif } } @@ -180,8 +191,6 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) { case 12: GOTO_SCREEN(EndstopStatesScreen); break; #if HAS_TRINAMIC_CONFIG case 13: GOTO_SCREEN(StepperCurrentScreen); break; - #endif - #if ENABLED(SENSORLESS_HOMING) case 14: GOTO_SCREEN(StepperBumpSensitivityScreen); break; #endif case 15: GOTO_SCREEN(DisplayTuningScreen); break; @@ -192,4 +201,5 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) { } return true; } + #endif // TOUCH_UI_FTDI_EVE diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp similarity index 96% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp index 3e3f1d4..97e399a 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp @@ -345,14 +345,10 @@ void BaseNumericAdjustmentScreen::widgets_t::home_buttons(uint8_t tag) { } cmd.font(LAYOUT_FONT); - _button(cmd, tag+0, BTN_POS(5,_line), BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_X)); - _button(cmd, tag+1, BTN_POS(7,_line), BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Y)); - #if DISABLED(Z_SAFE_HOMING) - _button(cmd, tag+2, BTN_POS(9,_line), BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Z)); - _button(cmd, tag+3, BTN_POS(11,_line), BTN_SIZE(3,1), GET_TEXT_F(MSG_AXIS_ALL)); - #else - _button(cmd, tag+3, BTN_POS(9,_line), BTN_SIZE(3,1), GET_TEXT_F(MSG_AXIS_ALL)); - #endif + _button(cmd, tag+0, BTN_POS(5,_line), BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_X)); + _button(cmd, tag+1, BTN_POS(7,_line), BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Y)); + _button(cmd, tag+2, BTN_POS(9,_line), BTN_SIZE(2,1), GET_TEXT_F(MSG_AXIS_Z)); + _button(cmd, tag+3, BTN_POS(11,_line), BTN_SIZE(3,1), GET_TEXT_F(MSG_AXIS_ALL)); _line++; } diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp similarity index 95% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp index 7e88b78..77cadab 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp @@ -46,7 +46,7 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t return false; } - #if LCD_TIMEOUT_TO_STATUS + #ifdef LCD_TIMEOUT_TO_STATUS if (EventLoop::get_pressed_tag() != 0) { reset_menu_timeout(); } @@ -66,7 +66,7 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t } void BaseScreen::onIdle() { - #if LCD_TIMEOUT_TO_STATUS + #ifdef LCD_TIMEOUT_TO_STATUS if ((millis() - last_interaction) > LCD_TIMEOUT_TO_STATUS) { reset_menu_timeout(); #if ENABLED(TOUCH_UI_DEBUG) @@ -78,12 +78,12 @@ void BaseScreen::onIdle() { } void BaseScreen::reset_menu_timeout() { - #if LCD_TIMEOUT_TO_STATUS + #ifdef LCD_TIMEOUT_TO_STATUS last_interaction = millis(); #endif } -#if LCD_TIMEOUT_TO_STATUS +#ifdef LCD_TIMEOUT_TO_STATUS uint32_t BaseScreen::last_interaction; #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp index ed8bcee..6c9f74f 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp @@ -85,7 +85,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) { #endif ) .tag(12) .button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_LINEAR_ADVANCE)) - .tag(13) .button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE)) + .tag(13) .button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS)) .tag(14) .button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS)) .colors(action_btn) .tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK)); diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp similarity index 88% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp index 79a6112..a3254ba 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp @@ -36,13 +36,11 @@ void BioConfirmHomeE::onRedraw(draw_mode_t) { bool BioConfirmHomeE::onTouchEnd(uint8_t tag) { switch (tag) { case 1: - #if defined(AXIS_LEVELING_COMMANDS) && defined(PARK_AND_RELEASE_COMMANDS) - SpinnerDialogBox::enqueueAndWait_P(F( - "G28 E\n" - AXIS_LEVELING_COMMANDS "\n" - PARK_AND_RELEASE_COMMANDS - )); - #endif + SpinnerDialogBox::enqueueAndWait_P(F( + "G28 E\n" + AXIS_LEVELING_COMMANDS "\n" + PARK_AND_RELEASE_COMMANDS + )); current_screen.forget(); break; case 2: diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp similarity index 92% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp index 3ae2d68..883a446 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp @@ -36,12 +36,10 @@ void BioConfirmHomeXYZ::onRedraw(draw_mode_t) { bool BioConfirmHomeXYZ::onTouchEnd(uint8_t tag) { switch (tag) { case 1: - #ifdef PARK_AND_RELEASE_COMMANDS - SpinnerDialogBox::enqueueAndWait_P(F( - "G28\n" - PARK_AND_RELEASE_COMMANDS - )); - #endif + SpinnerDialogBox::enqueueAndWait_P(F( + "G28\n" + PARK_AND_RELEASE_COMMANDS + )); current_screen.forget(); break; case 2: diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp index 1f6aa45..40ed847 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp @@ -51,7 +51,7 @@ void MainMenu::onRedraw(draw_mode_t what) { .tag(4).button( BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS)) .tag(5).button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_AUTOLEVEL_X_AXIS)) .tag(6).button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BED_TEMPERATURE)) - .tag(7).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE)) + .tag(7).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS)) .tag(8).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS)) .tag(9).button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU)) .colors(action_btn) @@ -72,9 +72,7 @@ bool MainMenu::onTouchEnd(uint8_t tag) { case 2: GOTO_SCREEN(BioConfirmHomeXYZ); break; case 3: SpinnerDialogBox::enqueueAndWait_P(e_homed ? F("G0 E0 F120") : F("G112")); break; case 4: StatusScreen::unlockMotors(); break; - #ifdef AXIS_LEVELING_COMMANDS case 5: SpinnerDialogBox::enqueueAndWait_P(F(AXIS_LEVELING_COMMANDS)); break; - #endif case 6: GOTO_SCREEN(TemperatureScreen); break; case 7: GOTO_SCREEN(InterfaceSettingsScreen); break; case 8: GOTO_SCREEN(AdvancedSettingsMenu); break; diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp similarity index 93% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp index 5e022b5..996c12c 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp @@ -80,14 +80,12 @@ void BootScreen::onIdle() { SpinnerDialogBox::hide(); } - #if DISABLED(TOUCH_UI_NO_BOOTSCREEN) - if (UIData::animations_enabled()) { - // If there is a startup video in the flash SPI, play - // that, otherwise show a static splash screen. - if (!MediaPlayerScreen::playBootMedia()) - showSplashScreen(); - } - #endif + if (UIData::animations_enabled()) { + // If there is a startup video in the flash SPI, play + // that, otherwise show a static splash screen. + if (!MediaPlayerScreen::playBootMedia()) + showSplashScreen(); + } StatusScreen::loadBitmaps(); diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp index 2b5963f..2d1e0d6 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp @@ -111,7 +111,6 @@ void ChangeFilamentScreen::onRedraw(draw_mode_t what) { if (what & BACKGROUND) { cmd.cmd(CLEAR_COLOR_RGB(bg_color)) .cmd(CLEAR(true,true,true)) - .cmd(COLOR_RGB(bg_text_enabled)) .tag(0) #ifdef TOUCH_UI_PORTRAIT .font(font_large) @@ -120,7 +119,7 @@ void ChangeFilamentScreen::onRedraw(draw_mode_t what) { #endif .text(BTN_POS(1,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_EXTRUDER_SELECTION)) #ifdef TOUCH_UI_PORTRAIT - .text(BTN_POS(1,7), BTN_SIZE(1,1), GET_TEXT_F(MSG_CURRENT_TEMPERATURE)) + .text(BTN_POS(1,7), BTN_SIZE(1,1), F("")) #else .text(BTN_POS(3,1), BTN_SIZE(2,1), GET_TEXT_F(MSG_CURRENT_TEMPERATURE)) .font(font_small) diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp index 4e165aa..61875c5 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp @@ -69,7 +69,7 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) { .cmd(COLOR_RGB(bg_text_enabled)) .tag(0) .font(font_medium) - .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE)) + .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE_SETTINGS)) #undef EDGE_R #define EDGE_R 30 .font(font_small) @@ -77,9 +77,7 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) { .text(BTN_POS(1,2), BTN_SIZE(2,1), GET_TEXT_F(MSG_LCD_BRIGHTNESS), OPT_RIGHTX | OPT_CENTERY) .text(BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_SOUND_VOLUME), OPT_RIGHTX | OPT_CENTERY) .text(BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_SCREEN_LOCK), OPT_RIGHTX | OPT_CENTERY); - #if DISABLED(TOUCH_UI_NO_BOOTSCREEN) cmd.text(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_BOOT_SCREEN), OPT_RIGHTX | OPT_CENTERY); - #endif #undef EDGE_R } @@ -97,18 +95,16 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) { .tag(3).slider(BTN_POS(3,3), BTN_SIZE(2,1), screen_data.InterfaceSettingsScreen.volume, 0xFF) .colors(ui_toggle) .tag(4).toggle2(BTN_POS(3,4), BTN_SIZE(w,1), GET_TEXT_F(MSG_NO), GET_TEXT_F(MSG_YES), LockScreen::is_enabled()) - #if DISABLED(TOUCH_UI_NO_BOOTSCREEN) .tag(5).toggle2(BTN_POS(3,5), BTN_SIZE(w,1), GET_TEXT_F(MSG_NO), GET_TEXT_F(MSG_YES), UIData::animations_enabled()) - #endif #undef EDGE_R #define EDGE_R 0 #ifdef TOUCH_UI_PORTRAIT .colors(normal_btn) - .tag(6).button (BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_SOUNDS)) + .tag(6).button (BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE_SOUNDS)) .colors(action_btn) .tag(1).button (BTN_POS(1,7), BTN_SIZE(4,1), GET_TEXT_F(MSG_BACK)); #else - .tag(6).button (BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_SOUNDS)) + .tag(6).button (BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_INTERFACE_SOUNDS)) .colors(action_btn) .tag(1).button (BTN_POS(3,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK)); #endif @@ -256,7 +252,7 @@ void InterfaceSettingsScreen::loadSettings(const char *buff) { } #ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE - #include "../../../../../HAL/shared/eeprom_api.h" + #include "../../../../../HAL/shared/persistent_store_api.h" bool restoreEEPROM() { uint8_t data[ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE]; diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp index 48fae86..57f520e 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp @@ -71,7 +71,7 @@ void InterfaceSoundsScreen::onRedraw(draw_mode_t what) { #define GRID_ROWS 9 .font(font_medium) - .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_SOUNDS)) + .text(BTN_POS(1,1), BTN_SIZE(4,1), GET_TEXT_F(MSG_INTERFACE_SOUNDS)) #undef EDGE_R #define EDGE_R 30 .font(font_small) diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp diff --git a/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp new file mode 100644 index 0000000..016996e --- /dev/null +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp @@ -0,0 +1,148 @@ +/***************** + * main_menu.cpp * + *****************/ + +/**************************************************************************** + * Written By Mark Pelletier 2017 - Aleph Objects, Inc. * + * Written By Marcio Teixeira 2018 - Aleph Objects, Inc. * + * Written By Marcio Teixeira 2019 - Cocoa Press * + * * + * 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. * + * * + * To view a copy of the GNU General Public License, go to the following * + * location: . * + ****************************************************************************/ + +#include "../config.h" + +#if ENABLED(TOUCH_UI_FTDI_EVE) && !defined(TOUCH_UI_LULZBOT_BIO) + +#include "screens.h" + +using namespace FTDI; +using namespace Theme; + +void MainMenu::onRedraw(draw_mode_t what) { + if (what & BACKGROUND) { + CommandProcessor cmd; + cmd.cmd(CLEAR_COLOR_RGB(Theme::bg_color)) + .cmd(CLEAR(true,true,true)); + } + + if (what & FOREGROUND) { + CommandProcessor cmd; + cmd.colors(normal_btn) + .font(Theme::font_medium) + #ifdef TOUCH_UI_PORTRAIT + #define GRID_ROWS 8 + #define GRID_COLS 2 + .tag(2).button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_AUTO_HOME)) + .enabled( + #if ENABLED(NOZZLE_CLEAN_FEATURE) + 1 + #endif + ) + .tag(3).button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_CLEAN_NOZZLE)) + .tag(4).button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_MOVE_AXIS)) + .tag(5).button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISABLE_STEPPERS)) + .tag(6).button( BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_TEMPERATURE)) + .enabled( + #if NONE(TOUCH_UI_LULZBOT_BIO, TOUCH_UI_COCOA_PRESS) + 1 + #endif + ) + .tag(7).button( BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_FILAMENTCHANGE)) + .tag(8).button( BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS)) + .enabled( + #ifdef PRINTCOUNTER + 1 + #endif + ) + .tag(9).button( BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_STATS_MENU)) + .tag(10).button( BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_INFO_MENU)) + .colors(action_btn) + .tag(1).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK)); + #undef GRID_COLS + #undef GRID_ROWS + #else + #define GRID_ROWS 5 + #define GRID_COLS 2 + .tag(2).button( BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_AUTO_HOME)) + #if ENABLED(TOUCH_UI_COCOA_PRESS) + .tag(3).button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_PREHEAT_1)) + #else + .enabled( + #if ENABLED(NOZZLE_CLEAN_FEATURE) + 1 + #endif + ) + .tag(3).button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_CLEAN_NOZZLE)) + #endif + .tag(4).button( BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_MOVE_AXIS)) + .tag(5).button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISABLE_STEPPERS)) + .tag(6).button( BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_TEMPERATURE)) + #if ENABLED(TOUCH_UI_COCOA_PRESS) + .tag(7).button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_CASE_LIGHT)) + #else + .enabled( + #if DISABLED(TOUCH_UI_LULZBOT_BIO) + 1 + #endif + ) + .tag(7).button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_FILAMENTCHANGE)) + #endif + .tag(8).button( BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_ADVANCED_SETTINGS)) + .enabled( + #ifdef PRINTCOUNTER + 1 + #endif + ) + .tag(9).button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_INFO_STATS_MENU)) + .tag(10).button( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_INFO_MENU)) + .colors(action_btn) + .tag(1).button( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACK)); + #undef GRID_COLS + #undef GRID_ROWS + #endif + } +} + +bool MainMenu::onTouchEnd(uint8_t tag) { + using namespace ExtUI; + + switch (tag) { + case 1: SaveSettingsDialogBox::promptToSaveSettings(); break; + case 2: SpinnerDialogBox::enqueueAndWait_P(F("G28")); break; + #if ENABLED(TOUCH_UI_COCOA_PRESS) + case 3: GOTO_SCREEN(PreheatTimerScreen); break; + #elif ENABLED(NOZZLE_CLEAN_FEATURE) + case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break; + #endif + case 4: GOTO_SCREEN(MoveAxisScreen); break; + case 5: injectCommands_P(PSTR("M84")); break; + case 6: GOTO_SCREEN(TemperatureScreen); break; + #if ENABLED(TOUCH_UI_COCOA_PRESS) + case 7: GOTO_SCREEN(CaseLightScreen); break; + #else + case 7: GOTO_SCREEN(ChangeFilamentScreen); break; + #endif + case 8: GOTO_SCREEN(AdvancedSettingsMenu); break; +#if ENABLED(PRINTCOUNTER) + case 9: GOTO_SCREEN(StatisticsScreen); break; +#endif + case 10: GOTO_SCREEN(AboutScreen); break; + default: + return false; + } + return true; +} + +#endif // TOUCH_UI_FTDI_EVE diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp index 7d68ae2..0a24c30 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/preheat_timer_screen.cpp @@ -77,6 +77,9 @@ void PreheatTimerScreen::draw_interaction_buttons(draw_mode_t what) { void PreheatTimerScreen::onEntry() { screen_data.PreheatTimerScreen.start_ms = millis(); + #ifdef COCOA_PRESS_PREHEAT_SCRIPT + injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_SCRIPT)); + #endif } void PreheatTimerScreen::onRedraw(draw_mode_t what) { diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp index ce75462..69c1cf1 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp @@ -105,7 +105,6 @@ SCREEN_TABLE { DECL_SCREEN(BioConfirmHomeE), #endif #if ENABLED(TOUCH_UI_COCOA_PRESS) - DECL_SCREEN(PreheatMenu), DECL_SCREEN(PreheatTimerScreen), #endif #if ENABLED(TOUCH_UI_DEVELOPER_MENU) diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h index 346d122..02c5b14 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h @@ -76,7 +76,6 @@ enum { PRINTING_SCREEN_CACHE, #endif #if ENABLED(TOUCH_UI_COCOA_PRESS) - PREHEAT_MENU_CACHE, PREHEAT_TIMER_SCREEN_CACHE, #endif CHANGE_FILAMENT_SCREEN_CACHE, @@ -100,7 +99,7 @@ enum { class BaseScreen : public UIScreen { protected: - #if LCD_TIMEOUT_TO_STATUS + #ifdef LCD_TIMEOUT_TO_STATUS static uint32_t last_interaction; #endif @@ -315,12 +314,6 @@ class StatusScreen : public BaseScreen, public CachedScreen { - public: - static void onRedraw(draw_mode_t); - static bool onTouchEnd(uint8_t tag); - }; - class PreheatTimerScreen : public BaseScreen, public CachedScreen { private: static uint16_t secondsRemaining(); diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp similarity index 57% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp index 98d0bba..e71f200 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp @@ -33,9 +33,9 @@ using namespace FTDI; using namespace Theme; #ifdef TOUCH_UI_PORTRAIT - #define GRID_ROWS 8 + #define GRID_ROWS 8 #else - #define GRID_ROWS 8 + #define GRID_ROWS 8 #endif void StatusScreen::draw_axis_position(draw_mode_t what) { @@ -43,41 +43,41 @@ void StatusScreen::draw_axis_position(draw_mode_t what) { #define GRID_COLS 3 - #ifdef TOUCH_UI_PORTRAIT - #define X_LBL_POS BTN_POS(1,5), BTN_SIZE(1,1) - #define Y_LBL_POS BTN_POS(1,6), BTN_SIZE(1,1) - #define Z_LBL_POS BTN_POS(1,7), BTN_SIZE(1,1) - #define X_VAL_POS BTN_POS(2,5), BTN_SIZE(2,1) - #define Y_VAL_POS BTN_POS(2,6), BTN_SIZE(2,1) - #define Z_VAL_POS BTN_POS(2,7), BTN_SIZE(2,1) - #else - #define X_LBL_POS BTN_POS(1,5), BTN_SIZE(1,1) - #define Y_LBL_POS BTN_POS(2,5), BTN_SIZE(1,1) - #define Z_LBL_POS BTN_POS(3,5), BTN_SIZE(1,1) - #define X_VAL_POS BTN_POS(1,6), BTN_SIZE(1,1) - #define Y_VAL_POS BTN_POS(2,6), BTN_SIZE(1,1) - #define Z_VAL_POS BTN_POS(3,6), BTN_SIZE(1,1) - #endif - - #define _UNION_POS(x1,y1,w1,h1,x2,y2,w2,h2) x1,y1,max(x1+w1,x2+w2)-x1,max(y1+h1,y2+h2)-y1 - #define UNION_POS(p1, p2) _UNION_POS(p1, p2) - if (what & BACKGROUND) { cmd.tag(6) - .fgcolor(Theme::axis_label) - .font(Theme::font_large) - .button( UNION_POS(X_LBL_POS, X_VAL_POS), F(""), OPT_FLAT) - .button( UNION_POS(Y_LBL_POS, Y_VAL_POS), F(""), OPT_FLAT) - .button( UNION_POS(Z_LBL_POS, Z_VAL_POS), F(""), OPT_FLAT) - .font(Theme::font_medium) - .fgcolor(Theme::x_axis) .button( X_VAL_POS, F(""), OPT_FLAT) - .fgcolor(Theme::y_axis) .button( Y_VAL_POS, F(""), OPT_FLAT) - .fgcolor(Theme::z_axis) .button( Z_VAL_POS, F(""), OPT_FLAT) - .font(Theme::font_small) - .text ( X_LBL_POS, GET_TEXT_F(MSG_AXIS_X)) - .text ( Y_LBL_POS, GET_TEXT_F(MSG_AXIS_Y)) - .text ( Z_LBL_POS, GET_TEXT_F(MSG_AXIS_Z)) - .colors(normal_btn); + #ifdef TOUCH_UI_PORTRAIT + .fgcolor(Theme::axis_label) + .font(Theme::font_large) + .button( BTN_POS(1,5), BTN_SIZE(2,1), F(""), OPT_FLAT) + .button( BTN_POS(1,6), BTN_SIZE(2,1), F(""), OPT_FLAT) + .button( BTN_POS(1,7), BTN_SIZE(2,1), F(""), OPT_FLAT) + + .font(Theme::font_small) + .text ( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_X)) + .text ( BTN_POS(1,6), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Y)) + .text ( BTN_POS(1,7), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Z)) + + .font(Theme::font_medium) + .fgcolor(Theme::x_axis) .button( BTN_POS(2,5), BTN_SIZE(2,1), F(""), OPT_FLAT) + .fgcolor(Theme::y_axis) .button( BTN_POS(2,6), BTN_SIZE(2,1), F(""), OPT_FLAT) + .fgcolor(Theme::z_axis) .button( BTN_POS(2,7), BTN_SIZE(2,1), F(""), OPT_FLAT); + #else + .fgcolor(Theme::axis_label) + .font(Theme::font_large) + .button( BTN_POS(1,5), BTN_SIZE(1,2), F(""), OPT_FLAT) + .button( BTN_POS(2,5), BTN_SIZE(1,2), F(""), OPT_FLAT) + .button( BTN_POS(3,5), BTN_SIZE(1,2), F(""), OPT_FLAT) + + .font(Theme::font_small) + .text ( BTN_POS(1,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_X)) + .text ( BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Y)) + .text ( BTN_POS(3,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_AXIS_Z)) + .font(Theme::font_medium) + + .fgcolor(Theme::x_axis) .button( BTN_POS(1,6), BTN_SIZE(1,1), F(""), OPT_FLAT) + .fgcolor(Theme::y_axis) .button( BTN_POS(2,6), BTN_SIZE(1,1), F(""), OPT_FLAT) + .fgcolor(Theme::z_axis) .button( BTN_POS(3,6), BTN_SIZE(1,1), F(""), OPT_FLAT); + #endif } if (what & FOREGROUND) { @@ -101,11 +101,16 @@ void StatusScreen::draw_axis_position(draw_mode_t what) { else strcpy_P(z_str, PSTR("?")); - cmd.tag(6) - .font(Theme::font_medium) - .text ( X_VAL_POS, x_str) - .text ( Y_VAL_POS, y_str) - .text ( Z_VAL_POS, z_str); + cmd.tag(6).font(Theme::font_medium) + #ifdef TOUCH_UI_PORTRAIT + .text ( BTN_POS(2,5), BTN_SIZE(2,1), x_str) + .text ( BTN_POS(2,6), BTN_SIZE(2,1), y_str) + .text ( BTN_POS(2,7), BTN_SIZE(2,1), z_str); + #else + .text ( BTN_POS(1,6), BTN_SIZE(1,1), x_str) + .text ( BTN_POS(2,6), BTN_SIZE(1,1), y_str) + .text ( BTN_POS(3,6), BTN_SIZE(1,1), z_str); + #endif } #undef GRID_COLS @@ -120,49 +125,49 @@ void StatusScreen::draw_axis_position(draw_mode_t what) { void StatusScreen::draw_temperature(draw_mode_t what) { using namespace Theme; - #define TEMP_RECT_1 BTN_POS(1,1), BTN_SIZE(4,2) - #define TEMP_RECT_2 BTN_POS(1,1), BTN_SIZE(8,1) - #define NOZ_1_POS BTN_POS(1,1), BTN_SIZE(4,1) - #define NOZ_2_POS BTN_POS(5,1), BTN_SIZE(4,1) - #define BED_POS BTN_POS(1,2), BTN_SIZE(4,1) - #define FAN_POS BTN_POS(5,2), BTN_SIZE(4,1) - - #define _ICON_POS(x,y,w,h) x, y, w/4, h - #define _TEXT_POS(x,y,w,h) x + w/4, y, w - w/4, h - #define ICON_POS(pos) _ICON_POS(pos) - #define TEXT_POS(pos) _TEXT_POS(pos) - CommandProcessor cmd; if (what & BACKGROUND) { cmd.font(Theme::font_small) + #ifdef TOUCH_UI_PORTRAIT .tag(5) - .fgcolor(temp) .button( TEMP_RECT_1, F(""), OPT_FLAT) - .button( TEMP_RECT_2, F(""), OPT_FLAT) - .fgcolor(fan_speed).button( FAN_POS, F(""), OPT_FLAT) - .tag(0); + .fgcolor(temp) .button( BTN_POS(1,1), BTN_SIZE(4,2), F(""), OPT_FLAT) + .button( BTN_POS(1,1), BTN_SIZE(8,1), F(""), OPT_FLAT) + .fgcolor(fan_speed) .button( BTN_POS(5,2), BTN_SIZE(4,1), F(""), OPT_FLAT) + .tag(0) + .fgcolor(progress) .button( BTN_POS(1,3), BTN_SIZE(4,1), F(""), OPT_FLAT) + .button( BTN_POS(5,3), BTN_SIZE(4,1), F(""), OPT_FLAT); + #else + .tag(5) + .fgcolor(temp) .button( BTN_POS(1,1), BTN_SIZE(4,2), F(""), OPT_FLAT) + .button( BTN_POS(1,1), BTN_SIZE(8,1), F(""), OPT_FLAT) + .fgcolor(fan_speed) .button( BTN_POS(5,2), BTN_SIZE(4,1), F(""), OPT_FLAT) + .tag(0) + .fgcolor(progress) .button( BTN_POS(9,1), BTN_SIZE(4,1), F(""), OPT_FLAT) + .button( BTN_POS(9,2), BTN_SIZE(4,1), F(""), OPT_FLAT); + #endif // Draw Extruder Bitmap on Extruder Temperature Button cmd.tag(5) - .cmd (BITMAP_SOURCE(Extruder_Icon_Info)) - .cmd (BITMAP_LAYOUT(Extruder_Icon_Info)) - .cmd (BITMAP_SIZE (Extruder_Icon_Info)) - .icon(ICON_POS(NOZ_1_POS), Extruder_Icon_Info, icon_scale) - .icon(ICON_POS(NOZ_2_POS), Extruder_Icon_Info, icon_scale); + .cmd(BITMAP_SOURCE(Extruder_Icon_Info)) + .cmd(BITMAP_LAYOUT(Extruder_Icon_Info)) + .cmd(BITMAP_SIZE (Extruder_Icon_Info)) + .icon (BTN_POS(1,1), BTN_SIZE(1,1), Extruder_Icon_Info, icon_scale) + .icon (BTN_POS(5,1), BTN_SIZE(1,1), Extruder_Icon_Info, icon_scale); // Draw Bed Heat Bitmap on Bed Heat Button - cmd.cmd (BITMAP_SOURCE(Bed_Heat_Icon_Info)) - .cmd (BITMAP_LAYOUT(Bed_Heat_Icon_Info)) - .cmd (BITMAP_SIZE (Bed_Heat_Icon_Info)) - .icon(ICON_POS(BED_POS), Bed_Heat_Icon_Info, icon_scale); + cmd.cmd(BITMAP_SOURCE(Bed_Heat_Icon_Info)) + .cmd(BITMAP_LAYOUT(Bed_Heat_Icon_Info)) + .cmd(BITMAP_SIZE (Bed_Heat_Icon_Info)) + .icon (BTN_POS(1,2), BTN_SIZE(1,1), Bed_Heat_Icon_Info, icon_scale); // Draw Fan Percent Bitmap on Bed Heat Button - cmd.cmd (BITMAP_SOURCE(Fan_Icon_Info)) - .cmd (BITMAP_LAYOUT(Fan_Icon_Info)) - .cmd (BITMAP_SIZE (Fan_Icon_Info)) - .icon(ICON_POS(FAN_POS), Fan_Icon_Info, icon_scale); + cmd.cmd(BITMAP_SOURCE(Fan_Icon_Info)) + .cmd(BITMAP_LAYOUT(Fan_Icon_Info)) + .cmd(BITMAP_SIZE (Fan_Icon_Info)) + .icon (BTN_POS(5,2), BTN_SIZE(1,1), Fan_Icon_Info, icon_scale); #ifdef TOUCH_UI_USE_UTF8 load_utf8_bitmaps(cmd); // Restore font bitmap handles @@ -207,10 +212,10 @@ void StatusScreen::draw_temperature(draw_mode_t what) { cmd.tag(5) .font(font_medium) - .text(TEXT_POS(NOZ_1_POS), e0_str) - .text(TEXT_POS(NOZ_2_POS), e1_str) - .text(TEXT_POS(BED_POS), bed_str) - .text(TEXT_POS(FAN_POS), fan_str); + .text(BTN_POS(2,1), BTN_SIZE(3,1), e0_str) + .text(BTN_POS(6,1), BTN_SIZE(3,1), e1_str) + .text(BTN_POS(2,2), BTN_SIZE(3,1), bed_str) + .text(BTN_POS(6,2), BTN_SIZE(3,1), fan_str); } } @@ -220,18 +225,15 @@ void StatusScreen::draw_progress(draw_mode_t what) { CommandProcessor cmd; - #if ENABLED(TOUCH_UI_PORTRAIT) - #define TIME_POS BTN_POS(1,3), BTN_SIZE(4,1) - #define PROGRESS_POS BTN_POS(5,3), BTN_SIZE(4,1) - #else - #define TIME_POS BTN_POS(9,1), BTN_SIZE(4,1) - #define PROGRESS_POS BTN_POS(9,2), BTN_SIZE(4,1) - #endif - if (what & BACKGROUND) { cmd.tag(0).font(font_medium) - .fgcolor(progress).button(TIME_POS, F(""), OPT_FLAT) - .button(PROGRESS_POS, F(""), OPT_FLAT); + #ifdef TOUCH_UI_PORTRAIT + .fgcolor(progress) .button(BTN_POS(1,3), BTN_SIZE(4,1), F(""), OPT_FLAT) + .button(BTN_POS(5,3), BTN_SIZE(4,1), F(""), OPT_FLAT); + #else + .fgcolor(progress) .button(BTN_POS(9,1), BTN_SIZE(4,1), F(""), OPT_FLAT) + .button(BTN_POS(9,2), BTN_SIZE(4,1), F(""), OPT_FLAT); + #endif } if (what & FOREGROUND) { @@ -246,8 +248,13 @@ void StatusScreen::draw_progress(draw_mode_t what) { sprintf_P(progress_str, PSTR("%-3d %%"), getProgress_percent() ); cmd.font(font_medium) - .tag(0).text(TIME_POS, time_str) - .text(PROGRESS_POS, progress_str); + #ifdef TOUCH_UI_PORTRAIT + .tag(0).text(BTN_POS(1,3), BTN_SIZE(4,1), time_str) + .text(BTN_POS(5,3), BTN_SIZE(4,1), progress_str); + #else + .tag(0).text(BTN_POS(9,1), BTN_SIZE(4,1), time_str) + .text(BTN_POS(9,2), BTN_SIZE(4,1), progress_str); + #endif } } @@ -259,14 +266,6 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) { if (what & FOREGROUND) { using namespace ExtUI; - #if ENABLED(TOUCH_UI_PORTRAIT) - #define MEDIA_BTN_POS BTN_POS(1,8), BTN_SIZE(2,1) - #define MENU_BTN_POS BTN_POS(3,8), BTN_SIZE(2,1) - #else - #define MEDIA_BTN_POS BTN_POS(1,7), BTN_SIZE(2,2) - #define MENU_BTN_POS BTN_POS(3,7), BTN_SIZE(2,2) - #endif - const bool has_media = isMediaInserted() && !isPrintingFromMedia(); CommandProcessor cmd; @@ -274,29 +273,42 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) { .font(Theme::font_medium) .enabled(has_media) .colors(has_media ? action_btn : normal_btn) - .tag(3).button(MEDIA_BTN_POS, isPrintingFromMedia() ? GET_TEXT_F(MSG_PRINTING) : GET_TEXT_F(MSG_BUTTON_MEDIA)) - .colors(!has_media ? action_btn : normal_btn) - .tag(4).button( MENU_BTN_POS, GET_TEXT_F(MSG_BUTTON_MENU)); + .tag(3).button( + #ifdef TOUCH_UI_PORTRAIT + BTN_POS(1,8), BTN_SIZE(2,1), + #else + BTN_POS(1,7), BTN_SIZE(2,2), + #endif + isPrintingFromMedia() ? GET_TEXT_F(MSG_PRINTING) : GET_TEXT_F(MSG_BUTTON_MEDIA) + ).colors(!has_media ? action_btn : normal_btn) + #ifdef TOUCH_UI_PORTRAIT + .tag(4).button( BTN_POS(3,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_MENU)); + #else + .tag(4).button( BTN_POS(3,7), BTN_SIZE(2,2), GET_TEXT_F(MSG_BUTTON_MENU)); + #endif } #undef GRID_COLS } void StatusScreen::draw_status_message(draw_mode_t what, const char* message) { #define GRID_COLS 1 - - #if ENABLED(TOUCH_UI_PORTRAIT) - #define STATUS_POS BTN_POS(1,4), BTN_SIZE(1,1) - #else - #define STATUS_POS BTN_POS(1,3), BTN_SIZE(1,2) - #endif - if (what & BACKGROUND) { CommandProcessor cmd; cmd.fgcolor(Theme::status_msg) .tag(0) - .button( STATUS_POS, F(""), OPT_FLAT); + #ifdef TOUCH_UI_PORTRAIT + .button( BTN_POS(1,4), BTN_SIZE(1,1), F(""), OPT_FLAT); + #else + .button( BTN_POS(1,3), BTN_SIZE(1,2), F(""), OPT_FLAT); + #endif - draw_text_box(cmd, STATUS_POS, message, OPT_CENTER, font_large); + draw_text_box(cmd, + #ifdef TOUCH_UI_PORTRAIT + BTN_POS(1,4), BTN_SIZE(1,1), + #else + BTN_POS(1,3), BTN_SIZE(1,2), + #endif + message, OPT_CENTER, font_large); } #undef GRID_COLS } @@ -314,10 +326,10 @@ void StatusScreen::setStatusMessage(const char* message) { .cmd(CLEAR(true,true,true)); draw_temperature(BACKGROUND); - draw_status_message(BACKGROUND, message); - draw_interaction_buttons(BACKGROUND); draw_progress(BACKGROUND); draw_axis_position(BACKGROUND); + draw_status_message(BACKGROUND, message); + draw_interaction_buttons(BACKGROUND); storeBackground(); diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h diff --git a/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h new file mode 100644 index 0000000..933e91d --- /dev/null +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h @@ -0,0 +1,149 @@ +/************ + * colors.h * + ************/ + +/**************************************************************************** + * Written By Mark Pelletier 2017 - Aleph Objects, Inc. * + * Written By Marcio Teixeira 2018 - Aleph Objects, Inc. * + * Written By Marcio Teixeira 2019 - Cocoa Press * + * * + * 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. * + * * + * To view a copy of the GNU General Public License, go to the following * + * location: . * + ****************************************************************************/ + +#pragma once + +namespace Theme { + #ifdef TOUCH_UI_LULZBOT_BIO + // The Lulzbot Bio uses the color PANTONE 2175C on the case silkscreen. + // This translates to HSL(208°, 100%, 39%) as an accent color on the GUI. + + constexpr int accent_hue = 208; + constexpr float accent_sat = 0.5; + + constexpr uint32_t logo_bg_rgb = 0xffffff; + constexpr uint32_t logo_fill_rgb = 0xffffff; + constexpr uint32_t logo_stroke_rgb = hsl_to_rgb(accent_hue, 1.0, 0.39); + #else + // The Lulzbot logo uses the color PANTONE 382c. + // This translates to HSL(68°, 68%, 52%) as an accent color on the GUI. + + constexpr int accent_hue = 68; + constexpr float accent_sat = 0.68; + + constexpr uint32_t logo_bg_rgb = hsl_to_rgb(accent_hue, 0.77, 0.64); + constexpr uint32_t logo_fill_rgb = hsl_to_rgb(accent_hue, 0.68, 0.52); // Lulzbot Green + constexpr uint32_t logo_stroke_rgb = 0x000000; + #endif + + // Shades of accent color + + #ifdef TOUCH_UI_COCOA_PRESS + constexpr uint32_t accent_color_1 = hsl_to_rgb(12.8,0.597,0.263); // Darkest + constexpr uint32_t accent_color_2 = hsl_to_rgb(12.8,0.597,0.263); + constexpr uint32_t accent_color_3 = hsl_to_rgb( 9.6,0.664,0.443); + constexpr uint32_t accent_color_4 = hsl_to_rgb(16.3,0.873,0.537); + constexpr uint32_t accent_color_5 = hsl_to_rgb(23.0,0.889,0.539); + constexpr uint32_t accent_color_6 = hsl_to_rgb(23.0,0.889,0.539); // Lightest + #else + constexpr uint32_t accent_color_1 = hsl_to_rgb(accent_hue, accent_sat, 0.26); // Darkest + constexpr uint32_t accent_color_2 = hsl_to_rgb(accent_hue, accent_sat, 0.39); + constexpr uint32_t accent_color_3 = hsl_to_rgb(accent_hue, accent_sat, 0.52); + constexpr uint32_t accent_color_4 = hsl_to_rgb(accent_hue, accent_sat, 0.65); + constexpr uint32_t accent_color_5 = hsl_to_rgb(accent_hue, accent_sat, 0.78); + constexpr uint32_t accent_color_6 = hsl_to_rgb(accent_hue, accent_sat, 0.91); // Lightest + #endif + + // Shades of gray + + constexpr float gray_sat = 0.14; + + constexpr uint32_t gray_color_1 = hsl_to_rgb(accent_hue, gray_sat, 0.26); // Darkest + constexpr uint32_t gray_color_2 = hsl_to_rgb(accent_hue, gray_sat, 0.39); + constexpr uint32_t gray_color_3 = hsl_to_rgb(accent_hue, gray_sat, 0.52); + constexpr uint32_t gray_color_4 = hsl_to_rgb(accent_hue, gray_sat, 0.65); + constexpr uint32_t gray_color_5 = hsl_to_rgb(accent_hue, gray_sat, 0.78); + constexpr uint32_t gray_color_6 = hsl_to_rgb(accent_hue, gray_sat, 0.91); // Lightest + + #if NONE(TOUCH_UI_LULZBOT_BIO, TOUCH_UI_COCOA_PRESS) + // Lulzbot TAZ Pro + constexpr uint32_t theme_darkest = gray_color_1; + constexpr uint32_t theme_dark = gray_color_2; + + constexpr uint32_t bg_color = theme_darkest; + constexpr uint32_t bg_text_disabled = theme_dark; + constexpr uint32_t bg_text_enabled = 0xFFFFFF; + constexpr uint32_t bg_normal = theme_darkest; + + constexpr uint32_t fg_normal = theme_dark; + constexpr uint32_t fg_action = accent_color_2; + constexpr uint32_t fg_disabled = theme_darkest; + #else + // Lulzbot Bio + constexpr uint32_t theme_darkest = accent_color_1; + constexpr uint32_t theme_dark = accent_color_4; + + constexpr uint32_t bg_color = 0xFFFFFF; + constexpr uint32_t bg_text_disabled = gray_color_1; + constexpr uint32_t bg_text_enabled = accent_color_1; + constexpr uint32_t bg_normal = accent_color_4; + + constexpr uint32_t fg_normal = accent_color_1; + constexpr uint32_t fg_action = accent_color_4; + constexpr uint32_t fg_disabled = gray_color_6; + + constexpr uint32_t shadow_rgb = gray_color_6; + constexpr uint32_t stroke_rgb = accent_color_1; + constexpr uint32_t fill_rgb = accent_color_3; + constexpr uint32_t syringe_rgb = accent_color_5; + #endif + + constexpr uint32_t x_axis = 0xFF0000; + constexpr uint32_t y_axis = 0x00BB00; + constexpr uint32_t z_axis = 0x0000BF; + constexpr uint32_t e_axis = gray_color_2; + constexpr uint32_t feedrate = gray_color_2; + constexpr uint32_t other = gray_color_2; + + // Status screen + constexpr uint32_t progress = gray_color_2; + constexpr uint32_t status_msg = gray_color_2; + constexpr uint32_t fan_speed = 0x377198; + constexpr uint32_t temp = 0x892c78; + constexpr uint32_t axis_label = gray_color_2; + + constexpr uint32_t disabled_icon = gray_color_1; + + // Calibration Registers Screen + constexpr uint32_t transformA = 0x3010D0; + constexpr uint32_t transformB = 0x4010D0; + constexpr uint32_t transformC = 0x5010D0; + constexpr uint32_t transformD = 0x6010D0; + constexpr uint32_t transformE = 0x7010D0; + constexpr uint32_t transformF = 0x8010D0; + constexpr uint32_t transformVal = 0x104010; + + constexpr btn_colors disabled_btn = {.bg = bg_color, .grad = fg_disabled, .fg = fg_disabled, .rgb = fg_disabled }; + constexpr btn_colors normal_btn = {.bg = fg_action, .grad = 0xFFFFFF, .fg = fg_normal, .rgb = 0xFFFFFF }; + constexpr btn_colors action_btn = {.bg = bg_color, .grad = 0xFFFFFF, .fg = fg_action, .rgb = 0xFFFFFF }; + constexpr btn_colors red_btn = {.bg = 0xFF5555, .grad = 0xFFFFFF, .fg = 0xFF0000, .rgb = 0xFFFFFF }; + constexpr btn_colors ui_slider = {.bg = theme_darkest, .grad = 0xFFFFFF, .fg = theme_dark, .rgb = accent_color_3 }; + constexpr btn_colors ui_toggle = {.bg = theme_darkest, .grad = 0xFFFFFF, .fg = theme_dark, .rgb = 0xFFFFFF }; + + // Temperature color scale + + const rgb_t cool_rgb ( 0, 0, 0); + const rgb_t low_rgb (128, 0, 0); + const rgb_t med_rgb (255, 128, 0); + const rgb_t high_rgb (255, 255, 128); +}; diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h index a65cbea..5e01f04 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h @@ -35,5 +35,5 @@ const PROGMEM uint16_t logo_stroke[] = {0xADF3, 0x546C, 0x419D, 0x546F, 0x3D05, #define LOGO_BACKGROUND logo_bg_rgb #define LOGO_PAINT_PATHS \ - LOGO_PAINT_PATH(logo_fill_rgb, logo_fill) \ - LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke) + LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke) \ + LOGO_PAINT_PATH(logo_fill_rgb, logo_fill) diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h index a9c1d40..a5af7a1 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h @@ -35,5 +35,5 @@ const PROGMEM uint16_t logo_stroke[] = {0x3C19, 0x70C5, 0x371A, 0x7159, 0x3302, #define LOGO_BACKGROUND logo_bg_rgb #define LOGO_PAINT_PATHS \ - LOGO_PAINT_PATH(logo_fill_rgb, logo_fill) \ - LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke) + LOGO_PAINT_PATH(logo_stroke_rgb, logo_stroke) \ + LOGO_PAINT_PATH(logo_fill_rgb, logo_fill) diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/ui_api.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/ui_api.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/ui_api.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/ui_api.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/ui_api.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/ui_api.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui/ui_api.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/ui_api.h index 01e0d1b..61fecae 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui/ui_api.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui/ui_api.h @@ -341,10 +341,10 @@ namespace ExtUI { void onConfigurationStoreWritten(bool success); void onConfigurationStoreRead(bool success); #if ENABLED(POWER_LOSS_RECOVERY) - void onPowerLossResume(); + void OnPowerLossResume(); #endif #if HAS_PID_HEATING - void onPidTuning(const result_t rst); + void OnPidTuning(const result_t rst); #endif }; diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui_dgus_lcd.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui_dgus_lcd.cpp similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui_dgus_lcd.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui_dgus_lcd.cpp index 855d090..66a58f8 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui_dgus_lcd.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui_dgus_lcd.cpp @@ -123,7 +123,7 @@ namespace ExtUI { } #if ENABLED(POWER_LOSS_RECOVERY) - void onPowerLossResume() { + void OnPowerLossResume() { // Called on resume from power-loss ScreenHandler.GotoScreen(DGUSLCD_SCREEN_POWER_LOSS); } @@ -131,9 +131,9 @@ namespace ExtUI { #if HAS_PID_HEATING - void onPidTuning(const result_t rst) { + void OnPidTuning(const result_t rst) { // Called for temperature PID tuning result - SERIAL_ECHOLNPAIR("onPidTuning:",rst); + SERIAL_ECHOLNPAIR("OnPidTuning:",rst); switch(rst) { case PID_BAD_EXTRUDER_NUM: ScreenHandler.setstatusmessagePGM(PSTR(STR_PID_BAD_EXTRUDER_NUM)); diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui_example.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui_example.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui_example.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui_example.cpp index 5c9a193..741787d 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui_example.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui_example.cpp @@ -94,13 +94,13 @@ namespace ExtUI { } #if ENABLED(POWER_LOSS_RECOVERY) - void onPowerLossResume() { + void OnPowerLossResume() { // Called on resume from power-loss } #endif #if HAS_PID_HEATING - void onPidTuning(const result_t rst) { + void OnPidTuning(const result_t rst) { // Called for temperature PID tuning result } #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/extui_malyan_lcd.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui_malyan_lcd.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/extui_malyan_lcd.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui_malyan_lcd.cpp index ddb8b84..0bb8060 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/extui_malyan_lcd.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/extui_malyan_lcd.cpp @@ -483,7 +483,7 @@ namespace ExtUI { void onLoadSettings(const char*) {} void onConfigurationStoreWritten(bool) {} void onConfigurationStoreRead(bool) {} - void onPidTuning(const result_t) {} + void OnPidTuning(const result_t) {} } #endif // MALYAN_LCD diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/fontutils.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/fontutils.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/fontutils.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/fontutils.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/fontutils.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/fontutils.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/fontutils.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/fontutils.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_an.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_an.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_an.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_an.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_bg.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_bg.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_bg.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_bg.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_ca.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_ca.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_ca.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_ca.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_cz.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_cz.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_cz.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_cz.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_da.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_da.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_da.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_da.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_de.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_de.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_de.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_de.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_el.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_el.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_el.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_el.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_el_gr.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_el_gr.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_el_gr.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_el_gr.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_en.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_en.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_en.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_en.h index a52d965..75c13de 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_en.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_en.h @@ -352,7 +352,6 @@ namespace Language_en { PROGMEM Language_Str MSG_PRINT_PAUSED = _UxGT("Print Paused"); PROGMEM Language_Str MSG_PRINTING = _UxGT("Printing..."); PROGMEM Language_Str MSG_PRINT_ABORTED = _UxGT("Print Aborted"); - PROGMEM Language_Str MSG_PRINT_DONE = _UxGT("Print Done"); PROGMEM Language_Str MSG_NO_MOVE = _UxGT("No Move."); PROGMEM Language_Str MSG_KILLED = _UxGT("KILLED. "); PROGMEM Language_Str MSG_STOPPED = _UxGT("STOPPED. "); @@ -602,9 +601,6 @@ namespace Language_en { PROGMEM Language_Str MSG_BACKLASH_C = LCD_STR_C; PROGMEM Language_Str MSG_BACKLASH_CORRECTION = _UxGT("Correction"); PROGMEM Language_Str MSG_BACKLASH_SMOOTHING = _UxGT("Smoothing"); - - PROGMEM Language_Str MSG_LEVEL_X_AXIS = _UxGT("Level X Axis"); - PROGMEM Language_Str MSG_AUTO_CALIBRATE = _UxGT("Auto Calibrate"); } #if FAN_COUNT == 1 diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_es.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_es.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_es.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_es.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_eu.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_eu.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_eu.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_eu.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_fi.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_fi.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_fi.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_fi.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_fr.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_fr.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_fr.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_fr.h index e691d26..ffa12f3 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_fr.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_fr.h @@ -93,7 +93,7 @@ namespace Language_fr { PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Allumer alim."); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Eteindre alim."); PROGMEM Language_Str MSG_EXTRUDE = _UxGT("Extrusion"); - PROGMEM Language_Str MSG_RETRACT = _UxGT("Rétractation"); + PROGMEM Language_Str MSG_RETRACT = _UxGT("Rétraction"); PROGMEM Language_Str MSG_MOVE_AXIS = _UxGT("Déplacer un axe"); PROGMEM Language_Str MSG_BED_LEVELING = _UxGT("Régler Niv. lit"); PROGMEM Language_Str MSG_LEVEL_BED = _UxGT("Niveau du lit"); @@ -317,7 +317,7 @@ namespace Language_fr { PROGMEM Language_Str MSG_NO_MOVE = _UxGT("Moteurs bloqués"); PROGMEM Language_Str MSG_KILLED = _UxGT("KILLED"); PROGMEM Language_Str MSG_STOPPED = _UxGT("STOPPÉ"); - PROGMEM Language_Str MSG_CONTROL_RETRACT = _UxGT("Rétractation mm"); + PROGMEM Language_Str MSG_CONTROL_RETRACT = _UxGT("Rétraction mm"); PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP = _UxGT("Ech. rétr. mm"); PROGMEM Language_Str MSG_CONTROL_RETRACTF = _UxGT("Vit. rétract°"); PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP = _UxGT("Saut Z mm"); diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_gl.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_gl.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_gl.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_gl.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_hr.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_hr.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_hr.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_hr.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_it.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_it.h similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_it.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_it.h index 8d8112d..ae4dd81 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_it.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_it.h @@ -245,11 +245,6 @@ namespace Language_it { PROGMEM Language_Str MSG_STORED_FAN_N = _UxGT("Ventola mem. ~"); // Max 15 characters PROGMEM Language_Str MSG_EXTRA_FAN_SPEED = _UxGT("Extra vel.vent."); // Max 15 characters PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N = _UxGT("Extra v.vent. ~"); // Max 15 characters - PROGMEM Language_Str MSG_CONTROLLER_FAN = _UxGT("Controller vent."); - PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED = _UxGT("Vel. inattivo"); - PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON = _UxGT("Modo autom."); - PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED = _UxGT("Vel. attivo"); - PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION = _UxGT("Tempo inattivo"); PROGMEM Language_Str MSG_FLOW = _UxGT("Flusso"); PROGMEM Language_Str MSG_FLOW_N = _UxGT("Flusso ~"); PROGMEM Language_Str MSG_CONTROL = _UxGT("Controllo"); @@ -317,9 +312,6 @@ namespace Language_it { PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Carica impostazioni"); PROGMEM Language_Str MSG_RESTORE_DEFAULTS = _UxGT("Ripristina imp."); PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("Inizializza EEPROM"); - PROGMEM Language_Str MSG_ERR_EEPROM_CRC = _UxGT("Err: CRC EEPROM"); - PROGMEM Language_Str MSG_ERR_EEPROM_INDEX = _UxGT("Err: Indice EEPROM"); - PROGMEM Language_Str MSG_ERR_EEPROM_VERSION = _UxGT("Err: Versione EEPROM"); PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Aggiorna media"); PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Resetta stampante"); PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Aggiorna"); diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_jp_kana.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_jp_kana.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_jp_kana.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_jp_kana.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_ko_KR.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_ko_KR.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_ko_KR.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_ko_KR.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_nl.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_nl.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_nl.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_nl.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_pl.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_pl.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_pl.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_pl.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_pt.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_pt.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_pt.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_pt.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_pt_br.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_pt_br.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_pt_br.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_pt_br.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_ru.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_ru.h similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_ru.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_ru.h index a7c971e..82c91c6 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_ru.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_ru.h @@ -222,11 +222,6 @@ namespace Language_ru { PROGMEM Language_Str MSG_FAN_SPEED_N = _UxGT("Кулер ~"); PROGMEM Language_Str MSG_EXTRA_FAN_SPEED = _UxGT("Кулер доп."); PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N = _UxGT("Кулер доп. ~"); - PROGMEM Language_Str MSG_CONTROLLER_FAN = _UxGT("Обдув платы"); - PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED = _UxGT("Обороты простоя"); - PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON = _UxGT("Автовключение"); - PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED = _UxGT("Рабочие обороты"); - PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION = _UxGT("Простой после"); PROGMEM Language_Str MSG_FLOW = _UxGT("Поток"); PROGMEM Language_Str MSG_FLOW_N = _UxGT("Поток ~"); PROGMEM Language_Str MSG_CONTROL = _UxGT("Настройки"); diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_sk.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_sk.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_sk.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_sk.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_test.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_test.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_test.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_test.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_tr.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_tr.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_tr.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_tr.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_uk.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_uk.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_uk.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_uk.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_vi.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_vi.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_vi.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_vi.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_zh_CN.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_zh_CN.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_zh_CN.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_zh_CN.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/language/language_zh_TW.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_zh_TW.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/language/language_zh_TW.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/language/language_zh_TW.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/lcdprint.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/lcdprint.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/lcdprint.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/lcdprint.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/lcdprint.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/lcdprint.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/lcdprint.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/lcdprint.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/brickout.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/brickout.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/brickout.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/brickout.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/brickout.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/brickout.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/brickout.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/brickout.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/game.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/game.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/game.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/game.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/game.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/game.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/game.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/game.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/invaders.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/invaders.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/invaders.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/invaders.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/invaders.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/invaders.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/invaders.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/invaders.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/maze.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/maze.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/maze.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/maze.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/maze.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/maze.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/maze.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/maze.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/snake.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/snake.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/snake.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/snake.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/snake.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/snake.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/snake.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/snake.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/types.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/types.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/game/types.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/game/types.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_addon.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_addon.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_addon.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_addon.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_advanced.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_advanced.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_advanced.cpp index f2327b7..ca02dc9 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_advanced.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_advanced.cpp @@ -84,7 +84,7 @@ void menu_cancelobject(); START_MENU(); BACK_ITEM(MSG_ADVANCED_SETTINGS); #define EDIT_CURRENT_PWM(LABEL,I) EDIT_ITEM_P(long5, PSTR(LABEL), &stepper.motor_current_setting[I], 100, 2000, stepper.refresh_motor_power) - #if ANY_PIN(MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y) + #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY) EDIT_CURRENT_PWM(STR_X STR_Y, 0); #endif #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z) @@ -376,12 +376,12 @@ void menu_cancelobject(); START_MENU(); BACK_ITEM(MSG_ADVANCED_SETTINGS); - const float max_accel = _MAX(planner.settings.max_acceleration_mm_per_s2[A_AXIS], planner.settings.max_acceleration_mm_per_s2[B_AXIS], planner.settings.max_acceleration_mm_per_s2[C_AXIS]); + static float max_accel = _MAX(planner.settings.max_acceleration_mm_per_s2[A_AXIS], planner.settings.max_acceleration_mm_per_s2[B_AXIS], planner.settings.max_acceleration_mm_per_s2[C_AXIS]); // M204 P Acceleration EDIT_ITEM_FAST(float5_25, MSG_ACC, &planner.settings.acceleration, 25, max_accel); // M204 R Retract Acceleration - EDIT_ITEM_FAST(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)]); + EDIT_ITEM_FAST(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, max_accel); // M204 T Travel Acceleration EDIT_ITEM_FAST(float5_25, MSG_A_TRAVEL, &planner.settings.travel_acceleration, 25, max_accel); diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_backlash.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_backlash.cpp similarity index 89% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_backlash.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_backlash.cpp index 720694b..ad9c51d 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_backlash.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_backlash.cpp @@ -39,9 +39,9 @@ void menu_backlash() { EDIT_ITEM_FAST(percent, MSG_BACKLASH_CORRECTION, &backlash.correction, all_off, all_on); #define EDIT_BACKLASH_DISTANCE(N) EDIT_ITEM_FAST(float43, MSG_BACKLASH_##N, &backlash.distance_mm[_AXIS(N)], 0.0f, 9.9f); - if (AXIS_CAN_CALIBRATE(A)) EDIT_BACKLASH_DISTANCE(A); - if (AXIS_CAN_CALIBRATE(B)) EDIT_BACKLASH_DISTANCE(B); - if (AXIS_CAN_CALIBRATE(C)) EDIT_BACKLASH_DISTANCE(C); + EDIT_BACKLASH_DISTANCE(A); + EDIT_BACKLASH_DISTANCE(B); + EDIT_BACKLASH_DISTANCE(C); #ifdef BACKLASH_SMOOTHING_MM EDIT_ITEM_FAST(float43, MSG_BACKLASH_SMOOTHING, &backlash.smoothing_mm, 0.0f, 9.9f); diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_bed_corners.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_bed_corners.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_bed_corners.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_bed_leveling.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_bed_leveling.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_bed_leveling.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_cancelobject.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_cancelobject.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_cancelobject.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_cancelobject.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_configuration.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_configuration.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_configuration.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_custom.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_custom.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_custom.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_custom.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_delta_calibrate.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_delta_calibrate.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_delta_calibrate.cpp index ac80870..a27e2c9 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_delta_calibrate.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_delta_calibrate.cpp @@ -61,14 +61,16 @@ void _man_probe_pt(const xy_pos_t &xy) { float lcd_probe_pt(const xy_pos_t &xy) { _man_probe_pt(xy); + KEEPALIVE_STATE(PAUSED_FOR_USER); ui.defer_status_screen(); + wait_for_user = true; #if ENABLED(HOST_PROMPT_SUPPORT) host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Delta Calibration in progress"), CONTINUE_STR); #endif #if ENABLED(EXTENSIBLE_UI) ExtUI::onUserConfirmRequired_P(PSTR("Delta Calibration in progress")); #endif - wait_for_user_response(); + while (wait_for_user) idle(); ui.goto_previous_screen_no_defer(); return current_position.z; } diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_filament.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_filament.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_filament.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_game.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_game.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_game.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_game.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_info.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_info.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_info.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_info.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_job_recovery.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_job_recovery.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_job_recovery.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_job_recovery.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_led.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_led.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_led.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_led.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_main.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_main.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_main.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_main.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_media.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_media.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_media.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_media.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_mixer.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_mixer.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_mixer.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_mixer.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_mmu2.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_mmu2.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_mmu2.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_mmu2.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_mmu2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_mmu2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_mmu2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_mmu2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_motion.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_motion.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_motion.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_spindle_laser.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_spindle_laser.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_spindle_laser.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_temperature.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_temperature.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_temperature.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_tmc.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_tmc.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_tmc.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_tune.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_tune.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_tune.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_ubl.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/menu/menu_ubl.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/menu/menu_ubl.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/thermistornames.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/thermistornames.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/thermistornames.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/thermistornames.h diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/ultralcd.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/ultralcd.cpp similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/ultralcd.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/ultralcd.cpp index bbcb678..1cb23ba 100644 --- a/2.0.5-bigTreeTech/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/ultralcd.cpp @@ -524,7 +524,7 @@ void MarlinUI::status_screen() { #if PROGRESS_MSG_EXPIRE > 0 // Handle message expire - if (expire_status_ms) { + if (expire_status_ms > 0) { // Expire the message if a job is active and the bar has ticks if (get_progress_percent() > 2 && !print_job_timer.isPaused()) { @@ -776,13 +776,6 @@ void MarlinUI::update() { // If the action button is pressed... static bool wait_for_unclick; // = false - auto do_click = [&]{ - wait_for_unclick = true; // - Set debounce flag to ignore continous clicks - lcd_clicked = !wait_for_user && !no_reentry; // - Keep the click if not waiting for a user-click - wait_for_user = false; // - Any click clears wait for user - quick_feedback(); // - Always make a click sound - }; - #if ENABLED(TOUCH_BUTTONS) if (touch_buttons) { RESET_STATUS_TIMEOUT(); @@ -803,8 +796,12 @@ void MarlinUI::update() { } } } - else if (!wait_for_unclick && (buttons & EN_C)) // OK button, if not waiting for a debounce release: - do_click(); + else if (!wait_for_unclick && (buttons & EN_C)) { // OK button, if not waiting for a debounce release: + wait_for_unclick = true; // - Set debounce flag to ignore continous clicks + lcd_clicked = !wait_for_user && !no_reentry; // - Keep the click if not waiting for a user-click + wait_for_user = false; // - Any click clears wait for user + quick_feedback(); // - Always make a click sound + } } else // keep wait_for_unclick value @@ -813,7 +810,12 @@ void MarlinUI::update() { { // Integrated LCD click handling via button_pressed if (!external_control && button_pressed()) { - if (!wait_for_unclick) do_click(); // Handle the click + if (!wait_for_unclick) { // If not waiting for a debounce release: + wait_for_unclick = true; // - Set debounce flag to ignore continous clicks + lcd_clicked = !wait_for_user && !no_reentry; // - Keep the click if not waiting for a user-click + wait_for_user = false; // - Any click clears wait for user + quick_feedback(); // - Always make a click sound + } } else wait_for_unclick = false; @@ -1335,19 +1337,15 @@ void MarlinUI::update() { UNUSED(persist); #endif - #if ENABLED(LCD_PROGRESS_BAR) || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT) - const millis_t ms = millis(); - #endif - #if ENABLED(LCD_PROGRESS_BAR) - progress_bar_ms = ms; + progress_bar_ms = millis(); #if PROGRESS_MSG_EXPIRE > 0 - expire_status_ms = persist ? 0 : ms + PROGRESS_MSG_EXPIRE; + expire_status_ms = persist ? 0 : progress_bar_ms + PROGRESS_MSG_EXPIRE; #endif #endif #if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT) - next_filament_display = ms + 5000UL; // Show status message for 5s + next_filament_display = millis() + 5000UL; // Show status message for 5s #endif #if HAS_SPI_LCD && ENABLED(STATUS_MESSAGE_SCROLLING) diff --git a/2.0.5-bigTreeTech/Marlin/src/lcd/ultralcd.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/ultralcd.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/lcd/ultralcd.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/lcd/ultralcd.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/L64XX/L64XX_Marlin.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/L64XX/L64XX_Marlin.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/L64XX/L64XX_Marlin.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/L64XX/L64XX_Marlin.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/L64XX/L64XX_Marlin.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/L64XX/L64XX_Marlin.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/L64XX/L64XX_Marlin.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/L64XX/README.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/L64XX/README.md similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/L64XX/README.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/L64XX/README.md diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/bresenham.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/bresenham.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/bresenham.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/bresenham.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/buzzer.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/buzzer.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/buzzer.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/buzzer.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/buzzer.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/buzzer.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/buzzer.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/buzzer.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/circularqueue.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/circularqueue.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/circularqueue.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/circularqueue.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/crc16.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/crc16.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/crc16.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/crc16.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/crc16.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/crc16.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/crc16.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/crc16.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/duration_t.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/duration_t.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/duration_t.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/duration_t.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/heatshrink/LICENSE b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/heatshrink/LICENSE similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/heatshrink/LICENSE rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/heatshrink/LICENSE diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/heatshrink/heatshrink_common.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/heatshrink/heatshrink_common.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/heatshrink/heatshrink_common.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/heatshrink/heatshrink_common.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/heatshrink/heatshrink_config.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/heatshrink/heatshrink_config.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/heatshrink/heatshrink_config.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/heatshrink/heatshrink_config.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/heatshrink/heatshrink_decoder.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/heatshrink/heatshrink_decoder.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/heatshrink/heatshrink_decoder.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/heatshrink/heatshrink_decoder.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/heatshrink/heatshrink_decoder.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/heatshrink/heatshrink_decoder.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/heatshrink/heatshrink_decoder.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/heatshrink/heatshrink_decoder.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/hex_print_routines.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/hex_print_routines.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/hex_print_routines.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/hex_print_routines.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/hex_print_routines.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/hex_print_routines.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/hex_print_routines.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/hex_print_routines.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/least_squares_fit.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/least_squares_fit.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/least_squares_fit.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/least_squares_fit.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/least_squares_fit.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/least_squares_fit.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/least_squares_fit.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/least_squares_fit.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/nozzle.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/nozzle.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/nozzle.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/nozzle.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/nozzle.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/nozzle.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/nozzle.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/nozzle.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/numtostr.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/numtostr.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/libs/numtostr.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/numtostr.cpp index 1ed315a..ac82bf1 100644 --- a/2.0.5-bigTreeTech/Marlin/src/libs/numtostr.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/numtostr.cpp @@ -312,7 +312,7 @@ const char* ftostr52sign(const float &f) { // Convert signed float to string with +12.345 format const char* ftostr53sign(const float &f) { - long i = (f * 10000 + (f < 0 ? -5: 5)) / 10; + long i = (f * 1000 + (f < 0 ? -5: 5)) / 10; conv[0] = MINUSOR(i, '+'); conv[1] = DIGIMOD(i, 10000); conv[2] = DIGIMOD(i, 1000); diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/numtostr.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/numtostr.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/numtostr.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/numtostr.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/private_spi.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/private_spi.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/private_spi.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/private_spi.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/softspi.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/softspi.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/softspi.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/softspi.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/stopwatch.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/stopwatch.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/stopwatch.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/stopwatch.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/stopwatch.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/stopwatch.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/stopwatch.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/stopwatch.h diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/vector_3.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/vector_3.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/vector_3.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/vector_3.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/libs/vector_3.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/vector_3.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/libs/vector_3.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/libs/vector_3.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/configuration_store.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/configuration_store.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/module/configuration_store.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/configuration_store.cpp index 2ecc929..4b7946c 100644 --- a/2.0.5-bigTreeTech/Marlin/src/module/configuration_store.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/configuration_store.cpp @@ -57,7 +57,7 @@ #include "../MarlinCore.h" #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE) - #include "../HAL/shared/eeprom_api.h" + #include "../HAL/shared/persistent_store_api.h" #endif #include "probe.h" @@ -127,11 +127,6 @@ void M710_report(const bool forReplay); #endif -#define HAS_CASE_LIGHT_BRIGHTNESS (ENABLED(CASE_LIGHT_MENU) && DISABLED(CASE_LIGHT_NO_BRIGHTNESS)) -#if HAS_CASE_LIGHT_BRIGHTNESS - #include "../feature/caselight.h" -#endif - #pragma pack(push, 1) // No padding between variables typedef struct { uint16_t X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5; } tmc_stepper_current_t; @@ -381,13 +376,6 @@ typedef struct SettingsDataStruct { uint8_t extui_data[ExtUI::eeprom_data_size]; #endif - // - // HAS_CASE_LIGHT_BRIGHTNESS - // - #if HAS_CASE_LIGHT_BRIGHTNESS - uint8_t case_light_brightness; - #endif - } SettingsData; //static_assert(sizeof(SettingsData) <= E2END + 1, "EEPROM too small to contain SettingsData!"); @@ -453,10 +441,6 @@ void MarlinSettings::postprocess() { planner.recalculate_max_e_jerk(); #endif - #if HAS_CASE_LIGHT_BRIGHTNESS - update_case_light(); - #endif - // Refresh steps_to_mm with the reciprocal of axis_steps_per_mm // and init stepper.count[], planner.position[] with current_position planner.refresh_positioning(); @@ -1247,7 +1231,7 @@ void MarlinSettings::postprocess() { #if HAS_MOTOR_CURRENT_PWM EEPROM_WRITE(stepper.motor_current_setting); #else - const uint32_t no_current[3] = { 0 }; + const xyz_ulong_t no_current{0}; EEPROM_WRITE(no_current); #endif } @@ -1325,13 +1309,6 @@ void MarlinSettings::postprocess() { } #endif - // - // Case Light Brightness - // - #if HAS_CASE_LIGHT_BRIGHTNESS - EEPROM_WRITE(case_light_brightness); - #endif - // // Validate CRC and Data Size // @@ -2186,14 +2163,6 @@ void MarlinSettings::postprocess() { } #endif - // - // Case Light Brightness - // - #if HAS_CASE_LIGHT_BRIGHTNESS - _FIELD_TEST(case_light_brightness); - EEPROM_READ(case_light_brightness); - #endif - eeprom_error = size_error(eeprom_index - (EEPROM_OFFSET)); if (eeprom_error) { DEBUG_ECHO_START(); @@ -2489,14 +2458,6 @@ void MarlinSettings::reset() { ExtUI::onFactoryReset(); #endif - // - // Case Light Brightness - // - - #if HAS_CASE_LIGHT_BRIGHTNESS - case_light_brightness = CASE_LIGHT_DEFAULT_BRIGHTNESS; - #endif - // // Magnetic Parking Extruder // @@ -2735,7 +2696,7 @@ void MarlinSettings::reset() { #if HAS_MOTOR_CURRENT_PWM constexpr uint32_t tmp_motor_current_setting[3] = PWM_MOTOR_CURRENT; - LOOP_L_N(q, 3) + for (uint8_t q = 3; q--;) stepper.digipot_current(q, (stepper.motor_current_setting[q] = tmp_motor_current_setting[q])); #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/module/configuration_store.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/configuration_store.h similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/module/configuration_store.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/configuration_store.h index f2e84c9..a2c8d97 100644 --- a/2.0.5-bigTreeTech/Marlin/src/module/configuration_store.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/configuration_store.h @@ -24,7 +24,7 @@ #include "../inc/MarlinConfig.h" #if ENABLED(EEPROM_SETTINGS) - #include "../HAL/shared/eeprom_api.h" + #include "../HAL/shared/persistent_store_api.h" #endif class MarlinSettings { diff --git a/2.0.5-bigTreeTech/Marlin/src/module/delta.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/delta.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/delta.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/delta.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/module/delta.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/delta.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/delta.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/delta.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/endstops.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/endstops.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/endstops.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/endstops.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/module/endstops.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/endstops.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/endstops.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/endstops.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/motion.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/motion.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/module/motion.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/motion.cpp index 1cc0a04..c1d8fce 100644 --- a/2.0.5-bigTreeTech/Marlin/src/module/motion.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/motion.cpp @@ -55,10 +55,6 @@ #include "../lcd/ultralcd.h" #endif -#if HAS_FILAMENT_SENSOR - #include "../feature/runout.h" -#endif - #if ENABLED(SENSORLESS_HOMING) #include "../feature/tmc_util.h" #endif @@ -222,6 +218,7 @@ inline void report_more_positions() { inline void report_logical_position(const xyze_pos_t &rpos) { const xyze_pos_t lpos = rpos.asLogical(); SERIAL_ECHOPAIR_P(X_LBL, lpos.x, SP_Y_LBL, lpos.y, SP_Z_LBL, lpos.z, SP_E_LBL, lpos.e); + report_more_positions(); } // Report the real current position according to the steppers. @@ -240,14 +237,10 @@ void report_real_position() { #endif report_logical_position(npos); - report_more_positions(); } // Report the logical current position according to the most recent G-code command -void report_current_position() { - report_logical_position(current_position); - report_more_positions(); -} +void report_current_position() { report_logical_position(current_position); } /** * Report the logical current position according to the most recent G-code command. @@ -336,17 +329,6 @@ void line_to_current_position(const feedRate_t &fr_mm_s/*=feedrate_mm_s*/) { planner.buffer_line(current_position, fr_mm_s, active_extruder); } -#if EXTRUDERS - void unscaled_e_move(const float &length, const feedRate_t &fr_mm_s) { - #if HAS_FILAMENT_SENSOR - runout.reset(); - #endif - current_position.e += length / planner.e_factor[active_extruder]; - line_to_current_position(fr_mm_s); - planner.synchronize(); - } -#endif - #if IS_KINEMATIC /** @@ -1307,14 +1289,12 @@ feedRate_t get_homing_bump_feedrate(const AxisEnum axis) { */ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t fr_mm_s=0.0) { - const feedRate_t real_fr_mm_s = fr_mm_s ?: homing_feedrate(axis); - if (DEBUGGING(LEVELING)) { DEBUG_ECHOPAIR(">>> do_homing_move(", axis_codes[axis], ", ", distance, ", "); if (fr_mm_s) DEBUG_ECHO(fr_mm_s); else - DEBUG_ECHOPAIR("[", real_fr_mm_s, "]"); + DEBUG_ECHOPAIR("[", homing_feedrate(axis), "]"); DEBUG_ECHOLNPGM(")"); } @@ -1348,6 +1328,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t #endif } + const feedRate_t real_fr_mm_s = fr_mm_s ?: homing_feedrate(axis); #if IS_SCARA // Tell the planner the axis is at 0 current_position[axis] = 0; @@ -1360,14 +1341,14 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t planner.set_machine_position_mm(target); target[axis] = distance; - #if HAS_DIST_MM_ARG - const xyze_float_t cart_dist_mm{0}; + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + const xyze_float_t delta_mm_cart{0}; #endif // Set delta/cartesian axes directly planner.buffer_segment(target - #if HAS_DIST_MM_ARG - , cart_dist_mm + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + , delta_mm_cart #endif , real_fr_mm_s, active_extruder ); @@ -1795,13 +1776,6 @@ void homeaxis(const AxisEnum axis) { #endif homing_feedrate(axis) ); - - #if ENABLED(SENSORLESS_HOMING) - planner.synchronize(); - #if IS_CORE - if (axis != NORMAL_AXIS) safe_delay(200); // Short delay to allow belts to spring back - #endif - #endif } #endif diff --git a/2.0.5-bigTreeTech/Marlin/src/module/motion.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/motion.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/module/motion.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/motion.h index e504f18..f6a75a9 100644 --- a/2.0.5-bigTreeTech/Marlin/src/module/motion.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/motion.h @@ -184,10 +184,6 @@ void sync_plan_position_e(); */ void line_to_current_position(const feedRate_t &fr_mm_s=feedrate_mm_s); -#if EXTRUDERS - void unscaled_e_move(const float &length, const feedRate_t &fr_mm_s); -#endif - void prepare_line_to_destination(); void _internal_move_to_destination(const feedRate_t &fr_mm_s=0.0f diff --git a/2.0.5-bigTreeTech/Marlin/src/module/planner.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/planner.cpp similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/module/planner.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/planner.cpp index e1a050a..3b2daf1 100644 --- a/2.0.5-bigTreeTech/Marlin/src/module/planner.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/planner.cpp @@ -1519,6 +1519,10 @@ void Planner::check_axes_activity() { #endif } + + #if ENABLED(SKEW_CORRECTION) + unskew(raw); + #endif } #endif // HAS_LEVELING @@ -1644,8 +1648,8 @@ bool Planner::_buffer_steps(const xyze_long_t &target #if HAS_POSITION_FLOAT , const xyze_pos_t &target_float #endif - #if HAS_DIST_MM_ARG - , const xyze_float_t &cart_dist_mm + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + , const xyze_float_t &delta_mm_cart #endif , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters ) { @@ -1662,8 +1666,8 @@ bool Planner::_buffer_steps(const xyze_long_t &target #if HAS_POSITION_FLOAT , target_float #endif - #if HAS_DIST_MM_ARG - , cart_dist_mm + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + , delta_mm_cart #endif , fr_mm_s, extruder, millimeters )) { @@ -1708,8 +1712,8 @@ bool Planner::_populate_block(block_t * const block, bool split_move, #if HAS_POSITION_FLOAT , const xyze_pos_t &target_float #endif - #if HAS_DIST_MM_ARG - , const xyze_float_t &cart_dist_mm + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + , const xyze_float_t &delta_mm_cart #endif , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/ ) { @@ -1836,51 +1840,51 @@ bool Planner::_populate_block(block_t * const block, bool split_move, * So we need to create other 2 "AXIS", named X_HEAD and Y_HEAD, meaning the real displacement of the Head. * Having the real displacement of the head, we can calculate the total movement length and apply the desired speed. */ - struct DistanceMM : abce_float_t { + struct DeltaMM : abce_float_t { #if IS_CORE xyz_pos_t head; #endif - } steps_dist_mm; + } delta_mm; #if IS_CORE #if CORE_IS_XY - steps_dist_mm.head.x = da * steps_to_mm[A_AXIS]; - steps_dist_mm.head.y = db * steps_to_mm[B_AXIS]; - steps_dist_mm.z = dc * steps_to_mm[Z_AXIS]; - steps_dist_mm.a = (da + db) * steps_to_mm[A_AXIS]; - steps_dist_mm.b = CORESIGN(da - db) * steps_to_mm[B_AXIS]; + delta_mm.head.x = da * steps_to_mm[A_AXIS]; + delta_mm.head.y = db * steps_to_mm[B_AXIS]; + delta_mm.z = dc * steps_to_mm[Z_AXIS]; + delta_mm.a = (da + db) * steps_to_mm[A_AXIS]; + delta_mm.b = CORESIGN(da - db) * steps_to_mm[B_AXIS]; #elif CORE_IS_XZ - steps_dist_mm.head.x = da * steps_to_mm[A_AXIS]; - steps_dist_mm.y = db * steps_to_mm[Y_AXIS]; - steps_dist_mm.head.z = dc * steps_to_mm[C_AXIS]; - steps_dist_mm.a = (da + dc) * steps_to_mm[A_AXIS]; - steps_dist_mm.c = CORESIGN(da - dc) * steps_to_mm[C_AXIS]; + delta_mm.head.x = da * steps_to_mm[A_AXIS]; + delta_mm.y = db * steps_to_mm[Y_AXIS]; + delta_mm.head.z = dc * steps_to_mm[C_AXIS]; + delta_mm.a = (da + dc) * steps_to_mm[A_AXIS]; + delta_mm.c = CORESIGN(da - dc) * steps_to_mm[C_AXIS]; #elif CORE_IS_YZ - steps_dist_mm.x = da * steps_to_mm[X_AXIS]; - steps_dist_mm.head.y = db * steps_to_mm[B_AXIS]; - steps_dist_mm.head.z = dc * steps_to_mm[C_AXIS]; - steps_dist_mm.b = (db + dc) * steps_to_mm[B_AXIS]; - steps_dist_mm.c = CORESIGN(db - dc) * steps_to_mm[C_AXIS]; + delta_mm.x = da * steps_to_mm[X_AXIS]; + delta_mm.head.y = db * steps_to_mm[B_AXIS]; + delta_mm.head.z = dc * steps_to_mm[C_AXIS]; + delta_mm.b = (db + dc) * steps_to_mm[B_AXIS]; + delta_mm.c = CORESIGN(db - dc) * steps_to_mm[C_AXIS]; #endif #else - steps_dist_mm.a = da * steps_to_mm[A_AXIS]; - steps_dist_mm.b = db * steps_to_mm[B_AXIS]; - steps_dist_mm.c = dc * steps_to_mm[C_AXIS]; + delta_mm.a = da * steps_to_mm[A_AXIS]; + delta_mm.b = db * steps_to_mm[B_AXIS]; + delta_mm.c = dc * steps_to_mm[C_AXIS]; #endif #if EXTRUDERS - steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)]; + delta_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)]; #else - steps_dist_mm.e = 0.0f; + delta_mm.e = 0.0f; #endif #if ENABLED(LCD_SHOW_E_TOTAL) - e_move_accumulator += steps_dist_mm.e; + e_move_accumulator += delta_mm.e; #endif if (block->steps.a < MIN_STEPS_PER_SEGMENT && block->steps.b < MIN_STEPS_PER_SEGMENT && block->steps.c < MIN_STEPS_PER_SEGMENT) { block->millimeters = (0 #if EXTRUDERS - + ABS(steps_dist_mm.e) + + ABS(delta_mm.e) #endif ); } @@ -1890,13 +1894,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move, else block->millimeters = SQRT( #if CORE_IS_XY - sq(steps_dist_mm.head.x) + sq(steps_dist_mm.head.y) + sq(steps_dist_mm.z) + sq(delta_mm.head.x) + sq(delta_mm.head.y) + sq(delta_mm.z) #elif CORE_IS_XZ - sq(steps_dist_mm.head.x) + sq(steps_dist_mm.y) + sq(steps_dist_mm.head.z) + sq(delta_mm.head.x) + sq(delta_mm.y) + sq(delta_mm.head.z) #elif CORE_IS_YZ - sq(steps_dist_mm.x) + sq(steps_dist_mm.head.y) + sq(steps_dist_mm.head.z) + sq(delta_mm.x) + sq(delta_mm.head.y) + sq(delta_mm.head.z) #else - sq(steps_dist_mm.x) + sq(steps_dist_mm.y) + sq(steps_dist_mm.z) + sq(delta_mm.x) + sq(delta_mm.y) + sq(delta_mm.z) #endif ); @@ -2067,7 +2071,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move, #if ENABLED(FILAMENT_WIDTH_SENSOR) if (extruder == FILAMENT_SENSOR_EXTRUDER_NUM) // Only for extruder with filament sensor - filwidth.advance_e(steps_dist_mm.e); + filwidth.advance_e(delta_mm.e); #endif // Calculate and limit speed in mm/sec @@ -2077,7 +2081,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move, // Linear axes first with less logic LOOP_XYZ(i) { - current_speed[i] = steps_dist_mm[i] * inverse_secs; + current_speed[i] = delta_mm[i] * inverse_secs; const feedRate_t cs = ABS(current_speed[i]), max_fr = settings.max_feedrate_mm_s[i]; if (cs > max_fr) NOMORE(speed_factor, max_fr / cs); @@ -2086,7 +2090,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move, // Limit speed on extruders, if any #if EXTRUDERS { - current_speed.e = steps_dist_mm.e * inverse_secs; + current_speed.e = delta_mm.e * inverse_secs; #if BOTH(MIXING_EXTRUDER, RETRACT_SYNC_MIXING) // Move all mixing extruders at the specified rate if (mixer.get_current_vtool() == MIXER_AUTORETRACT_TOOL) @@ -2304,10 +2308,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move, static xyze_float_t prev_unit_vec; xyze_float_t unit_vec = - #if HAS_DIST_MM_ARG - cart_dist_mm + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + delta_mm_cart #else - { steps_dist_mm.x, steps_dist_mm.y, steps_dist_mm.z, steps_dist_mm.e } + { delta_mm.x, delta_mm.y, delta_mm.z, delta_mm.e } #endif ; unit_vec *= inverse_millimeters; @@ -2568,8 +2572,8 @@ void Planner::buffer_sync_block() { * millimeters - the length of the movement, if known */ bool Planner::buffer_segment(const float &a, const float &b, const float &c, const float &e - #if HAS_DIST_MM_ARG - , const xyze_float_t &cart_dist_mm + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + , const xyze_float_t &delta_mm_cart #endif , const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/ ) { @@ -2647,8 +2651,8 @@ bool Planner::buffer_segment(const float &a, const float &b, const float &c, con #if HAS_POSITION_FLOAT , target_float #endif - #if HAS_DIST_MM_ARG - , cart_dist_mm + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + , delta_mm_cart #endif , fr_mm_s, extruder, millimeters ) @@ -2682,17 +2686,17 @@ bool Planner::buffer_line(const float &rx, const float &ry, const float &rz, con #if IS_KINEMATIC #if DISABLED(CLASSIC_JERK) - const xyze_pos_t cart_dist_mm = { + const xyze_pos_t delta_mm_cart = { rx - position_cart.x, ry - position_cart.y, rz - position_cart.z, e - position_cart.e }; #else - const xyz_pos_t cart_dist_mm = { rx - position_cart.x, ry - position_cart.y, rz - position_cart.z }; + const xyz_pos_t delta_mm_cart = { rx - position_cart.x, ry - position_cart.y, rz - position_cart.z }; #endif float mm = millimeters; if (mm == 0.0) - mm = (cart_dist_mm.x != 0.0 || cart_dist_mm.y != 0.0) ? cart_dist_mm.magnitude() : ABS(cart_dist_mm.z); + mm = (delta_mm_cart.x != 0.0 || delta_mm_cart.y != 0.0) ? delta_mm_cart.magnitude() : ABS(delta_mm_cart.z); // Cartesian XYZ to kinematic ABC, stored in global 'delta' inverse_kinematics(machine); @@ -2708,7 +2712,7 @@ bool Planner::buffer_line(const float &rx, const float &ry, const float &rz, con #endif if (buffer_segment(delta.a, delta.b, delta.c, machine.e #if DISABLED(CLASSIC_JERK) - , cart_dist_mm + , delta_mm_cart #endif , feedrate, extruder, mm )) { diff --git a/2.0.5-bigTreeTech/Marlin/src/module/planner.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/planner.h similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/module/planner.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/planner.h index 24c02c0..ae104eb 100644 --- a/2.0.5-bigTreeTech/Marlin/src/module/planner.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/planner.h @@ -61,10 +61,6 @@ manual_feedrate_mm_s { _mf.x / 60.0f, _mf.y / 60.0f, _mf.z / 60.0f, _mf.e / 60.0f }; #endif -#if IS_KINEMATIC && DISABLED(CLASSIC_JERK) - #define HAS_DIST_MM_ARG 1 -#endif - enum BlockFlagBit : char { // Recalculate trapezoids on entry junction. For optimization. BLOCK_BIT_RECALCULATE, @@ -592,8 +588,8 @@ class Planner { #if HAS_POSITION_FLOAT , const xyze_pos_t &target_float #endif - #if HAS_DIST_MM_ARG - , const xyze_float_t &cart_dist_mm + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + , const xyze_float_t &delta_mm_cart #endif , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters=0.0 ); @@ -615,8 +611,8 @@ class Planner { #if HAS_POSITION_FLOAT , const xyze_pos_t &target_float #endif - #if HAS_DIST_MM_ARG - , const xyze_float_t &cart_dist_mm + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + , const xyze_float_t &delta_mm_cart #endif , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters=0.0 ); @@ -647,21 +643,21 @@ class Planner { * millimeters - the length of the movement, if known */ static bool buffer_segment(const float &a, const float &b, const float &c, const float &e - #if HAS_DIST_MM_ARG - , const xyze_float_t &cart_dist_mm + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + , const xyze_float_t &delta_mm_cart #endif , const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0 ); FORCE_INLINE static bool buffer_segment(abce_pos_t &abce - #if HAS_DIST_MM_ARG - , const xyze_float_t &cart_dist_mm + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + , const xyze_float_t &delta_mm_cart #endif , const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0 ) { return buffer_segment(abce.a, abce.b, abce.c, abce.e - #if HAS_DIST_MM_ARG - , cart_dist_mm + #if IS_KINEMATIC && DISABLED(CLASSIC_JERK) + , delta_mm_cart #endif , fr_mm_s, extruder, millimeters); } diff --git a/2.0.5-bigTreeTech/Marlin/src/module/planner_bezier.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/planner_bezier.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/planner_bezier.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/planner_bezier.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/module/planner_bezier.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/planner_bezier.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/planner_bezier.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/planner_bezier.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/printcounter.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/printcounter.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/module/printcounter.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/printcounter.cpp index 3623c88..4b4d4b6 100644 --- a/2.0.5-bigTreeTech/Marlin/src/module/printcounter.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/printcounter.cpp @@ -35,7 +35,7 @@ Stopwatch print_job_timer; // Global Print Job Timer instance #include "printcounter.h" #include "../MarlinCore.h" -#include "../HAL/shared/eeprom_api.h" +#include "../HAL/shared/persistent_store_api.h" #if HAS_BUZZER && SERVICE_WARNING_BUZZES > 0 #include "../libs/buzzer.h" diff --git a/2.0.5-bigTreeTech/Marlin/src/module/printcounter.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/printcounter.h similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/module/printcounter.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/printcounter.h index 39a237c..261cdf0 100644 --- a/2.0.5-bigTreeTech/Marlin/src/module/printcounter.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/printcounter.h @@ -28,7 +28,7 @@ // Print debug messages with M111 S2 //#define DEBUG_PRINTCOUNTER -#if USE_WIRED_EEPROM +#if USE_REAL_EEPROM // round up address to next page boundary (assuming 32 byte pages) #define STATS_EEPROM_ADDRESS 0x40 #else @@ -57,7 +57,7 @@ class PrintCounter: public Stopwatch { private: typedef Stopwatch super; - #if USE_WIRED_EEPROM || defined(CPU_32_BIT) + #if USE_REAL_EEPROM || defined(CPU_32_BIT) typedef uint32_t eeprom_address_t; #else typedef uint16_t eeprom_address_t; diff --git a/2.0.5-bigTreeTech/Marlin/src/module/probe.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/probe.cpp similarity index 98% rename from 2.0.5-bigTreeTech/Marlin/src/module/probe.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/probe.cpp index 6e3f2ba..962c230 100644 --- a/2.0.5-bigTreeTech/Marlin/src/module/probe.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/probe.cpp @@ -134,10 +134,12 @@ xyz_pos_t Probe::offset; // Initialized by settings.load() LCD_MESSAGEPGM(MSG_MANUAL_DEPLOY_TOUCHMI); ui.return_to_status(); + KEEPALIVE_STATE(PAUSED_FOR_USER); + wait_for_user = true; // LCD click or M108 will clear this #if ENABLED(HOST_PROMPT_SUPPORT) - host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI"), CONTINUE_STR); + host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI probe."), CONTINUE_STR); #endif - wait_for_user_response(); + while (wait_for_user) idle(); ui.reset_status(); ui.goto_screen(prev_screen); @@ -295,13 +297,15 @@ FORCE_INLINE void probe_specific_action(const bool deploy) { serialprintPGM(ds_str); SERIAL_EOL(); + KEEPALIVE_STATE(PAUSED_FOR_USER); + wait_for_user = true; #if ENABLED(HOST_PROMPT_SUPPORT) host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), CONTINUE_STR); #endif #if ENABLED(EXTENSIBLE_UI) ExtUI::onUserConfirmRequired_P(PSTR("Stow Probe")); #endif - wait_for_user_response(); + while (wait_for_user) idle(); ui.reset_status(); } while( diff --git a/2.0.5-bigTreeTech/Marlin/src/module/probe.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/probe.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/probe.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/probe.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/scara.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/scara.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/scara.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/scara.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/module/scara.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/scara.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/scara.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/scara.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/servo.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/servo.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/servo.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/servo.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/module/servo.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/servo.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/servo.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/servo.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/speed_lookuptable.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/speed_lookuptable.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/speed_lookuptable.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/speed_lookuptable.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/stepper.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/stepper.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/module/stepper.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/stepper.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/stepper/L64xx.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/L64xx.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/stepper/L64xx.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/L64xx.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/module/stepper/L64xx.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/L64xx.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/stepper/L64xx.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/L64xx.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/stepper/TMC26X.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/TMC26X.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/stepper/TMC26X.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/TMC26X.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/module/stepper/TMC26X.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/TMC26X.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/stepper/TMC26X.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/TMC26X.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/stepper/indirection.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/indirection.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/stepper/indirection.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/indirection.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/module/stepper/indirection.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/indirection.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/stepper/indirection.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/indirection.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/stepper/trinamic.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/trinamic.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/stepper/trinamic.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/trinamic.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/module/stepper/trinamic.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/trinamic.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/stepper/trinamic.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/stepper/trinamic.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/temperature.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/temperature.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/module/temperature.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/temperature.cpp index 4018c75..f16a3af 100644 --- a/2.0.5-bigTreeTech/Marlin/src/module/temperature.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/temperature.cpp @@ -411,7 +411,7 @@ volatile bool Temperature::raw_temps_ready = false; if (target > GHV(BED_MAXTEMP - 10, temp_range[heater].maxtemp - 15)) { SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH); #if ENABLED(EXTENSIBLE_UI) - ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH); + ExtUI::OnPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH); #endif return; } @@ -527,7 +527,7 @@ volatile bool Temperature::raw_temps_ready = false; if (current_temp > target + MAX_OVERSHOOT_PID_AUTOTUNE) { SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH); #if ENABLED(EXTENSIBLE_UI) - ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH); + ExtUI::OnPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH); #endif break; } @@ -572,7 +572,7 @@ volatile bool Temperature::raw_temps_ready = false; #endif if (((ms - t1) + (ms - t2)) > (MAX_CYCLE_TIME_PID_AUTOTUNE * 60L * 1000L)) { #if ENABLED(EXTENSIBLE_UI) - ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT); + ExtUI::OnPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT); #endif SERIAL_ECHOLNPGM(STR_PID_TIMEOUT); break; @@ -623,7 +623,7 @@ volatile bool Temperature::raw_temps_ready = false; printerEventLEDs.onPidTuningDone(color); #endif #if ENABLED(EXTENSIBLE_UI) - ExtUI::onPidTuning(ExtUI::result_t::PID_DONE); + ExtUI::OnPidTuning(ExtUI::result_t::PID_DONE); #endif goto EXIT_M303; @@ -637,7 +637,7 @@ volatile bool Temperature::raw_temps_ready = false; printerEventLEDs.onPidTuningDone(color); #endif #if ENABLED(EXTENSIBLE_UI) - ExtUI::onPidTuning(ExtUI::result_t::PID_DONE); + ExtUI::OnPidTuning(ExtUI::result_t::PID_DONE); #endif EXIT_M303: @@ -830,9 +830,6 @@ void Temperature::min_temp_error(const heater_ind_t heater) { } #if HOTENDS - #if ENABLED(PID_DEBUG) - extern bool PID_Debug_Flag; - #endif float Temperature::get_pid_output_hotend(const uint8_t E_NAME) { const uint8_t ee = HOTEND_INDEX; @@ -914,15 +911,24 @@ void Temperature::min_temp_error(const heater_ind_t heater) { #endif // PID_OPENLOOP #if ENABLED(PID_DEBUG) - if (ee == active_extruder && PID_Debug_Flag) { + if (ee == active_extruder) { SERIAL_ECHO_START(); - SERIAL_ECHOPAIR(STR_PID_DEBUG, ee, STR_PID_DEBUG_INPUT, temp_hotend[ee].celsius, STR_PID_DEBUG_OUTPUT, pid_output); + SERIAL_ECHOPAIR( + STR_PID_DEBUG, ee, + STR_PID_DEBUG_INPUT, temp_hotend[ee].celsius, + STR_PID_DEBUG_OUTPUT, pid_output + ); #if DISABLED(PID_OPENLOOP) - SERIAL_ECHOPAIR( STR_PID_DEBUG_PTERM, work_pid[ee].Kp, STR_PID_DEBUG_ITERM, work_pid[ee].Ki, STR_PID_DEBUG_DTERM, work_pid[ee].Kd + { + SERIAL_ECHOPAIR( + STR_PID_DEBUG_PTERM, work_pid[ee].Kp, + STR_PID_DEBUG_ITERM, work_pid[ee].Ki, + STR_PID_DEBUG_DTERM, work_pid[ee].Kd #if ENABLED(PID_EXTRUSION_SCALING) , STR_PID_DEBUG_CTERM, work_pid[ee].Kc #endif ); + } #endif SERIAL_EOL(); } diff --git a/2.0.5-bigTreeTech/Marlin/src/module/temperature.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/temperature.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/temperature.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/temperature.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_10.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_10.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_10.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_10.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_1010.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_1010.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_1010.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_1010.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_1047.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_1047.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_1047.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_1047.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_11.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_11.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_11.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_11.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_110.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_110.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_110.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_110.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_12.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_12.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_12.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_12.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_13.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_13.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_13.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_13.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_147.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_147.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_147.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_147.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_15.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_15.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_15.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_15.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_18.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_18.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_18.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_18.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_20.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_20.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_20.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_20.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_201.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_201.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_201.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_201.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_202.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_202.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_202.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_202.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_21.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_21.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_21.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_21.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_3.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_3.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_3.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_3.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_331.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_331.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_331.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_331.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_332.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_332.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_332.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_332.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_4.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_4.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_4.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_4.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_5.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_5.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_5.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_5.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_501.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_501.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_501.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_501.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_51.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_51.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_51.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_51.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_512.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_512.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_512.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_512.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_52.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_52.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_52.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_52.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_55.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_55.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_55.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_55.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_6.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_6.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_6.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_6.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_60.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_60.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_60.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_60.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_61.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_61.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_61.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_61.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_66.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_66.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_66.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_66.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_666.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_666.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_666.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_666.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_67.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_67.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_67.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_67.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_7.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_7.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_7.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_7.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_70.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_70.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_70.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_70.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_71.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_71.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_71.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_71.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_75.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_75.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_75.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_75.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_8.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_8.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_8.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_8.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_9.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_9.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_9.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_9.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_99.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_99.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_99.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_99.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_998.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_998.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_998.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_998.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_999.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_999.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistor_999.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistor_999.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistors.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistors.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/thermistor/thermistors.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/thermistor/thermistors.h diff --git a/2.0.5-bigTreeTech/Marlin/src/module/tool_change.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/tool_change.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/module/tool_change.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/tool_change.cpp index 2471581..0d91669 100644 --- a/2.0.5-bigTreeTech/Marlin/src/module/tool_change.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/tool_change.cpp @@ -856,7 +856,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) { } else { #if ENABLED(ADVANCED_PAUSE_FEATURE) - unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed)); + do_pause_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed)); #else current_position.e -= toolchange_settings.swap_length / planner.e_factor[old_tool]; planner.buffer_line(current_position, MMM_TO_MMS(toolchange_settings.retract_speed), old_tool); @@ -991,8 +991,8 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) { #if ENABLED(TOOLCHANGE_FILAMENT_SWAP) if (should_swap && !too_cold) { #if ENABLED(ADVANCED_PAUSE_FEATURE) - unscaled_e_move(toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.prime_speed)); - unscaled_e_move(toolchange_settings.extra_prime, ADVANCED_PAUSE_PURGE_FEEDRATE); + do_pause_e_move(toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.prime_speed)); + do_pause_e_move(toolchange_settings.extra_prime, ADVANCED_PAUSE_PURGE_FEEDRATE); #else current_position.e += toolchange_settings.swap_length / planner.e_factor[new_tool]; planner.buffer_line(current_position, MMM_TO_MMS(toolchange_settings.prime_speed), new_tool); diff --git a/2.0.5-bigTreeTech/Marlin/src/module/tool_change.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/tool_change.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/module/tool_change.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/module/tool_change.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/esp32/pins_E4D.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/esp32/pins_E4D.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/esp32/pins_E4D.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/esp32/pins_E4D.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/esp32/pins_ESP32.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/esp32/pins_ESP32.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/esp32/pins_ESP32.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/esp32/pins_ESP32.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/esp32/pins_MRR_ESPA.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/esp32/pins_MRR_ESPA.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/esp32/pins_MRR_ESPA.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/esp32/pins_MRR_ESPE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/esp32/pins_MRR_ESPE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/esp32/pins_MRR_ESPE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/linux/pins_RAMPS_LINUX.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/linux/pins_RAMPS_LINUX.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/linux/pins_RAMPS_LINUX.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_CHEAPTRONIC.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_CHEAPTRONIC.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_CHEAPTRONIC.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_CHEAPTRONIC.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_CNCONTROLS_11.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_CNCONTROLS_11.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_CNCONTROLS_11.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_CNCONTROLS_11.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_CNCONTROLS_12.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_CNCONTROLS_12.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_CNCONTROLS_12.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_CNCONTROLS_12.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_CNCONTROLS_15.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_CNCONTROLS_15.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_CNCONTROLS_15.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_CNCONTROLS_15.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_EINSTART-S.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_EINSTART-S.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_EINSTART-S.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_EINSTART-S.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_ELEFU_3.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_ELEFU_3.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_ELEFU_3.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_ELEFU_3.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_GT2560_REV_A.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_GT2560_REV_A.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_GT2560_REV_A.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_GT2560_V3.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_GT2560_V3.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_GT2560_V3.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_GT2560_V3.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_GT2560_V3_A20.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_GT2560_V3_A20.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_GT2560_V3_A20.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_GT2560_V3_A20.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_HJC2560C_REV2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_HJC2560C_REV2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_HJC2560C_REV2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_HJC2560C_REV2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_LEAPFROG.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_LEAPFROG.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_LEAPFROG.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_LEAPFROG.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_MEGACONTROLLER.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_MEGACONTROLLER.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_MEGACONTROLLER.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_MEGACONTROLLER.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_MEGATRONICS.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_MEGATRONICS.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_MEGATRONICS.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_MEGATRONICS.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_MEGATRONICS_2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_MEGATRONICS_2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_MEGATRONICS_2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_MEGATRONICS_2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_MEGATRONICS_3.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_MEGATRONICS_3.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_MEGATRONICS_3.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_MEGATRONICS_3.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_MINITRONICS.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_MINITRONICS.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_MINITRONICS.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_MINITRONICS.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_OVERLORD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_OVERLORD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_OVERLORD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_PICA.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_PICA.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_PICA.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_PICA.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_PICAOLD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_PICAOLD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_PICAOLD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_PICAOLD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_SILVER_GATE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_SILVER_GATE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_SILVER_GATE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_SILVER_GATE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/pins.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/pins/pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/pins.h index 5de75a1..4402585 100644 --- a/2.0.5-bigTreeTech/Marlin/src/pins/pins.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/pins.h @@ -258,8 +258,6 @@ #include "mega/pins_PICA.h" // ATmega2560 env:mega2560 #elif MB(PICA_REVB) #include "mega/pins_PICAOLD.h" // ATmega2560 env:mega2560 -#elif MB(INTAMSYS40) - #include "mega/pins_INTAMSYS40.h" // ATmega2560 env:mega2560 // // ATmega1281, ATmega2561 @@ -500,6 +498,8 @@ #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB #elif MB(BTT_SKR_MINI_E3_V1_2) #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB +#elif MB(BTT_SKR_MINI_E3_V2_0) + #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB #elif MB(BTT_SKR_E3_DIP) #include "stm32f1/pins_BTT_SKR_E3_DIP.h" // STM32F1 env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB #elif MB(JGAURORA_A5S_A1) diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/pinsDebug.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/pinsDebug.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/pinsDebug.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/pinsDebug.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/pinsDebug_list.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/pinsDebug_list.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/pinsDebug_list.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/pinsDebug_list.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/rambo/pins_EINSY_RETRO.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/rambo/pins_EINSY_RETRO.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/rambo/pins_EINSY_RETRO.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/rambo/pins_MINIRAMBO.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/rambo/pins_MINIRAMBO.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/rambo/pins_MINIRAMBO.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/rambo/pins_RAMBO.h similarity index 96% rename from 2.0.5-bigTreeTech/Marlin/src/pins/rambo/pins_RAMBO.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/rambo/pins_RAMBO.h index dec72b8..0a443cc 100644 --- a/2.0.5-bigTreeTech/Marlin/src/pins/rambo/pins_RAMBO.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/rambo/pins_RAMBO.h @@ -72,10 +72,6 @@ #define Z_MIN_PROBE_PIN 30 #endif -#ifndef FIL_RUNOUT_PIN - #define FIL_RUNOUT_PIN 5 -#endif - // // Steppers // @@ -157,13 +153,6 @@ #define SPINDLE_LASER_ENA_PIN 31 // Pullup! #define SPINDLE_DIR_PIN 32 -// -// SPI for Max6675 or Max31855 Thermocouple -// -#ifndef MAX6675_SS_PIN - #define MAX6675_SS_PIN 32 // SPINDLE_DIR_PIN / STAT_LED_BLUE_PIN -#endif - // // M7/M8/M9 - Coolant Control // diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_3DRAG.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_3DRAG.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_3DRAG.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_AZTEEG_X3.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_AZTEEG_X3.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_AZTEEG_X3.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_AZTEEG_X3.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h similarity index 97% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h index 8f61ef4..7ee66b1 100644 --- a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h @@ -24,7 +24,6 @@ #define BOARD_INFO_NAME "Copymaster 3D RAMPS" #define Z_STEP_PIN 47 -#define Y_MAX_PIN 14 #define FIL_RUNOUT_PIN 15 #define SD_DETECT_PIN 66 diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FELIX2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FELIX2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FELIX2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FELIX2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h similarity index 94% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h index 5176c69..8fa3686 100644 --- a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h @@ -21,15 +21,6 @@ */ #pragma once -/** - * Override default LCD timing for Formbot T-Rex 2+ machines. - * The long LCD cables and the routing near electrically noisy stepper motors - * requires a slightly longer setup and hold time on the signals. - */ -#define BOARD_ST7920_DELAY_1 DELAY_NS(200) -#define BOARD_ST7920_DELAY_2 DELAY_NS(200) -#define BOARD_ST7920_DELAY_3 DELAY_NS(200) - /** * Formbot pin assignments */ diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_K8200.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_K8200.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_K8200.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_K8200.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_K8400.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_K8400.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_K8400.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_K8400.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_K8800.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_K8800.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_K8800.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_K8800.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_BASE_10.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_BASE_10.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_BASE_10.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_BASE_10.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_BASE_14.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_BASE_14.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_BASE_14.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_BASE_14.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_BASE_15.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_BASE_15.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_BASE_15.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_BASE_15.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_BASE_16.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_BASE_16.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_BASE_16.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_BASE_16.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_BASE_common.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_BASE_common.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_BASE_common.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_BASE_common.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_GEN_13.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_GEN_13.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_GEN_13.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_GEN_L.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_GEN_L.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_GEN_L.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_GEN_L.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS.h index ffe7f7b..0509327 100644 --- a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS.h @@ -169,11 +169,11 @@ #define TEMP_BED_PIN 14 // Analog Input #endif -// // SPI for Max6675 or Max31855 Thermocouple -// -#ifndef MAX6675_SS_PIN - #define MAX6675_SS_PIN 66 // Don't use 53 if using Display/SD card (SDSS) or 49 (SD_DETECT_PIN) +#if DISABLED(SDSUPPORT) + #define MAX6675_SS_PIN 66 // Don't use 53 if using Display/SD card +#else + #define MAX6675_SS_PIN 66 // Don't use 49 (SD_DETECT_PIN) #endif // diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS_13.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS_13.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS_13.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS_13.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS_OLD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS_OLD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS_OLD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS_OLD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RIGIDBOARD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RIGIDBOARD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RIGIDBOARD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RIGIDBOARD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RL200.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RL200.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RL200.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RL200.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RUMBA.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RUMBA.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RUMBA.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RUMBA.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_TANGO.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_TANGO.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_TANGO.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_TANGO.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h similarity index 74% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h index f32f006..dcf5ff5 100644 --- a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h @@ -47,43 +47,43 @@ #endif // Labeled pins -#define TG_HEATER_BED_PIN 8 -#define TG_HEATER_0_PIN 10 -#define TG_HEATER_1_PIN 45 // Anycubic Kossel: Unused +#define TRIGORILLA_HEATER_BED_PIN 8 +#define TRIGORILLA_HEATER_0_PIN 10 +#define TRIGORILLA_HEATER_1_PIN 45 // Anycubic Kossel: Unused -#define TG_FAN0_PIN 9 // Anycubic Kossel: Usually the part cooling fan -#define TG_FAN1_PIN 7 // Anycubic Kossel: Unused -#define TG_FAN2_PIN 44 // Anycubic Kossel: Hotend fan +#define TRIGORILLA_FAN0_PIN 9 // Anycubic Kossel: Usually the part cooling fan +#define TRIGORILLA_FAN1_PIN 7 // Anycubic Kossel: Unused +#define TRIGORILLA_FAN2_PIN 44 // Anycubic Kossel: Hotend fan // Remap MOSFET pins to common usages: -#define RAMPS_D10_PIN TG_HEATER_0_PIN // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h +#define RAMPS_D10_PIN TRIGORILLA_HEATER_0_PIN // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h #if HOTENDS > 1 // EEF and EEB - #define RAMPS_D9_PIN TG_HEATER_1_PIN + #define RAMPS_D9_PIN TRIGORILLA_HEATER_1_PIN #if !TEMP_SENSOR_BED // EEF - #define RAMPS_D8_PIN TG_FAN0_PIN + #define RAMPS_D8_PIN TRIGORILLA_FAN0_PIN #else // EEB - #define RAMPS_D8_PIN TG_HEATER_BED_PIN - #define FAN_PIN TG_FAN0_PIN // Override pin 4 in pins_RAMPS.h + #define RAMPS_D8_PINTRIGORILLA_HEATER_BED_PIN + #define FAN_PIN TRIGORILLA_FAN0_PIN // Override pin 4 in pins_RAMPS.h #endif #elif TEMP_SENSOR_BED // EFB (Anycubic Kossel default) - #define RAMPS_D9_PIN TG_FAN0_PIN - #define RAMPS_D8_PIN TG_HEATER_BED_PIN + #define RAMPS_D9_PIN TRIGORILLA_FAN0_PIN + #define RAMPS_D8_PINTRIGORILLA_HEATER_BED_PIN #else // EFF - #define RAMPS_D9_PIN TG_FAN1_PIN - #define RAMPS_D8_PIN TG_FAN0_PIN + #define RAMPS_D9_PIN TRIGORILLA_FAN1_PIN + #define RAMPS_D8_PIN TRIGORILLA_FAN0_PIN #endif #if HOTENDS > 1 || TEMP_SENSOR_BED // EEF, EEB, EFB - #define FAN1_PIN TG_FAN1_PIN + #define FAN1_PIN TRIGORILLA_FAN1_PIN #endif -#define FAN2_PIN TG_FAN2_PIN -#define ORIG_E0_AUTO_FAN_PIN TG_FAN2_PIN // Used in Anycubic Kossel example config +#define FAN2_PIN TRIGORILLA_FAN2_PIN +#define ORIG_E0_AUTO_FAN_PINTRIGORILLA_FAN2_PIN // Used in Anycubic Kossel example config #include "pins_RAMPS.h" diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_TT_OSCAR.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_TT_OSCAR.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_TT_OSCAR.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_ULTIMAKER.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_ULTIMAKER.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_ULTIMAKER.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_ULTIMAKER.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_VORON.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_VORON.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_VORON.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_VORON.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_ZRIB_V20.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_ZRIB_V20.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_ZRIB_V20.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_ZRIB_V20.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_ADSK.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_ADSK.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_ADSK.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_ADSK.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_ARCHIM1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_ARCHIM1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_ARCHIM1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_ARCHIM1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_ARCHIM2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_ARCHIM2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_ARCHIM2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_ARCHIM2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_DUE3DOM.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_DUE3DOM.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_DUE3DOM.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_DUE3DOM.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RADDS.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RADDS.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RADDS.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RADDS.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RAMPS4DUE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RAMPS4DUE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RAMPS4DUE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RAMPS4DUE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RAMPS_DUO.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RAMPS_DUO.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RAMPS_DUO.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RAMPS_DUO.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RAMPS_FD_V2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RAMPS_SMART.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RAMPS_SMART.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RAMPS_SMART.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RAMPS_SMART.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RURAMPS4D_11.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RURAMPS4D_11.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RURAMPS4D_11.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RURAMPS4D_13.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_RURAMPS4D_13.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_RURAMPS4D_13.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/samd/pins_RAMPS_144.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/pins/samd/pins_RAMPS_144.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/samd/pins_RAMPS_144.h index f02a8b8..b7d5172 100644 --- a/2.0.5-bigTreeTech/Marlin/src/pins/samd/pins_RAMPS_144.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/samd/pins_RAMPS_144.h @@ -44,9 +44,8 @@ // // EEPROM // -//#define QSPI_EEPROM // Use AGCM4 onboard QSPI EEPROM (Uses 4K of RAM) +#define E2END 0x7FFF // 32Kb (24lc256) #define I2C_EEPROM // EEPROM on I2C-0 -#define E2END 0x7FFF // 32K (24lc256) // // Limit Switches diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_ANET_10.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_ANET_10.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_ANET_10.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_ANET_10.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN6.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN6.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN6.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN6.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN7_12.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN7_12.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN7_12.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN7_12.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN7_13.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN7_13.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN7_13.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN7_13.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN7_14.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN7_14.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN7_14.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN7_14.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_MELZI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_MELZI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_MELZI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_MELZI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_OMCA.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_OMCA.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_OMCA.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_OMCA.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_OMCA_A.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_OMCA_A.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_OMCA_A.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_OMCA_A.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_SETHI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_SETHI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_SETHI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_SETHI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_STB_11.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_STB_11.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sanguino/pins_STB_11.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sanguino/pins_STB_11.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/sensitive_pins.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sensitive_pins.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/sensitive_pins.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/sensitive_pins.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h similarity index 88% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h index 15bc012..5996e5a 100644 --- a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3.h @@ -31,17 +31,26 @@ // Ignore temp readings during development. //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000 -#define FLASH_EEPROM_EMULATION -#define EEPROM_PAGE_SIZE uint16(0x800) // 2KB -#define EEPROM_START_ADDRESS uint32(0x8000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE) -#undef E2END -#define E2END (EEPROM_PAGE_SIZE - 1) // 2KB +#if NONE(SDCARD_EEPROM_EMULATION, I2C_EEPROM) + #define FLASH_EEPROM_EMULATION + #define EEPROM_PAGE_SIZE uint16(0x800) // 2KB + #define EEPROM_START_ADDRESS uint32(0x8000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE) + #undef E2END + #define E2END (EEPROM_PAGE_SIZE - 1) // 2KB +#endif // // Servos // #define SERVO0_PIN PA1 +// +// Power Loss Detection +// +#ifndef POWER_LOSS_PIN + #define POWER_LOSS_PIN PC12 +#endif + // // Limit Switches // @@ -91,12 +100,15 @@ // #define HEATER_0_PIN PC8 // EXTRUDER #define HEATER_BED_PIN PC9 // BED -#define FAN_PIN PA8 - +#ifndef FAN_PIN + #define FAN_PIN PA8 +#endif // // USB connect control // -#define USB_CONNECT_PIN PC13 +#ifndef USB_CONNECT_PIN + #define USB_CONNECT_PIN PC13 +#endif #define USB_CONNECT_INVERTING false #define SD_DETECT_PIN PC4 @@ -111,14 +123,17 @@ * ----- * EXP1 */ - -#define EXPA1_03_PIN PB7 +#ifndef EXPA1_03_PIN + #define EXPA1_03_PIN PB7 +#endif #define EXPA1_04_PIN PB8 #define EXPA1_05_PIN PB9 #define EXPA1_06_PIN PA10 #define EXPA1_07_PIN -1 #define EXPA1_08_PIN PA9 -#define EXPA1_09_PIN PB6 +#ifndef EXPA1_09_PIN + #define EXPA1_09_PIN PB6 +#endif #define EXPA1_10_PIN PB5 #if HAS_SPI_LCD diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h diff --git a/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h new file mode 100644 index 0000000..d03068e --- /dev/null +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h @@ -0,0 +1,70 @@ +/** + * 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 BOARD_INFO_NAME "BIGTREE SKR Mini E3 V2.0" + +// Release PA13/PA14 (led, usb control) from SWD pins +#define DISABLE_DEBUG + +#define I2C_EEPROM // On board AT24C32 +#define E2END (0xFFF) // 4KB + +#define NEOPIXEL_PIN PA8 // LED driving pin + +#define USB_CONNECT_PIN PA14 // USB connect control + +#define PS_ON_PIN PC13 // Power Supply Control + +#define FAN_PIN PC6 +#define FAN1_PIN PC7 +#ifndef CONTROLLER_FAN_PIN + #define CONTROLLER_FAN_PIN FAN1_PIN +#endif +/** + * TMC220x stepper drivers + * Hardware serial communication ports. + */ +#if HAS_TMC_UART + #define X_HARDWARE_SERIAL Serial4 + #define Y_HARDWARE_SERIAL Serial4 + #define Z_HARDWARE_SERIAL Serial4 + #define E0_HARDWARE_SERIAL Serial4 +#endif + + +/** + * _____ + * 5V | 1 2 | GND + * (LCD_EN) PB15 | 3 4 | PB8 (LCD_RS) + * (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2) + * RESET | 7 8 | PA9 (BTN_EN1) + * (BTN_ENC) PA15 | 9 10| PB5 (BEEPER) + * ----- + * EXP1 + */ + +#define EXPA1_03_PIN PB15 +#define EXPA1_09_PIN PA15 + +#include "pins_BTT_SKR_MINI_E3.h" \ No newline at end of file diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_CHITU3D.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_CHITU3D.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_CHITU3D.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h similarity index 81% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h index a8c6d30..db35548 100644 --- a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h @@ -157,38 +157,3 @@ #define SDSS PD2 #define SD_DETECT_PIN -1 #endif - -#if HAS_TMC_UART - /** - * TMC2208/TMC2209 stepper drivers - * - * Hardware serial communication ports. - * If undefined software serial is used according to the pins below - */ - //#define X_HARDWARE_SERIAL Serial1 - //#define X2_HARDWARE_SERIAL Serial1 - //#define Y_HARDWARE_SERIAL Serial1 - //#define Y2_HARDWARE_SERIAL Serial1 - //#define Z_HARDWARE_SERIAL Serial1 - //#define Z2_HARDWARE_SERIAL Serial1 - //#define E0_HARDWARE_SERIAL Serial1 - //#define E1_HARDWARE_SERIAL Serial1 - //#define E2_HARDWARE_SERIAL Serial1 - //#define E3_HARDWARE_SERIAL Serial1 - //#define E4_HARDWARE_SERIAL Serial1 - - // Unused servo pins may be repurposed with SoftwareSerialM - //#define X_SERIAL_TX_PIN PF8 // SERVO3_PIN - //#define Y_SERIAL_TX_PIN PF9 // SERVO2_PIN - //#define Z_SERIAL_TX_PIN PA1 // SERVO1_PIN - //#define E0_SERIAL_TX_PIN PC3 // SERVO0_PIN - //#define X_SERIAL_RX_PIN X_SERIAL_TX_PIN - //#define Y_SERIAL_RX_PIN Y_SERIAL_TX_PIN - //#define Z_SERIAL_RX_PIN Z_SERIAL_TX_PIN - //#define E0_SERIAL_RX_PIN E0_SERIAL_TX_PIN - - // Reduce baud rate for software serial reliability - #if HAS_TMC_SW_SERIAL - #define TMC_BAUD_RATE 19200 - #endif -#endif diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MORPHEUS.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MORPHEUS.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_MORPHEUS.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_MORPHEUS.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_STM32F1R.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_STM32F1R.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_STM32F1R.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_STM32F1R.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_ARMED.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_ARMED.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_ARMED.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_BEAST.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_BEAST.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_BEAST.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_BEAST.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_LERDGE_K.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_LERDGE_K.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_LERDGE_K.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_LERDGE_X.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_LERDGE_X.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_LERDGE_X.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_VAKE403D.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f4/pins_VAKE403D.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f4/pins_VAKE403D.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/stm32f7/pins_THE_BORG.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f7/pins_THE_BORG.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/stm32f7/pins_THE_BORG.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/stm32f7/pins_THE_BORG.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_5DPRINT.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_5DPRINT.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_5DPRINT.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_5DPRINT.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_BRAINWAVE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_BRAINWAVE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_BRAINWAVE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_BRAINWAVE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_BRAINWAVE_PRO.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_SAV_MKI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_SAV_MKI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_SAV_MKI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_SAV_MKI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_TEENSY2.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_TEENSY2.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_TEENSY2.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_TEENSY2.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_TEENSYLU.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_TEENSYLU.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/teensy2/pins_TEENSYLU.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy2/pins_TEENSYLU.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/teensy3/pins_TEENSY31_32.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy3/pins_TEENSY31_32.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/teensy3/pins_TEENSY31_32.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy3/pins_TEENSY31_32.h diff --git a/2.0.5-bigTreeTech/Marlin/src/pins/teensy3/pins_TEENSY35_36.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy3/pins_TEENSY35_36.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/pins/teensy3/pins_TEENSY35_36.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/pins/teensy3/pins_TEENSY35_36.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/Sd2Card.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/Sd2Card.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/Sd2Card.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/Sd2Card.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/Sd2Card.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/Sd2Card.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/Sd2Card.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/Sd2Card.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/Sd2Card_sdio.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/Sd2Card_sdio.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/Sd2Card_sdio.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/Sd2Card_sdio.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/SdBaseFile.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdBaseFile.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/SdBaseFile.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdBaseFile.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/SdBaseFile.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdBaseFile.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/SdBaseFile.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdBaseFile.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/SdFatConfig.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdFatConfig.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/SdFatConfig.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdFatConfig.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/SdFatStructs.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdFatStructs.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/SdFatStructs.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdFatStructs.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/SdFatUtil.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdFatUtil.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/SdFatUtil.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdFatUtil.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/SdFatUtil.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdFatUtil.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/SdFatUtil.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdFatUtil.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/SdFile.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdFile.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/SdFile.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdFile.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/SdFile.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdFile.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/SdFile.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdFile.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/SdInfo.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdInfo.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/SdInfo.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdInfo.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/SdVolume.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdVolume.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/SdVolume.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdVolume.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/SdVolume.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdVolume.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/SdVolume.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/SdVolume.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/cardreader.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/cardreader.cpp similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/sd/cardreader.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/cardreader.cpp index 80e94b8..aadd355 100644 --- a/2.0.5-bigTreeTech/Marlin/src/sd/cardreader.cpp +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/cardreader.cpp @@ -49,6 +49,7 @@ // public: card_flags_t CardReader::flag; +uint8_t CardReader::sdprinting_done_state; char CardReader::filename[FILENAME_LENGTH], CardReader::longFilename[LONG_FILENAME_LENGTH]; int8_t CardReader::autostart_index; @@ -1088,7 +1089,7 @@ void CardReader::fileHasFinished() { presort(); #endif - marlin_state = MF_SD_COMPLETE; + sdprinting_done_state = 1; } } diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/cardreader.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/cardreader.h similarity index 99% rename from 2.0.5-bigTreeTech/Marlin/src/sd/cardreader.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/cardreader.h index 955a8b6..749ece0 100644 --- a/2.0.5-bigTreeTech/Marlin/src/sd/cardreader.h +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/cardreader.h @@ -49,6 +49,7 @@ typedef struct { class CardReader { public: + static uint8_t sdprinting_done_state; static card_flags_t flag; // Flags (above) static char filename[FILENAME_LENGTH], // DOS 8.3 filename of the selected item longFilename[LONG_FILENAME_LENGTH]; // Long name of the selected item diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/Usb.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/Usb.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/Usb.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/Usb.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/Usb.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/Usb.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/Usb.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/Usb.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/UsbCore.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/UsbCore.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/UsbCore.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/UsbCore.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/address.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/address.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/address.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/address.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/confdescparser.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/confdescparser.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/confdescparser.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/confdescparser.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/hexdump.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/hexdump.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/hexdump.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/hexdump.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/macros.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/macros.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/macros.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/macros.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/max3421e.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/max3421e.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/max3421e.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/max3421e.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/message.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/message.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/message.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/message.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/message.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/message.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/message.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/message.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/parsetools.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/parsetools.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/parsetools.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/parsetools.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/parsetools.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/parsetools.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/parsetools.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/parsetools.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/printhex.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/printhex.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/printhex.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/printhex.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/settings.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/settings.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/settings.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/settings.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/usb_ch9.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/usb_ch9.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/usb_ch9.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/usb_ch9.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_BULK_STORAGE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_BULK_STORAGE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_BULK_STORAGE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_BULK_STORAGE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_BULK_STORAGE_INLINE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_BULK_STORAGE_INLINE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_BULK_STORAGE_INLINE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_BULK_STORAGE_INLINE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_SCSI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_SCSI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_SCSI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_SCSI.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UNOFFICIAL_IDs.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UNOFFICIAL_IDs.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UNOFFICIAL_IDs.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UNOFFICIAL_IDs.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_USB_IDs.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_USB_IDs.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_USB_IDs.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_USB_IDs.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UsbCore.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UsbCore.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UsbCore.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UsbCore.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_address.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_address.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_address.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_address.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_hexdump.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_hexdump.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_hexdump.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_hexdump.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_message.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_message.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_message.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_message.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printf_HELPER.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printf_HELPER.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printf_HELPER.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printf_HELPER.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printhex.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printhex.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printhex.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printhex.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_settings.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_settings.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_settings.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_settings.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_usb_ch9.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_usb_ch9.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_usb_ch9.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_usb_ch9.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_usbhost.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_usbhost.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_usbhost.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_usbhost.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_util_INLINE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_util_INLINE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_util_INLINE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_util_INLINE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/UHS_max3421e.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/UHS_max3421e.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/UHS_max3421e.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/UHS_max3421e.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD_INLINE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD_INLINE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD_INLINE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD_INLINE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/SWI_INLINE.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/SWI_INLINE.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/SWI_INLINE.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/SWI_INLINE.h diff --git a/2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/dyn_SWI.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/dyn_SWI.h similarity index 100% rename from 2.0.5-bigTreeTech/Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/dyn_SWI.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/dyn_SWI.h diff --git a/Marlin-2.0.x-SKR-mini-E3-V2.0/README.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/README.md new file mode 100644 index 0000000..ffb3de0 --- /dev/null +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/README.md @@ -0,0 +1,118 @@ +# Marlin 3D Printer Firmware + +![GitHub](https://img.shields.io/github/license/marlinfirmware/marlin.svg) +![GitHub contributors](https://img.shields.io/github/contributors/marlinfirmware/marlin.svg) +![GitHub Release Date](https://img.shields.io/github/release-date/marlinfirmware/marlin.svg) +[![Build Status](https://github.com/MarlinFirmware/Marlin/workflows/CI/badge.svg?branch=bugfix-2.0.x)](https://github.com/MarlinFirmware/Marlin/actions) + + + +Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/). +Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by! + +## Marlin 2.0 Bugfix Branch + +__Not for production use. Use with caution!__ + +Marlin 2.0 takes this popular RepRap firmware to the next level by adding support for much faster 32-bit and ARM-based boards while improving support for 8-bit AVR boards. Read about Marlin's decision to use a "Hardware Abstraction Layer" below. + +This branch is for patches to the latest 2.0.x release version. Periodically this branch will form the basis for the next minor 2.0.x release. + +Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases). + +## Building Marlin 2.0 + +To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino.cc/en/main/software) or [PlatformIO](http://docs.platformio.org/en/latest/ide.html#platformio-ide). We've posted detailed instructions on [Building Marlin with Arduino](http://marlinfw.org/docs/basics/install_arduino.html) and [Building Marlin with PlatformIO for ReArm](http://marlinfw.org/docs/basics/install_rearm.html) (which applies well to other 32-bit boards). + +## Hardware Abstraction Layer (HAL) + +Marlin 2.0 introduces a layer of abstraction so that all the existing high-level code can be built for 32-bit platforms while still retaining full 8-bit AVR compatibility. Retaining AVR compatibility and a single code-base is important to us, because we want to make sure that features and patches get as much testing and attention as possible, and that all platforms always benefit from the latest improvements. + +### Current HALs + + #### AVR (8-bit) + + board|processor|speed|flash|sram|logic|fpu + ----|---------|-----|-----|----|-----|--- + [Arduino AVR](https://www.arduino.cc/)|ATmega, ATTiny, etc.|16-20MHz|64-256k|2-16k|5V|no + + #### DUE + + boards|processor|speed|flash|sram|logic|fpu + ----|---------|-----|-----|----|-----|--- + [Arduino Due](https://www.arduino.cc/en/Guide/ArduinoDue), [RAMPS-FD](http://www.reprap.org/wiki/RAMPS-FD), etc.|[SAM3X8E ARM-Cortex M3](http://www.microchip.com/wwwproducts/en/ATsam3x8e)|84MHz|512k|64+32k|3.3V|no + + #### ESP32 + + board|processor|speed|flash|sram|logic|fpu + ----|---------|-----|-----|----|-----|--- + [ESP32](https://www.espressif.com/en/products/hardware/esp32/overview)|Tensilica Xtensa LX6|240MHz|---|---|3.3V|--- + + #### LPC1768 / LPC1769 + + boards|processor|speed|flash|sram|logic|fpu + ----|---------|-----|-----|----|-----|--- + [Re-ARM](https://www.kickstarter.com/projects/1245051645/re-arm-for-ramps-simple-32-bit-upgrade)|[LPC1768 ARM-Cortex M3](http://www.nxp.com/products/microcontrollers-and-processors/arm-based-processors-and-mcus/lpc-cortex-m-mcus/lpc1700-cortex-m3/512kb-flash-64kb-sram-ethernet-usb-lqfp100-package:LPC1768FBD100)|100MHz|512k|32+16+16k|3.3-5V|no + [MKS SBASE](http://forums.reprap.org/read.php?13,499322)|LPC1768 ARM-Cortex M3|100MHz|512k|32+16+16k|3.3-5V|no + [Selena Compact](https://github.com/Ales2-k/Selena)|LPC1768 ARM-Cortex M3|100MHz|512k|32+16+16k|3.3-5V|no + [Azteeg X5 GT](https://www.panucatt.com/azteeg_X5_GT_reprap_3d_printer_controller_p/ax5gt.htm)|LPC1769 ARM-Cortex M3|120MHz|512k|32+16+16k|3.3-5V|no + [Smoothieboard](http://reprap.org/wiki/Smoothieboard)|LPC1769 ARM-Cortex M3|120MHz|512k|64k|3.3-5V|no + + #### SAMD51 + + boards|processor|speed|flash|sram|logic|fpu + ----|---------|-----|-----|----|-----|--- + [Adafruit Grand Central M4](https://www.adafruit.com/product/4064)|[SAMD51P20A ARM-Cortex M4](https://www.microchip.com/wwwproducts/en/ATSAMD51P20A)|120MHz|1M|256k|3.3V|yes + + #### STM32F1 + + boards|processor|speed|flash|sram|logic|fpu + ----|---------|-----|-----|----|-----|--- + [Arduino STM32](https://github.com/rogerclarkmelbourne/Arduino_STM32)|[STM32F1](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html) ARM-Cortex M3|72MHz|256-512k|48-64k|3.3V|no + [STEVAL-3DP001V1](http://www.st.com/en/evaluation-tools/steval-3dp001v1.html)|[STM32F401VE Arm-Cortex M4](http://www.st.com/en/microcontrollers/stm32f401ve.html)|84MHz|512k|64+32k|3.3-5V|yes + + #### Teensy++ 2.0 + + boards|processor|speed|flash|sram|logic|fpu + ----|---------|-----|-----|----|-----|--- + [Teensy++ 2.0](http://www.microchip.com/wwwproducts/en/AT90USB1286)|[AT90USB1286](http://www.microchip.com/wwwproducts/en/AT90USB1286)|16MHz|128k|8k|5V|no + + #### Teensy 3.1 / 3.2 + + boards|processor|speed|flash|sram|logic|fpu + ----|---------|-----|-----|----|-----|--- + [Teensy 3.2](https://www.pjrc.com/store/teensy32.html)|[MK20DX256VLH7](https://www.mouser.com/ProductDetail/NXP-Freescale/MK20DX256VLH7) ARM-Cortex M4|72MHz|256k|32k|3.3V-5V|yes + + #### Teensy 3.5 / 3.6 + + boards|processor|speed|flash|sram|logic|fpu + ----|---------|-----|-----|----|-----|--- + [Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|[MK64FX512VMD12](https://www.mouser.com/ProductDetail/NXP-Freescale/MK64FX512VMD12) ARM-Cortex M4|120MHz|512k|192k|3.3-5V|yes + [Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|[MK66FX1M0VMD18](https://www.mouser.com/ProductDetail/NXP-Freescale/MK66FX1M0VMD18) ARM-Cortex M4|180MHz|1M|256k|3.3V|yes + +## Submitting Patches + +Proposed patches should be submitted as a Pull Request against the ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)) branch. + +- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 2.0.x life-cycle. +- Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers. +- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues). + +### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin) + +## Credits + +The current Marlin dev team consists of: + + - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA   [Donate](http://www.thinkyhead.com/donate-to-marlin) / Flattr: [![Flattr Scott](http://api.flattr.com/button/flattr-badge-small.png)](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) + - Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - USA + - Chris Pepper [[@p3p](https://github.com/p3p)] - UK + - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA + - João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portugal + - Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)] - Netherlands   [![Flattr Erik](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) + +## License + +Marlin is published under the [GPL license](/LICENSE) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork. + +While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own. diff --git a/2.0.5-bigTreeTech/buildroot/bin/generate_version b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/generate_version similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/bin/generate_version rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/generate_version diff --git a/2.0.5-bigTreeTech/buildroot/bin/opt_add b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/opt_add similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/bin/opt_add rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/opt_add diff --git a/2.0.5-bigTreeTech/buildroot/bin/opt_disable b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/opt_disable similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/bin/opt_disable rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/opt_disable diff --git a/2.0.5-bigTreeTech/buildroot/bin/opt_enable b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/opt_enable similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/bin/opt_enable rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/opt_enable diff --git a/2.0.5-bigTreeTech/buildroot/bin/opt_set b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/opt_set similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/bin/opt_set rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/opt_set diff --git a/2.0.5-bigTreeTech/buildroot/bin/pins_set b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/pins_set similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/bin/pins_set rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/pins_set diff --git a/2.0.5-bigTreeTech/buildroot/bin/restore_configs b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/restore_configs similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/bin/restore_configs rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/restore_configs diff --git a/2.0.5-bigTreeTech/buildroot/bin/use_example_configs b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/use_example_configs similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/bin/use_example_configs rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/bin/use_example_configs diff --git a/2.0.5-bigTreeTech/buildroot/etc/.astylerc b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/etc/.astylerc similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/etc/.astylerc rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/etc/.astylerc diff --git a/2.0.5-bigTreeTech/buildroot/etc/udev/rules.d/99-platformio-udev.rules b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/etc/udev/rules.d/99-platformio-udev.rules similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/etc/udev/rules.d/99-platformio-udev.rules rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/etc/udev/rules.d/99-platformio-udev.rules diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/BigTree_Btt002.json b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/BigTree_Btt002.json similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/BigTree_Btt002.json rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/BigTree_Btt002.json diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/BigTree_SKR_Pro.json b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/BigTree_SKR_Pro.json similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/BigTree_SKR_Pro.json rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/BigTree_SKR_Pro.json diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/FLYF407ZG.json b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/FLYF407ZG.json similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/FLYF407ZG.json rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/FLYF407ZG.json diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/STEVAL_STM32F401VE.json b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/STEVAL_STM32F401VE.json similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/STEVAL_STM32F401VE.json rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/STEVAL_STM32F401VE.json diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/at90usb1286.json b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/at90usb1286.json similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/at90usb1286.json rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/at90usb1286.json diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/blackSTM32F407VET6.json b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/blackSTM32F407VET6.json similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/blackSTM32F407VET6.json rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/blackSTM32F407VET6.json diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/fysetc_s6.json b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/fysetc_s6.json similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/fysetc_s6.json rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/fysetc_s6.json diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/malyanM200.json b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/malyanM200.json similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/malyanM200.json rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/malyanM200.json diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/malyanM200v2.json b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/malyanM200v2.json similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/boards/malyanM200v2.json rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/boards/malyanM200v2.json diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/STM32F103RC_SKR_MINI_256K.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/STM32F103RC_SKR_MINI_256K.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/STM32F103RC_SKR_MINI_256K.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/STM32F103RC_SKR_MINI_256K.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/STM32F103RC_SKR_MINI_512K.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/STM32F103RC_SKR_MINI_512K.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/STM32F103RC_SKR_MINI_512K.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/STM32F103RC_SKR_MINI_512K.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/STM32F103RE_SKR_E3_DIP.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/STM32F103RE_SKR_E3_DIP.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/STM32F103RE_SKR_E3_DIP.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/STM32F103RE_SKR_E3_DIP.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/STM32F103VE_longer.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/STM32F103VE_longer.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/STM32F103VE_longer.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/STM32F103VE_longer.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/chitu_f103.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/chitu_f103.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/chitu_f103.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/chitu_f103.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/fysetc_aio_ii.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/fysetc_aio_ii.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/fysetc_aio_ii.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/fysetc_aio_ii.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/jgaurora_a5s_a1.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/jgaurora_a5s_a1.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/jgaurora_a5s_a1.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/jgaurora_a5s_a1.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/mks_robin.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/mks_robin.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/mks_robin.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/mks_robin.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/mks_robin_lite.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/mks_robin_lite.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/mks_robin_lite.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/mks_robin_lite.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/mks_robin_lite3.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/mks_robin_lite3.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/mks_robin_lite3.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/mks_robin_lite3.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/mks_robin_mini.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/mks_robin_mini.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/mks_robin_mini.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/mks_robin_mini.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/mks_robin_nano.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/mks_robin_nano.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/mks_robin_nano.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/mks_robin_nano.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/mks_robin_pro.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/mks_robin_pro.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/ldscripts/mks_robin_pro.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/ldscripts/mks_robin_pro.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/STEVAL__F401XX.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/STEVAL__F401XX.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/STEVAL__F401XX.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/STEVAL__F401XX.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py similarity index 89% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py index 67a75f5..1aeaa4d 100644 --- a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py @@ -30,7 +30,7 @@ if platform.get_package_dir("tool-stm32duino") != None: env.Replace( UPLOADER=UPLOAD_TOOL, - UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr -R -b 115200 -g 0x8000000 -w \"" + join("$BUILD_DIR","${PROGNAME}.hex")+"\"" + " $UPLOAD_PORT") + UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr $UPLOAD_PORT -R -w \"" + join("$BUILD_DIR","${PROGNAME}.hex")+"\"") ) # Python callback diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/chitu_crypt.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/chitu_crypt.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/chitu_crypt.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/chitu_crypt.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/common-cxxflags.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/common-cxxflags.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/common-cxxflags.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/common-cxxflags.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/generic_create_variant.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/generic_create_variant.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/generic_create_variant.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/generic_create_variant.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/jgaurora_bootloader.bin b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/jgaurora_bootloader.bin similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/jgaurora_bootloader.bin rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/jgaurora_bootloader.bin diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/mks_robin.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/mks_robin.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/mks_robin.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/mks_robin.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/mks_robin_lite.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/mks_robin_lite.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/mks_robin_lite.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/mks_robin_lite.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/mks_robin_mini.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/mks_robin_mini.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/mks_robin_mini.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/mks_robin_mini.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/mks_robin_nano.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/mks_robin_nano.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/mks_robin_nano.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/mks_robin_nano.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/mks_robin_pro.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/mks_robin_pro.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/scripts/mks_robin_pro.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/scripts/mks_robin_pro.py diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PeripheralPins.c diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PinNamesVar.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PinNamesVar.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PinNamesVar.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/PinNamesVar.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/hal_conf_extra.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/hal_conf_extra.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/hal_conf_extra.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/hal_conf_extra.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/ldscript.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/ldscript.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/ldscript.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/ldscript.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/variant.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/variant.cpp similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/variant.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/variant.cpp diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/variant.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/variant.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/variant.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_BTT002/variant.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PeripheralPins.c diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PinNamesVar.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PinNamesVar.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PinNamesVar.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/PinNamesVar.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/hal_conf_extra.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/hal_conf_extra.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/hal_conf_extra.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/hal_conf_extra.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/ldscript.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/ldscript.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/ldscript.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/ldscript.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/variant.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/variant.cpp similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/variant.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/variant.cpp diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/variant.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/variant.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/variant.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/BIGTREE_SKR_PRO_1v1/variant.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FLY_F407ZG/PeripheralPins.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FLY_F407ZG/PeripheralPins.c similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FLY_F407ZG/PeripheralPins.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FLY_F407ZG/PeripheralPins.c diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FLY_F407ZG/PinNamesVar.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FLY_F407ZG/PinNamesVar.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FLY_F407ZG/PinNamesVar.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FLY_F407ZG/PinNamesVar.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FLY_F407ZG/ldscript.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FLY_F407ZG/ldscript.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FLY_F407ZG/ldscript.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FLY_F407ZG/ldscript.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FLY_F407ZG/variant.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FLY_F407ZG/variant.cpp similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FLY_F407ZG/variant.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FLY_F407ZG/variant.cpp diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FLY_F407ZG/variant.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FLY_F407ZG/variant.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FLY_F407ZG/variant.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FLY_F407ZG/variant.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FYSETC_S6/PeripheralPins.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FYSETC_S6/PeripheralPins.c similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FYSETC_S6/PeripheralPins.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FYSETC_S6/PeripheralPins.c diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FYSETC_S6/PinNamesVar.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FYSETC_S6/PinNamesVar.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FYSETC_S6/PinNamesVar.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FYSETC_S6/PinNamesVar.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FYSETC_S6/ldscript.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FYSETC_S6/ldscript.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FYSETC_S6/ldscript.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FYSETC_S6/ldscript.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.cpp similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.cpp diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/FYSETC_S6/variant.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/MARLIN_F407VE/PeripheralPins.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/MARLIN_F407VE/PeripheralPins.c similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/MARLIN_F407VE/PeripheralPins.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/MARLIN_F407VE/PeripheralPins.c diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/MARLIN_F407VE/PinNamesVar.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/MARLIN_F407VE/PinNamesVar.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/MARLIN_F407VE/PinNamesVar.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/MARLIN_F407VE/PinNamesVar.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.cpp similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.cpp diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/STEVAL_F401VE/PeripheralPins.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/STEVAL_F401VE/PeripheralPins.c similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/STEVAL_F401VE/PeripheralPins.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/STEVAL_F401VE/PeripheralPins.c diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/STEVAL_F401VE/PinNamesVar.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/STEVAL_F401VE/PinNamesVar.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/STEVAL_F401VE/PinNamesVar.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/STEVAL_F401VE/PinNamesVar.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/STEVAL_F401VE/hal_conf_custom.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/STEVAL_F401VE/hal_conf_custom.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/STEVAL_F401VE/hal_conf_custom.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/STEVAL_F401VE/hal_conf_custom.h diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/STEVAL_F401VE/ldscript.ld b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/STEVAL_F401VE/ldscript.ld similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/STEVAL_F401VE/ldscript.ld rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/STEVAL_F401VE/ldscript.ld diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.cpp b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.cpp similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.cpp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.cpp diff --git a/2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/NanumGothic.bdf b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/NanumGothic.bdf similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/NanumGothic.bdf rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/NanumGothic.bdf diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/README.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/README.md similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/README.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/README.md diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/genallfont.sh b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/genallfont.sh similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/genallfont.sh rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/genallfont.sh diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/genpages.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/genpages.c similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/genpages.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/genpages.c diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/get-bdf2u8g.sh b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/get-bdf2u8g.sh similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/get-bdf2u8g.sh rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/get-bdf2u8g.sh diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/getline.c b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/getline.c similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/getline.c rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/getline.c diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/getline.h b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/getline.h similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/getline.h rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/getline.h diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/marlin-6x12-1.bdf b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/marlin-6x12-1.bdf similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/marlin-6x12-1.bdf rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/marlin-6x12-1.bdf diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/marlin-6x12-2.bdf b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/marlin-6x12-2.bdf similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/marlin-6x12-2.bdf rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/marlin-6x12-2.bdf diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/marlin-6x12-3.bdf b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/marlin-6x12-3.bdf similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/marlin-6x12-3.bdf rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/marlin-6x12-3.bdf diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/u8glib-bdf2u8g.patch b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/u8glib-bdf2u8g.patch similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/u8glib-bdf2u8g.patch rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/u8glib-bdf2u8g.patch diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/uxggenpages.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/uxggenpages.md similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/uxggenpages.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/uxggenpages.md diff --git a/2.0.5-bigTreeTech/buildroot/share/fonts/uxggenpages.sh b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/uxggenpages.sh similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/fonts/uxggenpages.sh rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/fonts/uxggenpages.sh diff --git a/2.0.5-bigTreeTech/buildroot/share/git/README.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/README.md similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/README.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/README.md diff --git a/2.0.5-bigTreeTech/buildroot/share/git/firstpush b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/firstpush similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/firstpush rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/firstpush diff --git a/2.0.5-bigTreeTech/buildroot/share/git/ghpc b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/ghpc similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/ghpc rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/ghpc diff --git a/2.0.5-bigTreeTech/buildroot/share/git/ghtp b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/ghtp similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/ghtp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/ghtp diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mfadd b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfadd similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mfadd rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfadd diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mfclean b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfclean similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mfclean rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfclean diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mfdoc b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfdoc similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mfdoc rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfdoc diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mffp b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mffp similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mffp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mffp diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mfhelp b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfhelp similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mfhelp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfhelp diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mfinfo b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfinfo similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mfinfo rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfinfo diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mfinit b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfinit similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mfinit rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfinit diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mfnew b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfnew similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mfnew rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfnew diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mfpr b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfpr similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mfpr rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfpr diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mfpub b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfpub similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mfpub rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfpub diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mfqp b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfqp similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mfqp rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfqp diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mfrb b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfrb similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mfrb rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfrb diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mftest b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mftest similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mftest rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mftest diff --git a/2.0.5-bigTreeTech/buildroot/share/git/mfup b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfup similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/git/mfup rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/git/mfup diff --git a/2.0.5-bigTreeTech/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino diff --git a/2.0.5-bigTreeTech/buildroot/share/pixmaps/MarlinIcons.psd b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/MarlinIcons.psd similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/pixmaps/MarlinIcons.psd rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/MarlinIcons.psd diff --git a/2.0.5-bigTreeTech/buildroot/share/pixmaps/logo/marlin-1080.png b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/logo/marlin-1080.png similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/pixmaps/logo/marlin-1080.png rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/logo/marlin-1080.png diff --git a/2.0.5-bigTreeTech/buildroot/share/pixmaps/logo/marlin-250.png b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/logo/marlin-250.png similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/pixmaps/logo/marlin-250.png rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/logo/marlin-250.png diff --git a/2.0.5-bigTreeTech/buildroot/share/pixmaps/logo/marlin-old-250.png b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/logo/marlin-old-250.png similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/pixmaps/logo/marlin-old-250.png rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/logo/marlin-old-250.png diff --git a/2.0.5-bigTreeTech/buildroot/share/pixmaps/logo/marlin-old-627.png b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/logo/marlin-old-627.png similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/pixmaps/logo/marlin-old-627.png rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/logo/marlin-old-627.png diff --git a/2.0.5-bigTreeTech/buildroot/share/pixmaps/logo/marlin-old.svg b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/logo/marlin-old.svg similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/pixmaps/logo/marlin-old.svg rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/logo/marlin-old.svg diff --git a/2.0.5-bigTreeTech/buildroot/share/pixmaps/logo/marlin.svg b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/logo/marlin.svg similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/pixmaps/logo/marlin.svg rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/pixmaps/logo/marlin.svg diff --git a/2.0.5-bigTreeTech/buildroot/share/scripts/MarlinMesh.scad b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/scripts/MarlinMesh.scad similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/scripts/MarlinMesh.scad rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/scripts/MarlinMesh.scad diff --git a/2.0.5-bigTreeTech/buildroot/share/scripts/createSpeedLookupTable.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/scripts/createSpeedLookupTable.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/scripts/createSpeedLookupTable.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/scripts/createSpeedLookupTable.py diff --git a/2.0.5-bigTreeTech/buildroot/share/scripts/createTemperatureLookupMarlin.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/scripts/createTemperatureLookupMarlin.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/scripts/createTemperatureLookupMarlin.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/scripts/createTemperatureLookupMarlin.py diff --git a/2.0.5-bigTreeTech/buildroot/share/scripts/findMissingTranslations.sh b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/scripts/findMissingTranslations.sh similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/scripts/findMissingTranslations.sh rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/scripts/findMissingTranslations.sh diff --git a/2.0.5-bigTreeTech/buildroot/share/scripts/g29_auto.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/scripts/g29_auto.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/scripts/g29_auto.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/scripts/g29_auto.py diff --git a/2.0.5-bigTreeTech/buildroot/share/scripts/pinsformat.js b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/scripts/pinsformat.js similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/scripts/pinsformat.js rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/scripts/pinsformat.js diff --git a/2.0.5-bigTreeTech/buildroot/share/sublime/MarlinFirmware.sublime-project b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/sublime/MarlinFirmware.sublime-project similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/sublime/MarlinFirmware.sublime-project rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/sublime/MarlinFirmware.sublime-project diff --git a/2.0.5-bigTreeTech/buildroot/share/sublime/RepRapTools/G-Code.sublime-syntax b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/sublime/RepRapTools/G-Code.sublime-syntax similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/sublime/RepRapTools/G-Code.sublime-syntax rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/sublime/RepRapTools/G-Code.sublime-syntax diff --git a/2.0.5-bigTreeTech/buildroot/share/sublime/RepRapTools/syntax_test_G-code.gcode b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/sublime/RepRapTools/syntax_test_G-code.gcode similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/sublime/RepRapTools/syntax_test_G-code.gcode rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/sublime/RepRapTools/syntax_test_G-code.gcode diff --git a/2.0.5-bigTreeTech/buildroot/share/sublime/auto_build_sublime_menu/000_read_me.txt b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/sublime/auto_build_sublime_menu/000_read_me.txt similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/sublime/auto_build_sublime_menu/000_read_me.txt rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/sublime/auto_build_sublime_menu/000_read_me.txt diff --git a/2.0.5-bigTreeTech/buildroot/share/sublime/auto_build_sublime_menu/Main.sublime-menu b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/sublime/auto_build_sublime_menu/Main.sublime-menu similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/sublime/auto_build_sublime_menu/Main.sublime-menu rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/sublime/auto_build_sublime_menu/Main.sublime-menu diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/ARMED-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/ARMED-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/ARMED-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/ARMED-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/BIGTREE_BTT002-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/BIGTREE_BTT002-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/BIGTREE_BTT002-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/BIGTREE_BTT002-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/BIGTREE_GTR_V1_0-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/BIGTREE_GTR_V1_0-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/BIGTREE_GTR_V1_0-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/BIGTREE_GTR_V1_0-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/BIGTREE_SKR_PRO-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/BIGTREE_SKR_PRO-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/BIGTREE_SKR_PRO-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/BIGTREE_SKR_PRO-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/DUE-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/DUE-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/DUE-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/DUE-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/fysetc_f6_13-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/FYSETC_F6_13-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/fysetc_f6_13-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/FYSETC_F6_13-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/FYSETC_S6-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/FYSETC_S6-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/FYSETC_S6-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/FYSETC_S6-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/LPC1768-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/LPC1768-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/LPC1768-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/LPC1768-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/LPC1769-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/LPC1769-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/LPC1769-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/LPC1769-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/SAMD51_grandcentral_m4-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/SAMD51_grandcentral_m4-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/SAMD51_grandcentral_m4-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/SAMD51_grandcentral_m4-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/STM32F103CB_malyan-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103CB_malyan-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/STM32F103CB_malyan-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103CB_malyan-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/STM32F103RC_btt-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103RC_btt-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/STM32F103RC_btt-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103RC_btt-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/STM32F103RC_btt_USB-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103RC_btt_USB-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/STM32F103RC_btt_USB-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103RC_btt_USB-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/STM32F103RC_fysetc-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103RC_fysetc-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/STM32F103RC_fysetc-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103RC_fysetc-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/STM32F103RE-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103RE-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/STM32F103RE-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103RE-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/STM32F103RE_btt-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103RE_btt-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/STM32F103RE_btt-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103RE_btt-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/STM32F103RE_btt_USB-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103RE_btt_USB-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/STM32F103RE_btt_USB-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103RE_btt_USB-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/STM32F103VE_longer-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103VE_longer-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/STM32F103VE_longer-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F103VE_longer-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/STM32F4-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F4-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/STM32F4-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F4-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/STM32F407VE_black-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F407VE_black-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/STM32F407VE_black-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F407VE_black-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/STM32F7-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F7-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/STM32F7-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/STM32F7-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/at90usb1286_cdc-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/at90usb1286_cdc-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/at90usb1286_cdc-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/at90usb1286_cdc-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/at90usb1286_dfu-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/at90usb1286_dfu-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/at90usb1286_dfu-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/at90usb1286_dfu-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/esp32-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/esp32-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/esp32-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/esp32-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/jgaurora_a5s_a1-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/jgaurora_a5s_a1-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/jgaurora_a5s_a1-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/jgaurora_a5s_a1-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/linux_native-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/linux_native-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/linux_native-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/linux_native-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/mega1280-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mega1280-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/mega1280-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mega1280-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/mega2560-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mega2560-tests similarity index 83% rename from 2.0.5-bigTreeTech/buildroot/share/tests/mega2560-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mega2560-tests index 884ea8b..0bedfd5 100644 --- a/2.0.5-bigTreeTech/buildroot/share/tests/mega2560-tests +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mega2560-tests @@ -12,6 +12,43 @@ set -e #restore_configs #exec_test $1 $2 "Default Configuration" +# +# Test 2 extruders (one MAX6675) and heated bed on basic RAMPS 1.4 +# Test a "Fix Mounted" Probe with Safe Homing, some arc options, +# linear bed leveling, M48, leveling debug, and firmware retraction. +# +restore_configs +opt_set MOTHERBOARD BOARD_RAMPS_14_EEB +opt_set EXTRUDERS 2 +opt_set TEMP_SENSOR_0 -2 +opt_set TEMP_SENSOR_1 1 +opt_set TEMP_SENSOR_BED 2 +opt_set TEMP_SENSOR_PROBE 1 +opt_add TEMP_PROBE_PIN 12 +opt_set TEMP_SENSOR_CHAMBER 3 +opt_add HEATER_CHAMBER_PIN 45 +opt_set GRID_MAX_POINTS_X 16 +opt_set FANMUX0_PIN 53 +opt_disable USE_WATCHDOG +opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \ + FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING PIDTEMPBED \ + PROBING_HEATERS_OFF PROBING_FANS_OFF PROBING_STEPPERS_OFF WAIT_FOR_BED_HEATER \ + EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \ + BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \ + NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \ + PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU LCD_SHOW_E_TOTAL \ + PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 LEVEL_BED_CORNERS \ + NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \ + ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \ + AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DISTINCT_E_FACTORS \ + SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \ + BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \ + FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \ + PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \ + SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \ + HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL +exec_test $1 $2 "RAMPS | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..." + # # Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders # diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/mks_robin-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mks_robin-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/mks_robin-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mks_robin-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/mks_robin_lite-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mks_robin_lite-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/mks_robin_lite-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mks_robin_lite-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/mks_robin_mini-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mks_robin_mini-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/mks_robin_mini-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mks_robin_mini-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/mks_robin_nano-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mks_robin_nano-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/mks_robin_nano-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/mks_robin_nano-tests diff --git a/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/rambo-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/rambo-tests new file mode 100644 index 0000000..3f741fc --- /dev/null +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/rambo-tests @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# +# Build tests for AVR ATmega2560 RAMBo +# + +# exit on first failure +set -e + +# +# Build with the default configurations +# +restore_configs +opt_set MOTHERBOARD BOARD_EINSY_RAMBO +opt_set X_DRIVER_TYPE TMC2130 +opt_set Y_DRIVER_TYPE TMC2130 +opt_set Z_DRIVER_TYPE TMC2130 +opt_set E0_DRIVER_TYPE TMC2130 +exec_test $1 $2 "Default Configuration" + +# +# Full size Rambo Dual Endstop CNC +# +restore_configs +opt_set MOTHERBOARD BOARD_RAMBO +opt_set EXTRUDERS 0 +opt_set TEMP_SENSOR_0 999 +opt_set DUMMY_THERMISTOR_999_VALUE 170 +opt_set DIGIPOT_MOTOR_CURRENT '{ 120, 120, 120, 120, 120 }' +opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \ + REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER REVERSE_ENCODER_DIRECTION SDSUPPORT EEPROM_SETTINGS \ + S_CURVE_ACCELERATION X_DUAL_STEPPER_DRIVERS X_DUAL_ENDSTOPS Y_DUAL_STEPPER_DRIVERS Y_DUAL_ENDSTOPS \ + ADAPTIVE_STEP_SMOOTHING CNC_COORDINATE_SYSTEMS GCODE_MOTION_MODES +opt_disable MIN_SOFTWARE_ENDSTOP_Z MAX_SOFTWARE_ENDSTOPS +exec_test $1 $2 "Rambo CNC Configuration" + +# clean up +restore_configs diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/run_tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/run_tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/run_tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/run_tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/sanguino1284p-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/sanguino1284p-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/sanguino1284p-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/sanguino1284p-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/sanguino644p-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/sanguino644p-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/sanguino644p-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/sanguino644p-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/teensy31-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/teensy31-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/teensy31-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/teensy31-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/tests/teensy35-tests b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/teensy35-tests similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/tests/teensy35-tests rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/tests/teensy35-tests diff --git a/2.0.5-bigTreeTech/buildroot/share/vscode/auto_build.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/auto_build.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/vscode/auto_build.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/auto_build.py diff --git a/2.0.5-bigTreeTech/buildroot/share/vscode/avrdude.conf b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/avrdude.conf similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/vscode/avrdude.conf rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/avrdude.conf diff --git a/2.0.5-bigTreeTech/buildroot/share/vscode/avrdude_5.10_linux b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/avrdude_5.10_linux similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/vscode/avrdude_5.10_linux rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/avrdude_5.10_linux diff --git a/2.0.5-bigTreeTech/buildroot/share/vscode/avrdude_5.10_macOS b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/avrdude_5.10_macOS similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/vscode/avrdude_5.10_macOS rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/avrdude_5.10_macOS diff --git a/2.0.5-bigTreeTech/buildroot/share/vscode/avrdude_linux.conf b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/avrdude_linux.conf similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/vscode/avrdude_linux.conf rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/avrdude_linux.conf diff --git a/2.0.5-bigTreeTech/buildroot/share/vscode/avrdude_macOS.conf b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/avrdude_macOS.conf similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/vscode/avrdude_macOS.conf rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/avrdude_macOS.conf diff --git a/2.0.5-bigTreeTech/buildroot/share/vscode/create_custom_upload_command_CDC.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/create_custom_upload_command_CDC.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/vscode/create_custom_upload_command_CDC.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/create_custom_upload_command_CDC.py diff --git a/2.0.5-bigTreeTech/buildroot/share/vscode/create_custom_upload_command_DFU.py b/Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/create_custom_upload_command_DFU.py similarity index 100% rename from 2.0.5-bigTreeTech/buildroot/share/vscode/create_custom_upload_command_DFU.py rename to Marlin-2.0.x-SKR-mini-E3-V2.0/buildroot/share/vscode/create_custom_upload_command_DFU.py diff --git a/Marlin-2.0.x-SKR-mini-E3-V2.0/config/README.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/config/README.md new file mode 100644 index 0000000..be986b7 --- /dev/null +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/config/README.md @@ -0,0 +1,3 @@ +# Where have all the configurations gone? + +## https://github.com/MarlinFirmware/Configurations/archive/bugfix-2.0.x.zip diff --git a/2.0.5-bigTreeTech/data/www/index.html b/Marlin-2.0.x-SKR-mini-E3-V2.0/data/www/index.html similarity index 100% rename from 2.0.5-bigTreeTech/data/www/index.html rename to Marlin-2.0.x-SKR-mini-E3-V2.0/data/www/index.html diff --git a/2.0.5-bigTreeTech/data/www/marlin-logo.png b/Marlin-2.0.x-SKR-mini-E3-V2.0/data/www/marlin-logo.png similarity index 100% rename from 2.0.5-bigTreeTech/data/www/marlin-logo.png rename to Marlin-2.0.x-SKR-mini-E3-V2.0/data/www/marlin-logo.png diff --git a/2.0.5-bigTreeTech/data/www/marlin.css b/Marlin-2.0.x-SKR-mini-E3-V2.0/data/www/marlin.css similarity index 100% rename from 2.0.5-bigTreeTech/data/www/marlin.css rename to Marlin-2.0.x-SKR-mini-E3-V2.0/data/www/marlin.css diff --git a/2.0.5-bigTreeTech/data/www/marlin.js b/Marlin-2.0.x-SKR-mini-E3-V2.0/data/www/marlin.js similarity index 100% rename from 2.0.5-bigTreeTech/data/www/marlin.js rename to Marlin-2.0.x-SKR-mini-E3-V2.0/data/www/marlin.js diff --git a/2.0.5-bigTreeTech/docs/Bresenham.md b/Marlin-2.0.x-SKR-mini-E3-V2.0/docs/Bresenham.md similarity index 100% rename from 2.0.5-bigTreeTech/docs/Bresenham.md rename to Marlin-2.0.x-SKR-mini-E3-V2.0/docs/Bresenham.md diff --git a/2.0.5-bigTreeTech/platformio.ini b/Marlin-2.0.x-SKR-mini-E3-V2.0/platformio.ini similarity index 97% rename from 2.0.5-bigTreeTech/platformio.ini rename to Marlin-2.0.x-SKR-mini-E3-V2.0/platformio.ini index 7b12cd5..fb42c55 100644 --- a/2.0.5-bigTreeTech/platformio.ini +++ b/Marlin-2.0.x-SKR-mini-E3-V2.0/platformio.ini @@ -27,10 +27,10 @@ build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants lib_deps = LiquidCrystal TMCStepper@>=0.6.2,<1.0.0 - Adafruit NeoPixel + #Adafruit NeoPixel + https://github.com/bigtreetech/Adafruit_NeoPixel U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip Adafruit_MAX31865=https://github.com/adafruit/Adafruit_MAX31865/archive/1.1.0.zip - #Adafruit_MAX31865=https://github.com/adafruit/Adafruit_MAX31865/archive/master.zip LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/0.8.0.zip SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip @@ -302,8 +302,8 @@ extra_scripts = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py src_filter = ${common.default_src_filter} + lib_deps = ${common.lib_deps} SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip - USBComposite for STM32F1@==0.91 -lib_ignore = Adafruit NeoPixel, SPI + USBComposite_stm32f1@==0.91 +lib_ignore = SPI monitor_speed = 115200 [env:STM32F103RC_btt_USB] @@ -317,8 +317,8 @@ extra_scripts = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py src_filter = ${common.default_src_filter} + lib_deps = ${common.lib_deps} SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip - USBComposite for STM32F1@==0.91 -lib_ignore = Adafruit NeoPixel, SPI + USBComposite_stm32f1@==0.91 +lib_ignore = SPI monitor_speed = 115200 [env:STM32F103RC_btt_512K] @@ -333,8 +333,8 @@ extra_scripts = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py src_filter = ${common.default_src_filter} + lib_deps = ${common.lib_deps} SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip - USBComposite for STM32F1@==0.91 -lib_ignore = Adafruit NeoPixel, SPI + USBComposite_stm32f1@==0.91 +lib_ignore = SPI monitor_speed = 115200 [env:STM32F103RC_btt_512K_USB] @@ -349,8 +349,8 @@ extra_scripts = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py src_filter = ${common.default_src_filter} + lib_deps = ${common.lib_deps} SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip - USBComposite for STM32F1@==0.91 -lib_ignore = Adafruit NeoPixel, SPI + USBComposite_stm32f1@==0.91 +lib_ignore = SPI monitor_speed = 115200 # @@ -492,7 +492,7 @@ build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py build_unflags = -std=gnu++11 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano.py src_filter = ${common.default_src_filter} + -lib_deps = ${common.lib_deps} +lib_deps = ${common.lib_deps} SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip lib_ignore = Adafruit NeoPixel, SPI @@ -503,12 +503,10 @@ lib_ignore = Adafruit NeoPixel, SPI platform = ststm32 board = genericSTM32F103ZE build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py - ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_XL_DENSITY + ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY build_unflags = -std=gnu++11 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py src_filter = ${common.default_src_filter} + -lib_deps = ${common.lib_deps} - SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip lib_ignore = Adafruit NeoPixel, SPI # @@ -703,7 +701,7 @@ lib_deps = TMCStepper@>=0.5.2,<1.0.0 Adafruit NeoPixel LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip - Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/0.7.0.zip + Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/dev.zip lib_ignore = SoftwareSerial, SoftwareSerialM src_filter = ${common.default_src_filter} + monitor_speed = 250000 @@ -793,7 +791,6 @@ build_unflags = -std=gnu++11 src_filter = ${common.default_src_filter} + lib_deps = ${common.lib_deps} SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip - Adafruit_SPIFlash=https://github.com/adafruit/Adafruit_SPIFlash/archive/master.zip debug_tool = jlink # diff --git a/2.0.5-bigTreeTech/process-palette.json b/Marlin-2.0.x-SKR-mini-E3-V2.0/process-palette.json similarity index 100% rename from 2.0.5-bigTreeTech/process-palette.json rename to Marlin-2.0.x-SKR-mini-E3-V2.0/process-palette.json