Fix GUI auto-decimal (#21445)

arendst · May 21, 2024 · 2e51860 · 2e51860
1 parent 7824378
commit 2e51860
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_46_ccloader.ino b/tasmota/tasmota_xdrv_driver/xdrv_46_ccloader.ino
@@ -657,11 +657,11 @@ void CCLoadershow(bool json) {
  if (json) {
  // unused
  } else {
- WSContentSend_PD(PSTR("<h3>CCLoader</h3>"));
+ WSContentSend_P(PSTR("<h3>CCLoader</h3>"));
  if (CCL.chip.ID!=0){
- WSContentSend_PD(PSTR("Chip ID: %x<br>"),CCL.chip.ID);
- WSContentSend_PD(PSTR("Chip Revision: %x<br>"),CCL.chip.rev);
- WSContentSend_PD(PSTR("Chip Name: %s<br>"),CCLChipName(CCL.chip.ID).c_str());
+ WSContentSend_P(PSTR("Chip ID: %x<br>"),CCL.chip.ID);
+ WSContentSend_P(PSTR("Chip Revision: %x<br>"),CCL.chip.rev);
+ WSContentSend_P(PSTR("Chip Name: %s<br>"),CCLChipName(CCL.chip.ID).c_str());
  }
  }
 }

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_85_esp32_ble_eq3_trv.ino b/tasmota/tasmota_xdrv_driver/xdrv_85_esp32_ble_eq3_trv.ino
@@ -1007,7 +1007,7 @@ void EQ3Show(void)
  FirstSensorShown = true;
  const char *alias = BLE_ESP32::getAlias(EQ3Devices[i].addr);
  if (alias && *alias){
- WSContentSend_PD(HTTP_EQ3_ALIAS, i + 1, alias);
+ WSContentSend_P(HTTP_EQ3_ALIAS, i + 1, alias);
  }
  WSContentSend_P(HTTP_EQ3_MAC, i + 1, addrStr(EQ3Devices[i].addr));
  WSContentSend_PD(HTTP_EQ3_RSSI, i + 1, EQ3Devices[i].RSSI);

diff --git a/tasmota/tasmota_xsns_sensor/xsns_61_MI_NRF24.ino b/tasmota/tasmota_xsns_sensor/xsns_61_MI_NRF24.ino
@@ -1906,7 +1906,7 @@ void MINRFShow(bool json)
  continue;
  }
  WSContentSend_PD(HTTP_MINRF_HL);
