|
@ -356,10 +356,10 @@ void displayValues() { |
|
|
// other nodes
|
|
|
// other nodes
|
|
|
display.setFont(NULL); |
|
|
display.setFont(NULL); |
|
|
display.setCursor(0, y_offset+70); |
|
|
display.setCursor(0, y_offset+70); |
|
|
display.printf("246f28d1fa5c: %4.1f %4.1f %6.1f\n", sensors_246f28d1fa5c.temperature, sensors_246f28d1fa5c.humidity, sensors_246f28d1fa5c.pressure); |
|
|
if (!ota.getMAC().equals("246f28d1fa5c")) display.printf("246f28d1fa5c: %4.1f %4.1f %6.1f\n", sensors_246f28d1fa5c.temperature, sensors_246f28d1fa5c.humidity, sensors_246f28d1fa5c.pressure); |
|
|
display.printf("a4cf1211c3e4: %4.1f %4.1f %6.1f\n", sensors_a4cf1211c3e4.temperature, sensors_a4cf1211c3e4.humidity, sensors_a4cf1211c3e4.pressure); |
|
|
if (!ota.getMAC().equals("a4cf1211c3e4")) display.printf("a4cf1211c3e4: %4.1f %4.1f %6.1f\n", sensors_a4cf1211c3e4.temperature, sensors_a4cf1211c3e4.humidity, sensors_a4cf1211c3e4.pressure); |
|
|
display.printf("246f28d1a080: %4.1f %4.1f %6.1f\n", sensors_246f28d1a080.temperature, sensors_246f28d1a080.humidity, sensors_246f28d1a080.pressure); |
|
|
if (!ota.getMAC().equals("246f28d1a080")) display.printf("246f28d1a080: %4.1f %4.1f %6.1f\n", sensors_246f28d1a080.temperature, sensors_246f28d1a080.humidity, sensors_246f28d1a080.pressure); |
|
|
display.printf("30aea47b0568: %4.1f %4.1f %6.1f\n", sensors_30aea47b0568.temperature, sensors_30aea47b0568.humidity, sensors_30aea47b0568.pressure); |
|
|
if (!ota.getMAC().equals("30aea47b0568")) display.printf("30aea47b0568: %4.1f %4.1f %6.1f\n", sensors_30aea47b0568.temperature, sensors_30aea47b0568.humidity, sensors_30aea47b0568.pressure); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
while (display.nextPage()); |
|
|
while (display.nextPage()); |
|
@ -561,10 +561,10 @@ void setup() |
|
|
ESP_LOGD(TAG, "connecting to MQTT"); |
|
|
ESP_LOGD(TAG, "connecting to MQTT"); |
|
|
mqtt.begin(); |
|
|
mqtt.begin(); |
|
|
|
|
|
|
|
|
mqtt.subscribe("thomas/sensor/a4cf1211c3e4/#", receiveMqtt); |
|
|
if (!ota.getMAC().equals("a4cf1211c3e4")) mqtt.subscribe("thomas/sensor/a4cf1211c3e4/#", receiveMqtt); |
|
|
mqtt.subscribe("thomas/sensor/246f28d1fa5c/#", receiveMqtt); |
|
|
if (!ota.getMAC().equals("246f28d1fa5c")) mqtt.subscribe("thomas/sensor/246f28d1fa5c/#", receiveMqtt); |
|
|
mqtt.subscribe("thomas/sensor/246f28d1a080/#", receiveMqtt); |
|
|
if (!ota.getMAC().equals("246f28d1a080")) mqtt.subscribe("thomas/sensor/246f28d1a080/#", receiveMqtt); |
|
|
mqtt.subscribe("thomas/sensor/30aea47b0568/#", receiveMqtt); |
|
|
if (!ota.getMAC().equals("30aea47b0568")) mqtt.subscribe("thomas/sensor/30aea47b0568/#", receiveMqtt); |
|
|
|
|
|
|
|
|
ESP_LOGD(TAG, "setup done"); |
|
|
ESP_LOGD(TAG, "setup done"); |
|
|
} |
|
|
} |
|
|