mirror of
https://github.com/esphome/esphome.git
synced 2026-10-04 18:11:29 +00:00
Merge remote-tracking branch 'upstream/dev' into integration
This commit is contained in:
@@ -3,3 +3,4 @@ output:
|
||||
id: ac_dimmer_1
|
||||
gate_pin: ${gate_pin}
|
||||
zero_cross_pin: ${zero_cross_pin}
|
||||
zero_cross_interrupt_type: ANY
|
||||
|
||||
@@ -5,3 +5,10 @@ packages:
|
||||
uart: !include ../../test_build_components/common/uart/esp32-ard.yaml
|
||||
|
||||
<<: !include common.yaml
|
||||
|
||||
sensor:
|
||||
- platform: dsmr
|
||||
energy_delivered_lux:
|
||||
name: "Energy Consumed Luxembourg. OBIS: 1-0:1.8.0"
|
||||
energy_delivered_tariff1:
|
||||
name: "Energy Consumed Tariff 1. OBIS: 1-0:1.8.1"
|
||||
|
||||
@@ -5,3 +5,17 @@ packages:
|
||||
uart: !include ../../test_build_components/common/uart/esp32-idf.yaml
|
||||
|
||||
<<: !include common.yaml
|
||||
|
||||
sensor:
|
||||
- platform: dsmr
|
||||
energy_delivered_lux:
|
||||
name: "Energy Consumed Luxembourg. OBIS: 1-0:1.8.0"
|
||||
energy_delivered_tariff1:
|
||||
name: "Energy Consumed Tariff 1. OBIS: 1-0:1.8.1"
|
||||
|
||||
text_sensor:
|
||||
- platform: dsmr
|
||||
identification:
|
||||
name: "DSMR Identification"
|
||||
p1_version:
|
||||
name: "DSMR Version. OBIS: 1-3:0.2.8"
|
||||
|
||||
@@ -5,3 +5,10 @@ packages:
|
||||
uart: !include ../../test_build_components/common/uart/esp8266-ard.yaml
|
||||
|
||||
<<: !include common.yaml
|
||||
|
||||
text_sensor:
|
||||
- platform: dsmr
|
||||
identification:
|
||||
name: "DSMR Identification"
|
||||
p1_version:
|
||||
name: "DSMR Version. OBIS: 1-3:0.2.8"
|
||||
|
||||
@@ -20,6 +20,7 @@ esp32:
|
||||
disable_regi2c_in_iram: true
|
||||
disable_fatfs: true
|
||||
sram1_as_iram: true
|
||||
watchdog_timeout: 7s
|
||||
|
||||
wifi:
|
||||
ssid: MySSID
|
||||
|
||||
Reference in New Issue
Block a user