From 49669df0c44ef4675a998b529827d9cf55efae2b Mon Sep 17 00:00:00 2001 From: SgtBatten Date: Thu, 26 Jan 2023 19:18:37 +1100 Subject: [PATCH 01/27] Add MJ and GJ (#25862) Co-authored-by: epenet <6771947+epenet@users.noreply.github.com> --- source/_integrations/number.markdown | 4 ++-- source/_integrations/sensor.markdown | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/_integrations/number.markdown b/source/_integrations/number.markdown index cd6bbf5ad901..122af2051a2e 100644 --- a/source/_integrations/number.markdown +++ b/source/_integrations/number.markdown @@ -33,8 +33,8 @@ The type of data a number represents impacts how it is displayed in the frontend - **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 -- **energy**: Energy in Wh, kWh or MWh -- **frequency**: Frequency in Hz, kHz, MHz or GHz +- **energy**: Energy in Wh, kWh, MWh, MJ, or GJ +- **frequency**: Frequency in Hz, kHz, MHz, or GHz - **gas**: Gasvolume in m³, ft³, or CCF - **humidity**: Percentage of humidity in the air - **illuminance**: The current light level in lx diff --git a/source/_integrations/sensor.markdown b/source/_integrations/sensor.markdown index 4f6490f4783a..4b7a037f542a 100644 --- a/source/_integrations/sensor.markdown +++ b/source/_integrations/sensor.markdown @@ -30,11 +30,11 @@ The type of data a sensor returns impacts how it is displayed in the frontend. T - **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 - **date**: Date string (ISO 8601) -- **distance**: Generic distance in km, m, cm, mm, mi, yd or in -- **duration**: Duration in d, h, min or s -- **energy**: Energy in Wh, kWh or MWh +- **distance**: Generic distance in km, m, cm, mm, mi, yd, or in +- **duration**: Duration in d, h, min, or s +- **energy**: Energy in Wh, kWh, MWh, MJ, or GJ - **enum**: Has a limited set of (non-numeric) states -- **frequency**: Frequency in Hz, kHz, MHz or GHz +- **frequency**: Frequency in Hz, kHz, MHz, or GHz - **gas**: Gasvolume in m³, ft³ or CCF - **humidity**: Percentage of humidity in the air in % - **illuminance**: The current light level in lx From 66d843ced47fc093c7aa13b2f2fa631fec33d710 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Thu, 26 Jan 2023 15:53:00 -0500 Subject: [PATCH 02/27] Add assist docs (#25968) * Add Assist docs * Add supported languages --- source/_includes/asides/docs_navigation.html | 16 ++- source/docs/assist/aliases.markdown | 9 ++ source/docs/assist/android.markdown | 30 +++++ source/docs/assist/apple.markdown | 65 ++++++++++ source/docs/assist/builtin_sentences.markdown | 27 ++++ source/docs/assist/custom_sentences.markdown | 120 ++++++++++++++++++ source/docs/assist/index.markdown | 21 +++ source/images/assist/android_tile.png | Bin 0 -> 34396 bytes source/images/assist/android_watch.png | Bin 0 -> 19006 bytes source/images/assist/android_watch_1.png | Bin 0 -> 25435 bytes source/images/assist/android_watch_2.png | Bin 0 -> 30092 bytes source/images/assist/android_watch_3.png | Bin 0 -> 31386 bytes source/images/assist/assist-icon.svg | 1 + source/images/assist/assist-logo.png | Bin 0 -> 16783 bytes .../assist/ios-expanded-shortcut-action.jpeg | Bin 0 -> 164716 bytes 15 files changed, 285 insertions(+), 4 deletions(-) create mode 100644 source/docs/assist/aliases.markdown create mode 100644 source/docs/assist/android.markdown create mode 100644 source/docs/assist/apple.markdown create mode 100644 source/docs/assist/builtin_sentences.markdown create mode 100644 source/docs/assist/custom_sentences.markdown create mode 100644 source/docs/assist/index.markdown create mode 100644 source/images/assist/android_tile.png create mode 100644 source/images/assist/android_watch.png create mode 100644 source/images/assist/android_watch_1.png create mode 100644 source/images/assist/android_watch_2.png create mode 100644 source/images/assist/android_watch_3.png create mode 100644 source/images/assist/assist-icon.svg create mode 100644 source/images/assist/assist-logo.png create mode 100644 source/images/assist/ios-expanded-shortcut-action.jpeg diff --git a/source/_includes/asides/docs_navigation.html b/source/_includes/asides/docs_navigation.html index 7fa5b627746d..6c6d54411144 100644 --- a/source/_includes/asides/docs_navigation.html +++ b/source/_includes/asides/docs_navigation.html @@ -40,9 +40,17 @@

Topics

  • - Home Energy Management + {% active_link /docs/assist/ Assist %} +
      +
    • {% active_link /docs/assist/android/ Assist for Android Wear %}
      • +
    • {% active_link /docs/assist/apple/ Assist for Apple devices %}
      • +
    • {% active_link /docs/assist/builtin_sentences/ Built-in sentences %}
      • +
    • {% active_link /docs/assist/custom_sentences/ Custom sentences %}
      • +
    +
    • +
  • + {% active_link /docs/energy/ Home Energy Management %}
      -
    • {% active_link /docs/energy/ Introduction %}
    • {% active_link /docs/energy/electricity-grid/ Electricity Grid %}
    • {% active_link /docs/energy/solar-panels/ Solar Panels %}
    • {% active_link /docs/energy/individual-devices/ Individual Devices %}
      • @@ -50,7 +58,7 @@

      Topics

  • - Advanced Configuration + Advanced Configuration
    • {% active_link /docs/configuration/remote/ Remote access %}
    • @@ -81,7 +89,7 @@

      Topics

  • - Core objects + Core objects