From 49669df0c44ef4675a998b529827d9cf55efae2b Mon Sep 17 00:00:00 2001 From: SgtBatten Date: Thu, 26 Jan 2023 19:18:37 +1100 Subject: [PATCH] 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 cd6bbf5ad90..122af2051a2 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 4f6490f4783..4b7a037f542 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