Skip to content

Commit

Permalink
Merge branch 'current' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
bramkragten committed Feb 26, 2025
2 parents 0ad1274 + e88ab4b commit 5204bf6
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 41 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ GEM
rubocop-ast (>= 1.38.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.38.0)
rubocop-ast (1.38.1)
parser (>= 3.3.1.0)
ruby-lsp (0.23.11)
language_server-protocol (~> 3.17.0)
Expand Down Expand Up @@ -158,7 +158,7 @@ GEM
rack-protection (= 4.1.1)
rack-session (>= 2.0.0, < 3)
tilt (~> 2.0)
sorbet-runtime (0.5.11856)
sorbet-runtime (0.5.11862)
stringex (2.8.6)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand Down
36 changes: 19 additions & 17 deletions source/_integrations/number.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -42,53 +42,55 @@ The following device classes are supported for numbers:
- **apparent_power**: Apparent power in VA.
- **aqi**: Air Quality Index (unitless).
- **area**: Area in m², cm², km², mm², in², ft², yd², mi², ac, ha
- **atmospheric_pressure**: Atmospheric pressure in cbar, bar, hPa, inHg, kPa, mbar, Pa, psi
- **battery**: Percentage of battery that is left
- **blood_glocose_concentration**: Blood glucose concentration in mg/dL, mmol/L
- **carbon_dioxide**: Carbon Dioxide in CO2 (Smoke)
- **carbon_monoxide**: Carbon Monoxide in CO (Gas CNG/LPG)
- **atmospheric_pressure**: Atmospheric pressure in cbar, bar, hPa, mmHg, inHg, kPa, mbar, Pa or psi
- **battery**: Percentage of battery that is left in %
- **blood_glucose_concentration**: Blood glucose concentration in mg/dL, mmol/L
- **carbon_dioxide**: Carbon Dioxide in CO2 (Smoke) in ppm
- **carbon_monoxide**: Carbon Monoxide in CO (Gas CNG/LPG) in ppm
- **current**: Current in A, mA
- **data_rate**: Data rate in bit/s, kbit/s, Mbit/s, Gbit/s, B/s, kB/s, MB/s, GB/s, KiB/s, MiB/s, or GiB/s
- **data_size**: Data size in bit, kbit, Mbit, Gbit, B, kB, MB, GB, TB, PB, EB, ZB, YB, KiB, MiB, GiB, TiB, PiB, EiB, ZiB, or YiB
- **distance**: Generic distance in km, m, cm, mm, mi, yd, or in
- **data_rate**: Data rate in bit/s, kbit/s, Mbit/s, Gbit/s, B/s, kB/s, MB/s, GB/s, KiB/s, MiB/s or GiB/s
- **data_size**: Data size in bit, kbit, Mbit, Gbit, B, kB, MB, GB, TB, PB, EB, ZB, YB, KiB, MiB, GiB, TiB, PiB, EiB, ZiB or YiB
- **distance**: Generic distance in km, m, cm, mm, mi, nmi, yd, or in
- **duration**: Duration in d, h, min, s, or ms
- **energy**: Energy in J, kJ, MJ, GJ, mWh, Wh, kWh, MWh, GWh, TWh, cal, kcal, Mcal, or Gcal
- **energy_distance**: Energy per distance in kWh/100km, mi/kWh or km/kWh.
- **energy_storage**: Stored energy in J, kJ, MJ, GJ, mWh, Wh, kWh, MWh, GWh, TWh, cal, kcal, Mcal, or Gcal
- **frequency**: Frequency in Hz, kHz, MHz, or GHz
- **gas**: Gasvolume in m³, ft³, or CCF
- **humidity**: Percentage of humidity in the air
- **gas**: Gasvolume in m³, ft³ or CCF
- **humidity**: Percentage of humidity in the air in %
- **illuminance**: The current light level in lx
- **irradiance**: Irradiance in W/m² or BTU/(h⋅ft²)
- **moisture**: Percentage of water in a substance
- **monetary**: The monetary value
- **moisture**: Percentage of water in a substance in %
- **monetary**: The monetary value ([ISO 4217](https://en.wikipedia.org/wiki/ISO_4217#Active_codes))
- **nitrogen_dioxide**: Concentration of Nitrogen Dioxide in µg/m³
- **nitrogen_monoxide**: Concentration of Nitrogen Monoxide in µg/m³
- **nitrous_oxide**: Concentration of Nitrous Oxide in µg/m³
- **ozone**: Concentration of Ozone in µg/m³
- **ph**: Potential hydrogen (pH) value of a water solution
- **pm1**: Concentration of particulate matter less than 1 micrometer in µg/m³
- **pm10**: Concentration of particulate matter less than 10 micrometers in µg/m³
- **pm25**: Concentration of particulate matter less than 2.5 micrometers in µg/m³
- **power_factor**: Power factor(unitless), unit may be `None` or %
- **pm10**: Concentration of particulate matter less than 10 micrometers in µg/m³
- **power_factor**: Power factor (unitless), unit may be `None` or %
- **power**: Power in mW, W, kW, MW, GW or TW
- **precipitation**: Accumulated precipitation in cm, in or mm
- **precipitation_intensity**: Precipitation intensity in in/d, in/h, mm/d, or mm/h
- **pressure**: Pressure in Pa, kPa, hPa, bar, cbar, mbar, mmHg, inHg, or psi
- **precipitation_intensity**: Precipitation intensity in in/d, in/h, mm/d or mm/h
- **pressure**: Pressure in Pa, kPa, hPa, bar, cbar, mbar, mmHg, inHg or psi
- **reactive_power**: Reactive power in var
- **signal_strength**: Signal strength in dB or dBm
- **sound_pressure**: Sound pressure in dB or dBA
- **speed**: Generic speed in ft/s, in/d, in/h, in/s, km/h, kn, m/s, mph, mm/d, or mm/s
- **sulphur_dioxide**: Concentration of sulphur dioxide in µg/m³
- **temperature**: Temperature in °C, °F or K
- **volatile_organic_compounds**: Concentration of volatile organic compounds in µg/m³
- **volatile_organic_compounds_parts**: Ratio of volatile organic compounds in ppm or ppb
- **voltage**: Voltage in V, mV, µV, kV, MV
- **volume**: Generic volume in L, mL, gal, fl. oz., m³, ft³, or CCF
- **volume_flow_rate**: Volume flow rate in m³/h, ft³/min, L/min, gal/min, or mL/s
- **volume_storage**: Generic stored volume in L, mL, gal, fl. oz., m³, ft³, or CCF
- **water**: Water consumption in L, gal, m³, ft³, or CCF
- **weight**: Generic mass in kg, g, mg, µg, oz, lb, or st
- **wind_direction**: Wind direction in °
- **wind_speed**: Wind speed in ft/s, km/h, kn, m/s, or mph
- **wind_speed**: Wind speed in Beaufort, ft/s, km/h, kn, m/s, or mph

## Actions

Expand Down
26 changes: 11 additions & 15 deletions source/_integrations/zha.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,21 @@ Newer coordinators generally support Zigbee 3.0 firmware, but it is up to the ma

### Other supported but not recommended Zigbee radio adapters or modules

The following hardware is supported, but _not recommended_. Specific models and details are noted where available in each section.

{% details "List of hardware that is not recommended" %}

{% warning %}
{% caution %}

The following hardware is supported, but _not recommended_. Specific models and details are noted where available in each section.
- It is **not recommended** to run a coordinator via **Serial-Proxy-Server** _(also called Serial-to-IP bridge or Ser2Net remote adapter)_ over:

- **Wi-Fi**,
- **WAN**, or
- **VPN**

{% endwarning %}
- The coordinator requires a stable, local connection to its serial port interface without drops in communication with the Zigbee gateway application running on the host computer.
- Serial protocols used by the coordinator do not have enough robustness, resilience, or fault tolerance to handle packet loss and latency delays that can occur over unstable connections.
{% endcaution %}

**Silicon Labs EmberZNet based radios using legacy hardware using the EZSP protocol (via the [bellows](https://github.com/zigpy/bellows) library for zigpy)**

Expand Down Expand Up @@ -165,18 +173,6 @@ The following hardware is supported, but _not recommended_. Specific models and

If you find an opportunity to improve this information, refer to the section on how to [add support for new and unsupported devices](#how-to-add-support-for-new-and-unsupported-devices).

{% caution %}

- It is **not recommended** to run a coordinator via **Serial-Proxy-Server** _(also called Serial-to-IP bridge or Ser2Net remote adapter)_ over:

- **Wi-Fi**,
- **WAN**, or
- **VPN**

- The coordinator requires a stable, local connection to its serial port interface without drops in communication with the Zigbee gateway application running on the host computer.
- Serial protocols used by the coordinator do not have enough robustness, resilience, or fault tolerance to handle packet loss and latency delays that can occur over unstable connections.
{% endcaution %}

## Configuration requirements

Be sure to connect a compatible radio module and restart Home Assistant before proceeding with configuration.
Expand Down
10 changes: 6 additions & 4 deletions source/voice_control/create_wake_word.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ Enabling a wake word consists of 2 steps:
1. Go to {% my supervisor_addon addon="core_openwakeword" title="**Settings** > **Add-ons** > **openWakeWord**" %} and select **Install**.
2. **Start** the add-on.
3. Go to {% my integrations title="**Settings** > **Devices & Services**" %}.
- Under **Discovered**, you should now see the **openWakeWord** integration.
- Under **Discovered**, you should now see the **openWakeWord** component of the **Wyoming** integration.
- Select **Configure** and **Submit**.
- **Result**: You have successfully installed the **openWakeWord** add-on and Wyoming integration.
- **Result**: You have successfully installed the **openWakeWord** add-on and **Wyoming** integration.

### To enable wake word for your voice assistant

Expand All @@ -56,8 +56,10 @@ Enabling a wake word consists of 2 steps:
- If the **Text-to-speech** and **Speech-to-text** sections do not provide language selectors, this means you do not have an Assist pipeline set up.
- Set up [Home Assistant Cloud](https://www.nabucasa.com) or a manually configured [Assist pipeline](/voice_control/voice_remote_local_assistant).
5. Under **Text-to-speech**, select the language and voice you want Home Assistant to use when speaking to you.
6. To define the wake word engine, under **Wake word**, select **openwakeword**.
- Then, select **ok nabu**.
6. To define the wake word engine, in the top-right corner of the dialog, select the three dots {% icon "mdi:dots-vertical" %} menu and select **Add streaming wake word**.
- **Troubleshooting**: If you don't see the three dots {% icon "mdi:dots-vertical" %} menu, go to {% my integrations title="**Settings** > **Devices & Services**" %} and make sure the **openWakeWord** component of the **Wyoming** integration is added.
- **Result**: on the bottom of the page, you now see a new section **Streaming wake word engine**.
- Select **openwakeword**, then select **ok nabu**.
- If you created a new assistant, select **Create**.
- If you edited an existing assistant, select **Update**.
- **Result**: You now have a voice assistant that listens to a wake word.
Expand Down
8 changes: 5 additions & 3 deletions source/voice_control/install_wake_word_add_on.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Enabling a wake word consists of 2 steps:
1. Go to {% my supervisor_addon addon="core_openwakeword" title="**Settings** > **Add-ons** > **openWakeWord**" %} and select **Install**.
2. **Start** the add-on.
3. Go to {% my integrations title="**Settings** > **Devices & Services**" %}.
- Under **Discovered**, you should now see the **openWakeWord** integration.
- Under **Discovered**, you should now see the **openWakeWord** component of the **Wyoming** integration.
- Select **Configure** and **Submit**.
- **Result**: You have successfully installed the openWakeWord add-on and Wyoming integration.

Expand All @@ -38,8 +38,10 @@ Enabling a wake word consists of 2 steps:
- If the **Text-to-speech** and **Speech-to-text** sections do not provide language selectors, this means you do not have an Assist pipeline set up.
- Set up [Home Assistant Cloud](https://www.nabucasa.com) or a manually configured [Assist pipeline](/voice_control/voice_remote_local_assistant).
5. Under **Text-to-speech**, select the language and voice you want Home Assistant to use when speaking to you.
6. To define the wake word engine, under **Wake word**, select **openwakeword**.
- Then, select **ok nabu**.
6. To define the wake word engine, in the top-right corner of the dialog, select the three dots {% icon "mdi:dots-vertical" %} menu and select **Add streaming wake word**.
- **Troubleshooting**: If you don't see the three dots {% icon "mdi:dots-vertical" %} menu, go to {% my integrations title="**Settings** > **Devices & Services**" %} and make sure the **openWakeWord** component of the **Wyoming** integration is added.
- **Result**: on the bottom of the page, you now see a new section **Streaming wake word engine**.
- Select **openwakeword**, then select **ok nabu**.
- If you created a new assistant, select **Create**.
- If you edited an existing assistant, select **Update**.
- **Result**: You now have a voice assistant that listens to a wake word.
Expand Down

0 comments on commit 5204bf6

Please sign in to comment.