[UI] Bugfix: Don't show - None - [SD-CARD] in GPIO selector when SD-Card is not configured (improves letscontrolit#4780)

tonhuisman · tonhuisman · commit b7b4925649e3 · 2023-09-09T13:17:44.000+02:00
diff --git a/src/src/Helpers/StringGenerator_GPIO.cpp b/src/src/Helpers/StringGenerator_GPIO.cpp
@@ -274,7 +274,7 @@ const __FlashStringHelper* getConflictingUse(int gpio, PinSelectPurpose purpose)
   }
 
   #if FEATURE_SD
-  if (Settings.Pin_sd_cs == gpio && includeSDCard) { return F("SD-Card CS"); }
+  if (validGpio(gpio) && Settings.Pin_sd_cs == gpio && includeSDCard) { return F("SD-Card CS"); }
   #endif // if FEATURE_SD
 
 

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ const __FlashStringHelper* getConflictingUse(int gpio, PinSelectPurpose purpose)`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`#if FEATURE_SD`
`277`		`- if (Settings.Pin_sd_cs == gpio && includeSDCard) { return F("SD-Card CS"); }`
	`277`	`+ if (validGpio(gpio) && Settings.Pin_sd_cs == gpio && includeSDCard) { return F("SD-Card CS"); }`
`278`	`278`	`#endif // if FEATURE_SD`
`279`	`279`
`280`	`280`