- WSContentSend_PD(HTTP_MINRF_MAC, kMINRFDeviceType[MIBLEsensors[i].type-1], D_MAC_ADDRESS, MIBLEsensors[i].MAC[0], MIBLEsensors[i].MAC[1],MIBLEsensors[i].MAC[2],MIBLEsensors[i].MAC[3],MIBLEsensors[i].MAC[4],MIBLEsensors[i].MAC[5]);
+ WSContentSend_P(HTTP_MINRF_MAC, kMINRFDeviceType[MIBLEsensors[i].type-1], D_MAC_ADDRESS, MIBLEsensors[i].MAC[0], MIBLEsensors[i].MAC[1],MIBLEsensors[i].MAC[2],MIBLEsensors[i].MAC[3],MIBLEsensors[i].MAC[4],MIBLEsensors[i].MAC[5]);
  if (MIBLEsensors[i].type==YEERC) continue;
  if (MIBLEsensors[i].type==FLORA){
  if(!isnan(MIBLEsensors[i].temp)){
@@ -1932,7 +1932,7 @@ void MINRFShow(bool json)
  if(MINRF.beacon.active){
  WSContentSend_PD(HTTP_MINRF_HL);
  WSContentSend_PD(HTTP_MINRF_HL);
- WSContentSend_PD(HTTP_MINRF_MAC, F("Beacon"), D_MAC_ADDRESS, MINRF.beacon.MAC[0], MINRF.beacon.MAC[1],MINRF.beacon.MAC[2],MINRF.beacon.MAC[3],MINRF.beacon.MAC[4],MINRF.beacon.MAC[5]);
+ WSContentSend_P(HTTP_MINRF_MAC, F("Beacon"), D_MAC_ADDRESS, MINRF.beacon.MAC[0], MINRF.beacon.MAC[1],MINRF.beacon.MAC[2],MINRF.beacon.MAC[3],MINRF.beacon.MAC[4],MINRF.beacon.MAC[5]);
  WSContentSend_PD(PSTR("{s}Beacon Time{m}%u seconds{e}"),MINRF.beacon.time);
  }
 

diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_MI_HM10.ino b/tasmota/tasmota_xsns_sensor/xsns_62_MI_HM10.ino
@@ -2228,12 +2228,12 @@ void HM10Show(bool json)
  }
  if (MIBLEsensors.size()==0) i=-1; // only for the GUI
 
- WSContentSend_PD(HTTP_HM10, HM10.firmware, i+1,stemp,MIBLEsensors.size());
+ WSContentSend_P(HTTP_HM10, HM10.firmware, i+1,stemp,MIBLEsensors.size());
  for (i; i<j; i++) {
  WSContentSend_PD(HTTP_HM10_HL);
  char _MAC[18];
  ToHex_P(MIBLEsensors[i].MAC,6,_MAC,18,':');
- WSContentSend_PD(HTTP_HM10_MAC, kHM10DeviceType[MIBLEsensors[i].type-1], D_MAC_ADDRESS, _MAC);
+ WSContentSend_P(HTTP_HM10_MAC, kHM10DeviceType[MIBLEsensors[i].type-1], D_MAC_ADDRESS, _MAC);
  if (MIBLEsensors[i].type==HM10_FLORA){
  if(!isnan(MIBLEsensors[i].temp)){
  WSContentSend_Temp(kHM10DeviceType[MIBLEsensors[i].type-1], MIBLEsensors[i].temp);
@@ -2288,7 +2288,7 @@ void HM10Show(bool json)
  _sbeacon[6] = _idx + 0x30;
  char _MAC[18];
  ToHex_P(_beacon.MAC,6,_MAC,18,':');
- WSContentSend_PD(HTTP_HM10_MAC, _sbeacon, D_MAC_ADDRESS, _MAC);
+ WSContentSend_P(HTTP_HM10_MAC, _sbeacon, D_MAC_ADDRESS, _MAC);
  WSContentSend_PD(HTTP_RSSI, _sbeacon, _beacon.RSSI);
  if(_beacon.CID!=0) WSContentSend_PD(PSTR("{s}Beacon%u CID{m}0x%04X{e}"),_idx, _beacon.CID);
  if(_beacon.SVC!=0) WSContentSend_PD(PSTR("{s}Beacon%u SVC{m}0x%04X{e}"),_idx, _beacon.SVC);

diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino
@@ -2661,8 +2661,8 @@ void MI32Show(bool json)
  char _MAC[18];
  ToHex_P(MIBLEsensors[i].MAC,6,_MAC,18,':');
  const char * _sensorName = MI32getDeviceName(i);
- WSContentSend_PD(HTTP_MI32_MAC, _sensorName, D_MAC_ADDRESS, _MAC);
- WSContentSend_PD(HTTP_RSSI, _sensorName, MIBLEsensors[i].RSSI);
+ WSContentSend_P(HTTP_MI32_MAC, _sensorName, D_MAC_ADDRESS, _MAC);
+ WSContentSend_P(HTTP_RSSI, _sensorName, MIBLEsensors[i].RSSI);
  if (MIBLEsensors[i].type==FLORA) {
  if (!isnan(MIBLEsensors[i].temp)) {
  WSContentSend_Temp(_sensorName, MIBLEsensors[i].temp);

diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino
@@ -3527,7 +3527,7 @@ void MI32Show(bool json)
  const char *typeName = kMI32DeviceType[p->type-1];
  const char *alias = BLE_ESP32::getAlias(p->MAC);
  if (alias && *alias){
- WSContentSend_PD(HTTP_MI32_ALIAS, typeName, alias);
+ WSContentSend_P(HTTP_MI32_ALIAS, typeName, alias);
  }
  char _MAC[18];
  ToHex_P(p->MAC,6,_MAC,18);//,':');