a bunch of esphome improvements

esphome/esp-occupancyoffice.yaml

@@ -21,7 +21,7 @@
 # If NOT using a secrets file, just replace these with the passwords etc (in quotes)
 #############################################
 substitutions:
-  devicename: "esp-occupancyoffice"
+  device_name: "esp-occupancyoffice"
   friendly_name: "Office Occupancy & Environment"
   description_comment: "D1 Mini ESP32 with LD1125H mmWave and environment sensors for downstairs office"
   api_key: !secret esp-occupancyoffice_api_key #unfortunately you can't use substitutions inside secrets names
@@ -29,7 +29,7 @@ substitutions:
   static_ip_address: !secret esp-occupancyoffice_ip
   log_level: "INFO" # Define logging level: NONE, ERROR, WARN, INFO, DEBUG (Default), VERBOSE, VERY_VERBOSE
   update_interval: "60s" # update time for for general sensors etc
-  room: "Office"  # Allows ESP device to be automatically linked to an 'Area' in Home Assistant.  
+  device_area: "Office"  # Allows ESP device to be automatically linked to an 'Area' in Home Assistant.  
 
   #############################################
   # SPECIFIC PROJECT VARIABLE SUBSTITUTIONS
@@ -68,11 +68,11 @@ packages:
 # https://esphome.io/components/esphome.html
 #############################################
 esphome:
-  name: ${devicename}
+  name: ${device_name}
   friendly_name: ${friendly_name}
   comment: ${description_comment} #appears on the esphome page in HA
   min_version: 2024.6.0
-  area: "${room}"
+  area: "${device_area}"
   on_boot:    #LD1125H Initial Setting, will remember previous values (if set)
     priority: -200
     then: