dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions 1 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/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. */
};