Browse Source
Merge pull request #15850 from thingsboard/rc
Merge rc into master
pull/15856/head
Vladyslav Prykhodko
2 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
7 additions and
0 deletions
-
ui-ngx/src/app/shared/models/units/volume-flow.ts
-
ui-ngx/src/assets/locale/locale.constant-en_US.json
|
|
|
@ -25,6 +25,7 @@ export type VolumeFlowMetricUnits = |
|
|
|
| 'L/min' |
|
|
|
| 'L/hr' |
|
|
|
| 'm³/s' |
|
|
|
| 'm³/min' |
|
|
|
| 'm³/hr'; |
|
|
|
|
|
|
|
export type VolumeFlowImperialUnits = |
|
|
|
@ -67,6 +68,11 @@ const METRIC: TbMeasureUnits<VolumeFlowMetricUnits> = { |
|
|
|
tags: ['airflow', 'ventilation', 'HVAC', 'gas flow rate'], |
|
|
|
to_anchor: 1000, |
|
|
|
}, |
|
|
|
'm³/min': { |
|
|
|
name: 'unit.cubic-meters-per-minute', |
|
|
|
tags: ['airflow', 'ventilation', 'HVAC', 'gas flow rate'], |
|
|
|
to_anchor: 1000 / 60, |
|
|
|
}, |
|
|
|
'm³/hr': { |
|
|
|
name: 'unit.cubic-meters-per-hour', |
|
|
|
tags: ['airflow', 'ventilation', 'HVAC', 'gas flow rate'], |
|
|
|
|
|
|
|
@ -7337,6 +7337,7 @@ |
|
|
|
"cubic-foot-per-minute": "Cubic foot per minute", |
|
|
|
"cubic-meters-per-hour": "Cubic meters per hour", |
|
|
|
"cubic-meters-per-second": "Cubic meters per second", |
|
|
|
"cubic-meters-per-minute": "Cubic meters per minute", |
|
|
|
"liter-per-second": "Liter per second", |
|
|
|
"liter-per-minute": "Liter per minute", |
|
|
|
"gallons-per-minute": "Gallons per minute", |
|
|
|
|
