Browse Source

Revert PR 3648 to fix SD printing

The character 0x7E is common in 8.3 filenames. Maybe the last condition
should be removed completely instead.
pull/1/head
Scott Lahteine 9 years ago
parent
commit
da47b83b3d
  1. 2
      Marlin/SdBaseFile.cpp

2
Marlin/SdBaseFile.cpp

@ -405,7 +405,7 @@ bool SdBaseFile::make83Name(const char* str, uint8_t* name, const char** ptr) {
uint8_t b; uint8_t b;
while ((b = pgm_read_byte(p++))) if (b == c) goto fail; while ((b = pgm_read_byte(p++))) if (b == c) goto fail;
// check size and only allow ASCII printable characters // check size and only allow ASCII printable characters
if (i > n || c < 0X21 || c == 0X7E)goto fail; if (i > n || c < 0x21 || c > 0x7E) goto fail;
// only upper case allowed in 8.3 names - convert lower to upper // only upper case allowed in 8.3 names - convert lower to upper
name[i++] = (c < 'a' || c > 'z') ? (c) : (c + ('A' - 'a')); name[i++] = (c < 'a' || c > 'z') ? (c) : (c + ('A' - 'a'));
} }

Loading…
Cancel
Save