Skip to content

Add MJ and GJ #25862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frenck merged 6 commits into from
Jan 26, 2023
Merged

Add MJ and GJ #25862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a34758
Add MJ and GJ
SgtBatten Jan 20, 2023
15ecf44
add Mj and GJ
SgtBatten Jan 26, 2023
cd9fb64
Merge branch 'next' into next
SgtBatten Jan 26, 2023
0a66d6f
Update source/_integrations/number.markdown
SgtBatten Jan 26, 2023
dd6d52a
Update source/_integrations/sensor.markdown
SgtBatten Jan 26, 2023
9cdc4a1
Correct conflict fix after comma suggestion
SgtBatten Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/_integrations/number.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions source/_integrations/sensor.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down