Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 753890c

Browse files
Merge pull request #11827 from martinbudden/fix_shadow_warning
fix(esp32): Compiler warning - parameter `byte` in function EspClass::magicFlashChipSize shadows `typedef uint8_t byte;`
2 parents 9ab0473 + ee541d5 commit 753890c

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎cores/esp32/Esp.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ FlashMode_t EspClass::getFlashChipMode(void) {
378378
}
379379
#endif // if !defined(CONFIG_IDF_TARGET_ESP32P4)
380380

381-
uint32_t EspClass::magicFlashChipSize(uint8_t byte) {
381+
uint32_t EspClass::magicFlashChipSize(uint8_t flashByte) {
382382
/*
383383
FLASH_SIZES = {
384384
"1MB": 0x00,
@@ -391,7 +391,7 @@ uint32_t EspClass::magicFlashChipSize(uint8_t byte) {
391391
"128MB": 0x70,
392392
}
393393
*/
394-
switch (byte & 0x0F) {
394+
switch (flashByte & 0x0F) {
395395
case 0x0: return (1_MB); // 8 MBit (1MB)
396396
case 0x1: return (2_MB); // 16 MBit (2MB)
397397
case 0x2: return (4_MB); // 32 MBit (4MB)
@@ -405,7 +405,7 @@ uint32_t EspClass::magicFlashChipSize(uint8_t byte) {
405405
}
406406
}
407407

408-
uint32_t EspClass::magicFlashChipSpeed(uint8_t byte) {
408+
uint32_t EspClass::magicFlashChipSpeed(uint8_t flashByte) {
409409
#if CONFIG_IDF_TARGET_ESP32C2
410410
/*
411411
FLASH_FREQUENCY = {
@@ -415,7 +415,7 @@ uint32_t EspClass::magicFlashChipSpeed(uint8_t byte) {
415415
"15m": 0x2,
416416
}
417417
*/
418-
switch (byte & 0x0F) {
418+
switch (flashByte & 0x0F) {
419419
case 0xF: return (60_MHz);
420420
case 0x0: return (30_MHz);
421421
case 0x1: return (20_MHz);
@@ -432,7 +432,7 @@ uint32_t EspClass::magicFlashChipSpeed(uint8_t byte) {
432432
"20m": 0x2,
433433
}
434434
*/
435-
switch (byte & 0x0F) {
435+
switch (flashByte & 0x0F) {
436436
case 0x0: return (80_MHz);
437437
case 0x2: return (20_MHz);
438438
default: // fail?
@@ -449,7 +449,7 @@ uint32_t EspClass::magicFlashChipSpeed(uint8_t byte) {
449449
"12m": 0x2,
450450
}
451451
*/
452-
switch (byte & 0x0F) {
452+
switch (flashByte & 0x0F) {
453453
case 0xF: return (48_MHz);
454454
case 0x0: return (24_MHz);
455455
case 0x1: return (16_MHz);
@@ -467,7 +467,7 @@ uint32_t EspClass::magicFlashChipSpeed(uint8_t byte) {
467467
"20m": 0x2,
468468
}
469469
*/
470-
switch (byte & 0x0F) {
470+
switch (flashByte & 0x0F) {
471471
case 0xF: return (80_MHz);
472472
case 0x0: return (40_MHz);
473473
case 0x1: return (26_MHz);
@@ -478,8 +478,8 @@ uint32_t EspClass::magicFlashChipSpeed(uint8_t byte) {
478478
#endif
479479
}
480480

481-
FlashMode_t EspClass::magicFlashChipMode(uint8_t byte) {
482-
FlashMode_t mode = (FlashMode_t)byte;
481+
FlashMode_t EspClass::magicFlashChipMode(uint8_t flashByte) {
482+
FlashMode_t mode = (FlashMode_t)flashByte;
483483
if (mode > FM_SLOW_READ) {
484484
mode = FM_UNKNOWN;
485485
}

‎cores/esp32/Esp.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ class EspClass {
9292
uint32_t getFlashChipSpeed();
9393
FlashMode_t getFlashChipMode();
9494

95-
uint32_t magicFlashChipSize(uint8_t byte);
96-
uint32_t magicFlashChipSpeed(uint8_t byte);
97-
FlashMode_t magicFlashChipMode(uint8_t byte);
95+
uint32_t magicFlashChipSize(uint8_t flashByte);
96+
uint32_t magicFlashChipSpeed(uint8_t flashByte);
97+
FlashMode_t magicFlashChipMode(uint8_t flashByte);
9898

9999
uint32_t getSketchSize();
100100
String getSketchMD5();

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /