Skip to content

Commit 8dd89ea

Browse files
mikezsmikezs
committed
Merge branch 'bugfix-2.1.x' into mike-anet-evo
* bugfix-2.1.x: [cron] Bump distribution date (2024-01-30) 🎨 Misc. cleanup 29-01 [cron] Bump distribution date (2024-01-29) 🩹 Temp constraints followup (MarlinFirmware#26744) [cron] Bump distribution date (2024-01-28) 🐛 Protect EEPROM bytes 916-926 🧑‍💻 Fix warning, adjust tests [cron] Bump distribution date (2024-01-27) 🎨 Misc. cleanup 25-01 Add Conditionals_type.h [cron] Bump distribution date (2024-01-26) ✨🔨 EEPROM exclusion zone (MarlinFirmware#26729) 🩹 Fix single Neo strip M150 K (MarlinFirmware#26709) 🔧 HYBRID_THRESHOLD sanity checks (MarlinFirmware#26681) 🩹 Followup to EDITABLE_STEPS_PER_UNIT (MarlinFirmware#26677) ✏️ Fix draw_dialog.cpp typo (MarlinFirmware#26684) ✨ Creality v2.4.S4_170 (Ender 2 Pro, HC32F460KCTA) (MarlinFirmware#26730) 🎨 Misc. LCD pins comments 🔧 Allow float Z_PROBE_LOW_POINT (MarlinFirmware#26711) 🩹 Fix IA Creality IDEX case
2 parents 2eb9949 + 70d942a commit 8dd89ea

File tree

290 files changed

+1036
-702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

290 files changed

+1036
-702
lines changed

‎Marlin/Marlin.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
Marlin Firmware
44
5-
(c) 2011-2023 MarlinFirmware
5+
(c) 2011-2024 MarlinFirmware
66
Portions of Marlin are (c) by their respective authors.
77
All code complies with GPLv2 and/or GPLv3
88

‎Marlin/Version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
44-
//#define STRING_DISTRIBUTION_DATE "2024-01-25"
44+
//#define STRING_DISTRIBUTION_DATE "2024-01-30"
4545

4646
/**
4747
* Defines a generic printer name to be output to the LCD after booting Marlin.

‎Marlin/src/HAL/AVR/HAL_SPI.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ void spiBegin() {
119119
while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
120120
}
121121

122-
123122
/** begin spi transaction */
124123
void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode) {
125124
// Based on Arduino SPI library
@@ -175,7 +174,6 @@ void spiBegin() {
175174
SPSR = clockDiv | 0x01;
176175
}
177176

178-
179177
#else // SOFTWARE_SPI || FORCE_SOFT_SPI
180178

181179
// ------------------------

‎Marlin/src/HAL/AVR/Servo.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363

6464
static volatile int8_t Channel[_Nbr_16timers]; // counter for the servo being pulsed for each timer (or -1 if refresh interval)
6565

66-
6766
/************ static functions common to all instances ***********************/
6867

6968
static inline void handle_interrupts(const timer16_Sequence_t timer, volatile uint16_t* TCNTn, volatile uint16_t* OCRnA) {

‎Marlin/src/HAL/AVR/eeprom.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
#ifndef MARLIN_EEPROM_SIZE
3636
#define MARLIN_EEPROM_SIZE size_t(E2END + 1)
3737
#endif
38-
size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE; }
38+
size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
3939
bool PersistentStore::access_start() { return true; }
4040
bool PersistentStore::access_finish() { return true; }
4141

4242
bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
4343
uint16_t written = 0;
4444
while (size--) {
45-
uint8_t * const p = (uint8_t * const)pos;
45+
uint8_t * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
4646
uint8_t v = *value;
4747
if (v != eeprom_read_byte(p)) { // EEPROM has only ~100,000 write cycles, so only write bytes that have changed!
4848
eeprom_write_byte(p, v);
@@ -61,7 +61,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
6161

6262
bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
6363
do {
64-
uint8_t c = eeprom_read_byte((uint8_t*)pos);
64+
const uint8_t c = eeprom_read_byte((uint8_t*)REAL_EEPROM_ADDR(pos));
6565
if (writing) *value = c;
6666
crc16(crc, &c, 1);
6767
pos++;

‎Marlin/src/HAL/AVR/endstop_interrupts.h

-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ void endstop_ISR() { endstops.update(); }
9191

9292
#endif
9393

94-
9594
// Install Pin change interrupt for a pin. Can be called multiple times.
9695
void pciSetup(const int8_t pin) {
9796
if (digitalPinHasPCICR(pin)) {

‎Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h

-1
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,6 @@
679679
#define PF7_PWM 0
680680
#define PF7_DDR DDRF
681681

682-
683682
/**
684683
* Some of the pin mapping functions of the Teensduino extension to the Arduino IDE
685684
* do not function the same as the other Arduino extensions.

‎Marlin/src/HAL/AVR/inc/Conditionals_type.h

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/**
2+
* Marlin 3D Printer Firmware
3+
* Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4+
*
5+
* Based on Sprinter and grbl.
6+
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7+
*
8+
* This program is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU General Public License as published by
10+
* the Free Software Foundation, either version 3 of the License, or
11+
* (at your option) any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU General Public License
19+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
20+
*
21+
*/
22+
#pragma once

‎Marlin/src/HAL/AVR/pinsDebug.h

-3
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ bool pwm_status(uint8_t pin) {
163163
SERIAL_ECHO_SP(2);
164164
} // pwm_status
165165

166-
167166
const volatile uint8_t* const PWM_other[][3] PROGMEM = {
168167
{ &TCCR0A, &TCCR0B, &TIMSK0 },
169168
{ &TCCR1A, &TCCR1B, &TIMSK1 },
@@ -181,7 +180,6 @@ const volatile uint8_t* const PWM_other[][3] PROGMEM = {
181180
#endif
182181
};
183182

184-
185183
const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
186184

187185
#ifdef TIMER0A
@@ -217,7 +215,6 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
217215
#endif
218216
};
219217

220-
221218
#define TCCR_A(T) pgm_read_word(&PWM_other[T][0])
222219
#define TCCR_B(T) pgm_read_word(&PWM_other[T][1])
223220
#define TIMSK(T) pgm_read_word(&PWM_other[T][2])

‎Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
120120
U8G_ATOMIC_END();
121121
}
122122

123-
124123
#if ENABLED(FYSETC_MINI_12864)
125124
#define SPISEND_SW_AVR u8g_spiSend_sw_AVR_mode_3
126125
#else

‎Marlin/src/HAL/DUE/MarlinSerial.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,6 @@ void MarlinSerial<Cfg>::flushTX() {
474474
}
475475
}
476476

477-
478477
// If not using the USB port as serial port
479478
#if defined(SERIAL_PORT) && SERIAL_PORT >= 0
480479
template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT> >;

‎Marlin/src/HAL/DUE/eeprom_flash.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -958,14 +958,14 @@ static void ee_Init() {
958958
#ifndef MARLIN_EEPROM_SIZE
959959
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
960960
#endif
961-
size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE; }
961+
size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
962962
bool PersistentStore::access_start() { ee_Init(); return true; }
963963
bool PersistentStore::access_finish() { ee_Flush(); return true; }
964964

965965
bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
966966
uint16_t written = 0;
967967
while (size--) {
968-
uint8_t * const p = (uint8_t * const)pos;
968+
uint8_t * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
969969
uint8_t v = *value;
970970
if (v != ee_Read(uint32_t(p))) { // EEPROM has only ~100,000 write cycles, so only write bytes that have changed!
971971
ee_Write(uint32_t(p), v);
@@ -984,7 +984,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
984984

985985
bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
986986
do {
987-
uint8_t c = ee_Read(uint32_t(pos));
987+
uint8_t c = ee_Read(uint32_t(REAL_EEPROM_ADDR(pos)));
988988
if (writing) *value = c;
989989
crc16(crc, &c, 1);
990990
pos++;

‎Marlin/src/HAL/DUE/eeprom_wired.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
#ifndef MARLIN_EEPROM_SIZE
3737
#error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."
3838
#endif
39-
size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE; }
39+
size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
4040
bool PersistentStore::access_start() { eeprom_init(); return true; }
4141
bool PersistentStore::access_finish() { return true; }
4242

4343
bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
4444
uint16_t written = 0;
4545
while (size--) {
46-
uint8_t * const p = (uint8_t * const)pos;
46+
uint8_t * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
4747
uint8_t v = *value;
4848
if (v != eeprom_read_byte(p)) { // EEPROM has only ~100,000 write cycles, so only write bytes that have changed!
4949
eeprom_write_byte(p, v);
@@ -62,7 +62,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
6262

6363
bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
6464
do {
65-
uint8_t c = eeprom_read_byte((uint8_t*)pos);
65+
const uint8_t c = eeprom_read_byte((uint8_t*)REAL_EEPROM_ADDR(pos));
6666
if (writing) *value = c;
6767
crc16(crc, &c, 1);
6868
pos++;

‎Marlin/src/HAL/DUE/fastio/G2_PWM.h

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ extern volatile uint32_t *SODR_A, *SODR_B, *CODR_A, *CODR_B;
4949

5050
#define PWM_MAP_INIT_ROW(IO,ZZ) { ZZ == 'A' ? SODR_A : SODR_B, ZZ == 'A' ? CODR_A : CODR_B, 1 << _PIN(IO) }
5151

52-
5352
#define PWM_MAP_INIT { PWM_MAP_INIT_ROW(MOTOR_CURRENT_PWM_X_PIN, 'B'), \
5453
PWM_MAP_INIT_ROW(MOTOR_CURRENT_PWM_Y_PIN, 'B'), \
5554
PWM_MAP_INIT_ROW(MOTOR_CURRENT_PWM_Z_PIN, 'B'), \

‎Marlin/src/HAL/DUE/fastio/G2_pins.h

-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ const G2_PinDescription G2_g_APinDescription[] = {
168168
{ PIOB, PIO_PB21, ID_PIOB, PIO_OUTPUT_0, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // PIN 52
169169
{ PIOB, PIO_PB14, ID_PIOB, PIO_OUTPUT_0, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // PIN 53
170170

171-
172171
// 54 .. 65 - Analog pins
173172
// ----------------------
174173
{ PIOA, PIO_PA16X1_AD7, ID_PIOA, PIO_INPUT, PIO_DEFAULT, PIN_ATTR_ANALOG, ADC0, ADC7, NOT_ON_PWM, NOT_ON_TIMER }, // AD0

‎Marlin/src/HAL/DUE/inc/Conditionals_type.h

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/**
2+
* Marlin 3D Printer Firmware
3+
* Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4+
*
5+
* Based on Sprinter and grbl.
6+
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7+
*
8+
* This program is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU General Public License as published by
10+
* the Free Software Foundation, either version 3 of the License, or
11+
* (at your option) any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU General Public License
19+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
20+
*
21+
*/
22+
#pragma once

‎Marlin/src/HAL/DUE/usb/compiler.h

-11
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@
142142
*/
143143
#define COMPILER_PACK_RESET() COMPILER_PRAGMA(pack())
144144

145-
146145
/**
147146
* \brief Set aligned boundary.
148147
*/
@@ -283,15 +282,13 @@ typedef double F64; //!< 64-bit floating-point number.
283282
typedef uint32_t iram_size_t;
284283
//! @}
285284

286-
287285
/*! \name Status Types
288286
*/
289287
//! @{
290288
typedef bool Status_bool_t; //!< Boolean status.
291289
typedef U8 Status_t; //!< 8-bit-coded status.
292290
//! @}
293291

294-
295292
/*! \name Aliasing Aggregate Types
296293
*/
297294
//! @{
@@ -462,7 +459,6 @@ typedef struct
462459
#endif
463460
//! @}
464461

465-
466462
#ifndef __ASSEMBLY__ // not for assembling.
467463

468464
//! \name Optimization Control
@@ -581,7 +577,6 @@ typedef struct
581577

582578
//! @}
583579

584-
585580
/*! \name Zero-Bit Counting
586581
*
587582
* Under GCC, __builtin_clz and __builtin_ctz behave like macros when
@@ -692,7 +687,6 @@ typedef struct
692687

693688
//! @}
694689

695-
696690
/*! \name Bit Reversing
697691
*/
698692
//! @{
@@ -732,7 +726,6 @@ typedef struct
732726

733727
//! @}
734728

735-
736729
/*! \name Alignment
737730
*/
738731
//! @{
@@ -798,7 +791,6 @@ typedef struct
798791
*/
799792
#define Long_call(addr) ((*(void (*)(void))(addr))())
800793

801-
802794
/*! \name MCU Endianism Handling
803795
* ARM is MCU little endianism.
804796
*/
@@ -868,7 +860,6 @@ typedef struct
868860
#define CPU_TO_BE32(x) swap32(x)
869861
//! @}
870862

871-
872863
/*! \name Endianism Conversion
873864
*
874865
* The same considerations as for clz and ctz apply here but GCC's
@@ -955,7 +946,6 @@ typedef struct
955946

956947
//! @}
957948

958-
959949
/*! \name Target Abstraction
960950
*/
961951
//! @{
@@ -997,7 +987,6 @@ typedef U8 Byte; //!< 8-bit unsigned integer.
997987

998988
#endif // #ifndef __ASSEMBLY__
999989

1000-
1001990
#ifdef __ICCARM__
1002991
#define SHORTENUM __packed
1003992
#elif defined(__GNUC__)

‎Marlin/src/HAL/DUE/usb/conf_access.h

-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
#define LUN_0_NAME "\"SD/MMC Card\""
8282
//! @}
8383

84-
8584
/*! \name Actions Associated with Memory Accesses
8685
*
8786
* Write here the action to associate with each memory access.
@@ -112,5 +111,4 @@
112111
#define GLOBAL_WR_PROTECT false //!< Management of a global write protection.
113112
//! @}
114113

115-
116114
#endif // _CONF_ACCESS_H_

‎Marlin/src/HAL/DUE/usb/conf_clock.h

-1
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,4 @@
9696
// - UPLL frequency: 480MHz
9797
// - USB clock: 480 / 1 = 480MHz
9898

99-
10099
#endif /* CONF_CLOCK_H_INCLUDED */

‎Marlin/src/HAL/DUE/usb/conf_usb.h

-4
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
#endif
8989
//@}
9090

91-
9291
/**
9392
* USB Device Callbacks definitions (Optional)
9493
* @{
@@ -150,7 +149,6 @@
150149

151150
//@}
152151

153-
154152
/**
155153
* USB Interface Configuration
156154
* @{
@@ -210,7 +208,6 @@
210208
//@}
211209
//@}
212210

213-
214211
/**
215212
* Configuration of MSC interface
216213
* @{
@@ -245,7 +242,6 @@
245242

246243
//@}
247244

248-
249245
/**
250246
* Description of Composite Device
251247
* @{

0 commit comments

Comments
 (0)