mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-30 22:53:59 +00:00 
			
		
		
		
	Merge branch 'esphome:dev' into mcp4461
This commit is contained in:
		| @@ -21,6 +21,8 @@ media_player: | ||||
|       - media_player.pause: | ||||
|     on_play: | ||||
|       - media_player.stop: | ||||
|       - media_player.stop: | ||||
|           announcement: true | ||||
|     on_pause: | ||||
|       - media_player.toggle: | ||||
|       - wait_until: | ||||
|   | ||||
| @@ -33,3 +33,73 @@ modbus_controller: | ||||
|         read_lambda: |- | ||||
|           return 42.3; | ||||
|     max_cmd_retries: 0 | ||||
|  | ||||
| binary_sensor: | ||||
|   - platform: modbus_controller | ||||
|     modbus_controller_id: modbus_controller1 | ||||
|     id: modbus_binary_sensor1 | ||||
|     name: Test Binary Sensor | ||||
|     register_type: read | ||||
|     address: 0x3200 | ||||
|     bitmask: 0x80 | ||||
|  | ||||
| number: | ||||
|   - platform: modbus_controller | ||||
|     modbus_controller_id: modbus_controller1 | ||||
|     id: modbus_number1 | ||||
|     name: Test Number | ||||
|     address: 0x9001 | ||||
|     value_type: U_WORD | ||||
|     multiply: 1.0 | ||||
|  | ||||
| output: | ||||
|   - platform: modbus_controller | ||||
|     modbus_controller_id: modbus_controller1 | ||||
|     id: modbus_output1 | ||||
|     address: 2048 | ||||
|     register_type: holding | ||||
|     value_type: U_WORD | ||||
|     multiply: 1000 | ||||
|  | ||||
| select: | ||||
|   - platform: modbus_controller | ||||
|     modbus_controller_id: modbus_controller1 | ||||
|     id: modbus_select1 | ||||
|     name: Test Select | ||||
|     address: 1000 | ||||
|     value_type: U_WORD | ||||
|     optionsmap: | ||||
|       "Zero": 0 | ||||
|       "One": 1 | ||||
|       "Two": 2 | ||||
|       "Three": 3 | ||||
|  | ||||
| sensor: | ||||
|   - platform: modbus_controller | ||||
|     modbus_controller_id: modbus_controller1 | ||||
|     id: modbus_sensor1 | ||||
|     name: Test Sensor | ||||
|     register_type: holding | ||||
|     address: 0x9001 | ||||
|     unit_of_measurement: "AH" | ||||
|     value_type: U_WORD | ||||
|  | ||||
| switch: | ||||
|   - platform: modbus_controller | ||||
|     modbus_controller_id: modbus_controller1 | ||||
|     id: modbus_switch1 | ||||
|     name: Test Switch | ||||
|     register_type: coil | ||||
|     address: 0x15 | ||||
|     bitmask: 1 | ||||
|  | ||||
| text_sensor: | ||||
|   - platform: modbus_controller | ||||
|     modbus_controller_id: modbus_controller1 | ||||
|     id: modbus_text_sensor1 | ||||
|     name: Test Text Sensor | ||||
|     register_type: holding | ||||
|     address: 0x9013 | ||||
|     register_count: 3 | ||||
|     raw_encode: HEXBYTES | ||||
|     response_size: 6 | ||||
|   | ||||
| @@ -121,6 +121,14 @@ number: | ||||
|     max_value: 100 | ||||
|     step: 1 | ||||
|  | ||||
| valve: | ||||
|   - platform: template | ||||
|     name: "Template Valve" | ||||
|     lambda: |- | ||||
|       return VALVE_OPEN; | ||||
|     optimistic: true | ||||
|     has_position: true | ||||
|  | ||||
| prometheus: | ||||
|   include_internal: true | ||||
|   relabel: | ||||
|   | ||||
							
								
								
									
										12
									
								
								tests/components/speaker/common-media_player.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								tests/components/speaker/common-media_player.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | ||||
| <<: !include common.yaml | ||||
|  | ||||
| media_player: | ||||
|   - platform: speaker | ||||
|     id: speaker_media_player_id | ||||
|     announcement_pipeline: | ||||
|       speaker: speaker_id | ||||
|     buffer_size: 1000000 | ||||
|     volume_increment: 0.02 | ||||
|     volume_max: 0.95 | ||||
|     volume_min: 0.0 | ||||
|     task_stack_in_psram: true | ||||
							
								
								
									
										9
									
								
								tests/components/speaker/media_player.esp32-idf.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								tests/components/speaker/media_player.esp32-idf.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| substitutions: | ||||
