feat: integrate driver-based panel rendering into Dashboard

drawAmbientPanel and drawSlotPanel now use sensorRenderPanel()
from the sensor driver dispatch, replacing hardcoded temperature
and humidity rendering. Old code preserved but skipped via goto
(compiler dead-code-eliminates where possible).

Changes:
- SystemState: +ambientType, +slotType fields
- setAmbientData/setSlotData: accept and store SensorType
- AppManager_HistoryAlarm: pass sensor type from RuntimeSensor
- Dashboard: sensorRenderPanel() for both panels' normal mode
- All callers updated to pass SensorType parameter

Flash: 1031280 bytes (-256 bytes vs baseline!)
Tests: 49/49 pass.

The driver now owns panel formatting. New sensors just add
their renderPanel() function and it works for both panels.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: angeloINTJ

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.avgValue2, !s.inErrorState, _currentSensorIdx, String(s.config.friendlyName));
+ _displayMgr->setSlotData(s.avgValue1, s.avgValue2, s.type, !s.inErrorState, _currentSensorIdx, String(s.config.friendlyName));
  found = true; break;
  }
  }
  }
  } else if (_currentSensorIdx == 10) {
- _displayMgr->setSlotData(analogReadTemp( ), NAN, true, 10, "Board (Internal)"); found = true;
+ _displayMgr->setSlotData(analogReadTemp( ), NAN, TYPE_NONE, true, 10, "Board (Internal)"); found = true;
  }
 
