3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use PGM strings

Browse source
This commit is contained in:
Scott Lahteine 2020-11-01 01:01:09 -06:00
parent d7b0a8892b
commit 50e21a2aa2
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/STM32/eeprom_flash.cpp
View file

@ -113,7 +113,7 @@ bool PersistentStore::access_start() {
// This must be the first time since power on that we have accessed the storage, or someone // This must be the first time since power on that we have accessed the storage, or someone
// loaded and called write_data and never called access_finish. // loaded and called write_data and never called access_finish.
// Lets go looking for the slot that holds our configuration. // Lets go looking for the slot that holds our configuration.
if (eeprom_data_written) DEBUG_ECHOLN("Dangling EEPROM write_data"); if (eeprom_data_written) DEBUG_ECHOLNPGM("Dangling EEPROM write_data");
uint32_t address = FLASH_ADDRESS_START; uint32_t address = FLASH_ADDRESS_START;
while (address <= FLASH_ADDRESS_END) { while (address <= FLASH_ADDRESS_END) {
uint32_t address_value = (*(__IO uint32_t*)address); uint32_t address_value = (*(__IO uint32_t*)address);

12
Marlin/src/sd/cardreader.cpp
View file

@ -175,7 +175,7 @@ char *createFilename(char * const buffer, const dir_t &p) {
bool CardReader::is_dir_or_gcode(const dir_t &p) { bool CardReader::is_dir_or_gcode(const dir_t &p) {
//uint8_t pn0 = p.name[0]; //uint8_t pn0 = p.name[0];
if ((p.attributes & DIR_ATT_HIDDEN) // Hidden by attribute if ( (p.attributes & DIR_ATT_HIDDEN) // Hidden by attribute
// When readDir() > 0 these must be false: // When readDir() > 0 these must be false:
//|| pn0 == DIR_NAME_FREE || pn0 == DIR_NAME_DELETED // Clear or Deleted entry //|| pn0 == DIR_NAME_FREE || pn0 == DIR_NAME_DELETED // Clear or Deleted entry
//|| pn0 == '.' || longFilename[0] == '.' // Hidden file //|| pn0 == '.' || longFilename[0] == '.' // Hidden file
@ -261,17 +261,17 @@ void CardReader::selectByName(SdFile dir, const char * const match, const bool d
} }
else { else {
// Match Not Found -> Wipe out the filenames to avoid returning a path to a different file // Match Not Found -> Wipe out the filenames to avoid returning a path to a different file
//if (debug) DEBUG_ECHOLN("FALSE"); //if (debug) DEBUG_ECHOLNPGM("FALSE");
strcpy(filename, ""); strcpy(filename, "");
strcpy(longFilename, ""); strcpy(longFilename, "");
} }
#else #else
if (strcasecmp(match, filename) == 0) { if (strcasecmp(match, filename) == 0) {
if (debug) DEBUG_ECHOLN(" DEBUG SelectByName - MatchFound"); if (debug) DEBUG_ECHOLNPGM(" DEBUG SelectByName - MatchFound");
return; return;
} }
else if (debug) else if (debug)
DEBUG_ECHOLN("FALSE"); DEBUG_ECHOLNPGM("FALSE");
#endif #endif
} }
} }
@ -954,7 +954,7 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile*& diveDir, cons
DEBUG_ECHOLNPAIR("diveToFile: path = '", path, "'"); DEBUG_ECHOLNPAIR("diveToFile: path = '", path, "'");
if (path[0] == '/') { // Starting at the root directory? if (path[0] == '/') { // Starting at the root directory?
DEBUG_ECHOLN("Starting from ROOT"); DEBUG_ECHOLNPGM("Starting from ROOT");
diveDir = &root; diveDir = &root;
diveDir->rewind(); // Redundant rewind, but no harm diveDir->rewind(); // Redundant rewind, but no harm
item_name_adr++; item_name_adr++;
@ -962,7 +962,7 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile*& diveDir, cons
if (update_cwd) workDirDepth = 0; // The cwd can be updated for the benefit of sub-programs if (update_cwd) workDirDepth = 0; // The cwd can be updated for the benefit of sub-programs
} }
else else
DEBUG_ECHOLN("Starting from WorkingDirectory"); DEBUG_ECHOLNPGM("Starting from WorkingDirectory");
diveDir = &workDir; // Dive from workDir (as set by the UI) diveDir = &workDir; // Dive from workDir (as set by the UI)
startDir = diveDir; startDir = diveDir;