Skip to content

Commit cdc996d

Browse files
ellenspthinkyhead
authored andcommitted
🔧 Fix SPI_FLASH_BACKUP flag (#27934)
Followup to #27373
1 parent fe6eb17 commit cdc996d

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

Marlin/src/gcode/control/M993_M994.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ void GcodeSuite::M993() {
4949
W25QXX.SPI_FLASH_BufferRead(buf, addr, COUNT(buf));
5050
addr += COUNT(buf);
5151
card.write(buf, COUNT(buf));
52-
if (addr % (COUNT(buf) * 10) == 0) SERIAL_CHAR('.');
52+
if (!(addr % (COUNT(buf) * 10))) SERIAL_CHAR('.');
53+
if (!(addr % (COUNT(buf) * 32))) hal.watchdog_refresh();
5354
}
5455
SERIAL_ECHOLNPGM(" done");
5556

@@ -78,7 +79,8 @@ void GcodeSuite::M994() {
7879
card.read(buf, COUNT(buf));
7980
W25QXX.SPI_FLASH_BufferWrite(buf, addr, COUNT(buf));
8081
addr += COUNT(buf);
81-
if (addr % (COUNT(buf) * 10) == 0) SERIAL_CHAR('.');
82+
if (!(addr % (COUNT(buf) * 10))) SERIAL_CHAR('.');
83+
if (!(addr % (COUNT(buf) * 32))) hal.watchdog_refresh();
8284
}
8385
SERIAL_ECHOLNPGM(" done");
8486

Marlin/src/inc/Conditionals-3-etc.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,3 @@
677677
#if ANY(PID_DEBUG, PID_BED_DEBUG, PID_CHAMBER_DEBUG)
678678
#define HAS_PID_DEBUG 1
679679
#endif
680-
681-
#if ALL(SPI_FLASH, HAS_MEDIA, MARLIN_DEV_MODE)
682-
#define SPI_FLASH_BACKUP 1
683-
#endif

Marlin/src/inc/Conditionals-5-post.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3593,3 +3593,8 @@
35933593
#if ANY(AUTO_BED_LEVELING_UBL, M100_FREE_MEMORY_WATCHER, DEBUG_GCODE_PARSER, TMC_DEBUG, MARLIN_DEV_MODE, DEBUG_CARDREADER, M20_TIMESTAMP_SUPPORT, HAS_STM32_UID)
35943594
#define NEED_HEX_PRINT 1
35953595
#endif
3596+
3597+
// SPI Flash Backup
3598+
#if ALL(SPI_FLASH, HAS_MEDIA, MARLIN_DEV_MODE)
3599+
#define SPI_FLASH_BACKUP 1
3600+
#endif

Marlin/src/pins/stm32f4/pins_MKS_NEPTUNE_X_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
#if ENABLED(SPI_FLASH)
227227
#define HAS_SPI_FLASH 1
228228
#define SPI_DEVICE 2
229-
#define SPI_FLASH_SIZE 0x1000000
229+
#define SPI_FLASH_SIZE 0x1000000 // 16MB
230230
#define SPI_FLASH_CS_PIN PB12
231231
#define SPI_FLASH_MOSI_PIN PC3
232232
#define SPI_FLASH_MISO_PIN PC2

0 commit comments

Comments
 (0)