Skip to content

Commit

Permalink
Routine
Browse files Browse the repository at this point in the history
  • Loading branch information
edwardtfn committed Sep 27, 2024
1 parent 833d07c commit 6731a77
Show file tree
Hide file tree
Showing 33 changed files with 234 additions and 1,229 deletions.
15 changes: 13 additions & 2 deletions .storage/core.area_registry
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
},
{
"aliases": [
"Master",
"Quarto",
"Master bedroom",
"Master"
"Master bedroom"
],
"floor_id": null,
"icon": null,
Expand Down Expand Up @@ -282,6 +282,17 @@
"picture": null,
"created_at": "2024-08-22T19:58:29.217361+00:00",
"modified_at": "2024-08-22T19:58:29.217369+00:00"
},
{
"aliases": [],
"floor_id": "outdoor",
"icon": "mdi:outdoor-lamp",
"id": "deck",
"labels": [],
"name": "Deck",
"picture": null,
"created_at": "2024-09-16T11:20:44.562395+00:00",
"modified_at": "2024-09-16T11:20:44.562405+00:00"
}
]
}
Expand Down
24 changes: 5 additions & 19 deletions .storage/emulated_hue.ids
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,10 @@
"key": "emulated_hue.ids",
"data": {
"1": "input_boolean.home_party_mode",
"2": "light.balcony_lamp_light",
"3": "light.balcony_string_lights",
"4": "light.bathroom_ceiling_lights",
"5": "light.bathroom_mirror_light",
"6": "light.bedroom_carol_light",
"7": "light.bedroom_closet_lights",
"8": "light.bedroom_edward_light",
"9": "switch.bedroom_power_strip_1_tv_samsung",
"10": "light.corridor_all_lights",
"11": "light.guest_bathroom_ceiling_light",
"12": "light.guest_bathroom_mirror_lights",
"13": "light.guest_room_closet_lights",
"14": "light.guest_room_wall_lights",
"15": "light.hall_ceiling_light",
"16": "light.kitchen_bench_lights",
"17": "light.kitchen_table_lights",
"18": "light.office_ceiling_lines",
"19": "light.office_workstation_lights",
"20": "light.kitchen_curtain_s_lights"
"2": "light.balcony_light",
"3": "switch.guest_room_panel_relay_1",
"4": "light.kitchen_bench_lights",
"5": "light.kitchen_table_lights",
"6": "light.office_workstation_lights"
}
}
299 changes: 163 additions & 136 deletions .storage/lovelace

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions configuration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ automation: !include automations.yaml
#logbook:
#logger:
#default: info
# logs:
#logs:
# homeassistant.components.rest: debug
#custom_components.bosch: debug
#bosch_thermostat_client: debug
#map:
#media_source:
#mobile_app:
Expand Down Expand Up @@ -237,7 +239,7 @@ tts:

zha:
enable_quirks: true
custom_quirks_path: /config/zha/quirks
custom_quirks_path: "/config/zha/quirks"

# https://github.com/zigpy/zigpy/wiki/OTA-Device-Firmware-Updates
zigpy_config:
Expand Down
5 changes: 5 additions & 0 deletions esphome/guest-room-panel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,8 @@ packages:
files:
- nspanel_esphome.yaml # Base package including TFT transfer
- esphome/nspanel_esphome_addon_bluetooth_proxy.yaml

manual_ip: !include
file: packages/config_manual_ip.yaml
vars:
ip: !secret ip_guest_room_panel
40 changes: 16 additions & 24 deletions esphome/office-workstation-panel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ packages:
#heat_package: !include packages/Blackymas/nspanel_esphome_addon_climate_heat.yaml
#cool_package: !include packages/Blackymas/nspanel_esphome_addon_climate_cool.yaml
#cover_package: !include packages/Blackymas/esphome/nspanel_esphome_addon_cover.yaml
advanced_package: !include packages/Blackymas/esphome/nspanel_esphome_advanced.yaml
#advanced_package: !include packages/Blackymas/esphome/nspanel_esphome_advanced.yaml
ble_proxy_package: !include packages/Blackymas/esphome/nspanel_esphome_addon_bluetooth_proxy.yaml

