Remove area from comments, and add, if missing

mcu-air-office-r.yaml

@@ -4,7 +4,7 @@ substitutions:
   name: Office R Air
   name_short: Office R
   area: Office R
-  comment: "${area} | AirQ Monitoring"
+  comment: AirQ Monitoring
 
 esphome:
   name: mcu-${device}

mcu-atoms3.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: atoms3
   name: AtomS3
   area: DEV
-  comment: "${area} | --"
+  comment: --
 
 esphome:
   name: mcu-${device}

mcu-basement-2.yaml

@@ -4,7 +4,7 @@ substitutions:
   name_short: Basement
   name: Basement 2
   area: Basement
-  comment: "${area} | Lights"
+  comment: Lights
 
 esphome:
   name: mcu-${device}

mcu-basement.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: basement
   name: Basement
   area: Basement
-  comment: "${area} | Sockets"
+  comment: Sockets
 
 esphome:
   name: mcu-${device}

mcu-bedroom-lamp-left.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: bedroom-lamp-left
   name: Bedroom Lamp Left
   area: Bedroom
-  comment: "${area} | Left Lamp"
+  comment: Left Lamp
   default_transition_length: 800ms
 
 esphome:

mcu-bedroom-lamp-right.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: bedroom-lamp-right
   name: Bedroom Lamp Right
   area: Bedroom
-  comment: "${area} | Right Lamp"
+  comment: Right Lamp
   default_transition_length: 800ms
 
 esphome:

mcu-c6-test-1.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: c6-test-1
   name: C6 TEST 1
   area: DEV
-  comment: "${area} | C6"
+  comment: C6
 
 esphome:
   name: mcu-${device}

mcu-c6-test-2.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: c6-test-2
   name: C6 TEST 2
   area: DEV
-  comment: "${area} | C6"
+  comment: C6
 
 esphome:
   name: mcu-${device}

mcu-cam-1.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: cam-1
   name: Cam 1
   area: DEV
-  comment: "${area} | Camera"
+  comment: Camera
 
 esphome:
   name: mcu-${device}

mcu-can-node-1.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: can-node-1
   name: CAN Node 1
   area: DEV
-  comment: "${area} | CANopen"
+  comment: CANopen
 
 esphome:
   name: mcu-${device}

mcu-can-node-2.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: can-node-2
   name: CAN Node 2
   area: DEV
-  comment: "${area} | CANopen"
+  comment: CANopen
 
 esphome:
   name: mcu-${device}

mcu-cec-bedroom.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: cec-bedroom
   name: Bedroom TV
   area: Bedroom
-  comment: "${area} | CEC"
+  comment: CEC
 
 esphome:
   name: mcu-${device}

mcu-clock-1.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: clock-1
   name: Clock 1
   area: Office R
-  comment: "${area} | Clock"
+  comment: Clock
 
 esphome:
   name: mcu-${device}

mcu-clock-living-room.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: clock-living-room
   name: Living room Clock
   area: Living Room & Kitchen
-  comment: "${area}: TV Rack Clock"
+  comment: TV Rack Clock
 
 esphome:
   name: mcu-${device}

mcu-desk-lamp.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: desk-lamp
   name: Desk Lamp
   area: Room
-  comment: "${area} | Desk lamp"
+  comment: Desk lamp
 
 esphome:
   name: mcu-${device}

mcu-dimmer.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: dimmer
   name: Dimmer
   area: Basement
-  comment: "${area} | Pain cave fan"
+  comment: Pain cave fan
 
 esphome:
   name: mcu-${device}

mcu-echo-1.yaml

@@ -4,7 +4,7 @@ substitutions:
   name: Echo 1
   name_short: Echo 1
   area: DEV
-  comment: "${area} | Echo"
+  comment: Echo
 
 esphome:
   name: mcu-${device}

mcu-echo.yaml

@@ -4,7 +4,7 @@ substitutions:
   name: Echo
   name_short: Echo
   area: Office R
-  comment: "${area} | Speaker"
+  comment: Speaker
 
 esphome:
   name: mcu-${device}

mcu-eworkbench.yaml

@@ -2,11 +2,13 @@
 substitutions:
   device: eworkbench
   name: Electronics Workbench
-  comment: "Office R | Electronics Workbench"
+  area: Office R
+  comment: Electronics Workbench
 
 esphome:
   name: mcu-${device}
   friendly_name: ${name}
+  area: ${area}
   comment: ${comment}
   platformio_options:
     board_build.flash_mode: dio

mcu-fireplace.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: fireplace
   name: Heating Fireplace
   area: Living Room & Kitchen
-  comment: "${area}, Fireplace | Fireplace monitoring for heating"
+  comment: Fireplace monitoring for heating
 
 esphome:
   name: mcu-${device}

mcu-gate.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: gate
   name: Gate
   area: Outside
-  comment: "${area} | Gate"
+  comment: Gate
 
 esphome:
   name: mcu-${device}
@@ -142,7 +142,7 @@ binary_sensor:
       mode:
         input: true
     filters:
-      - delayed_on: 10ms
+      - delayed_on_off: 10ms
     entity_category: diagnostic
     on_multi_click:
       - timing:
@@ -154,15 +154,23 @@ binary_sensor:
           - logger.log: "OGI OFF => GATE CLOSED"
         invalid_cooldown: 100ms
       - timing:
-          - ON for at least 400ms
+          - ON for at least 1500ms
-          - OFF for at least 400ms
+        then:
-          - ON for at least 400ms
+          - select.set:
-          - OFF for at least 400ms
+              id: gate_state
+              option: Open
+          - logger.log: "OGI ON => GATE OPEN"
+        invalid_cooldown: 100ms
+      - timing:
+          - ON for 400ms to 500ms
+          - OFF for 400ms to 500ms
+          - ON for 400ms to 500ms
+          - OFF for 400ms to 500ms
         then:
           - select.set:
               id: gate_state
               option: Opening
-          - logger.log: "OGI SLOW BLINK => GATE OPENING"
+          - logger.log: "OGI SLOW BLINKING => GATE OPENING"
         invalid_cooldown: 100ms
       - timing:
           - ON for at most 300ms
@@ -173,15 +181,7 @@ binary_sensor:
           - select.set:
               id: gate_state
               option: Closing
-          - logger.log: "OGI FAST BLINK => GATE CLOSING"
+          - logger.log: "OGI FAST BLINKING => GATE CLOSING"
-        invalid_cooldown: 100ms
-      - timing:
-          - ON for at least 1500ms
-        then:
-          - select.set:
-              id: gate_state
-              option: Open
-          - logger.log: "OGI ON => GATE OPEN"
         invalid_cooldown: 100ms
 
 select:

mcu-gateway.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: gateway
   name: Gateway
   area: DEV
-  comment: "${area} | BLE Proxy, Modbus"
+  comment: BLE Proxy, Modbus
 
 esphome:
   name: mcu-${device}

mcu-heater.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: heater
   name: Heater
   area: Basement
-  comment: "${area} | Hot water and Heating control"
+  comment: Hot water and Heating control
 
 esphome:
   name: mcu-${device}

mcu-kitchen.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: kitchen
   name: Kitchen
   area: Living Room & Kitchen
-  comment: "${area} | Kitchen Worktop and Stove Lights"
+  comment: Kitchen Worktop and Stove Lights
 
 esphome:
   name: mcu-${device}

mcu-lightening.yaml

@@ -4,7 +4,7 @@ substitutions:
   name: Lightening detector
   name_short: Lightening
   area: DEV
-  comment: "${area} | Lightening"
+  comment: Lightening
 
 esphome:
   name: mcu-${device}

mcu-lvgl-eworkbench.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: lvgl-eworkbench
   name: Electronics Workbench Display
   area: Office R
-  comment: "${area} | Electronics Workbench"
+  comment: Electronics Workbench
 
 esphome:
   name: mcu-${device}

mcu-lvgl.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: lvgl
   name: LVGL
   area: DEV
-  comment: "${area} | LVGL"
+  comment: LVGL
 
 esphome:
   name: mcu-${device}

mcu-m5paper.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: m5paper
   name: M5Paper
   area: DEV
