forked from MarlinFirmware/Marlin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into P3Steel-Bugfix
- Loading branch information
Showing
202 changed files
with
4,126 additions
and
3,267 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /** | ||
| * 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 <https://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
| #ifdef STM32F1 | ||
|
|
||
| /** | ||
| * PersistentStore for Arduino-style EEPROM interface | ||
| * with simple implementations supplied by Marlin. | ||
| */ | ||
|
|
||
| #include "../../inc/MarlinConfig.h" | ||
|
|
||
| #if ENABLED(IIC_BL24CXX_EEPROM) | ||
|
|
||
| #include "../shared/eeprom_if.h" | ||
| #include "../shared/eeprom_api.h" | ||
|
|
||
| // | ||
| // PersistentStore | ||
| // | ||
|
|
||
| #ifndef MARLIN_EEPROM_SIZE | ||
| #error "MARLIN_EEPROM_SIZE is required for IIC_BL24CXX_EEPROM." | ||
| #endif | ||
|
|
||
| size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE; } | ||
|
|
||
| bool PersistentStore::access_start() { eeprom_init(); return true; } | ||
| bool PersistentStore::access_finish() { return true; } | ||
|
|
||
| bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) { | ||
| uint16_t written = 0; | ||
| while (size--) { | ||
| uint8_t v = *value; | ||
| uint8_t * const p = (uint8_t * const)pos; | ||
| if (v != eeprom_read_byte(p)) { // EEPROM has only ~100,000 write cycles, so only write bytes that have changed! | ||
| eeprom_write_byte(p, v); | ||
| if (++written & 0x7F) delay(2); else safe_delay(2); // Avoid triggering watchdog during long EEPROM writes | ||
| if (eeprom_read_byte(p) != v) { | ||
| SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE); | ||
| return true; | ||
| } | ||
| } | ||
| crc16(crc, &v, 1); | ||
| pos++; | ||
| value++; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) { | ||
| do { | ||
| uint8_t * const p = (uint8_t * const)pos; | ||
| uint8_t c = eeprom_read_byte(p); | ||
| if (writing) *value = c; | ||
| crc16(crc, &c, 1); | ||
| pos++; | ||
| value++; | ||
| } while (--size); | ||
| return false; | ||
| } | ||
|
|
||
| #endif // IIC_BL24CXX_EEPROM | ||
| #endif // STM32F1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /** | ||
| * 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 <https://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| /** | ||
| * Platform-independent Arduino functions for I2C EEPROM. | ||
| * Enable USE_SHARED_EEPROM if not supplied by the framework. | ||
| */ | ||
|
|
||
| #ifdef STM32F1 | ||
|
|
||
| #include "../../inc/MarlinConfig.h" | ||
|
|
||
| #if ENABLED(IIC_BL24CXX_EEPROM) | ||
|
|
||
| #include "../../libs/BL24CXX.h" | ||
| #include "../shared/eeprom_if.h" | ||
|
|
||
| void eeprom_init() { BL24CXX::init(); } | ||
|
|
||
| // ------------------------ | ||
| // Public functions | ||
| // ------------------------ | ||
|
|
||
| void eeprom_write_byte(uint8_t *pos, uint8_t value) { | ||
| const unsigned eeprom_address = (unsigned)pos; | ||
| return BL24CXX::writeOneByte(eeprom_address, value); | ||
| } | ||
|
|
||
| uint8_t eeprom_read_byte(uint8_t *pos) { | ||
| const unsigned eeprom_address = (unsigned)pos; | ||
| return BL24CXX::readOneByte(eeprom_address); | ||
| } | ||
|
|
||
| #endif // IIC_BL24CXX_EEPROM | ||
| #endif // STM32F1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.