Check warning on line 41 in esphome/office-workstation-panel.yaml

View workflow job for this annotation

GitHub Actions / Validate YAML

41:22 [colons] too many spaces after colon
#nspanel_core: !include packages/Blackymas/esphome/nspanel_esphome_core.yaml
#nspanel_upload_tft: !include packages/Blackymas/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
Expand All @@ -53,6 +53,21 @@ packages:
# #- nspanel_esphome_core.yaml # Base package
# #- nspanel_esphome_upload_tft.yaml # Use only if you have issues with TFT transfer

manual_ip: !include
file: packages/config_manual_ip.yaml
vars:
ip: !secret ip_office_workstation_panel

#uart:
# - id: !extend tf_uart
# debug:
# direction: BOTH
# dummy_receiver: false
# after:
# delimiter: 0xff, 0xff, 0xff
# sequence:
# - lambda: UARTDebug::log_string(direction, bytes);

#bluetooth_proxy:
# active: true
#esphome:
Expand Down Expand Up @@ -102,11 +117,6 @@ packages:
#CONFIG_SPIRAM_CACHE_WORKAROUND: "y"
#CONFIG_SPIRAM_SUPPORT: "y"

#psram:
# id: ext_ram
#mode: octal
#speed: 120MHz

#button:
# - id: release_ble
# name: DEBUG Release Bluetooth
Expand Down Expand Up @@ -155,11 +165,6 @@ packages:
# - -DDCONFIG_D0WD_PSRAM_CLK_IO=5
# - -DDCONFIG_D0WD_PSRAM_CS_IO=18


#GPIO05 - PSRAM SCLK
#GPIO18 - PSRAM /CE
#GPIO09 - PSRAM SIO[3]

#switch:
# - id: nspanel_psram_sw
# name: "PSRAM"
Expand Down Expand Up @@ -214,9 +219,6 @@ packages:

#web_server: !remove

#psram:
# id: nspanel_psram

# - source:
# type: git
# url: https://github.com/edwardtfn/esphome
Expand All @@ -232,16 +234,6 @@ packages:
# exit_reparse_on_start: true
# #soft_reset_on_start: false

#uart:
# - id: !extend tf_uart
# debug:
# direction: BOTH
# dummy_receiver: false
# after:
# delimiter: 0xff, 0xff, 0xff
# sequence:
# - lambda: UARTDebug::log_string(direction, bytes);

debug:

text_sensor:
Expand Down
4 changes: 2 additions & 2 deletions esphome/packages/base_shelly_plus_1pm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ sensor:
- id: temp_analog_reading
platform: adc
pin: GPIO32
attenuation: 11db
attenuation: 12db

- platform: adc
name: "Relay Supply Voltage"
pin: GPIO33
attenuation: 11db
attenuation: 12db
filters:
- multiply: 8

Expand Down
7 changes: 6 additions & 1 deletion esphome/packages/config_wifi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@ wifi:
domain: !secret lan_domain
fast_connect: true
ap:
ssid: "ESPHome fallback"
# ssid: "ESPHome fallback"
password: !secret fallback_password
ap_timeout:
minutes: 5

binary_sensor:
- platform: status
name: "Status"
device_class: connectivity

#button:
# - platform: template
# name: WiFi restart
Expand Down
27 changes: 0 additions & 27 deletions packages/areas/balcony/balcony_cover.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions packages/areas/balcony/balcony_door.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions packages/areas/balcony/balcony_electricity.yaml

This file was deleted.

123 changes: 0 additions & 123 deletions packages/areas/balcony/balcony_lights.yaml

This file was deleted.

Loading

0 comments on commit 6731a77

Please sign in to comment.