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

Units fixes (#13)

Browse Source 
* Match unit name to name used in specification.

* Add missing unit strings to bactext.
This commit is contained in:
Roger Light
2020-01-15 05:20:16 +00:00
committed by Steve Karg
parent 284f009a05
commit 0a414b88f6
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bactext.c
+21 -6
View File
@@ -821,8 +821,8 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
"kilojoules-per-kilogram-dry-air" },
{ UNITS_MEGAJOULES_PER_KILOGRAM_DRY_AIR,
"megajoules-per-kilogram-dry-air" },
{ UNITS_KILOJOULES_PER_DEGREE_KELVIN, "kilojoules-per-degree-Kelvin" },
{ UNITS_MEGAJOULES_PER_DEGREE_KELVIN, "megajoules-per-degree-Kelvin" },
{ UNITS_KILOJOULES_PER_DEGREE_KELVIN, "kilojoules-per-degree-kelvin" },
{ UNITS_MEGAJOULES_PER_DEGREE_KELVIN, "megajoules-per-degree-kelvin" },
{ UNITS_NEWTON, "newton" }, { UNITS_GRAMS_PER_SECOND, "grams-per-second" },
{ UNITS_GRAMS_PER_MINUTE, "grams-per-minute" },
{ UNITS_TONS_PER_HOUR, "tons-per-hour" },
@@ -843,12 +843,12 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
{ UNITS_OHM_METERS, "ohm-meters" }, { UNITS_SIEMENS, "siemens" },
{ UNITS_SIEMENS_PER_METER, "siemens-per-meter" },
{ UNITS_TESLAS, "teslas" },
{ UNITS_VOLTS_PER_DEGREE_KELVIN, "volts-per-degree-Kelvin" },
{ UNITS_VOLTS_PER_DEGREE_KELVIN, "volts-per-degree-kelvin" },
{ 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_DEGREES_KELVIN_PER_HOUR, "degrees-kelvin-per-hour" },
{ UNITS_DEGREES_KELVIN_PER_MINUTE, "degrees-kelvin-per-minute" },
{ UNITS_JOULE_SECONDS, "joule-seconds" },
{ UNITS_RADIANS_PER_SECOND, "radians-per-second" },
{ UNITS_SQUARE_METERS_PER_NEWTON, "square-meters-per-Newton" },
@@ -856,7 +856,22 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
{ UNITS_NEWTON_SECONDS, "newton-seconds" },
{ UNITS_NEWTONS_PER_METER, "newtons-per-meter" },
{ UNITS_WATTS_PER_METER_PER_DEGREE_KELVIN,
"watts-per-meter-per-degree-Kelvin" },
"watts-per-meter-per-degree-kelvin" },
{ UNITS_MICROSIEMENS, "micro-siemens" },
{ UNITS_CUBIC_FEET_PER_HOUR, "cubic-feet-per-hour" },
{ UNITS_US_GALLONS_PER_HOUR, "us-gallons-per-hour" },
{ UNITS_KILOMETERS, "kilometers" }, { UNITS_MICROMETERS, "micrometers" },
{ UNITS_GRAMS, "grams" }, { UNITS_MILLIGRAMS, "milligrams" },
{ UNITS_MILLILITERS, "milliliters" },
{ UNITS_MILLILITERS_PER_SECOND, "milliliters-per-second" },
{ UNITS_DECIBELS, "decibels" },
{ 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_MILLIMETERS_OF_WATER, "millimeters-of-water" },
{ UNITS_PER_MILLE, "per-mille" },
{ UNITS_GRAMS_PER_GRAM, "grams-per-gram" },
{ UNITS_KILOGRAMS_PER_KILOGRAM, "kilograms-per-kilogram" },