-  comment: "${area} | M5Paper"
+  comment: M5Paper
 
 esphome:
   name: mcu-${device}

mcu-mains-power.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: mains-power
   name: Mains Power
   area: Room
-  comment: "${area} | Mains Power Monitoring"
+  comment: Mains Power Monitoring
 
 esphome:
   name: mcu-${device}

mcu-nspanel-bedroom.yaml

@@ -4,7 +4,7 @@ substitutions:
   name: Bedroom NSPanel
   name_short: Bedroom
   area: Bedroom
-  comment: "${area} | NSPanel"
+  comment: NSPanel
   panel_recv_topic: "tele/${device}/RESULT"
   panel_send_topic: "cmnd/${device}/CustomSend"
   tft_url: !secret tft_url

mcu-nspanel-dev.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: nspanel-dev
   name: NSPanel DEV
   area: DEV
-  comment: "${area} | NSPanel"
+  comment: NSPanel
   panel_recv_topic: "tele/${device}/RESULT"
   panel_send_topic: "cmnd/${device}/CustomSend"
   tft_url: !secret tft_url

mcu-nspanel-fireplace.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: nspanel-fireplace
   name: Fireplace NSPanel
   area: Living Room & Kitchen
-  comment: "${area}, Fireplace | NSPanel"
+  comment: NSPanel
   panel_recv_topic: "tele/${device}/RESULT"
   panel_send_topic: "cmnd/${device}/CustomSend"
   tft_url: !secret tft_url

mcu-nspanel-office-j.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: nspanel-office-j
   name: Office J NSPanel
   area: Office J
-  comment: "${area} | NSPanel"
+  comment: NSPanel
   panel_recv_topic: "tele/${device}/RESULT"
   panel_send_topic: "cmnd/${device}/CustomSend"
   tft_url: !secret tft_url

mcu-nspanel-office-r.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: nspanel-office-r
   name: Office R NSPanel
   area: Office R
-  comment: "${area} | NSPanel"
+  comment: NSPanel
   panel_recv_topic: "tele/${device}/RESULT"
   panel_send_topic: "cmnd/${device}/CustomSend"
   tft_url: !secret tft_url

mcu-nspanel-patio.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: nspanel-patio
   name: Patio NSPanel
   area: Living Room & Kitchen
-  comment: "${area}, Patio | NSPanel"
+  comment: ${area}, Patio | NSPanel
   panel_recv_topic: "tele/${device}/RESULT"
   panel_send_topic: "cmnd/${device}/CustomSend"
   tft_url: !secret tft_url

mcu-office-r.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: office-r
   name: Office R
   area: Office R
-  comment: "${area} | MS Teams presence"
+  comment: MS Teams presence
 
 esphome:
   name: mcu-${device}

mcu-patio.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: patio
   name: Patio
   area: Outside
-  comment: "${area}, Patio | On the back yard"
+  comment: Patio | On the back yard
 
 esphome:
   name: mcu-${device}

mcu-pow-dishwasher.yaml

@@ -2,12 +2,14 @@
 substitutions:
   device: pow-dishwasher
   name: Dishwasher POW
-  comment: Living Room & Kitchen
+  area: Living Room & Kitchen
+  comment: Kitchen | Under sink
   update_interval: 10s
 
 esphome:
   name: mcu-${device}
   friendly_name: ${name}
+  area: ${area}
   comment: ${comment}
 
 esp32:

mcu-pow-washer.yaml

@@ -2,12 +2,14 @@
 substitutions:
   device: pow-washer
   name: Washer POW
-  comment: Washroom
+  comment: 
+  area: Washroom
   update_interval: 10s
 
 esphome:
   name: mcu-${device}
   friendly_name: ${name}
+  area: ${area}
   comment: ${comment}
 
 esp32:

mcu-rf433.yaml

@@ -2,8 +2,8 @@
 substitutions:
   device: rf433
   name: RF433 Bridge
-  area: Living Room / Kitchen
+  area: Living Room & Kitchen
-  comment: "${area}, Fireplace | RF433 Gateway"
+  comment: Fireplace | RF433 Gateway
 
 esphome:
   name: mcu-${device}

mcu-rfid-reader.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: rfid-reader
   name: RFID Reader
   area: DEV
-  comment: "${area} | RFID Reader"
+  comment: RFID Reader
 
 esphome:
   name: mcu-${device}

mcu-shed.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: shed
   name: Shed
   area: Outside
-  comment: "${area}, Shed | Irrigation B"
+  comment: Shed | Irrigation B
 
 esphome:
   name: mcu-${device}

mcu-socket-01.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: socket-01
   name: Socket 01
   area: Bedroom
-  comment: "${area} | TV Socket"
+  comment: TV Socket
   current_res: "0.00290"
   voltage_div: "940"
 

mcu-socket-02.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: socket-02
   name: Socket 02
   area: Bedroom
-  comment: "${area} | Bug Repelent Socket"
+  comment: Bug Repelent Socket
   current_res: "0.00290"
   voltage_div: "940"
 

mcu-socket-03.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: socket-03
   name: Socket 03
   area: Bedroom
-  comment: "${area} | SPARE Socket"
+  comment: SPARE Socket
   max_power: "3450"
   # <2020
   current_res: "0.00290"

mcu-staircase-light.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: staircase-light
   name: Staircase
   area: Staircase
-  comment: "${area} | Light"
+  comment: Light
 
 esphome:
   name: mcu-${device}

mcu-tracker.yaml

@@ -2,11 +2,13 @@
 substitutions:
   device: tracker
   name: Tracker
-  comment: "DEV | LTE GPS tracker"
+  area: DEV
+  comment: LTE GPS tracker
 
 esphome:
   name: mcu-${device}
   friendly_name: ${device}
+  area: ${area}
   comment: ${comment}
   on_boot:
     # priority: -10
@@ -85,7 +87,6 @@ esp32:
   variant: esp32
   framework:
     type: esp-idf
-    # version: 5.3.2
     # platform_version: 53.03.11
 
 ## TESTING

mcu-tv-light.yaml

@@ -2,8 +2,8 @@
 substitutions:
   device: tv-light
   name: TV Light
-  area: Living Room / Kitchen
+  area: Living Room & Kitchen
-  comment: "${area}: TV Rack Light"
+  comment: TV Rack Light
 
 esphome:
   name: mcu-${device}

mcu-vehicle-honda-pcx125.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: vehicle-honda-pcx125
   name: Vehicle Honda PCX125
   area: Outside
-  comment: "${area}, Beacon | Honda PCX125"
+  comment: ${area}, Beacon | Honda PCX125
 
 esphome:
   name: mcu-${device}

mcu-vehicle-suzuki-dl650.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: vehicle-suzuki-dl650
   name: Vehicle Suzuki DL650
   area: Outside
-  comment: "${area}, Beacon | Suzuki DL650"
+  comment: ${area}, Beacon | Suzuki DL650
 
 esphome:
   name: mcu-${device}

mcu-vehicle-toyota-auris-ts.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: vehicle-toyota-auris-ts
   name: Vehicle Toyota Auris TS
   area: Outside
-  comment: "${area}, Beacon | Toyota Auris TS"
+  comment: ${area}, Beacon | Toyota Auris TS
 
 esphome:
   name: mcu-${device}

mcu-vehicle-toyota-yaris-cross.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: vehicle-toyota-yaris-cross
   name: Vehicle Toyota Yaris Cross
   area: Outside
-  comment: "${area}, Beacon | Toyota Yaris Cross"
+  comment: ${area}, Beacon | Toyota Yaris Cross
 
 esphome:
   name: mcu-${device}

mcu-waterproof-socket.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: waterproof-socket
   name: Waterproof Socket
   area: Basement
-  comment: "${area} | Hardened remote controlled socket"
+  comment: Hardened remote controlled socket
 
 esphome:
   name: mcu-${device}

mcu-well.yaml

@@ -3,7 +3,7 @@ substitutions:
   device: well
   name: Well
   area: Outside
-  comment: "${area}, Well | Irrigation A"
+  comment: Well | Irrigation A
 
 esphome:
   name: mcu-${device}