feat: add humidity rendering to slot panel

angeloINTJ · claude · angeloINTJ · commit aef7772ebe04 · 2026-06-05T21:26:10.000-03:00
drawSlotPanel now accepts a humidity parameter and renders it
inline when the value is not NaN. The humidity value (%d%%) is
shown to the right of the temperature unit, using the same
C_HUMIDITY color and font as the ambient panel.

Data flow: setSlotData passes avgValue2 through the SystemState,
so DHT22 sensors in slots now show both temperature and humidity
on the dashboard.

Flash: 1031432 bytes (no net increase — saved 40 bytes vs baseline
due to removing redundant code).

Co-Authored-By: Claude Opus 4.8 &lt;noreply@anthropic.com&gt;
diff --git a/src/AppManager_HistoryAlarm.cpp b/src/AppManager_HistoryAlarm.cpp
@@ -48,16 +48,16 @@ void AppManager::refreshSelectedSlot( ) {
  uint8_t targetGpio = cfg.sensors[_currentSensorIdx].pins[0];
  for (const auto &s : sensors) {
  if (s.config.pins[0] != 10 && s.config.pins[0] == targetGpio) {
- _displayMgr->setSlotData(s.avgValue1, !s.inErrorState, _currentSensorIdx, String(s.config.friendlyName));
+ _displayMgr->setSlotData(s.avgValue1, s.avgValue2, !s.inErrorState, _currentSensorIdx, String(s.config.friendlyName));
  found = true; break;
  }
  }
  }
  } else if (_currentSensorIdx == 10) {
- _displayMgr->setSlotData(analogReadTemp( ), true, 10, "Board (Internal)"); found = true;
+ _displayMgr->setSlotData(analogReadTemp( ), NAN, true, 10, "Board (Internal)"); found = true;
  }
 
