Michel2/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2026-09-11 17:23:18 +00:00
Code Issues Releases Activity

Fix AddLog(0 regression

Browse Source
This commit is contained in:
Theo Arends
2026-08-05 15:13:54 +02:00
parent 4764987f19
commit 81bf049836
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tasmota/tasmota_xsns_sensor/xsns_02_analog.ino
+4 -3
View File
@@ -714,8 +714,9 @@ float AdcGetRange(uint32_t channel) {
*/
int adc = AdcRead(Adc[channel].pin, 5);
float adcrange = ( ((float)Adc[channel].param[1] - (float)adc) / ( ((float)Adc[channel].param[1] - (float)Adc[channel].param[0])) * ((float)Adc[channel].param[2] - (float)Adc[channel].param[3]) + (float)Adc[channel].param[3] );
// AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("DBG: ADC%d, AdcRead %d, Range %4_f"), channel +1, adc, &adcrange);
#ifdef ADC_DEBUG
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("DBG: ADC%d, AdcRead %d, Range %4_f"), channel +1, adc, &adcrange);
#endif // ADC_DEBUG
return adcrange;
}
@@ -741,7 +742,7 @@ void AdcGetCurrentPower(uint32_t channel, uint32_t factor) {
analog_max = analog;
}
}
//AddLog(0, PSTR("min: %u, max:%u, dif:%u"), analog_min, analog_max, analog_max-analog_min);
// AddLog(LOG_LEVEL_DEBUG, PSTR("min: %u, max:%u, dif:%u"), analog_min, analog_max, analog_max-analog_min);
Adc[channel].current = (float)(analog_max-analog_min) * ((float)(Adc[channel].param[1]) / 100000);
if (Adc[channel].current < (((float)Adc[channel].param[3]) / 10000.0)) {
Adc[channel].current = 0.0;
tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino
+7 -7
View File
@@ -1691,12 +1691,9 @@ void MI32Init(void) {
MI32.option.onlyAliased = MI32_OPTION5_ONLY_ALIASED; // Mi32Option5: only include sensors that are aliased
MI32.option.MQTTType = MI32_OPTION6_MQTT_TYPE; // Mi32Option6: publish sensor on MI32.bleTopic with 1 topic per sensor
AddLog(0,PSTR("MI32Option0: %d"), MI32.option.allwaysAggregate);
AddLog(0,PSTR("MI32Option1: %d"), MI32.option.noSummary);
AddLog(0,PSTR("MI32Option2: %d"), MI32.option.directBridgeMode);
AddLog(0,PSTR("MI32Option4: %d"), MI32.option.ignoreBogusBattery);
AddLog(0,PSTR("MI32Option5: %d"), MI32.option.onlyAliased);
AddLog(0,PSTR("MI32Option6: %d"), MI32.option.MQTTType);
AddLog(LOG_LEVEL_DEBUG, PSTR("M32: MI32Option0:%d, 1:%d, 2:%d, 4:%d, 5:%d, 6:%d"),
MI32.option.allwaysAggregate, MI32.option.noSummary, MI32.option.directBridgeMode,
MI32.option.ignoreBogusBattery, MI32.option.onlyAliased, MI32.option.MQTTType);
BLE_ESP32::registerForAdvertismentCallbacks((const char *)"MI32", MI32advertismentCallback);
BLE_ESP32::registerForScanCallbacks((const char *)"MI32", MI32scanCompleteCallback);
@@ -2124,7 +2121,10 @@ static const bthome_obj_def_t BTHOME_OBJECTS[] = {
{0x63, 4}, // Acceleration (0.000001 m/s2) int32
{0x64, 1}, // Light level (0 = Dark, 1 = Twilight, 2 = Bright) uint8
{0x65, 1}, // Settings revision uint8
{0xFF, 0}, // sentinel
{0xF0, 2}, // Device type id uint16
{0xF1, 4}, // Firmware version (F100010204 = 4.2.1.0} uint32
{0xF2, 3}, // Firmware version (F2000106 = 6.1.0} uint24
{0xFF, 0} // sentinel
};
// Returns data length for a BTHome v2 object ID, or -1 if unknown