mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-30 22:53:59 +00:00 
			
		
		
		
	Merge branch 'dev' into gsm
This commit is contained in:
		| @@ -5,8 +5,8 @@ esphome: | ||||
|           event: esphome.button_pressed | ||||
|           data: | ||||
|             message: Button was pressed | ||||
|       - homeassistant.service: | ||||
|           service: notify.html5 | ||||
|       - homeassistant.action: | ||||
|           action: notify.html5 | ||||
|           data: | ||||
|             message: Button was pressed | ||||
|       - homeassistant.tag_scanned: pulse | ||||
| @@ -21,8 +21,8 @@ api: | ||||
|   reboot_timeout: 0min | ||||
|   encryption: | ||||
|     key: bOFFzzvfpg5DB94DuBGLXD/hMnhpDKgP9UQyBulwWVU= | ||||
|   services: | ||||
|     - service: hello_world | ||||
|   actions: | ||||
|     - action: hello_world | ||||
|       variables: | ||||
|         name: string | ||||
|       then: | ||||
| @@ -30,10 +30,10 @@ api: | ||||
|             format: Hello World %s! | ||||
|             args: | ||||
|               - name.c_str() | ||||
|     - service: empty_service | ||||
|     - action: empty_action | ||||
|       then: | ||||
|         - logger.log: Service Called | ||||
|     - service: all_types | ||||
|         - logger.log: Action Called | ||||
|     - action: all_types | ||||
|       variables: | ||||
|         bool_: bool | ||||
|         int_: int | ||||
| @@ -41,7 +41,7 @@ api: | ||||
|         string_: string | ||||
|       then: | ||||
|         - logger.log: Something happened | ||||
|     - service: array_types | ||||
|     - action: array_types | ||||
|       variables: | ||||
|         bool_arr: bool[] | ||||
|         int_arr: int[] | ||||
|   | ||||
| @@ -13,12 +13,12 @@ esphome: | ||||
|             message: The humidity is {{ my_variable }}%. | ||||
|           variables: | ||||
|             my_variable: "return id(ha_hello_world_temperature).state;" | ||||
|       - homeassistant.service: | ||||
|           service: notify.html5 | ||||
|       - homeassistant.action: | ||||
|           action: notify.html5 | ||||
|           data: | ||||
|             message: Button was pressed | ||||
|       - homeassistant.service: | ||||
|           service: notify.html5 | ||||
|       - homeassistant.action: | ||||
|           action: notify.html5 | ||||
|           data: | ||||
|             title: New Humidity | ||||
|           data_template: | ||||
|   | ||||
| @@ -7,6 +7,7 @@ lvgl: | ||||
|       long_press_time: 500ms | ||||
|   widgets: | ||||
|     - label: | ||||
|         id: hello_label | ||||
|         text: Hello world | ||||
|         text_color: 0xFF8000 | ||||
|         align: center | ||||
| @@ -95,9 +96,43 @@ lvgl: | ||||
|         height: 10% | ||||
|         pressed: | ||||
|           bg_color: light_blue | ||||
|         checkable: true | ||||
|         checked: | ||||
|           bg_color: 0x000000 | ||||
|         widgets: | ||||
|           - label: | ||||
|               text: Button | ||||
|         on_click: | ||||
|           lvgl.label.update: | ||||
|             id: hello_label | ||||
|             bg_color: 0x123456 | ||||
|             text: clicked | ||||
|         on_value: | ||||
|           logger.log: | ||||
|             format: "state now %d" | ||||
|             args: [x] | ||||
|         on_short_click: | ||||
|           lvgl.widget.hide: hello_label | ||||
|         on_long_press: | ||||
|           lvgl.widget.show: hello_label | ||||
|         on_cancel: | ||||
|           lvgl.widget.enable: hello_label | ||||
|         on_ready: | ||||
|           lvgl.widget.disable: hello_label | ||||
|         on_defocus: | ||||
|           lvgl.widget.hide: hello_label | ||||
|         on_focus: | ||||
|           logger.log: Button clicked | ||||
|         on_scroll: | ||||
|           logger.log: Button clicked | ||||
|         on_scroll_end: | ||||
|           logger.log: Button clicked | ||||
|         on_scroll_begin: | ||||
|           logger.log: Button clicked | ||||
|         on_release: | ||||
|           logger.log: Button clicked | ||||
|         on_long_press_repeat: | ||||
|           logger.log: Button clicked | ||||
|  | ||||
| font: | ||||
|   - file: "gfonts://Roboto" | ||||
|   | ||||
| @@ -6,6 +6,23 @@ i2c: | ||||
|   sda: GPIO18 | ||||
|   scl: GPIO19 | ||||
|  | ||||
| sensor: | ||||
|   - platform: rotary_encoder | ||||
|     name: "Rotary Encoder" | ||||
|     id: encoder | ||||
|     pin_a: 2 | ||||
|     pin_b: 1 | ||||
|     internal: true | ||||
|  | ||||
| binary_sensor: | ||||
|   - platform: gpio | ||||
|     id: pushbutton | ||||
|     name: Pushbutton | ||||
|     pin: | ||||
|       number: 0 | ||||
|       inverted: true | ||||
|       ignore_strapping_warning: true | ||||
|  | ||||
| display: | ||||
|   - platform: ili9xxx | ||||
|     model: st7789v | ||||
| @@ -50,5 +67,9 @@ lvgl: | ||||
|   displays: | ||||
|     - tft_display | ||||
|     - second_display | ||||
|   rotary_encoders: | ||||
|     sensor: encoder | ||||
|     enter_button: pushbutton | ||||
|     group: general | ||||
|  | ||||
| <<: !include common.yaml | ||||
|   | ||||
| @@ -1 +1,28 @@ | ||||
| substitutions: | ||||
|   verify_ssl: "true" | ||||
|  | ||||
| esphome: | ||||
|   on_boot: | ||||
|     then: | ||||
|       - if: | ||||
|           condition: | ||||
|             update.is_available: | ||||
|           then: | ||||
|             - logger.log: "Update available" | ||||
|       - update.perform: | ||||
|           force_update: true | ||||
|  | ||||
| wifi: | ||||
|   ssid: MySSID | ||||
|   password: password1 | ||||
|  | ||||
| http_request: | ||||
|   verify_ssl: ${verify_ssl} | ||||
|  | ||||
| ota: | ||||
|   - platform: http_request | ||||
|  | ||||
| update: | ||||
|   - platform: http_request | ||||
|     name: Firmware Update | ||||
|     source: http://example.com/manifest.json | ||||
|   | ||||
| @@ -1 +1,4 @@ | ||||
| substitutions: | ||||
|   verify_ssl: "false" | ||||
|  | ||||
| <<: !include common.yaml | ||||
|   | ||||
| @@ -1 +1,4 @@ | ||||
| substitutions: | ||||
|   verify_ssl: "false" | ||||
|  | ||||
| <<: !include common.yaml | ||||
|   | ||||
| @@ -1 +1,4 @@ | ||||
| substitutions: | ||||
|   verify_ssl: "false" | ||||
|  | ||||
| <<: !include common.yaml | ||||
|   | ||||
		Reference in New Issue
	
	Block a user