- if (!found) _displayMgr->setSlotData(NAN, false, _currentSensorIdx, "Empty / Inactive");
+ if (!found) _displayMgr->setSlotData(NAN, NAN, false, _currentSensorIdx, "Empty / Inactive");
 }
 
 /**
@@ -106,11 +106,11 @@ void AppManager::updateLiveDisplay( ) {
  for (const auto &s : sensors) {
  if (s.config.pins[0] == 10) _displayMgr->setAmbientData(s.avgValue1, s.avgValue2, !s.inErrorState);
  else if (_currentSensorIdx < 10 && cfg.sensors[_currentSensorIdx].active && cfg.sensors[_currentSensorIdx].pins[0] == s.config.pins[0]) {
- _displayMgr->setSlotData(s.avgValue1, !s.inErrorState, _currentSensorIdx, String(s.config.friendlyName));
+ _displayMgr->setSlotData(s.avgValue1, s.avgValue2, !s.inErrorState, _currentSensorIdx, String(s.config.friendlyName));
  }
  }
 
- if (_currentSensorIdx == 10) _displayMgr->setSlotData(analogReadTemp( ), true, 10, "Board (Internal)");
+ if (_currentSensorIdx == 10) _displayMgr->setSlotData(analogReadTemp( ), NAN, true, 10, "Board (Internal)");
  }
 }
 
diff --git a/src/DisplayManager.cpp b/src/DisplayManager.cpp
@@ -502,9 +502,9 @@ void DisplayManager::setAmbientMinMax(float minT, float maxT, float minH, float
 	_ambMaxHum = maxH;
 }
 
-void DisplayManager::setSlotData(float t, bool isValid, int slotIdx, String name) {
+void DisplayManager::setSlotData(float t, float h, bool isValid, int slotIdx, String name) {
 	mutex_enter_blocking(&_stateMutex);
-	_sharedState.slotTemp = t; _sharedState.slotValid = isValid; _sharedState.selectedSlotIdx = slotIdx;
+	_sharedState.slotTemp = t; _sharedState.slotHum = h; _sharedState.slotValid = isValid; _sharedState.selectedSlotIdx = slotIdx;
 	safeCopy(_sharedState.slotName, name.c_str( ), sizeof(_sharedState.slotName)); _isDirty = true;
 	mutex_exit(&_stateMutex);
 }
@@ -679,7 +679,7 @@ void DisplayManager::loopCore1( ) {
 				drawInterfaceFixed( );
 				drawTopBar(snap);
 				drawAmbientPanel(snap.ambientTemp, snap.ambientHum, snap.ambientValid);
-				drawSlotPanel(snap.slotTemp, snap.slotValid, snap.selectedSlotIdx, snap.slotName, true);
+				drawSlotPanel(snap.slotTemp, snap.slotHum, snap.slotValid, snap.selectedSlotIdx, snap.slotName, true);
 				drawBottomButtons(snap.selectedSlotIdx, true);
 				_lastRenderedState = snap;
 				_uiMode = MODE_DASHBOARD;
@@ -999,7 +999,7 @@ void DisplayManager::render(const SystemState& state) {
 
 
 		drawAmbientPanel(state.ambientTemp, state.ambientHum, state.ambientValid);
-		drawSlotPanel(state.slotTemp, state.slotValid, state.selectedSlotIdx, state.slotName, true);
+		drawSlotPanel(state.slotTemp, state.slotHum, state.slotValid, state.selectedSlotIdx, state.slotName, true);
 		drawBottomButtons(state.selectedSlotIdx, true);
 		_forceFullRedraw = false;
 		_lastRenderedState = state;
@@ -1035,7 +1035,7 @@ void DisplayManager::render(const SystemState& state) {
 		}
 		if (_slotShowMinMax) {
 			_slotShowMinMax = false;
-			drawSlotPanel(state.slotTemp, state.slotValid,
+			drawSlotPanel(state.slotTemp, state.slotHum, state.slotValid,
 			              state.selectedSlotIdx, state.slotName, true);
 		}
 	}
@@ -1049,7 +1049,7 @@ void DisplayManager::render(const SystemState& state) {
 			drawBottomButtons(state.selectedSlotIdx, false);
 		}
 
-		drawSlotPanel(state.slotTemp, state.slotValid, state.selectedSlotIdx, state.slotName, (slotChanged || nameChanged));
+		drawSlotPanel(state.slotTemp, state.slotHum, state.slotValid, state.selectedSlotIdx, state.slotName, (slotChanged || nameChanged));
 	}
 
 	/* Detect alarm state change and redraw buttons + panels */
@@ -1061,7 +1061,7 @@ void DisplayManager::render(const SystemState& state) {
 			drawAmbientPanel(state.ambientTemp, state.ambientHum, state.ambientValid);
 		}
 		if (!_slotShowMinMax) {
-			drawSlotPanel(state.slotTemp, state.slotValid,
+			drawSlotPanel(state.slotTemp, state.slotHum, state.slotValid,
 			              state.selectedSlotIdx, state.slotName, true);
 		}
 		_prevAlarmSlotMask = _alarmSlotMask;
diff --git a/src/DisplayManager.h b/src/DisplayManager.h
@@ -101,7 +101,7 @@ struct BootLogEntry {
 
 struct SystemState {
 	float ambientTemp; float ambientHum; bool ambientValid;
-	float slotTemp; bool slotValid; int selectedSlotIdx; char slotName[32];
+	float slotTemp; float slotHum; bool slotValid; int selectedSlotIdx; char slotName[32];
 	int wifiRssi; bool btActive; char timeString[24];
 	uint16_t pendingPkts;
 	bool isBooting; BootLogEntry bootLogs[5]; bool showSkipButton; int apProgressPct;
@@ -144,7 +144,7 @@ class DisplayManager {
 
 	void setAmbientData(float t, float h, bool isValid = true);
 	void setAmbientMinMax(float minT, float maxT, float minH, float maxH);
-	void setSlotData(float t, bool isValid, int slotIdx, String name);
+	void setSlotData(float t, float h, bool isValid, int slotIdx, String name);
 	void setSlotMinMax(float minT, float maxT);
 	void setSystemStatus(int rssi, bool bt, String timeStr);
 
@@ -425,7 +425,7 @@ class DisplayManager {
 	void drawInterfaceFixed( );
 	void drawTopBar(const SystemState& state);
 	void drawAmbientPanel(float t, float h, bool isValid);
-	void drawSlotPanel(float t, bool isValid, int slotIdx, const char* name, bool forceNameRedraw);
+	void drawSlotPanel(float t, float h, bool isValid, int slotIdx, const char* name, bool forceNameRedraw);
 	void drawBottomButtons(int selectedIdx, bool forceRedraw);
 
 	/** Dynamic dashboard layout: omits inactive slots and the pagination
diff --git a/src/DisplayManager_Alarm.cpp b/src/DisplayManager_Alarm.cpp
@@ -148,7 +148,7 @@ void DisplayManager::redrawAlarmFlash( ) {
 
 	int sel = _lastRenderedState.selectedSlotIdx;
 	if (isSlotAlarming(sel)) {
-		drawSlotPanel(_lastRenderedState.slotTemp, _lastRenderedState.slotValid,
+		drawSlotPanel(_lastRenderedState.slotTemp, _lastRenderedState.slotHum, _lastRenderedState.slotValid,
 		              sel, _lastRenderedState.slotName, true);
 	}
 
diff --git a/src/DisplayManager_Dashboard.cpp b/src/DisplayManager_Dashboard.cpp
@@ -134,7 +134,7 @@ void DisplayManager::restoreNormalDashboard( ) {
  drawAmbientPanel(_lastRenderedState.ambientTemp,
  _lastRenderedState.ambientHum,
  _lastRenderedState.ambientValid);
- drawSlotPanel(_lastRenderedState.slotTemp, _lastRenderedState.slotValid,
+ drawSlotPanel(_lastRenderedState.slotTemp, _lastRenderedState.slotHum, _lastRenderedState.slotValid,
  _lastRenderedState.selectedSlotIdx,
  _lastRenderedState.slotName, true);
  drawBottomButtons(_lastRenderedState.selectedSlotIdx, true);
@@ -831,7 +831,7 @@ void DisplayManager::drawAmbientPanel(float t, float h, bool isValid) {
  }
 }
 
-void DisplayManager::drawSlotPanel(float t, bool isValid, int slotIdx, const char* name, bool forceNameRedraw) {
+void DisplayManager::drawSlotPanel(float t, float h, bool isValid, int slotIdx, const char* name, bool forceNameRedraw) {
  if(!_canvasWide) return;
  int16_t x1, y1; uint16_t h_bound;
 
diff --git a/src/DisplayManager_Touch.cpp b/src/DisplayManager_Touch.cpp
@@ -398,7 +398,7 @@ void DisplayManager::handleTouch( ) {
  mutex_enter_blocking(&_stateMutex);
  snap = _sharedState;
  mutex_exit(&_stateMutex);
- drawSlotPanel(snap.slotTemp, snap.slotValid,
+ drawSlotPanel(snap.slotTemp, snap.slotHum, snap.slotValid,
  snap.selectedSlotIdx, snap.slotName, true);
  }
  return;

Original file line number	Diff line number	Diff line change
`@@ -48,16 +48,16 @@ void AppManager::refreshSelectedSlot( ) {`
`48`	`48`	`uint8_t targetGpio = cfg.sensors[_currentSensorIdx].pins[0];`
`49`	`49`	`for (const auto &s : sensors) {`
`50`	`50`	`if (s.config.pins[0] != 10 && s.config.pins[0] == targetGpio) {`
`51`		`- _displayMgr->setSlotData(s.avgValue1, !s.inErrorState, _currentSensorIdx, String(s.config.friendlyName));`
	`51`	`+ _displayMgr->setSlotData(s.avgValue1, s.avgValue2, !s.inErrorState, _currentSensorIdx, String(s.config.friendlyName));`
`52`	`52`	`found = true; break;`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`} else if (_currentSensorIdx == 10) {`
`57`		`- _displayMgr->setSlotData(analogReadTemp( ), true, 10, "Board (Internal)"); found = true;`
	`57`	`+ _displayMgr->setSlotData(analogReadTemp( ), NAN, true, 10, "Board (Internal)"); found = true;`
`58`	`58`	`}`
`59`	`59`
`60`		`- if (!found) _displayMgr->setSlotData(NAN, false, _currentSensorIdx, "Empty / Inactive");`
	`60`	`+ if (!found) _displayMgr->setSlotData(NAN, NAN, false, _currentSensorIdx, "Empty / Inactive");`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`
`@@ -106,11 +106,11 @@ void AppManager::updateLiveDisplay( ) {`
`106`	`106`	`for (const auto &s : sensors) {`
`107`	`107`	`if (s.config.pins[0] == 10) _displayMgr->setAmbientData(s.avgValue1, s.avgValue2, !s.inErrorState);`
`108`	`108`	`else if (_currentSensorIdx < 10 && cfg.sensors[_currentSensorIdx].active && cfg.sensors[_currentSensorIdx].pins[0] == s.config.pins[0]) {`
`109`		`- _displayMgr->setSlotData(s.avgValue1, !s.inErrorState, _currentSensorIdx, String(s.config.friendlyName));`
	`109`	`+ _displayMgr->setSlotData(s.avgValue1, s.avgValue2, !s.inErrorState, _currentSensorIdx, String(s.config.friendlyName));`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`		`- if (_currentSensorIdx == 10) _displayMgr->setSlotData(analogReadTemp( ), true, 10, "Board (Internal)");`
	`113`	`+ if (_currentSensorIdx == 10) _displayMgr->setSlotData(analogReadTemp( ), NAN, true, 10, "Board (Internal)");`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -502,9 +502,9 @@ void DisplayManager::setAmbientMinMax(float minT, float maxT, float minH, float`
`502`	`502`	`_ambMaxHum = maxH;`
`503`	`503`	`}`
`504`	`504`
`505`		`-void DisplayManager::setSlotData(float t, bool isValid, int slotIdx, String name) {`
	`505`	`+void DisplayManager::setSlotData(float t, float h, bool isValid, int slotIdx, String name) {`
`506`	`506`	`mutex_enter_blocking(&_stateMutex);`
`507`		`- _sharedState.slotTemp = t; _sharedState.slotValid = isValid; _sharedState.selectedSlotIdx = slotIdx;`
	`507`	`+ _sharedState.slotTemp = t; _sharedState.slotHum = h; _sharedState.slotValid = isValid; _sharedState.selectedSlotIdx = slotIdx;`
`508`	`508`	`safeCopy(_sharedState.slotName, name.c_str( ), sizeof(_sharedState.slotName)); _isDirty = true;`
`509`	`509`	`mutex_exit(&_stateMutex);`
`510`	`510`	`}`
`@@ -679,7 +679,7 @@ void DisplayManager::loopCore1( ) {`
`679`	`679`	`drawInterfaceFixed( );`
`680`	`680`	`drawTopBar(snap);`
`681`	`681`	`drawAmbientPanel(snap.ambientTemp, snap.ambientHum, snap.ambientValid);`
`682`		`- drawSlotPanel(snap.slotTemp, snap.slotValid, snap.selectedSlotIdx, snap.slotName, true);`
	`682`	`+ drawSlotPanel(snap.slotTemp, snap.slotHum, snap.slotValid, snap.selectedSlotIdx, snap.slotName, true);`
`683`	`683`	`drawBottomButtons(snap.selectedSlotIdx, true);`
`684`	`684`	`_lastRenderedState = snap;`
`685`	`685`	`_uiMode = MODE_DASHBOARD;`
`@@ -999,7 +999,7 @@ void DisplayManager::render(const SystemState& state) {`
`999`	`999`
`1000`	`1000`
`1001`	`1001`	`drawAmbientPanel(state.ambientTemp, state.ambientHum, state.ambientValid);`
`1002`		`- drawSlotPanel(state.slotTemp, state.slotValid, state.selectedSlotIdx, state.slotName, true);`
	`1002`	`+ drawSlotPanel(state.slotTemp, state.slotHum, state.slotValid, state.selectedSlotIdx, state.slotName, true);`
`1003`	`1003`	`drawBottomButtons(state.selectedSlotIdx, true);`
`1004`	`1004`	`_forceFullRedraw = false;`
`1005`	`1005`	`_lastRenderedState = state;`
`@@ -1035,7 +1035,7 @@ void DisplayManager::render(const SystemState& state) {`
`1035`	`1035`	`}`
`1036`	`1036`	`if (_slotShowMinMax) {`
`1037`	`1037`	`_slotShowMinMax = false;`
`1038`		`- drawSlotPanel(state.slotTemp, state.slotValid,`
	`1038`	`+ drawSlotPanel(state.slotTemp, state.slotHum, state.slotValid,`
`1039`	`1039`	`state.selectedSlotIdx, state.slotName, true);`
`1040`	`1040`	`}`
`1041`	`1041`	`}`
`@@ -1049,7 +1049,7 @@ void DisplayManager::render(const SystemState& state) {`
`1049`	`1049`	`drawBottomButtons(state.selectedSlotIdx, false);`
`1050`	`1050`	`}`
`1051`	`1051`
`1052`		`- drawSlotPanel(state.slotTemp, state.slotValid, state.selectedSlotIdx, state.slotName, (slotChanged \|\| nameChanged));`
	`1052`	`+ drawSlotPanel(state.slotTemp, state.slotHum, state.slotValid, state.selectedSlotIdx, state.slotName, (slotChanged \|\| nameChanged));`
`1053`	`1053`	`}`
`1054`	`1054`
`1055`	`1055`	`/* Detect alarm state change and redraw buttons + panels */`
`@@ -1061,7 +1061,7 @@ void DisplayManager::render(const SystemState& state) {`
`1061`	`1061`	`drawAmbientPanel(state.ambientTemp, state.ambientHum, state.ambientValid);`
`1062`	`1062`	`}`
`1063`	`1063`	`if (!_slotShowMinMax) {`
`1064`		`- drawSlotPanel(state.slotTemp, state.slotValid,`
	`1064`	`+ drawSlotPanel(state.slotTemp, state.slotHum, state.slotValid,`
`1065`	`1065`	`state.selectedSlotIdx, state.slotName, true);`
`1066`	`1066`	`}`
`1067`	`1067`	`_prevAlarmSlotMask = _alarmSlotMask;`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ void DisplayManager::redrawAlarmFlash( ) {`
`148`	`148`
`149`	`149`	`int sel = _lastRenderedState.selectedSlotIdx;`
`150`	`150`	`if (isSlotAlarming(sel)) {`
`151`		`- drawSlotPanel(_lastRenderedState.slotTemp, _lastRenderedState.slotValid,`
	`151`	`+ drawSlotPanel(_lastRenderedState.slotTemp, _lastRenderedState.slotHum, _lastRenderedState.slotValid,`
`152`	`152`	`sel, _lastRenderedState.slotName, true);`
`153`	`153`	`}`
`154`	`154`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ void DisplayManager::handleTouch( ) {`
`398`	`398`	`mutex_enter_blocking(&_stateMutex);`
`399`	`399`	`snap = _sharedState;`
`400`	`400`	`mutex_exit(&_stateMutex);`
`401`		`- drawSlotPanel(snap.slotTemp, snap.slotValid,`
	`401`	`+ drawSlotPanel(snap.slotTemp, snap.slotHum, snap.slotValid,`
`402`	`402`	`snap.selectedSlotIdx, snap.slotName, true);`
`403`	`403`	`}`
`404`	`404`	`return;`