dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modifications for ASHRAE 135-2020cn engineering units (#703)

Browse Source
This commit is contained in:
Eric Miller
2024-07-22 17:39:13 -04:00
committed by GitHub
parent 766e0c020d
commit 39f08d253b
2 changed files with 331 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bacenum.h
+163 -10
View File
@@ -642,6 +642,13 @@ typedef enum {
UNITS_CURRENCY8 = 112,
UNITS_CURRENCY9 = 113,
UNITS_CURRENCY10 = 114,
/* Efficiency */
UNITS_BTU_PER_HOUR_PER_WATT = 47898,
UNITS_BTU_PER_WATT_HOUR_SEASONAL = 47899,
UNITS_COEFFICIENT_OF_PERFORMANCE = 47900,
UNITS_COEFFICIENT_OF_PERFORMANCE_SEASONAL = 47901,
UNITS_KILOWATT_PER_TON_REFRIGERATION = 47902,
UNITS_LUMENS_PER_WATT = 47903,
/* Electrical */
UNITS_MILLIAMPERES = 2,
UNITS_AMPERES = 3,
@@ -662,6 +669,9 @@ typedef enum {
UNITS_MILLISIEMENS = 202,
UNITS_SIEMENS = 173, /* 1 mho equals 1 siemens */
UNITS_SIEMENS_PER_METER = 174,
UNITS_MICROSIEMENS_PER_CENTIMETER = 47909,
UNITS_MILLISIEMENS_PER_CENTIMETER = 47910,
UNITS_MILLISIEMENS_PER_METER = 47911,
UNITS_TESLAS = 175,
UNITS_VOLTS = 5,
UNITS_MILLIVOLTS = 124,
@@ -683,17 +693,26 @@ typedef enum {
UNITS_KILOJOULES = 17,
UNITS_KILOJOULES_PER_KILOGRAM = 125,
UNITS_MEGAJOULES = 126,
UNITS_GIGAJOULES = 47925,
UNITS_TERAJOULES = 47926,
UNITS_WATT_HOURS = 18,
UNITS_KILOWATT_HOURS = 19,
UNITS_MEGAWATT_HOURS = 146,
UNITS_WATT_HOURS_REACTIVE = 203,
UNITS_KILOWATT_HOURS_REACTIVE = 204,
UNITS_MEGAWATT_HOURS_REACTIVE = 205,
UNITS_GIGAWATT_HOURS = 47927,
UNITS_WATT_REACTIVE_HOURS = 203,
UNITS_KILOWATT_REACTIVE_HOURS = 204,
UNITS_MEGAWATT_REACTIVE_HOURS = 205,
UNITS_GIGAWATT_REACTIVE_HOURS = 47928,
UNITS_BTUS = 20,
UNITS_KILO_BTUS = 147,
UNITS_MEGA_BTUS = 148,
UNITS_THERMS = 21,
UNITS_TON_HOURS = 22,
UNITS_ACTIVE_ENERGY_PULSE_VALUE = 47918,
UNITS_REACTIVE_ENERGY_PULSE_VALUE = 47919,
UNITS_APPARENT_ENERGY_PULSE_VALUE = 47920,
UNITS_VOLT_SQUARED_HOUR_PULSE_VALUE = 47921,
UNITS_AMPERE_SQUARED_HOUR_PULSE_VALUE = 47922,
/* Enthalpy */
UNITS_JOULES_PER_KILOGRAM_DRY_AIR = 23,
UNITS_KILOJOULES_PER_KILOGRAM_DRY_AIR = 149,
@@ -713,7 +732,9 @@ typedef enum {
UNITS_HERTZ = 27,
UNITS_KILOHERTZ = 129,
UNITS_MEGAHERTZ = 130,
UNITS_PER_DAY = 47823,
UNITS_PER_HOUR = 131,
UNITS_PER_MILLISECOND = 47824,
/* Humidity */
UNITS_GRAMS_OF_WATER_PER_KILOGRAM_DRY_AIR = 28,
UNITS_PERCENT_RELATIVE_HUMIDITY = 29,
@@ -725,6 +746,9 @@ typedef enum {
UNITS_METERS = 31,
UNITS_INCHES = 32,
UNITS_FEET = 33,
UNITS_YARDS = 47825,
UNITS_MILES = 47826,
UNITS_NAUTICAL_MILES = 47827,
/* Light */
UNITS_CANDELAS = 179,
UNITS_CANDELAS_PER_SQUARE_METER = 180,
@@ -734,28 +758,70 @@ typedef enum {
UNITS_LUXES = 37,
UNITS_FOOT_CANDLES = 38,
/* Mass */
UNITS_NANOGRAMS = 47828,
UNITS_MICROGRAMS = 47829,
UNITS_MILLIGRAMS = 196,
UNITS_GRAMS = 195,
UNITS_KILOGRAMS = 39,
UNITS_POUNDS_MASS = 40,
UNITS_TONS = 41,
UNITS_METRIC_TONNES = 47830,
UNITS_SHORT_TONS = 47831,
UNITS_LONG_TONS = 47832,
/* Mass Flow */
UNITS_GRAMS_PER_SECOND = 154,
UNITS_GRAMS_PER_MINUTE = 155,
UNITS_GRAMS_PER_HOUR = 47833,
UNITS_GRAMS_PER_DAY = 47834,
UNITS_KILOGRAMS_PER_SECOND = 42,
UNITS_KILOGRAMS_PER_MINUTE = 43,
UNITS_KILOGRAMS_PER_HOUR = 44,
UNITS_KILOGRAMS_PER_DAY = 47835,
UNITS_POUNDS_MASS_PER_SECOND = 119,
UNITS_POUNDS_MASS_PER_MINUTE = 45,
UNITS_POUNDS_MASS_PER_HOUR = 46,
UNITS_TONS_PER_HOUR = 156,
UNITS_SHORT_TONS_PER_SECOND = 47836,
UNITS_SHORT_TONS_PER_MINUTE = 47837,
UNITS_SHORT_TONS_PER_HOUR = 47838,
UNITS_SHORT_TONS_PER_DAY = 47839,
UNITS_METRIC_TONNES_PER_SECOND = 47840,
UNITS_METRIC_TONNES_PER_MINUTE = 47841,
UNITS_METRIC_TONNES_PER_HOUR = 47842,
UNITS_METRIC_TONNES_PER_DAY = 47843,
UNITS_LONG_TONS_PER_SECOND = 47844,
UNITS_LONG_TONS_PER_MINUTE = 47845,
UNITS_LONG_TONS_PER_HOUR = 47846,
UNITS_LONG_TONS_PER_DAY = 47847,
/* Power */
UNITS_MILLIWATTS = 132,
UNITS_WATTS = 47,
UNITS_KILOWATTS = 48,
UNITS_MEGAWATTS = 49,
UNITS_GIGAWATTS = 47924,
UNITS_BTUS_PER_SECOND = 47848,
UNITS_BTUS_PER_MINUTE = 47849,
UNITS_BTUS_PER_HOUR = 50,
UNITS_BTUS_PER_DAY = 47850,
UNITS_KILO_BTUS_PER_SECOND = 47851,
UNITS_KILO_BTUS_PER_MINUTE = 47852,
UNITS_KILO_BTUS_PER_HOUR = 157,
UNITS_KILO_BTUS_PER_DAY = 47853,
UNITS_MEGA_BTUS_PER_SECOND = 47854,
UNITS_MEGA_BTUS_PER_MINUTE = 47855,
UNITS_MEGA_BTUS_PER_HOUR = 47856,
UNITS_MEGA_BTUS_PER_DAY = 47857,
UNITS_JOULES_PER_SECOND = 47858,
UNITS_JOULES_PER_MINUTE = 47859,
UNITS_JOULES_PER_DAY = 47860,
UNITS_KILOJOULES_PER_SECOND = 47861,
UNITS_KILOJOULES_PER_MINUTE = 47862,
UNITS_KILOJOULES_PER_HOUR = 47863,
UNITS_KILOJOULES_PER_DAY = 47864,
UNITS_MEGAJOULES_PER_SECOND = 47865,
UNITS_MEGAJOULES_PER_MINUTE = 47866,
UNITS_MEGAJOULES_PER_HOUR = 47867,
UNITS_MEGAJOULES_PER_DAY = 47868,
UNITS_HORSEPOWER = 51,
UNITS_TONS_REFRIGERATION = 52,
/* Pressure */
@@ -765,6 +831,8 @@ typedef enum {
UNITS_MILLIBARS = 134,
UNITS_BARS = 55,
UNITS_POUNDS_FORCE_PER_SQUARE_INCH = 56,
UNITS_POUNDS_FORCE_PER_SQUARE_INCH_ABSOLUTE = 47907,
UNITS_POUNDS_FORCE_PER_SQUARE_INCH_GAUGE = 47908,
UNITS_MILLIMETERS_OF_WATER = 206,
UNITS_CENTIMETERS_OF_WATER = 57,
UNITS_INCHES_OF_WATER = 58,
@@ -773,14 +841,18 @@ typedef enum {
UNITS_INCHES_OF_MERCURY = 61,
/* Temperature */
UNITS_DEGREES_CELSIUS = 62,
UNITS_DEGREES_KELVIN = 63,
UNITS_DEGREES_KELVIN_PER_HOUR = 181,
UNITS_DEGREES_KELVIN_PER_MINUTE = 182,
UNITS_DEGREES_CELSIUS_PER_DAY = 47869,
UNITS_KELVIN = 63,
UNITS_KELVIN_PER_DAY = 47870,
UNITS_KELVIN_PER_HOUR = 181,
UNITS_KELVIN_PER_MINUTE = 182,
UNITS_DEGREES_FAHRENHEIT = 64,
UNITS_DEGREES_FAHRENHEIT_PER_DAY = 47871,
UNITS_DEGREE_DAYS_CELSIUS = 65,
UNITS_DEGREE_DAYS_FAHRENHEIT = 66,
UNITS_DELTA_DEGREES_CELSIUS = 47872,
UNITS_DELTA_DEGREES_FAHRENHEIT = 120,
UNITS_DELTA_DEGREES_KELVIN = 121,
UNITS_DELTA_KELVIN = 121,
/* Time */
UNITS_YEARS = 67,
UNITS_MONTHS = 68,
@@ -793,6 +865,9 @@ typedef enum {
UNITS_MILLISECONDS = 159,
/* Torque */
UNITS_NEWTON_METERS = 160,
UNITS_POUND_FORCE_FEET = 47904,
UNITS_POUND_FORCE_INCHES = 47905,
UNITS_OUNCE_FORCE_INCHES = 47906,
/* Velocity */
UNITS_MILLIMETERS_PER_SECOND = 161,
UNITS_MILLIMETERS_PER_MINUTE = 162,
@@ -810,20 +885,52 @@ typedef enum {
UNITS_MILLILITERS = 197,
UNITS_LITERS = 82,
UNITS_US_GALLONS = 83,
UNITS_MILLIONS_OF_US_GALLONS = 47912,
UNITS_MILLIONS_OF_IMPERIAL_GALLONS = 47913,
UNITS_VOLUME1 = 47937,
UNITS_VOLUME2 = 47938,
UNITS_VOLUME3 = 47939,
UNITS_VOLUME4 = 47940,
UNITS_VOLUME5 = 47941,
UNITS_VOLUME6 = 47942,
UNITS_VOLUME7 = 47943,
UNITS_VOLUME8 = 47944,
UNITS_VOLUME9 = 47945,
UNITS_VOLUME10 = 47946,
/* Volumetric Flow */
UNITS_CUBIC_FEET_PER_SECOND = 142,
UNITS_CUBIC_FEET_PER_MINUTE = 84,
UNITS_CUBIC_FEET_PER_HOUR = 191,
UNITS_MILLION_CUBIC_FEET_PER_MINUTE = 47873,
UNITS_MILLION_CUBIC_FEET_PER_DAY = 47874,
UNITS_CUBIC_METERS_PER_SECOND = 85,
UNITS_CUBIC_METERS_PER_MINUTE = 165,
UNITS_CUBIC_METERS_PER_HOUR = 135,
UNITS_IMPERIAL_GALLONS_PER_SECOND = 47875,
UNITS_IMPERIAL_GALLONS_PER_MINUTE = 86,
UNITS_IMPERIAL_GALLONS_PER_HOUR = 47876,
UNITS_IMPERIAL_GALLONS_PER_DAY = 47877,
UNITS_MILLILITERS_PER_SECOND = 198,
UNITS_MILLILITERS_PER_MINUTE = 47914,
UNITS_LITERS_PER_SECOND = 87,
UNITS_LITERS_PER_MINUTE = 88,
UNITS_LITERS_PER_HOUR = 136,
UNITS_LITERS_PER_DAY = 47878,
UNITS_US_GALLONS_PER_SECOND = 47879,
UNITS_US_GALLONS_PER_MINUTE = 89,
UNITS_US_GALLONS_PER_HOUR = 192,
UNITS_US_GALLONS_PER_DAY = 47880,
UNITS_CUBIC_METER_PULSE_VALUE = 47923,
UNITS_VOLUMETRIC_FLOW1 = 47947,
UNITS_VOLUMETRIC_FLOW2 = 47948,
UNITS_VOLUMETRIC_FLOW3 = 47949,
UNITS_VOLUMETRIC_FLOW4 = 47950,
UNITS_VOLUMETRIC_FLOW5 = 47951,
UNITS_VOLUMETRIC_FLOW6 = 47952,
UNITS_VOLUMETRIC_FLOW7 = 47953,
UNITS_VOLUMETRIC_FLOW8 = 47954,
UNITS_VOLUMETRIC_FLOW9 = 47955,
UNITS_VOLUMETRIC_FLOW10 = 47956,
/* Other */
UNITS_DEGREES_ANGULAR = 90,
UNITS_DEGREES_CELSIUS_PER_HOUR = 91,
@@ -845,6 +952,9 @@ typedef enum {
UNITS_PERCENT_OBSCURATION_PER_FOOT = 143,
UNITS_PERCENT_OBSCURATION_PER_METER = 144,
UNITS_PERCENT_PER_SECOND = 99,
UNITS_PERCENT_PER_MINUTE = 47881,
UNITS_PERCENT_PER_HOUR = 47882,
UNITS_PERCENT_PER_DAY = 47883,
UNITS_PER_MINUTE = 100,
UNITS_PER_SECOND = 101,
UNITS_PSI_PER_DEGREE_FAHRENHEIT = 102,
@@ -855,20 +965,34 @@ typedef enum {
UNITS_WATTS_PER_METER_PER_DEGREE_KELVIN = 189,
UNITS_WATTS_PER_SQUARE_METER_DEGREE_KELVIN = 141,
UNITS_PER_MILLE = 207,
UNITS_PER_MILLION = 47884,
UNITS_PER_BILLION = 47885,
UNITS_GRAMS_PER_GRAM = 208,
UNITS_MICROGRAMS_PER_GRAM = 47886,
UNITS_NANOGRAMS_PER_GRAM = 47887,
UNITS_KILOGRAMS_PER_KILOGRAM = 209,
UNITS_GRAMS_PER_KILOGRAM = 210,
UNITS_MILLIGRAMS_PER_GRAM = 211,
UNITS_MILLIGRAMS_PER_KILOGRAM = 212,
UNITS_MICROGRAMS_PER_KILOGRAM = 47888,
UNITS_NANOGRAMS_PER_KILOGRAM = 47889,
UNITS_GRAMS_PER_MILLILITER = 213,
UNITS_MILLIGRAMS_PER_MILLILITER = 47890,
UNITS_MICROGRAMS_PER_MILLILITER = 47891,
UNITS_NANOGRAMS_PER_MILLILITER = 47892,
UNITS_KILOGRAMS_PER_LITER = 47893,
UNITS_GRAMS_PER_LITER = 214,
UNITS_MILLIGRAMS_PER_LITER = 215,
UNITS_MICROGRAMS_PER_LITER = 216,
UNITS_NANOGRAMS_PER_LITER = 47894,
UNITS_GRAMS_PER_CUBIC_METER = 217,
UNITS_MILLIGRAMS_PER_CUBIC_METER = 218,
UNITS_MICROGRAMS_PER_CUBIC_METER = 219,
UNITS_NANOGRAMS_PER_CUBIC_METER = 220,
UNITS_GRAMS_PER_CUBIC_CENTIMETER = 221,
UNITS_MILLIGRAMS_PER_CUBIC_CENTIMETER = 47895,
UNITS_MICROGRAMS_PER_CUBIC_CENTIMETER = 47896,
UNITS_NANOGRAMS_PER_CUBIC_CENTIMETER = 47897,
UNITS_BECQUERELS = 222,
UNITS_KILOBECQUERELS = 223,
UNITS_MEGABECQUERELS = 224,
@@ -884,14 +1008,43 @@ typedef enum {
UNITS_PH = 234,
UNITS_GRAMS_PER_SQUARE_METER = 235,
UNITS_MINUTES_PER_DEGREE_KELVIN = 236,
UNITS_DEGREES_LOVIBOND = 47816,
UNITS_ALCOHOL_BY_VOLUME = 47817,
UNITS_INTERNATIONAL_BITTERING_UNITS = 47818,
UNITS_EUROPEAN_BITTERNESS_UNITS = 47819,
UNITS_DEGREES_PLATO = 47820,
UNITS_SPECIFIC_GRAVITY = 47821,
UNITS_EUROPEAN_BREWING_CONVENTION = 47822,
UNITS_MILS_PER_YEAR = 47915,
UNITS_MILLIMETERS_PER_YEAR = 47916,
UNITS_PULSES_PER_MINUTE = 47917,
UNITS_BITS_PER_SECOND = 47929,
UNITS_KILOBITS_PER_SECOND = 47930,
UNITS_MEGABITS_PER_SECOND = 47931,
UNITS_GIGABITS_PER_SECOND = 47932,
UNITS_BYTES_PER_SECOND = 47933,
UNITS_KILOBYTES_PER_SECOND = 47934,
UNITS_MEGABYTES_PER_SECOND = 47935,
UNITS_GIGABYTES_PER_SECOND = 47936,
UNITS_SITE_UNIT1 = 47958,
UNITS_SITE_UNIT2 = 47959,
UNITS_SITE_UNIT3 = 47960,
UNITS_SITE_UNIT4 = 47961,
UNITS_SITE_UNIT5 = 47962,
UNITS_SITE_UNIT6 = 47963,
UNITS_SITE_UNIT7 = 47964,
UNITS_SITE_UNIT8 = 47965,
UNITS_SITE_UNIT9 = 47966,
UNITS_SITE_UNIT10 = 47967,
UNITS_OHM_METER_SQUARED_PER_METER = 237,
UNITS_AMPERE_SECONDS = 238,
UNITS_VOLT_AMPERE_HOURS = 239,
UNITS_KILOVOLT_AMPERE_HOURS = 240,
UNITS_MEGAVOLT_AMPERE_HOURS = 241,
UNITS_VOLT_AMPERE_HOURS_REACTIVE = 242,
UNITS_KILOVOLT_AMPERE_HOURS_REACTIVE = 243,
UNITS_MEGAVOLT_AMPERE_HOURS_REACTIVE = 244,
UNITS_VOLT_AMPERE_REACTIVE_HOURS = 242,
UNITS_KILOVOLT_AMPERE_REACTIVE_HOURS = 243,
UNITS_MEGAVOLT_AMPERE_REACTIVE_HOURS = 244,
UNITS_VOLT_SQUARE_HOURS = 245,
UNITS_AMPERE_SQUARE_HOURS = 246,
UNITS_JOULE_PER_HOURS = 247,
src/bacnet/bactext.c
+168 -15
View File
@@ -818,7 +818,7 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
{ UNITS_CENTIMETERS_OF_MERCURY, "centimeters-of-mercury" },
{ UNITS_INCHES_OF_MERCURY, "inches-of-mercury" },
{ UNITS_DEGREES_CELSIUS, "degrees-celsius" },
{ UNITS_DEGREES_KELVIN, "degrees-kelvin" },
{ UNITS_KELVIN, "kelvin" },
{ UNITS_DEGREES_FAHRENHEIT, "degrees-fahrenheit" },
{ UNITS_DEGREE_DAYS_CELSIUS, "degree-days-celsius" },
{ UNITS_DEGREE_DAYS_FAHRENHEIT, "degree-days-fahrenheit" },
@@ -860,11 +860,11 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
{ UNITS_CURRENCY9, "currency9" }, { UNITS_CURRENCY10, "currency10" },
{ UNITS_SQUARE_INCHES, "square-inches" },
{ UNITS_SQUARE_CENTIMETERS, "square-centimeters" },
{ UNITS_BTUS_PER_POUND, "btus_per-pound" },
{ UNITS_BTUS_PER_POUND, "btus-per-pound" },
{ UNITS_CENTIMETERS, "centimeters" },
{ UNITS_POUNDS_MASS_PER_SECOND, "pounds-mass-per-second" },
{ UNITS_DELTA_DEGREES_FAHRENHEIT, "delta-degrees-fahrenheit" },
{ UNITS_DELTA_DEGREES_KELVIN, "delta-degrees-kelvin" },
{ UNITS_DELTA_KELVIN, "delta-kelvin" },
{ UNITS_KILOHMS, "kilohms" }, { UNITS_MEGOHMS, "megohms" },
{ UNITS_MILLIVOLTS, "millivolts" },
{ UNITS_KILOJOULES_PER_KILOGRAM, "kilojoules-per-kilogram" },
@@ -919,11 +919,11 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
{ UNITS_VOLTS_PER_METER, "volts-per-meter" }, { UNITS_WEBERS, "webers" },
{ UNITS_CANDELAS, "candelas" },
{ UNITS_CANDELAS_PER_SQUARE_METER, "candelas-per-square-meter" },
{ UNITS_DEGREES_KELVIN_PER_HOUR, "degrees-kelvin-per-hour" },
{ UNITS_DEGREES_KELVIN_PER_MINUTE, "degrees-kelvin-per-minute" },
{ UNITS_KELVIN_PER_HOUR, "kelvin-per-hour" },
{ UNITS_KELVIN_PER_MINUTE, "kelvin-per-minute" },
{ UNITS_JOULE_SECONDS, "joule-seconds" },
{ UNITS_RADIANS_PER_SECOND, "radians-per-second" },
{ UNITS_SQUARE_METERS_PER_NEWTON, "square-meters-per-Newton" },
{ UNITS_SQUARE_METERS_PER_NEWTON, "square-meters-per-newton" },
{ UNITS_KILOGRAMS_PER_CUBIC_METER, "kilograms-per-cubic-meter" },
{ UNITS_NEWTON_SECONDS, "newton-seconds" },
{ UNITS_NEWTONS_PER_METER, "newtons-per-meter" },
@@ -940,9 +940,9 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
{ UNITS_DECIBELS_MILLIVOLT, "decibels-millivolt" },
{ UNITS_DECIBELS_VOLT, "decibels-volt" },
{ UNITS_MILLISIEMENS, "millisiemens" },
{ UNITS_WATT_HOURS_REACTIVE, "watt-hours-reactive" },
{ UNITS_KILOWATT_HOURS_REACTIVE, "kilowatt-hours-reactive" },
{ UNITS_MEGAWATT_HOURS_REACTIVE, "megawatt-hours-reactive" },
{ UNITS_WATT_REACTIVE_HOURS, "watt-reactive-hours" },
{ UNITS_KILOWATT_REACTIVE_HOURS, "kilowatt-reactive-hours" },
{ UNITS_MEGAWATT_REACTIVE_HOURS, "megawatt-reactive-hours" },
{ UNITS_MILLIMETERS_OF_WATER, "millimeters-of-water" },
{ UNITS_PER_MILLE, "per-mille" },
{ UNITS_GRAMS_PER_GRAM, "grams-per-gram" },
@@ -960,6 +960,7 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
{ UNITS_NANOGRAMS_PER_CUBIC_METER, "nanograms-per-cubic-meter" },
{ UNITS_GRAMS_PER_CUBIC_CENTIMETER, "grams-per-cubic-centimeter" },
{ UNITS_BECQUERELS, "becquerels" },
{ UNITS_KILOBECQUERELS, "kilobecquerels" },
{ UNITS_MEGABECQUERELS, "megabecquerels" }, { UNITS_GRAY, "gray" },
{ UNITS_MILLIGRAY, "milligray" }, { UNITS_MICROGRAY, "microgray" },
{ UNITS_SIEVERTS, "sieverts" }, { UNITS_MILLISIEVERTS, "millisieverts" },
@@ -975,9 +976,9 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
{ UNITS_VOLT_AMPERE_HOURS, "volt-ampere-hours" },
{ UNITS_KILOVOLT_AMPERE_HOURS, "kilovolt-ampere-hours" },
{ UNITS_MEGAVOLT_AMPERE_HOURS, "megavolt-ampere-hours" },
{ UNITS_VOLT_AMPERE_HOURS_REACTIVE, "volt-ampere-hours-reactive" },
{ UNITS_KILOVOLT_AMPERE_HOURS_REACTIVE, "kilovolt-ampere-hours-reactive" },
{ UNITS_MEGAVOLT_AMPERE_HOURS_REACTIVE, "megavolt-ampere-hours-reactive" },
{ UNITS_VOLT_AMPERE_REACTIVE_HOURS, "volt-ampere-reactive-hours" },
{ UNITS_KILOVOLT_AMPERE_REACTIVE_HOURS, "kilovolt-ampere-reactive-hours" },
{ UNITS_MEGAVOLT_AMPERE_REACTIVE_HOURS, "megavolt-ampere-reactive-hours" },
{ UNITS_VOLT_SQUARE_HOURS, "volt-square-hours" },
{ UNITS_AMPERE_SQUARE_HOURS, "ampere-square-hours" },
{ UNITS_JOULE_PER_HOURS, "joule-per-hours" },
@@ -997,9 +998,161 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
"thousand-standard-cubic-feet-per-day" },
{ UNITS_POUNDS_MASS_PER_DAY, "pounds-mass-per-day" },
{ UNITS_MILLIREMS, "millirems" },
{ UNITS_MILLIREMS_PER_HOUR, "millirems-per-hour" }, { 0, NULL }
/* Enumerated values 0-255 are reserved for definition by ASHRAE.
Enumerated values 256-65535 may be used by others subject to
{ UNITS_MILLIREMS_PER_HOUR, "millirems-per-hour" },
{ UNITS_DEGREES_LOVIBOND, "degrees-lovibond" },
{ UNITS_ALCOHOL_BY_VOLUME, "alcohol-by-volume" },
{ UNITS_INTERNATIONAL_BITTERING_UNITS, "international-bittering-units" },
{ UNITS_EUROPEAN_BITTERNESS_UNITS, "european-bitterness-units" },
{ UNITS_DEGREES_PLATO, "degrees-plato" },
{ UNITS_SPECIFIC_GRAVITY, "specific-gravity" },
{ UNITS_EUROPEAN_BREWING_CONVENTION, "european-brewing-convention" },
{ UNITS_PER_DAY, "per-day" },
{ UNITS_PER_MILLISECOND, "per-millisecond" },
{ UNITS_YARDS, "yards" },
{ UNITS_MILES, "miles" },
{ UNITS_NAUTICAL_MILES, "nautical-miles" },
{ UNITS_NANOGRAMS, "nanograms" },
{ UNITS_MICROGRAMS, "micrograms" },
{ UNITS_METRIC_TONNES, "metric-tonnes" },
{ UNITS_SHORT_TONS, "short-tons" },
{ UNITS_LONG_TONS, "long-tons" },
{ UNITS_GRAMS_PER_HOUR, "grams-per-hour" },
{ UNITS_GRAMS_PER_DAY, "grams-per-day" },
{ UNITS_KILOGRAMS_PER_DAY, "kilograms-per-day" },
{ UNITS_SHORT_TONS_PER_SECOND, "short-tons-per-second" },
{ UNITS_SHORT_TONS_PER_MINUTE, "short-tons-per-minute" },
{ UNITS_SHORT_TONS_PER_HOUR, "short-tons-per-hour" },
{ UNITS_SHORT_TONS_PER_DAY, "short-tons-per-day" },
{ UNITS_METRIC_TONNES_PER_SECOND, "metric-tonnes-per-second" },
{ UNITS_METRIC_TONNES_PER_MINUTE, "metric-tonnes-per-minute" },
{ UNITS_METRIC_TONNES_PER_HOUR, "metric-tonnes-per-hour" },
{ UNITS_METRIC_TONNES_PER_DAY, "metric-tonnes-per-day" },
{ UNITS_LONG_TONS_PER_SECOND, "long-tons-per-second" },
{ UNITS_LONG_TONS_PER_MINUTE, "long-tons-per-minute" },
{ UNITS_LONG_TONS_PER_HOUR, "long-tons-per-hour" },
{ UNITS_LONG_TONS_PER_DAY, "long-tons-per-day" },
{ UNITS_BTUS_PER_SECOND, "btus-per-second" },
{ UNITS_BTUS_PER_MINUTE, "btus-per-minute" },
{ UNITS_BTUS_PER_DAY, "btus-per-day" },
{ UNITS_KILO_BTUS_PER_SECOND, "kilo-btus-per-second" },
{ UNITS_KILO_BTUS_PER_MINUTE, "kilo-btus-per-minute" },
{ UNITS_KILO_BTUS_PER_DAY, "kilo-btus-per-day" },
{ UNITS_MEGA_BTUS_PER_SECOND, "mega-btus-per-second" },
{ UNITS_MEGA_BTUS_PER_MINUTE, "mega-btus-per-minute" },
{ UNITS_MEGA_BTUS_PER_HOUR, "mega-btus-per-hour" },
{ UNITS_MEGA_BTUS_PER_DAY, "mega-btus-per-day" },
{ UNITS_JOULES_PER_SECOND, "joules-per-second" },
{ UNITS_JOULES_PER_MINUTE, "joules-per-minute" },
{ UNITS_JOULES_PER_DAY, "joules-per-day" },
{ UNITS_KILOJOULES_PER_SECOND, "kilojoules-per-second" },
{ UNITS_KILOJOULES_PER_MINUTE, "kilojoules-per-minute" },
{ UNITS_KILOJOULES_PER_HOUR, "kilojoules-per-hour" },
{ UNITS_KILOJOULES_PER_DAY, "kilojoules-per-day" },
{ UNITS_MEGAJOULES_PER_SECOND, "megajoules-per-second" },
{ UNITS_MEGAJOULES_PER_MINUTE, "megajoules-per-minute" },
{ UNITS_MEGAJOULES_PER_HOUR, "megajoules-per-hour" },
{ UNITS_MEGAJOULES_PER_DAY, "megajoules-per-day" },
{ UNITS_DEGREES_CELSIUS_PER_DAY, "degrees-celsius-per-day" },
{ UNITS_KELVIN_PER_DAY, "kelvin-per-day" },
{ UNITS_DEGREES_FAHRENHEIT_PER_DAY, "degrees-fahrenheit-per-day" },
{ UNITS_DELTA_DEGREES_CELSIUS, "delta-degrees-celsius" },
{ UNITS_MILLION_CUBIC_FEET_PER_MINUTE, "million-cubic-feet-per-minute" },
{ UNITS_MILLION_CUBIC_FEET_PER_DAY, "million-cubic-feet-per-day" },
{ UNITS_IMPERIAL_GALLONS_PER_SECOND, "imperial-gallons-per-second" },
{ UNITS_IMPERIAL_GALLONS_PER_HOUR, "imperial-gallons-per-hour" },
{ UNITS_IMPERIAL_GALLONS_PER_DAY, "imperial-gallons-per-day" },
{ UNITS_LITERS_PER_DAY, "liters-per-day" },
{ UNITS_US_GALLONS_PER_SECOND, "us-gallons-per-second" },
{ UNITS_US_GALLONS_PER_DAY, "us-gallons-per-day" },
{ UNITS_PERCENT_PER_MINUTE, "percent-per-minute" },
{ UNITS_PERCENT_PER_HOUR, "percent-per-hour" },
{ UNITS_PERCENT_PER_DAY, "percent-per-day" },
{ UNITS_PER_MILLION, "per-million" },
{ UNITS_PER_BILLION, "per-billion" },
{ UNITS_MICROGRAMS_PER_GRAM, "micrograms-per-gram" },
{ UNITS_NANOGRAMS_PER_GRAM, "nanograms-per-gram" },
{ UNITS_MICROGRAMS_PER_KILOGRAM, "micrograms-per-kilogram" },
{ UNITS_NANOGRAMS_PER_KILOGRAM, "nanograms-per-kilogram" },
{ UNITS_MILLIGRAMS_PER_MILLILITER, "milligrams-per-milliliter" },
{ UNITS_MICROGRAMS_PER_MILLILITER, "micrograms-per-milliliter" },
{ UNITS_NANOGRAMS_PER_MILLILITER, "nanograms-per-milliliter" },
{ UNITS_KILOGRAMS_PER_LITER, "kilograms-per-liter" },
{ UNITS_NANOGRAMS_PER_LITER, "nanograms-per-liter" },
{ UNITS_MILLIGRAMS_PER_CUBIC_CENTIMETER, "milligrams-per-cubic-centimeter" },
{ UNITS_MICROGRAMS_PER_CUBIC_CENTIMETER, "micrograms-per-cubic-centimeter" },
{ UNITS_NANOGRAMS_PER_CUBIC_CENTIMETER, "nanograms-per-cubic-centimeter" },
{ UNITS_BTU_PER_HOUR_PER_WATT, "btu-per-hour-per-watt" },
{ UNITS_BTU_PER_WATT_HOUR_SEASONAL, "btu-per-watt-hour-seasonal" },
{ UNITS_COEFFICIENT_OF_PERFORMANCE, "coefficient-of-performance" },
{ UNITS_COEFFICIENT_OF_PERFORMANCE_SEASONAL, "coefficient-of-performance-seasonal" },
{ UNITS_KILOWATT_PER_TON_REFRIGERATION, "kilowatt-per-ton-refrigeration" },
{ UNITS_LUMENS_PER_WATT, "lumens-per-watt" },
{ UNITS_POUND_FORCE_FEET, "pound-force-feet" },
{ UNITS_POUND_FORCE_INCHES, "pound-force-inches" },
{ UNITS_OUNCE_FORCE_INCHES, "ounce-force-inches" },
{ UNITS_POUNDS_FORCE_PER_SQUARE_INCH_ABSOLUTE, "pounds-force-per-square-inch-absolute" },
{ UNITS_POUNDS_FORCE_PER_SQUARE_INCH_GAUGE, "pounds-force-per-square-inch-gauge" },
{ UNITS_MICROSIEMENS_PER_CENTIMETER, "microsiemens-per-centimeter" },
{ UNITS_ACTIVE_ENERGY_PULSE_VALUE, "active-energy-pulse-value" },
{ UNITS_MILLISIEMENS_PER_CENTIMETER, "millisiemens-per-centimeter" },
{ UNITS_MILLISIEMENS_PER_METER, "millisiemens-per-meter" },
{ UNITS_MILLIONS_OF_US_GALLONS, "millions-of-us-gallons" },
{ UNITS_MILLIONS_OF_IMPERIAL_GALLONS, "millions-of-imperial-gallons" },
{ UNITS_MILLILITERS_PER_MINUTE, "milliliters-per-minute" },
{ UNITS_MILS_PER_YEAR, "mils-per-year" },
{ UNITS_MILLIMETERS_PER_YEAR, "millimeters-per-year" },
{ UNITS_PULSES_PER_MINUTE, "pulses-per-minute" },
{ UNITS_REACTIVE_ENERGY_PULSE_VALUE, "reactive-energy-pulse-value" },
{ UNITS_APPARENT_ENERGY_PULSE_VALUE, "apparent-energy-pulse-value" },
{ UNITS_VOLT_SQUARED_HOUR_PULSE_VALUE, "volt-squared-hour-pulse-value" },
{ UNITS_AMPERE_SQUARED_HOUR_PULSE_VALUE, "ampere-squared-hour-pulse-value" },
{ UNITS_CUBIC_METER_PULSE_VALUE, "cubic-meter-pulse-value" },
{ UNITS_GIGAWATTS, "gigawatts" },
{ UNITS_GIGAJOULES, "gigajoules" },
{ UNITS_TERAJOULES, "terajoules" },
{ UNITS_GIGAWATT_HOURS, "gigawatt-hours" },
{ UNITS_GIGAWATT_REACTIVE_HOURS, "gigawatt-reactive-hours" },
{ UNITS_BITS_PER_SECOND, "bits-per-second" },
{ UNITS_KILOBITS_PER_SECOND, "kilobits-per-second" },
{ UNITS_MEGABITS_PER_SECOND, "megabits-per-second" },
{ UNITS_GIGABITS_PER_SECOND, "gigabits-per-second" },
{ UNITS_BYTES_PER_SECOND, "bytes-per-second" },
{ UNITS_KILOBYTES_PER_SECOND, "kilobytes-per-second" },
{ UNITS_MEGABYTES_PER_SECOND, "megabytes-per-second" },
{ UNITS_GIGABYTES_PER_SECOND, "gigabytes-per-second" },
{ UNITS_VOLUME1, "volume1" },
{ UNITS_VOLUME2, "volume2" },
{ UNITS_VOLUME3, "volume3" },
{ UNITS_VOLUME4, "volume4" },
{ UNITS_VOLUME5, "volume5" },
{ UNITS_VOLUME6, "volume6" },
{ UNITS_VOLUME7, "volume7" },
{ UNITS_VOLUME8, "volume8" },
{ UNITS_VOLUME9, "volume9" },
{ UNITS_VOLUME10, "volume10" },
{ UNITS_VOLUMETRIC_FLOW1, "volumetric-flow1" },
{ UNITS_VOLUMETRIC_FLOW2, "volumetric-flow2" },
{ UNITS_VOLUMETRIC_FLOW3, "volumetric-flow3" },
{ UNITS_VOLUMETRIC_FLOW4, "volumetric-flow4" },
{ UNITS_VOLUMETRIC_FLOW5, "volumetric-flow5" },
{ UNITS_VOLUMETRIC_FLOW6, "volumetric-flow6" },
{ UNITS_VOLUMETRIC_FLOW7, "volumetric-flow7" },
{ UNITS_VOLUMETRIC_FLOW8, "volumetric-flow8" },
{ UNITS_VOLUMETRIC_FLOW9, "volumetric-flow9" },
{ UNITS_VOLUMETRIC_FLOW10, "volumetric-flow10" },
{ UNITS_SITE_UNIT1, "site-unit1" },
{ UNITS_SITE_UNIT2, "site-unit2" },
{ UNITS_SITE_UNIT3, "site-unit3" },
{ UNITS_SITE_UNIT4, "site-unit4" },
{ UNITS_SITE_UNIT5, "site-unit5" },
{ UNITS_SITE_UNIT6, "site-unit6" },
{ UNITS_SITE_UNIT7, "site-unit7" },
{ UNITS_SITE_UNIT8, "site-unit8" },
{ UNITS_SITE_UNIT9, "site-unit9" },
{ UNITS_SITE_UNIT10, "site-unit10" },
{ 0, NULL }
/* Enumerated values 0-255 and 47808-49999 are reserved for definition by ASHRAE.
Enumerated values 256-47807 and 50000-65535 may be used by others subject to
the procedures and constraints described in Clause 23. */
};