Merge branch 'dev' into rc

This commit is contained in:
Otto Winter
2019-01-06 19:38:23 +01:00
parent 1ad65516cf
commit 4046a16d85
227 changed files with 11196 additions and 3511 deletions
+10
View File
@@ -0,0 +1,10 @@
# Gitignore settings for esphomeyaml
# This is an example and may include too much for your use-case.
# You can modify this file to suit your needs.
/.esphomeyaml/
**/.pioenvs/
**/.piolibdeps/
**/lib/
**/src/
**/platformio.ini
/secrets.yaml
+46 -17
View File
@@ -2,8 +2,6 @@ esphomeyaml:
name: test1
platform: ESP32
board: nodemcu-32s
# Use latest upstream esphomelib git version.
esphomelib_version: dev
# Use this for testing while developing:
# esphomelib_version:
# local: ~/path/to/esphomelib
@@ -24,8 +22,13 @@ esphomeyaml:
build_path: build/test1
wifi:
ssid: 'MySSID'
password: 'password1'
networks:
- ssid: 'MySSID'
password: 'password1'
- ssid: 'MySSID2'
password: ''
channel: 14
bssid: 'A1:63:95:47:D3:1D'
manual_ip:
static_ip: 192.168.178.230
gateway: 192.168.178.1
@@ -180,7 +183,7 @@ sensor:
- lambda: return x * (9.0/5.0) + 32.0;
on_value:
then:
- lambda: >-
- lambda: |-
ESP_LOGD("main", "Got value %f", x);
id(my_sensor).publish_state(42.0);
ESP_LOGI("main", "Value of my sensor: %f", id(my_sensor).state);
@@ -373,6 +376,10 @@ sensor:
name: "Living Room Temperature"
cs_pin: GPIO23
update_interval: 15s
- platform: max31855
name: "Den Temperature"
cs_pin: GPIO23
update_interval: 15s
- platform: mhz19
co2:
name: "MH-Z19 CO2 Value"
@@ -528,6 +535,11 @@ binary_sensor:
format: "Multi Clicked SINGLE"
level: warn
id: binary_sensor1
- platform: gpio
pin:
number: GPIO9
mode: INPUT_PULLUP
name: "Living Room Window 2"
- platform: status
name: "Living Room Status"
- platform: esp32_touch
@@ -712,8 +724,8 @@ light:
color_correct: [75%, 100%, 50%]
name: "FastLED WS2811 Light"
effects:
- fastled_color_wipe:
- fastled_color_wipe:
- addressable_color_wipe:
- addressable_color_wipe:
name: Color Wipe Effect With Custom Values
colors:
- red: 100%
@@ -726,29 +738,29 @@ light:
num_leds: 1
add_led_interval: 100ms
reverse: False
- fastled_scan:
- fastled_scan:
- addressable_scan:
- addressable_scan:
name: Scan Effect With Custom Values
move_interval: 100ms
- fastled_twinkle:
- fastled_twinkle:
- addressable_twinkle:
- addressable_twinkle:
name: Twinkle Effect With Custom Values
twinkle_probability: 5%
progress_interval: 4ms
- fastled_random_twinkle:
- fastled_random_twinkle:
- addressable_random_twinkle:
- addressable_random_twinkle:
name: Random Twinkle Effect With Custom Values
twinkle_probability: 5%
progress_interval: 32ms
- fastled_fireworks:
- fastled_fireworks:
- addressable_fireworks:
- addressable_fireworks:
name: Fireworks Effect With Custom Values
update_interval: 32ms
spark_probability: 10%
use_random_color: false
fade_out_rate: 120
- fastled_flicker:
- fastled_flicker:
- addressable_flicker:
- addressable_flicker:
name: Flicker Effect With Custom Values
update_interval: 16ms
intensity: 5%
@@ -759,6 +771,22 @@ light:
num_leds: 60
rgb_order: BRG
name: "FastLED SPI Light"
- platform: neopixelbus
name: "Neopixelbus Light"
gamma_correct: 2.8
color_correct: [0.0, 0.0, 0.0, 0.0]
default_transition_length: 10s
power_supply: atx_power_supply
effects:
- addressable_flicker:
name: Flicker Effect With Custom Values
update_interval: 16ms
intensity: 5%
type: GRBW
variant: SK6812
method: ESP32_I2S_0
num_leds: 60
pin: GPIO23
remote_transmitter:
- pin: 32
@@ -770,6 +798,7 @@ switch:
icon: "mdi:restart"
inverted: True
command_topic: custom_command_topic
restore_mode: ALWAYS_OFF
- platform: remote_transmitter
name: "Panasonic TV Off"
nec:
+75 -8
View File
@@ -1,19 +1,29 @@
esphomeyaml:
name: test2
name: $devicename
platform: ESP32
board: nodemcu-32s
# Use latest upstream esphomelib git version.
esphomelib_version: dev
# Use this for testing while developing:
# esphomelib_version:
# local: ~/path/to/esphomelib
use_custom_code: true
build_path: build/test2
wifi:
ssid: 'MySSID'
password: 'password1'
reboot_timeout: 120s
substitutions:
devicename: test2
ethernet:
type: LAN8720
mdc_pin: GPIO23
mdio_pin: GPIO24
clk_mode: GPIO0_IN
phy_addr: 0
power_pin: GPIO25
manual_ip:
static_ip: 192.168.178.56
gateway: 192.168.178.1
subnet: 255.255.255.0
hostname: helloworld
domain: .local
mqtt:
broker: '192.168.178.84'
@@ -21,6 +31,8 @@ mqtt:
username: 'debug'
password: 'debug'
api:
i2c:
sda: 21
scl: 22
@@ -117,6 +129,31 @@ sensor:
name: "CSE7766 Current"
power:
name: "CSE776 Power"
- platform: apds9960
type: proximity
name: APDS9960 Proximity
- platform: apds9960
type: clear
name: APDS9960 Clear
- platform: apds9960
type: red
name: APDS9960 Red
- platform: apds9960
type: green
name: APDS9960 Green
- platform: apds9960
type: blue
name: APDS9960 Blue
- platform: homeassistant
entity_id: sensor.hello_world
id: ha_hello_world
time:
- platform: homeassistant
apds9960:
address: 0x20
update_interval: 60s
esp32_touch:
setup_mode: True
@@ -129,6 +166,18 @@ binary_sensor:
name: "ESP32 Touch Pad GPIO27"
pin: GPIO27
threshold: 1000
- platform: apds9960
direction: up
name: APDS9960 Up
- platform: apds9960
direction: down
name: APDS9960 Down
- platform: apds9960
direction: left
name: APDS9960 Left
- platform: apds9960
direction: right
name: APDS9960 Right
remote_receiver:
pin: GPIO32
@@ -150,7 +199,7 @@ text_sensor:
icon: mdi:icon
id: version_sensor
on_value:
- lambda: |-
- lambda: !lambda |-
ESP_LOGD("main", "The state is %s=%s", x.c_str(), id(version_sensor).state.c_str());
- script.execute: my_script
- platform: mqtt_subscribe
@@ -161,8 +210,26 @@ text_sensor:
name: "Template Text Sensor"
lambda: |-
return {"Hello World"};
- platform: homeassistant
entity_id: sensor.hello_world2
id: ha_hello_world2
script:
- id: my_script
then:
- lambda: 'ESP_LOGD("main", "Hello World!");'
stepper:
- platform: uln2003
id: my_stepper
pin_a: GPIO23
pin_b: GPIO24
pin_c: GPIO25
pin_d: GPIO26
sleep_when_done: no
step_mode: HALF_STEP
max_speed: 250 steps/s
# Optional:
acceleration: inf
deceleration: inf