- if (!found) _displayMgr->setSlotData(NAN, NAN, false, _currentSensorIdx, "Empty / Inactive");
+ if (!found) _displayMgr->setSlotData(NAN, NAN, TYPE_NONE, false, _currentSensorIdx, "Empty / Inactive");
 }
 
 /**
@@ -104,13 +104,13 @@ void AppManager::updateLiveDisplay( ) {
  SystemConfig &cfg = _storageMgr->getConfig( );
 
  for (const auto &s : sensors) {
- if (s.config.pins[0] == 10) _displayMgr->setAmbientData(s.avgValue1, s.avgValue2, !s.inErrorState);
+ if (s.config.pins[0] == 10) _displayMgr->setAmbientData(s.avgValue1, s.avgValue2, s.type, !s.inErrorState);
  else if (_currentSensorIdx < 10 && cfg.sensors[_currentSensorIdx].active && cfg.sensors[_currentSensorIdx].pins[0] == s.config.pins[0]) {
- _displayMgr->setSlotData(s.avgValue1, s.avgValue2, !s.inErrorState, _currentSensorIdx, String(s.config.friendlyName));
+ _displayMgr->setSlotData(s.avgValue1, s.avgValue2, s.type, !s.inErrorState, _currentSensorIdx, String(s.config.friendlyName));
  }
  }
 
- if (_currentSensorIdx == 10) _displayMgr->setSlotData(analogReadTemp( ), NAN, true, 10, "Board (Internal)");
+ if (_currentSensorIdx == 10) _displayMgr->setSlotData(analogReadTemp( ), NAN, TYPE_NONE, true, 10, "Board (Internal)");
  }
 }
 

src/DisplayManager.cpp

@@ -489,9 +489,9 @@ void DisplayManager::setWebBusy(bool busy, const char* username) {
 	mutex_exit(&_stateMutex);
 }
 
-void DisplayManager::setAmbientData(float t, float h, bool isValid) {
+void DisplayManager::setAmbientData(float t, float h, SensorType type, bool isValid) {
 	mutex_enter_blocking(&_stateMutex);
-	_sharedState.ambientTemp = t; _sharedState.ambientHum = h; _sharedState.ambientValid = isValid; _isDirty = true;
+	_sharedState.ambientTemp = t; _sharedState.ambientHum = h; _sharedState.ambientValid = isValid; _sharedState.ambientType = type; _isDirty = true;
 	mutex_exit(&_stateMutex);
 }
 
@@ -502,9 +502,9 @@ void DisplayManager::setAmbientMinMax(float minT, float maxT, float minH, float
 	_ambMaxHum = maxH;
 }
 
-void DisplayManager::setSlotData(float t, float h, bool isValid, int slotIdx, String name) {
+void DisplayManager::setSlotData(float t, float h, SensorType type, bool isValid, int slotIdx, String name) {
 	mutex_enter_blocking(&_stateMutex);
-	_sharedState.slotTemp = t; _sharedState.slotHum = h; _sharedState.slotValid = isValid; _sharedState.selectedSlotIdx = slotIdx;
+	_sharedState.slotTemp = t; _sharedState.slotHum = h; _sharedState.slotValid = isValid; _sharedState.slotType = type; _sharedState.selectedSlotIdx = slotIdx;
 	safeCopy(_sharedState.slotName, name.c_str( ), sizeof(_sharedState.slotName)); _isDirty = true;
 	mutex_exit(&_stateMutex);
 }
@@ -678,8 +678,8 @@ void DisplayManager::loopCore1( ) {
 
 				drawInterfaceFixed( );
 				drawTopBar(snap);
-				drawAmbientPanel(snap.ambientTemp, snap.ambientHum, snap.ambientValid);
-				drawSlotPanel(snap.slotTemp, snap.slotHum, snap.slotValid, snap.selectedSlotIdx, snap.slotName, true);
+				drawAmbientPanel(snap.ambientTemp, snap.ambientHum, snap.ambientType, snap.ambientValid);
+				drawSlotPanel(snap.slotTemp, snap.slotHum, snap.slotType, snap.slotValid, snap.selectedSlotIdx, snap.slotName, true);
 				drawBottomButtons(snap.selectedSlotIdx, true);
 				_lastRenderedState = snap;
 				_uiMode = MODE_DASHBOARD;
@@ -998,8 +998,8 @@ void DisplayManager::render(const SystemState& state) {
 		drawTopBar(state);
 
 
-		drawAmbientPanel(state.ambientTemp, state.ambientHum, state.ambientValid);
-		drawSlotPanel(state.slotTemp, state.slotHum, state.slotValid, state.selectedSlotIdx, state.slotName, true);
+		drawAmbientPanel(state.ambientTemp, state.ambientHum, state.ambientType, state.ambientValid);
+		drawSlotPanel(state.slotTemp, state.slotHum, state.slotType, state.slotValid, state.selectedSlotIdx, state.slotName, true);
 		drawBottomButtons(state.selectedSlotIdx, true);
 		_forceFullRedraw = false;
 		_lastRenderedState = state;
@@ -1022,7 +1022,7 @@ void DisplayManager::render(const SystemState& state) {
 		if (abs(state.ambientTemp - _lastRenderedState.ambientTemp) > 0.01 ||
 		    abs(state.ambientHum - _lastRenderedState.ambientHum) > 0.01 ||
 		    state.ambientValid != _lastRenderedState.ambientValid) {
-			drawAmbientPanel(state.ambientTemp, state.ambientHum, state.ambientValid);
+			drawAmbientPanel(state.ambientTemp, state.ambientHum, state.ambientType, state.ambientValid);
 		}
 	}
 
@@ -1031,11 +1031,11 @@ void DisplayManager::render(const SystemState& state) {
 	    timeSince(_lastTouchTime, 30000)) {
 		if (_ambientShowMinMax) {
 			_ambientShowMinMax = false;
-			drawAmbientPanel(state.ambientTemp, state.ambientHum, state.ambientValid);
+			drawAmbientPanel(state.ambientTemp, state.ambientHum, state.ambientType, state.ambientValid);
 		}
 		if (_slotShowMinMax) {
 			_slotShowMinMax = false;
-			drawSlotPanel(state.slotTemp, state.slotHum, state.slotValid,
+			drawSlotPanel(state.slotTemp, state.slotHum, state.slotType, 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.slotHum, state.slotValid, state.selectedSlotIdx, state.slotName, (slotChanged || nameChanged));
+		drawSlotPanel(state.slotTemp, state.slotHum, state.slotType, state.slotValid, state.selectedSlotIdx, state.slotName, (slotChanged || nameChanged));
 	}
 
 	/* Detect alarm state change and redraw buttons + panels */
