Added new units from ASHRAE 135-2012 standard.

bacnet-stack/include/bacenum.h

@@ -494,6 +494,9 @@ typedef enum {
     UNITS_AMPERES_PER_METER = 167,
     UNITS_AMPERES_PER_SQUARE_METER = 168,
     UNITS_AMPERE_SQUARE_METERS = 169,
+	UNITS_DECIBELS = 199,
+	UNITS_DECIBELS_MILLIVOLT = 200,
+	UNITS_DECIBELS_VOLT = 201,
     UNITS_FARADS = 170,
     UNITS_HENRYS = 171,
     UNITS_OHMS = 4,
@@ -501,6 +504,8 @@ typedef enum {
     UNITS_MILLIOHMS = 145,
     UNITS_KILOHMS = 122,
     UNITS_MEGOHMS = 123,
+    UNITS_MICROSIEMENS = 190,
+    UNITS_MILLISIEMENS = 202,
     UNITS_SIEMENS = 173,        /* 1 mho equals 1 siemens */
     UNITS_SIEMENS_PER_METER = 174,
     UNITS_TESLAS = 175,
@@ -527,6 +532,9 @@ typedef enum {
     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_BTUS = 20,
     UNITS_KILO_BTUS = 147,
     UNITS_MEGA_BTUS = 148,
@@ -556,8 +564,10 @@ typedef enum {
     UNITS_GRAMS_OF_WATER_PER_KILOGRAM_DRY_AIR = 28,
     UNITS_PERCENT_RELATIVE_HUMIDITY = 29,
     /* Length */
+    UNITS_MICROMETERS = 194,
     UNITS_MILLIMETERS = 30,
     UNITS_CENTIMETERS = 118,
+    UNITS_KILOMETERS = 193,
     UNITS_METERS = 31,
     UNITS_INCHES = 32,
     UNITS_FEET = 33,
@@ -570,6 +580,8 @@ typedef enum {
     UNITS_LUXES = 37,
     UNITS_FOOT_CANDLES = 38,
     /* Mass */
+    UNITS_MILLIGRAMS = 196,
+    UNITS_GRAMS = 195,
     UNITS_KILOGRAMS = 39,
     UNITS_POUNDS_MASS = 40,
     UNITS_TONS = 41,
@@ -599,6 +611,7 @@ typedef enum {
     UNITS_MILLIBARS = 134,
     UNITS_BARS = 55,
     UNITS_POUNDS_FORCE_PER_SQUARE_INCH = 56,
+    UNITS_MILLIMETERS_OF_WATER = 206,
     UNITS_CENTIMETERS_OF_WATER = 57,
     UNITS_INCHES_OF_WATER = 58,
     UNITS_MILLIMETERS_OF_MERCURY = 59,
@@ -640,19 +653,23 @@ typedef enum {
     UNITS_CUBIC_FEET = 79,
     UNITS_CUBIC_METERS = 80,
     UNITS_IMPERIAL_GALLONS = 81,
+    UNITS_MILLILITERS = 197,
     UNITS_LITERS = 82,
     UNITS_US_GALLONS = 83,
     /* Volumetric Flow */
     UNITS_CUBIC_FEET_PER_SECOND = 142,
     UNITS_CUBIC_FEET_PER_MINUTE = 84,
+    UNITS_CUBIC_FEET_PER_HOUR = 191,
     UNITS_CUBIC_METERS_PER_SECOND = 85,
     UNITS_CUBIC_METERS_PER_MINUTE = 165,
     UNITS_CUBIC_METERS_PER_HOUR = 135,
     UNITS_IMPERIAL_GALLONS_PER_MINUTE = 86,
+    UNITS_MILLILITERS_PER_SECOND = 198,
     UNITS_LITERS_PER_SECOND = 87,
     UNITS_LITERS_PER_MINUTE = 88,
     UNITS_LITERS_PER_HOUR = 136,
     UNITS_US_GALLONS_PER_MINUTE = 89,
+    UNITS_US_GALLONS_PER_HOUR = 192,
     /* Other */
     UNITS_DEGREES_ANGULAR = 90,
     UNITS_DEGREES_CELSIUS_PER_HOUR = 91,
@@ -683,11 +700,40 @@ typedef enum {
     UNITS_SQUARE_METERS_PER_NEWTON = 185,
     UNITS_WATTS_PER_METER_PER_DEGREE_KELVIN = 189,
     UNITS_WATTS_PER_SQUARE_METER_DEGREE_KELVIN = 141,
+    UNITS_PER_MILLE = 207,
+	UNITS_GRAMS_PER_GRAM = 208,
+	UNITS_KILOGRAMS_PER_KILOGRAM = 209,
+	UNITS_GRAMS_PER_KILOGRAM = 210,
+	UNITS_MILLIGRAMS_PER_GRAM = 211,
+	UNITS_MILLIGRAMS_PER_KILOGRAM = 212,
+	UNITS_GRAMS_PER_MILLILITER = 213,
+	UNITS_GRAMS_PER_LITER = 214,
+	UNITS_MILLIGRAMS_PER_LITER = 215,
+	UNITS_MICROGRAMS_PER_LITER = 216,
+	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_BECQUERELS = 222,
+	UNITS_MEGABECQUERELS = 224,
+	UNITS_GRAY = 225,
+	UNITS_MILLIGRAY = 226,
+	UNITS_MICROGRAY = 227,
+	UNITS_SIEVERTS = 228,
+	UNITS_MILLISIEVERTS = 229,
+	UNITS_MICROSIEVERTS = 230,
+	UNITS_MICROSIEVERTS_PER_HOUR = 231,
+	UNITS_DECIBELS_A = 232,
+	UNITS_NEPHELOMETRIC_TURBIDITY_UNIT = 233,
+	UNITS_PH = 234,
+	UNITS_GRAMS_PER_SQUARE_METER = 235,
+	UNITS_MINUTES_PER_DEGREE_KELVIN = 236,
     /* Enumerated values 0-255 are reserved for definition by ASHRAE. */
     /* Enumerated values 256-65535 may be used by others subject to */
     /* the procedures and constraints described in Clause 23. */
-    /* The last enumeration used in this version is 189. */
-    MAX_UNITS = 190
+    /* The last enumeration used in this version is 236. */
+    MAX_UNITS = 237
 } BACNET_ENGINEERING_UNITS;
 
 typedef enum {