Skip to content

Add unit sets for meters #319

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
merged 4 commits into from
Nov 14, 2021
Merged

Add unit sets for meters #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e625d1
Add unit sets for meters
raman325 Nov 13, 2021
aca27e9
Prepend UNIT_ on constants to be more consistent
raman325 Nov 13, 2021
e876d46
Add types
raman325 Nov 13, 2021
2c30daf
black
raman325 Nov 13, 2021
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
6 changes: 4 additions & 2 deletions scripts/generate_multilevel_sensor_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def generate_int_enum_class_definition(
"# ----------------------------------------------------------------------------------- #",
"",
"from enum import IntEnum",
"from typing import Dict, Type, Union",
"from typing import Dict, Set, Type, Union",
'CC_SPECIFIC_SCALE = "scale"',
'CC_SPECIFIC_SENSOR_TYPE = "sensorType"',
]
Expand Down Expand Up @@ -199,7 +199,9 @@ def generate_int_enum_class_definition(
lines.append("")

for unit_name, unit_enums in unit_name_to_enum_map.items():
lines.append(f"UNIT_{unit_name} = {{{','.join(sorted(unit_enums))}}}")
lines.append(
f"UNIT_{unit_name}: Set[MultilevelSensorScaleType] = {{{','.join(sorted(unit_enums))}}}"
)

lines.extend(
[
Expand Down
25 changes: 25 additions & 0 deletions zwave_js_server/const/command_class/meter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,28 @@ class HeatingScale(IntEnum):
WaterScale.US_GALLON,
WaterScale.PULSE_COUNT,
}

UNIT_KILOWATT_HOUR: Set[MeterScaleType] = {
ElectricScale.KILOWATT_HOUR,
HeatingScale.KILOWATT_HOUR,
CoolingScale.KILOWATT_HOUR,
}
UNIT_KILOVOLT_AMPERE_HOUR: Set[MeterScaleType] = {ElectricScale.KILOVOLT_AMPERE_HOUR}
UNIT_WATT: Set[MeterScaleType] = {ElectricScale.WATT}
UNIT_PULSE_COUNT: Set[MeterScaleType] = {
ElectricScale.PULSE_COUNT,
GasScale.PULSE_COUNT,
WaterScale.PULSE_COUNT,
}
UNIT_VOLT: Set[MeterScaleType] = {ElectricScale.VOLT}
UNIT_AMPERE: Set[MeterScaleType] = {ElectricScale.AMPERE}
UNIT_POWER_FACTOR: Set[MeterScaleType] = {ElectricScale.POWER_FACTOR}
UNIT_KILOVOLT_AMPERE_REACTIVE: Set[MeterScaleType] = {
ElectricScale.KILOVOLT_AMPERE_REACTIVE
}
UNIT_KILOVOLT_AMPERE_REACTIVE_HOUR: Set[MeterScaleType] = {
ElectricScale.KILOVOLT_AMPERE_REACTIVE_HOUR
}
UNIT_CUBIC_METER: Set[MeterScaleType] = {GasScale.CUBIC_METER, WaterScale.CUBIC_METER}
UNIT_CUBIC_FEET: Set[MeterScaleType] = {GasScale.CUBIC_FEET, WaterScale.CUBIC_FEET}
UNIT_US_GALLON: Set[MeterScaleType] = {WaterScale.US_GALLON}
193 changes: 117 additions & 76 deletions zwave_js_server/const/command_class/multilevel_sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# ----------------------------------------------------------------------------------- #

from enum import IntEnum
from typing import Dict, Type, Union
from typing import Dict, Set, Type, Union

CC_SPECIFIC_SCALE = "scale"
CC_SPECIFIC_SENSOR_TYPE = "sensorType"
Expand Down Expand Up @@ -681,68 +681,97 @@ class WeightScale(IntEnum):
MultilevelSensorType.WEIGHT: WeightScale,
}

UNIT_ABSOLUTE_HUMIDITY = {HumidityScale.ABSOLUTE_HUMIDITY}
UNIT_ACIDITY = {AcidityScale.ACIDITY}
UNIT_AMPERE = {CurrentScale.AMPERE}
UNIT_A_WEIGHTED_DECIBELS = {LoudnessScale.A_WEIGHTED_DECIBELS}
UNIT_BEATS_PER_MINUTE = {HeartRateScale.BEATS_PER_MINUTE}
UNIT_BECQUEREL_PER_CUBIC_METER = {RadonConcentrationScale.BECQUEREL_PER_CUBIC_METER}
UNIT_BODY_MASS_INDEX = {BodyMassIndexScale.BODY_MASS_INDEX}
UNIT_BODY_WAVE = {SeismicMagnitudeScale.BODY_WAVE}
UNIT_BREATHS_PER_MINUTE = {RespiratoryRateScale.BREATHS_PER_MINUTE}
UNIT_BTU_H = {PowerScale.BTU_H}
UNIT_CELSIUS = {TemperatureScale.CELSIUS}
UNIT_CENTIMETER = {DistanceScale.CENTIMETER}
UNIT_CUBIC_FEET_PER_MINUTE = {AirFlowScale.CUBIC_FEET_PER_MINUTE}
UNIT_CUBIC_METER = {TankCapacityScale.CUBIC_METER}
UNIT_CUBIC_METER_PER_HOUR = {AirFlowScale.CUBIC_METER_PER_HOUR}
UNIT_DECIBEL = {LoudnessScale.DECIBEL}
UNIT_DEGREES = {DirectionScale.DEGREES}
UNIT_DEGREES_RELATIVE_TO_NORTH_POLE_OF_STANDING_EYE_VIEW = {
AnglePositionScale.DEGREES_RELATIVE_TO_NORTH_POLE_OF_STANDING_EYE_VIEW
UNIT_ABSOLUTE_HUMIDITY: Set[MultilevelSensorScaleType] = {
HumidityScale.ABSOLUTE_HUMIDITY
}
UNIT_DEGREES_RELATIVE_TO_SOUTH_POLE_OF_STANDING_EYE_VIEW = {
AnglePositionScale.DEGREES_RELATIVE_TO_SOUTH_POLE_OF_STANDING_EYE_VIEW
UNIT_ACIDITY: Set[MultilevelSensorScaleType] = {AcidityScale.ACIDITY}
UNIT_AMPERE: Set[MultilevelSensorScaleType] = {CurrentScale.AMPERE}
UNIT_A_WEIGHTED_DECIBELS: Set[MultilevelSensorScaleType] = {
LoudnessScale.A_WEIGHTED_DECIBELS
}
UNIT_DENSITY = {DensityScale.DENSITY}
UNIT_DIASTOLIC = {BloodPressureScale.DIASTOLIC}
UNIT_DIMENSIONLESS_VALUE = {GeneralPurposeScale.DIMENSIONLESS_VALUE}
UNIT_EUROPEAN_MACROSEISMIC = {SeismicIntensityScale.EUROPEAN_MACROSEISMIC}
UNIT_FAHRENHEIT = {TemperatureScale.FAHRENHEIT}
UNIT_FEET = {DistanceScale.FEET, TideLevelScale.FEET}
UNIT_GALLONS = {TankCapacityScale.GALLONS}
UNIT_HERTZ = {FrequencyScale.HERTZ, RotationScale.HERTZ}
UNIT_IMPEDANCE = {MoistureScale.IMPEDANCE}
UNIT_INCHES_OF_MERCURY = {AirPressureScale.INCHES_OF_MERCURY}
UNIT_INCHES_PER_HOUR = {RainRateScale.INCHES_PER_HOUR}
UNIT_JOULE = {BasisMetabolicRateScale.JOULE}
UNIT_KILOGRAM = {MassScale.KILOGRAM, WeightScale.KILOGRAM}
UNIT_KILOHERTZ = {FrequencyScale.KILOHERTZ}
UNIT_KILOPASCAL = {
UNIT_BEATS_PER_MINUTE: Set[MultilevelSensorScaleType] = {
HeartRateScale.BEATS_PER_MINUTE
}
UNIT_BECQUEREL_PER_CUBIC_METER: Set[MultilevelSensorScaleType] = {
RadonConcentrationScale.BECQUEREL_PER_CUBIC_METER
}
UNIT_BODY_MASS_INDEX: Set[MultilevelSensorScaleType] = {
BodyMassIndexScale.BODY_MASS_INDEX
}
UNIT_BODY_WAVE: Set[MultilevelSensorScaleType] = {SeismicMagnitudeScale.BODY_WAVE}
UNIT_BREATHS_PER_MINUTE: Set[MultilevelSensorScaleType] = {
RespiratoryRateScale.BREATHS_PER_MINUTE
}
UNIT_BTU_H: Set[MultilevelSensorScaleType] = {PowerScale.BTU_H}
UNIT_CELSIUS: Set[MultilevelSensorScaleType] = {TemperatureScale.CELSIUS}
UNIT_CENTIMETER: Set[MultilevelSensorScaleType] = {DistanceScale.CENTIMETER}
UNIT_CUBIC_FEET_PER_MINUTE: Set[MultilevelSensorScaleType] = {
AirFlowScale.CUBIC_FEET_PER_MINUTE
}
UNIT_CUBIC_METER: Set[MultilevelSensorScaleType] = {TankCapacityScale.CUBIC_METER}
UNIT_CUBIC_METER_PER_HOUR: Set[MultilevelSensorScaleType] = {
AirFlowScale.CUBIC_METER_PER_HOUR
}
UNIT_DECIBEL: Set[MultilevelSensorScaleType] = {LoudnessScale.DECIBEL}
UNIT_DEGREES: Set[MultilevelSensorScaleType] = {DirectionScale.DEGREES}
UNIT_DEGREES_RELATIVE_TO_NORTH_POLE_OF_STANDING_EYE_VIEW: Set[
MultilevelSensorScaleType
] = {AnglePositionScale.DEGREES_RELATIVE_TO_NORTH_POLE_OF_STANDING_EYE_VIEW}
UNIT_DEGREES_RELATIVE_TO_SOUTH_POLE_OF_STANDING_EYE_VIEW: Set[
MultilevelSensorScaleType
] = {AnglePositionScale.DEGREES_RELATIVE_TO_SOUTH_POLE_OF_STANDING_EYE_VIEW}
UNIT_DENSITY: Set[MultilevelSensorScaleType] = {DensityScale.DENSITY}
UNIT_DIASTOLIC: Set[MultilevelSensorScaleType] = {BloodPressureScale.DIASTOLIC}
UNIT_DIMENSIONLESS_VALUE: Set[MultilevelSensorScaleType] = {
GeneralPurposeScale.DIMENSIONLESS_VALUE
}
UNIT_EUROPEAN_MACROSEISMIC: Set[MultilevelSensorScaleType] = {
SeismicIntensityScale.EUROPEAN_MACROSEISMIC
}
UNIT_FAHRENHEIT: Set[MultilevelSensorScaleType] = {TemperatureScale.FAHRENHEIT}
UNIT_FEET: Set[MultilevelSensorScaleType] = {DistanceScale.FEET, TideLevelScale.FEET}
UNIT_GALLONS: Set[MultilevelSensorScaleType] = {TankCapacityScale.GALLONS}
UNIT_HERTZ: Set[MultilevelSensorScaleType] = {FrequencyScale.HERTZ, RotationScale.HERTZ}
UNIT_IMPEDANCE: Set[MultilevelSensorScaleType] = {MoistureScale.IMPEDANCE}
UNIT_INCHES_OF_MERCURY: Set[MultilevelSensorScaleType] = {
AirPressureScale.INCHES_OF_MERCURY
}
UNIT_INCHES_PER_HOUR: Set[MultilevelSensorScaleType] = {RainRateScale.INCHES_PER_HOUR}
UNIT_JOULE: Set[MultilevelSensorScaleType] = {BasisMetabolicRateScale.JOULE}
UNIT_KILOGRAM: Set[MultilevelSensorScaleType] = {
MassScale.KILOGRAM,
WeightScale.KILOGRAM,
}
UNIT_KILOHERTZ: Set[MultilevelSensorScaleType] = {FrequencyScale.KILOHERTZ}
UNIT_KILOPASCAL: Set[MultilevelSensorScaleType] = {
AirPressureScale.KILOPASCAL,
PressureScale.KILOPASCAL,
WaterPressureScale.KILOPASCAL,
}
UNIT_LIEDU = {SeismicIntensityScale.LIEDU}
UNIT_LITER = {TankCapacityScale.LITER}
UNIT_LITER_PER_HOUR = {WaterFlowScale.LITER_PER_HOUR}
UNIT_LOCAL = {SeismicMagnitudeScale.LOCAL}
UNIT_LUX = {IlluminanceScale.LUX}
UNIT_MERCALLI = {SeismicIntensityScale.MERCALLI}
UNIT_METER = {DistanceScale.METER, TideLevelScale.METER}
UNIT_METER_PER_SQUARE_SECOND = {AccelerationScale.METER_PER_SQUARE_SECOND}
UNIT_MICROGRAM_PER_CUBIC_METER = {
UNIT_LIEDU: Set[MultilevelSensorScaleType] = {SeismicIntensityScale.LIEDU}
UNIT_LITER: Set[MultilevelSensorScaleType] = {TankCapacityScale.LITER}
UNIT_LITER_PER_HOUR: Set[MultilevelSensorScaleType] = {WaterFlowScale.LITER_PER_HOUR}
UNIT_LOCAL: Set[MultilevelSensorScaleType] = {SeismicMagnitudeScale.LOCAL}
UNIT_LUX: Set[MultilevelSensorScaleType] = {IlluminanceScale.LUX}
UNIT_MERCALLI: Set[MultilevelSensorScaleType] = {SeismicIntensityScale.MERCALLI}
UNIT_METER: Set[MultilevelSensorScaleType] = {DistanceScale.METER, TideLevelScale.METER}
UNIT_METER_PER_SQUARE_SECOND: Set[MultilevelSensorScaleType] = {
AccelerationScale.METER_PER_SQUARE_SECOND
}
UNIT_MICROGRAM_PER_CUBIC_METER: Set[MultilevelSensorScaleType] = {
ParticulateMatter10Scale.MICROGRAM_PER_CUBIC_METER,
ParticulateMatter25Scale.MICROGRAM_PER_CUBIC_METER,
}
UNIT_MILLIAMPERE = {CurrentScale.MILLIAMPERE}
UNIT_MILLIGRAM_PER_LITER = {WaterChlorineLevelScale.MILLIGRAM_PER_LITER}
UNIT_MILLIMETER_HOUR = {RainRateScale.MILLIMETER_HOUR}
UNIT_MILLIVOLT = {
UNIT_MILLIAMPERE: Set[MultilevelSensorScaleType] = {CurrentScale.MILLIAMPERE}
UNIT_MILLIGRAM_PER_LITER: Set[MultilevelSensorScaleType] = {
WaterChlorineLevelScale.MILLIGRAM_PER_LITER
}
UNIT_MILLIMETER_HOUR: Set[MultilevelSensorScaleType] = {RainRateScale.MILLIMETER_HOUR}
UNIT_MILLIVOLT: Set[MultilevelSensorScaleType] = {
VoltageScale.MILLIVOLT,
WaterOxidationReductionPotentialScale.MILLIVOLT,
}
UNIT_MOLE_PER_CUBIC_METER = {
UNIT_MOLE_PER_CUBIC_METER: Set[MultilevelSensorScaleType] = {
CarbonMonoxideLevelScale.MOLE_PER_CUBIC_METER,
FormaldehydeLevelScale.MOLE_PER_CUBIC_METER,
MethaneDensityScale.MOLE_PER_CUBIC_METER,
Expand All @@ -751,42 +780,54 @@ class WeightScale(IntEnum):
SoilSalinityScale.MOLE_PER_CUBIC_METER,
VolatileOrganicCompoundLevelScale.MOLE_PER_CUBIC_METER,
}
UNIT_MOMENT = {SeismicMagnitudeScale.MOMENT}
UNIT_MPH = {VelocityScale.MPH}
UNIT_M_S = {VelocityScale.M_S}
UNIT_NEWTON = {AppliedForceOnTheSensorScale.NEWTON}
UNIT_OHM_METER = {ElectricalResistivityScale.OHM_METER}
UNIT_PARTS_MILLION = {
UNIT_MOMENT: Set[MultilevelSensorScaleType] = {SeismicMagnitudeScale.MOMENT}
UNIT_MPH: Set[MultilevelSensorScaleType] = {VelocityScale.MPH}
UNIT_M_S: Set[MultilevelSensorScaleType] = {VelocityScale.M_S}
UNIT_NEWTON: Set[MultilevelSensorScaleType] = {AppliedForceOnTheSensorScale.NEWTON}
UNIT_OHM_METER: Set[MultilevelSensorScaleType] = {ElectricalResistivityScale.OHM_METER}
UNIT_PARTS_MILLION: Set[MultilevelSensorScaleType] = {
CarbonDioxideLevelScale.PARTS_MILLION,
CarbonMonoxideLevelScale.PARTS_MILLION,
VolatileOrganicCompoundLevelScale.PARTS_MILLION,
}
UNIT_PERCENTAGE_VALUE = {
UNIT_PERCENTAGE_VALUE: Set[MultilevelSensorScaleType] = {
AnglePositionScale.PERCENTAGE_VALUE,
GeneralPurposeScale.PERCENTAGE_VALUE,
HumidityScale.PERCENTAGE_VALUE,
IlluminanceScale.PERCENTAGE_VALUE,
MoistureScale.PERCENTAGE_VALUE,
PercentageScale.PERCENTAGE_VALUE,
}
UNIT_PICOCURIES_PER_LITER = {RadonConcentrationScale.PICOCURIES_PER_LITER}
UNIT_POUNDS = {WeightScale.POUNDS}
UNIT_POUND_PER_SQUARE_INCH = {PressureScale.POUND_PER_SQUARE_INCH}
UNIT_POWER_LEVEL = {RfSignalStrengthScale.POWER_LEVEL}
UNIT_REVOLUTIONS_PER_MINUTE = {RotationScale.REVOLUTIONS_PER_MINUTE}
UNIT_RSSI = {RfSignalStrengthScale.RSSI}
UNIT_SECOND = {TimeScale.SECOND}
UNIT_SHINDO = {SeismicIntensityScale.SHINDO}
UNIT_SIEMENS_PER_METER = {ElectricalConductivityScale.SIEMENS_PER_METER}
UNIT_SURFACE_WAVE = {SeismicMagnitudeScale.SURFACE_WAVE}
UNIT_SYSTOLIC = {BloodPressureScale.SYSTOLIC}
UNIT_UNITLESS = {UnitlessScale.UNITLESS}
UNIT_UV_INDEX = {UltravioletScale.UV_INDEX}
UNIT_VOLT = {VoltageScale.VOLT}
UNIT_VOLUME_WATER_CONTENT = {MoistureScale.VOLUME_WATER_CONTENT}
UNIT_WATER_ACTIVITY = {MoistureScale.WATER_ACTIVITY}
UNIT_WATT = {PowerScale.WATT}
UNIT_WATT_PER_SQUARE_METER = {SolarRadiationScale.WATT_PER_SQUARE_METER}
UNIT_PICOCURIES_PER_LITER: Set[MultilevelSensorScaleType] = {
RadonConcentrationScale.PICOCURIES_PER_LITER
}
UNIT_POUNDS: Set[MultilevelSensorScaleType] = {WeightScale.POUNDS}
UNIT_POUND_PER_SQUARE_INCH: Set[MultilevelSensorScaleType] = {
PressureScale.POUND_PER_SQUARE_INCH
}
UNIT_POWER_LEVEL: Set[MultilevelSensorScaleType] = {RfSignalStrengthScale.POWER_LEVEL}
UNIT_REVOLUTIONS_PER_MINUTE: Set[MultilevelSensorScaleType] = {
RotationScale.REVOLUTIONS_PER_MINUTE
}
UNIT_RSSI: Set[MultilevelSensorScaleType] = {RfSignalStrengthScale.RSSI}
UNIT_SECOND: Set[MultilevelSensorScaleType] = {TimeScale.SECOND}
UNIT_SHINDO: Set[MultilevelSensorScaleType] = {SeismicIntensityScale.SHINDO}
UNIT_SIEMENS_PER_METER: Set[MultilevelSensorScaleType] = {
ElectricalConductivityScale.SIEMENS_PER_METER
}
UNIT_SURFACE_WAVE: Set[MultilevelSensorScaleType] = {SeismicMagnitudeScale.SURFACE_WAVE}
UNIT_SYSTOLIC: Set[MultilevelSensorScaleType] = {BloodPressureScale.SYSTOLIC}
UNIT_UNITLESS: Set[MultilevelSensorScaleType] = {UnitlessScale.UNITLESS}
UNIT_UV_INDEX: Set[MultilevelSensorScaleType] = {UltravioletScale.UV_INDEX}
UNIT_VOLT: Set[MultilevelSensorScaleType] = {VoltageScale.VOLT}
UNIT_VOLUME_WATER_CONTENT: Set[MultilevelSensorScaleType] = {
MoistureScale.VOLUME_WATER_CONTENT
}
UNIT_WATER_ACTIVITY: Set[MultilevelSensorScaleType] = {MoistureScale.WATER_ACTIVITY}
UNIT_WATT: Set[MultilevelSensorScaleType] = {PowerScale.WATT}
UNIT_WATT_PER_SQUARE_METER: Set[MultilevelSensorScaleType] = {
SolarRadiationScale.WATT_PER_SQUARE_METER
}

# ----------------------------------------------------------------------------------- #
# **END OF AUTOGENERATED CONTENT** (DO NOT EDIT/REMOVE THIS COMMENT BLOCK AND DO NOT #
Expand Down