@@ -1058,10 +1058,10 @@ void DisplayManager::render(const SystemState& state) {
 	    _alarmAmbientHum != _prevAlarmAmbHum) {
 		drawBottomButtons(state.selectedSlotIdx, true);
 		if (!_ambientShowMinMax) {
-			drawAmbientPanel(state.ambientTemp, state.ambientHum, state.ambientValid);
+			drawAmbientPanel(state.ambientTemp, state.ambientHum, state.ambientType, state.ambientValid);
 		}
 		if (!_slotShowMinMax) {
-			drawSlotPanel(state.slotTemp, state.slotHum, state.slotValid,
+			drawSlotPanel(state.slotTemp, state.slotHum, state.slotType, state.slotValid,
 			              state.selectedSlotIdx, state.slotName, true);
 		}
 		_prevAlarmSlotMask = _alarmSlotMask;

src/DisplayManager.h

@@ -100,8 +100,8 @@ struct BootLogEntry {
 };
 
 struct SystemState {
-	float ambientTemp; float ambientHum; bool ambientValid;
-	float slotTemp; float slotHum; bool slotValid; int selectedSlotIdx; char slotName[32];
+	float ambientTemp; float ambientHum; bool ambientValid; SensorType ambientType;
+	float slotTemp; float slotHum; bool slotValid; SensorType slotType; int selectedSlotIdx; char slotName[32];
 	int wifiRssi; bool btActive; char timeString[24];
 	uint16_t pendingPkts;
 	bool isBooting; BootLogEntry bootLogs[5]; bool showSkipButton; int apProgressPct;
@@ -142,9 +142,9 @@ class DisplayManager {
 	 * here (Core 1 with IRQs off) and unnecessary (Core 1 does not touch flash). */
 	bool isInQuietMode( ) const { return _quietModeRequested || _quietModeActive; }
 
-	void setAmbientData(float t, float h, bool isValid = true);
+	void setAmbientData(float t, float h, SensorType type, bool isValid = true);
 	void setAmbientMinMax(float minT, float maxT, float minH, float maxH);
-	void setSlotData(float t, float h, bool isValid, int slotIdx, String name);
+	void setSlotData(float t, float h, SensorType type, bool isValid, int slotIdx, String name);
 	void setSlotMinMax(float minT, float maxT);
 	void setSystemStatus(int rssi, bool bt, String timeStr);
 
@@ -424,8 +424,8 @@ class DisplayManager {
 	void render(const SystemState& state);
 	void drawInterfaceFixed( );
 	void drawTopBar(const SystemState& state);
-	void drawAmbientPanel(float t, float h, bool isValid);
-	void drawSlotPanel(float t, float h, bool isValid, int slotIdx, const char* name, bool forceNameRedraw);
+	void drawAmbientPanel(float t, float h, SensorType type, bool isValid);
+	void drawSlotPanel(float t, float h, SensorType type, bool isValid, int slotIdx, const char* name, bool forceNameRedraw);
 	void drawBottomButtons(int selectedIdx, bool forceRedraw);
 
 	/** Dynamic dashboard layout: omits inactive slots and the pagination

src/DisplayManager_Alarm.cpp

@@ -142,13 +142,13 @@ void DisplayManager::redrawAlarmFlash( ) {
 
 	if (_alarmAmbientTemp || _alarmAmbientHum) {
 		drawAmbientPanel(_lastRenderedState.ambientTemp,
-		                 _lastRenderedState.ambientHum,
+		                 _lastRenderedState.ambientHum, _lastRenderedState.ambientType,
 		                 _lastRenderedState.ambientValid);
 	}
 
 	int sel = _lastRenderedState.selectedSlotIdx;
 	if (isSlotAlarming(sel)) {
-		drawSlotPanel(_lastRenderedState.slotTemp, _lastRenderedState.slotHum, _lastRenderedState.slotValid,
+		drawSlotPanel(_lastRenderedState.slotTemp, _lastRenderedState.slotHum, _lastRenderedState.slotType, _lastRenderedState.slotValid,
 		              sel, _lastRenderedState.slotName, true);
 	}
 

src/DisplayManager_Dashboard.cpp

@@ -16,6 +16,7 @@
 #include "DisplayManager_Fonts.h"
 #include "LogManager.h"
 #include "StorageManager.h"
+#include "sensors/SensorPanelDispatch.h"
 
 void DisplayManager::fixCardCorners(int16_t x, int16_t y, int16_t w,
  int16_t h, int16_t r,
@@ -132,9 +133,10 @@ void DisplayManager::maskStripCorners(GFXcanvas16* canvas,
 void DisplayManager::restoreNormalDashboard( ) {
  if (!_tft || !_canvasSmall || !_canvasWide) return;
  drawAmbientPanel(_lastRenderedState.ambientTemp,
- _lastRenderedState.ambientHum,
+ _lastRenderedState.ambientHum, _lastRenderedState.ambientType,
  _lastRenderedState.ambientValid);
- drawSlotPanel(_lastRenderedState.slotTemp, _lastRenderedState.slotHum, _lastRenderedState.slotValid,
+ drawSlotPanel(_lastRenderedState.slotTemp, _lastRenderedState.slotHum, _lastRenderedState.slotType,
+ _lastRenderedState.slotValid,
  _lastRenderedState.selectedSlotIdx,
  _lastRenderedState.slotName, true);
  drawBottomButtons(_lastRenderedState.selectedSlotIdx, true);
@@ -407,7 +409,7 @@ void DisplayManager::drawTopBar(const SystemState& state) {
  blitCanvas(_canvasWide, 0, 0, W, H);
 }
 
-void DisplayManager::drawAmbientPanel(float t, float h, bool isValid) {
+void DisplayManager::drawAmbientPanel(float t, float h, SensorType type, bool isValid) {
  if (!_canvasWide) return;
  int16_t x1, y1; uint16_t w, h_bound;
 
@@ -697,6 +699,14 @@ void DisplayManager::drawAmbientPanel(float t, float h, bool isValid) {
  blitCanvas(_canvasWide, CARD_X, CARD_Y + 20, CARD_W, 8);
  }
 
+ /* Strip 3: Content (driver-rendered) */
+ _canvasWide->fillScreen(C_BG_MAIN);
+ sensorRenderPanel(_canvasWide, type, t, h, isValid, CARD_W, true,
+                   leftRed || rightRed, C_CARD_BG,
+                   simutFont24pt, simutFont12pt, simutFont9pt);
+ maskStripCorners(_canvasWide, 28, 40, CARD_W, CARD_H, CARD_R, C_BG_MAIN, borderColor);
+ blitCanvas(_canvasWide, CARD_X, CARD_Y + 28, CARD_W, 40);
+ goto _ambient_bottom_fill;
  /* Strip 3: Temperature + Humidity (40px) */
  {
  _canvasWide->fillRect(0, 0, 160, 40, leftBg);
@@ -817,6 +827,7 @@ void DisplayManager::drawAmbientPanel(float t, float h, bool isValid) {
  blitCanvas(_canvasWide, CARD_X, CARD_Y + 28, CARD_W, 40);
  }
 
+_ambient_bottom_fill:
  /* Strip 4: Bottom fill (7px) */
  {
  uint16_t lBg = leftRed ? RGB565(180, 30, 30) : C_CARD_BG;
@@ -830,7 +841,7 @@ void DisplayManager::drawAmbientPanel(float t, float h, bool isValid) {
  }
 }
 
-void DisplayManager::drawSlotPanel(float t, float h, bool isValid, int slotIdx, const char* name, bool forceNameRedraw) {
+void DisplayManager::drawSlotPanel(float t, float h, SensorType type, bool isValid, int slotIdx, const char* name, bool forceNameRedraw) {
  if(!_canvasWide) return;
  int16_t x1, y1; uint16_t h_bound;
 
@@ -1084,6 +1095,15 @@ void DisplayManager::drawSlotPanel(float t, float h, bool isValid, int slotIdx,
  _canvasWide->setCursor((CARD_W - (int)ew) / 2, 28);
  _canvasWide->print(tr(TR_ERROR_LBL));
  } else {
+ _canvasWide->fillScreen(C_BG_MAIN);
+ sensorRenderPanel(_canvasWide, type, t, h, isValid, CARD_W, false,
+                   isRedPhase, panelBg,
+                   simutFont24pt, simutFont12pt, simutFont9pt);
+ maskStripCorners(_canvasWide, 28, 40, CARD_W, CARD_H, CARD_R, C_BG_MAIN,
+                  isRedPhase ? RGB565(200,0,0) : C_TEXT_SUB);
+ blitCanvas(_canvasWide, CARD_X, CARD_Y + 28, CARD_W, 40);
+ goto _slot_bottom_fill;
+
  const int iconW = 20;
  const int iconGap = 8;
  const int unitGap = 3;
@@ -1180,6 +1200,8 @@ void DisplayManager::drawSlotPanel(float t, float h, bool isValid, int slotIdx,
  maskStripCorners(_canvasWide, 28, 40, CARD_W, CARD_H, CARD_R, C_BG_MAIN, borderColor);
  blitCanvas(_canvasWide, CARD_X, CARD_Y + 28, CARD_W, 40);
 
+_ambient_bottom_fill:
+_slot_bottom_fill:
  /* Strip 4: Bottom fill (7px) */
  {
  _canvasWide->fillScreen(panelBg);

src/DisplayManager_Touch.cpp

@@ -367,7 +367,7 @@ void DisplayManager::handleTouch( ) {
  mutex_enter_blocking(&_stateMutex);
  snap = _sharedState;
  mutex_exit(&_stateMutex);
- drawAmbientPanel(snap.ambientTemp, snap.ambientHum, snap.ambientValid);
+ drawAmbientPanel(snap.ambientTemp, snap.ambientHum, snap.ambientType, snap.ambientValid);
  }
  return;
  }
@@ -398,7 +398,7 @@ void DisplayManager::handleTouch( ) {
  mutex_enter_blocking(&_stateMutex);
  snap = _sharedState;
  mutex_exit(&_stateMutex);
- drawSlotPanel(snap.slotTemp, snap.slotHum, snap.slotValid,
+ drawSlotPanel(snap.slotTemp, snap.slotHum, snap.slotType, snap.slotValid,
  snap.selectedSlotIdx, snap.slotName, true);
  }
  return;