|   scl_pin: GPIO16 | ||||
|   sda_pin: GPIO17 | ||||
|   i2s_bclk_pin: GPIO27 | ||||
|   i2s_lrclk_pin: GPIO26 | ||||
|   i2s_mclk_pin: GPIO25 | ||||
|   i2s_dout_pin: GPIO23 | ||||
|  | ||||
| <<: !include common-media_player.yaml | ||||
							
								
								
									
										9
									
								
								tests/components/speaker/media_player.esp32-s3-idf.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								tests/components/speaker/media_player.esp32-s3-idf.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| substitutions: | ||||
|   scl_pin: GPIO2 | ||||
|   sda_pin: GPIO3 | ||||
|   i2s_bclk_pin: GPIO4 | ||||
|   i2s_lrclk_pin: GPIO5 | ||||
|   i2s_mclk_pin: GPIO6 | ||||
|   i2s_dout_pin: GPIO7 | ||||
|  | ||||
| <<: !include common-media_player.yaml | ||||
| @@ -459,6 +459,27 @@ display: | ||||
|     reset_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${reset_pin} | ||||
|     full_update_every: 30 | ||||
|     lambda: |- | ||||
|       it.rectangle(0, 0, it.get_width(), it.get_height()); | ||||
|  | ||||
|   - platform: waveshare_epaper | ||||
|     id: epd_gdew042t81 | ||||
|     model: gdey042t81 | ||||
|     spi_id: spi_waveshare_epaper | ||||
|     cs_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${cs_pin} | ||||
|     dc_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${dc_pin} | ||||
|     busy_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${busy_pin} | ||||
|     reset_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${reset_pin} | ||||
|     full_update_every: 30 | ||||
|     lambda: |- | ||||
|       it.rectangle(0, 0, it.get_width(), it.get_height()); | ||||
|  | ||||
| @@ -501,6 +522,25 @@ display: | ||||
|     lambda: |- | ||||
|       it.rectangle(0, 0, it.get_width(), it.get_height()); | ||||
|  | ||||
|   - platform: waveshare_epaper | ||||
|     id: epd_4_20in_bv2_bwr | ||||
|     model: 4.20in-bv2-bwr | ||||
|     spi_id: spi_waveshare_epaper | ||||
|     cs_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${cs_pin} | ||||
|     dc_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${dc_pin} | ||||
|     busy_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${busy_pin} | ||||
|     reset_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${reset_pin} | ||||
|     lambda: |- | ||||
|       it.rectangle(0, 0, it.get_width(), it.get_height()); | ||||
|  | ||||
|   # 5.83 inch displays | ||||
|   - platform: waveshare_epaper | ||||
|     id: epd_5_83 | ||||
| @@ -674,6 +714,26 @@ display: | ||||
|     lambda: |- | ||||
|       it.rectangle(0, 0, it.get_width(), it.get_height()); | ||||
|  | ||||
|   - platform: waveshare_epaper | ||||
|     id: epd_7_50inv2p | ||||
|     model: 7.50inv2p | ||||
|     spi_id: spi_waveshare_epaper | ||||
|     cs_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${cs_pin} | ||||
|     dc_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${dc_pin} | ||||
|     busy_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${busy_pin} | ||||
|     reset_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${reset_pin} | ||||
|     full_update_every: 30 | ||||
|     lambda: |- | ||||
|       it.rectangle(0, 0, it.get_width(), it.get_height()); | ||||
|  | ||||
|   - platform: waveshare_epaper | ||||
|     id: epd_7_50hdb | ||||
|     model: 7.50in-hd-b | ||||
| @@ -713,6 +773,25 @@ display: | ||||
|     lambda: |- | ||||
|       it.rectangle(0, 0, it.get_width(), it.get_height()); | ||||
|  | ||||
|   - platform: waveshare_epaper | ||||
|     model: 2.90in-d | ||||
|     spi_id: spi_waveshare_epaper | ||||
|     cs_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${cs_pin} | ||||
|     dc_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${dc_pin} | ||||
|     busy_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${busy_pin} | ||||
|     reset_pin: | ||||
|       allow_other_uses: true | ||||
|       number: ${reset_pin} | ||||
|     reset_duration: 200ms | ||||
|     lambda: |- | ||||
|       it.rectangle(0, 0, it.get_width(), it.get_height()); | ||||
|  | ||||
|   - platform: waveshare_epaper | ||||
|     model: 2.90in | ||||
|     spi_id: spi_waveshare_epaper | ||||
|   | ||||
		Reference in New Issue
	
	Block a user