diff --git a/automations/esszimmerradio_an_aus.yaml b/automations/esszimmerradio_an_aus.yaml index 235053b..2781e77 100644 --- a/automations/esszimmerradio_an_aus.yaml +++ b/automations/esszimmerradio_an_aus.yaml @@ -107,15 +107,15 @@ event_data: button_name: key_stop repeat_counter: 0 - host: esszimmerradio.fritz.box + host: esszimmerradio.fritz.box - platform: event event_type: ir_command_received event_data: button_name: key_pause repeat_counter: 0 - host: esszimmerradio.fritz.box + host: esszimmerradio.fritz.box action: - service: media_player.media_pause + service: media_player.turn_off data: entity_id: media_player.esszimmer diff --git a/automations/ir_bedroom.yaml b/automations/ir_bedroom.yaml index 98a5ab1..fbf4957 100644 --- a/automations/ir_bedroom.yaml +++ b/automations/ir_bedroom.yaml @@ -179,7 +179,7 @@ action: service: scene.turn_on data: - entity_id: scene.schlafzimmer_orange + entity_id: scene.schlafzimmer_stillen - alias: IR bedroompi.fritz.box key_green trigger: platform: event @@ -444,22 +444,28 @@ service: light.turn_off data: entity_id: group.bedroom -- alias: IR bedroompi.fritz.box Musik Play/Pause +- alias: IR bedroompi.fritz.box Musik Play trigger: - - platform: event + platform: event event_type: ir_command_received event_data: button_name: key_play repeat_counter: 0 host: bedroompi.fritz.box - - platform: event + action: + service: media_player.media_play_pause + data: + entity_id: media_player.bedroompi +- alias: IR bedroompi.fritz.box Musik Pause + trigger: + platform: event event_type: ir_command_received event_data: button_name: key_pause repeat_counter: 0 host: bedroompi.fritz.box action: - service: media_player.media_play_pause + service: media_player.turn_off data: entity_id: media_player.bedroompi - alias: IR bedroompi.fritz.box Musik Next diff --git a/automations/ir_first_floor_dining_room.yaml b/automations/ir_first_floor_dining_room.yaml index 859ad10..306adbd 100644 --- a/automations/ir_first_floor_dining_room.yaml +++ b/automations/ir_first_floor_dining_room.yaml @@ -168,22 +168,28 @@ media_content_id: SammlungGeorg media_content_type: music entity_id: media_player.esszimmer -- alias: IR esszimmerradio.fritz.box Musik Play/Pause +- alias: IR esszimmerradio.fritz.box Musik Play trigger: - - platform: event + platform: event event_type: ir_command_received event_data: button_name: key_play repeat_counter: 0 host: esszimmerradio.fritz.box - - platform: event + action: + service: media_player.media_play_pause + data: + entity_id: media_player.esszimmer +- alias: IR esszimmerradio.fritz.box Musik Pause + trigger: + platform: event event_type: ir_command_received event_data: button_name: key_pause repeat_counter: 0 host: esszimmerradio.fritz.box action: - service: media_player.media_play_pause + service: media_player.turn_off data: entity_id: media_player.esszimmer - alias: IR esszimmerradio.fritz.box Musik Next diff --git a/automations/ir_first_floor_living_room.yaml b/automations/ir_first_floor_living_room.yaml index c80d6cd..8a7535c 100644 --- a/automations/ir_first_floor_living_room.yaml +++ b/automations/ir_first_floor_living_room.yaml @@ -168,22 +168,28 @@ media_content_id: SammlungGeorg media_content_type: music entity_id: media_player.wohnzimmer -- alias: IR musikserverWohnzimmerOben.fritz.box Musik Play/Pause +- alias: IR musikserverWohnzimmerOben.fritz.box Musik Play trigger: - - platform: event + platform: event event_type: ir_command_received event_data: button_name: key_play repeat_counter: 0 host: musikserverWohnzimmerOben.fritz.box - - platform: event + action: + service: media_player.media_play_pause + data: + entity_id: media_player.wohnzimmer +- alias: IR musikserverWohnzimmerOben.fritz.box Musik Pause + trigger: + platform: event event_type: ir_command_received event_data: button_name: key_pause repeat_counter: 0 host: musikserverWohnzimmerOben.fritz.box action: - service: media_player.media_play_pause + service: media_player.turn_off data: entity_id: media_player.wohnzimmer - alias: IR musikserverWohnzimmerOben.fritz.box Musik Next diff --git a/automations/ir_living_area.yaml b/automations/ir_living_area.yaml index 27a86b0..9d6eb14 100644 --- a/automations/ir_living_area.yaml +++ b/automations/ir_living_area.yaml @@ -280,22 +280,28 @@ service: light.turn_off data: entity_id: group.living_area -- alias: IR kitchenpi.fritz.box Musik Play/Pause +- alias: IR kitchenpi.fritz.box Musik Play trigger: - - platform: event + platform: event event_type: ir_command_received event_data: button_name: key_play repeat_counter: 0 host: kitchenpi.fritz.box - - platform: event + action: + service: media_player.media_play_pause + data: + entity_id: media_player.kitchenpi +- alias: IR kitchenpi.fritz.box Musik Pause + trigger: + platform: event event_type: ir_command_received event_data: button_name: key_pause repeat_counter: 0 host: kitchenpi.fritz.box action: - service: media_player.media_play_pause + service: media_player.turn_off data: entity_id: media_player.kitchenpi - alias: IR kitchenpi.fritz.box Musik Next diff --git a/config_creation/ir_automations.py b/config_creation/ir_automations.py index f58a08c..0a08b3c 100644 --- a/config_creation/ir_automations.py +++ b/config_creation/ir_automations.py @@ -30,7 +30,7 @@ def get_config(): 'btn_0': '[radio] Bayern 3', 'key_numeric_pound': '[radio] Bayern 2', - 'key_red': '[scene] schlafzimmer_orange', + 'key_red': '[scene] schlafzimmer_stillen', 'key_green': '[scene] schlafzimmer_rot', 'key_yellow': '[scene] schlafzimmer_ganz_hell', 'key_blue': '[scene] schlafzimmer_blau', @@ -256,10 +256,15 @@ def default_music_controls(device_group, ir_host): """Default music control (play, pause, next) for Hauppauge IR""" return [ { - 'alias': f'IR {ir_host} Musik Play/Pause', - 'trigger': [ir_trigger(ir_host, 'key_play'), ir_trigger(ir_host, 'key_pause')], + 'alias': f'IR {ir_host} Musik Play', + 'trigger': ir_trigger(ir_host, 'key_play'), 'action': service('media_player.media_play_pause', device_group), }, + { + 'alias': f'IR {ir_host} Musik Pause', + 'trigger': ir_trigger(ir_host, 'key_pause'), + 'action': service('media_player.turn_off', device_group), + }, { 'alias': f'IR {ir_host} Musik Next', 'trigger': [ir_trigger(ir_host, 'key_forward'), ir_trigger(ir_host, 'key_fastforward')], diff --git a/config_creation/manual_config.yaml b/config_creation/manual_config.yaml index 28ed1a0..4e211c3 100644 --- a/config_creation/manual_config.yaml +++ b/config_creation/manual_config.yaml @@ -7,7 +7,9 @@ person: sun: system_health: updater: - +recorder: +logbook: + #input_boolean: #input_datetime: #input_number: @@ -17,7 +19,6 @@ updater: # Uncomment this if you are using SSL/TLS, running in Docker container, etc. http: - base_url: https://ha.bauer.tech homeassistant: name: MyHome @@ -67,6 +68,9 @@ homekit: include_domains: - scene +discovery: + ignore: + - philips_hue history: exclude: @@ -275,20 +279,20 @@ sensor: - 'date_time_iso' - 'time_date' -# - platform: history_stats -# name: Pool Pumpe Heute -# entity_id: switch.pool_pumpe -# type: time -# state: 'on' -# start: '{{ now().replace(hour=0).replace(minute=0).replace(second=0) }}' -# end: '{{ now() }}' -# - platform: history_stats -# name: Pool Pumpe Gestern -# entity_id: switch.pool_pumpe -# type: time -# state: 'on' -# start: '{{ as_timestamp(now().replace(hour=0).replace(minute=0).replace(second=0)) - (60*60 * 24) }}' -# end: '{{ now().replace(hour=0).replace(minute=0).replace(second=0) }}' + - platform: history_stats + name: Pool Pumpe Heute + entity_id: switch.mobile_steckdose_schalter_1 + type: time + state: 'on' + start: '{{ now().replace(hour=0).replace(minute=0).replace(second=0) }}' + end: '{{ now() }}' + - platform: history_stats + name: Pool Pumpe Gestern + entity_id: switch.mobile_steckdose_schalter_1 + type: time + state: 'on' + start: '{{ as_timestamp(now().replace(hour=0).replace(minute=0).replace(second=0)) - (60*60 * 24) }}' + end: '{{ now().replace(hour=0).replace(minute=0).replace(second=0) }}' group: !include groups.yaml diff --git a/scenes/schlafzimmer.yaml b/scenes/schlafzimmer.yaml index 8a5470c..2ef06ea 100644 --- a/scenes/schlafzimmer.yaml +++ b/scenes/schlafzimmer.yaml @@ -35,6 +35,21 @@ state: 'off' light.schlafzimmer_schrank: state: 'off' +- id: schlafzimmer_stillen + name: Schlafzimmer Stillen + entities: + light.bett_rebecca: + state: true + brightness: 10 + xy_color: + - 0.502 + - 0.414 + light.schlafzimmer_deckenlampe: + state: 'off' + light.schlafzimmer_fluter: + state: 'off' + light.schlafzimmer_schrank: + state: 'off' - name: Schlafzimmer Einschlaflicht id: schlafzimmer_einschlaflicht entities: