From a95c5b4f6a05055511271bd3be42404204cff45f Mon Sep 17 00:00:00 2001 From: Staars Date: Thu, 6 Feb 2020 19:06:09 +0100 Subject: [PATCH] resolve conflict --- tasmota/tasmota_template.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index ba7c7c318..347ca4a4f 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -216,6 +216,8 @@ enum UserSelectablePins { GPIO_HPMA_TX, // Honeywell HPMA115S0 Serial interface GPIO_GPS_RX, // GPS serial interface GPIO_GPS_TX, // GPS serial interface + GPIO_DSB_OUT, // Pseudo Single wire DS18B20 or DS18S20 + GPIO_DHT11_OUT, // Pseudo Single wire DHT11, DHT21, DHT22, AM2301, AM2302, AM2321 GPIO_HM10_RX, // HM10-BLE-Mijia-bridge serial interface GPIO_HM10_TX, // HM10-BLE-Mijia-bridge serial interface GPIO_SENSOR_END };