mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-09-28 22:15:23 +08:00
Code Issues Releases Wiki Activity

additional units submitted in #106

Browse Source
This commit is contained in:
Joel Bender 2017-02-27 21:59:11 -05:00
parent e75257c7d0
commit 49c50f5bd0
3 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
py25/bacpypes/basetypes.py
View File

@ -481,6 +481,7 @@ class EngineeringUnits(Enumerated):
, 'henrys':171
, 'ohms':4
, 'ohmMeters':172
, 'ohmMeterPerSquareMeter':237
, 'milliohms':145
, 'kilohms':122
, 'megohms':123
@ -496,11 +497,20 @@ class EngineeringUnits(Enumerated):
, 'voltAmperes':8
, 'kilovoltAmperes':9
, 'megavoltAmperes':10
, 'ampereSeconds':238
, 'ampereSquareHours':246
, 'voltAmpereHours':239 #VAh
, 'kilovoltAmpereHours':240 #kVAh
, 'megavoltAmpereHours':241 #MVAh
, 'voltAmperesReactive':11
, 'kilovoltAmperesReactive':12
, 'megavoltAmperesReactive':13
, 'voltAmpereHoursReactive':242 #varh
, 'kilovoltAmpereHoursReactive':243 #kvarh
, 'megavoltAmpereHoursReactive':244 #Mvarh
, 'voltsPerDegreeKelvin':176
, 'voltsPerMeter':177
, 'voltsSquareHours':245
, 'degreesPhase':14
, 'powerFactor':15
, 'webers':178
@ -509,6 +519,7 @@ class EngineeringUnits(Enumerated):
, 'kilojoules':17
, 'kilojoulesPerKilogram':125
, 'megajoules':126
, 'joulesPerHours':247
, 'wattHours':18
, 'kilowattHours':19
, 'megawattHours':146
@ -581,6 +592,7 @@ class EngineeringUnits(Enumerated):
, 'pascals':53
, 'hectopascals':133
, 'kilopascals':54
, 'pascalSeconds':253
, 'millibars':134
, 'bars':55
, 'poundsForcePerSquareInch':56
@ -619,7 +631,9 @@ class EngineeringUnits(Enumerated):
, 'feetPerMinute':77
, 'milesPerHour':78
, 'cubicFeet':79
, 'cubicFeetPerDay':248
, 'cubicMeters':80
, 'cubicMetersPerDay':249
, 'imperialGallons':81
, 'milliliters':197
, 'liters':82
@ -681,6 +695,8 @@ class EngineeringUnits(Enumerated):
, 'microgramsPerCubicMeter':219
, 'nanogramsPerCubicMeter':220
, 'gramsPerCubicCentimeter':221
, 'wattHoursPerCubicMeter':250
, 'joulesPerCubicMeter':251
, 'becquerels':222
, 'kilobecquerels':223
, 'megabecquerels':224

15
py27/bacpypes/basetypes.py
View File

@ -481,6 +481,7 @@ class EngineeringUnits(Enumerated):
, 'henrys':171
, 'ohms':4
, 'ohmMeters':172
, 'ohmMeterPerSquareMeter':237
, 'milliohms':145
, 'kilohms':122
, 'megohms':123
@ -496,9 +497,17 @@ class EngineeringUnits(Enumerated):
, 'voltAmperes':8
, 'kilovoltAmperes':9
, 'megavoltAmperes':10
, 'ampereSeconds':238
, 'ampereSquareHours':246
, 'voltAmpereHours':239 #VAh
, 'kilovoltAmpereHours':240 #kVAh
, 'megavoltAmpereHours':241 #MVAh
, 'voltAmperesReactive':11
, 'kilovoltAmperesReactive':12
, 'megavoltAmperesReactive':13
, 'voltAmpereHoursReactive':242 #varh
, 'kilovoltAmpereHoursReactive':243 #kvarh
, 'megavoltAmpereHoursReactive':244 #Mvarh
, 'voltsPerDegreeKelvin':176
, 'voltsPerMeter':177
, 'degreesPhase':14
@ -509,6 +518,7 @@ class EngineeringUnits(Enumerated):
, 'kilojoules':17
, 'kilojoulesPerKilogram':125
, 'megajoules':126
, 'joulesPerHours':247
, 'wattHours':18
, 'kilowattHours':19
, 'megawattHours':146
@ -581,6 +591,7 @@ class EngineeringUnits(Enumerated):
, 'pascals':53
, 'hectopascals':133
, 'kilopascals':54
, 'pascalSeconds':253
, 'millibars':134
, 'bars':55
, 'poundsForcePerSquareInch':56
@ -619,7 +630,9 @@ class EngineeringUnits(Enumerated):
, 'feetPerMinute':77
, 'milesPerHour':78
, 'cubicFeet':79
, 'cubicFeetPerDay':248
, 'cubicMeters':80
, 'cubicMetersPerDay':249
, 'imperialGallons':81
, 'milliliters':197
, 'liters':82
@ -681,6 +694,8 @@ class EngineeringUnits(Enumerated):
, 'microgramsPerCubicMeter':219
, 'nanogramsPerCubicMeter':220
, 'gramsPerCubicCentimeter':221
, 'wattHoursPerCubicMeter':250
, 'joulesPerCubicMeter':251
, 'becquerels':222
, 'kilobecquerels':223
, 'megabecquerels':224

16
py34/bacpypes/basetypes.py
View File

@ -481,6 +481,7 @@ class EngineeringUnits(Enumerated):
, 'henrys':171
, 'ohms':4
, 'ohmMeters':172
, 'ohmMeterPerSquareMeter':237
, 'milliohms':145
, 'kilohms':122
, 'megohms':123
@ -496,11 +497,20 @@ class EngineeringUnits(Enumerated):
, 'voltAmperes':8
, 'kilovoltAmperes':9
, 'megavoltAmperes':10
, 'ampereSeconds':238
, 'ampereSquareHours':246
, 'voltAmpereHours':239 #VAh
, 'kilovoltAmpereHours':240 #kVAh
, 'megavoltAmpereHours':241 #MVAh
, 'voltAmperesReactive':11
, 'kilovoltAmperesReactive':12
, 'megavoltAmperesReactive':13
, 'voltAmpereHoursReactive':242 #varh
, 'kilovoltAmpereHoursReactive':243 #kvarh
, 'megavoltAmpereHoursReactive':244 #Mvarh
, 'voltsPerDegreeKelvin':176
, 'voltsPerMeter':177
, 'voltsSquareHours':245
, 'degreesPhase':14
, 'powerFactor':15
, 'webers':178
@ -509,6 +519,7 @@ class EngineeringUnits(Enumerated):
, 'kilojoules':17
, 'kilojoulesPerKilogram':125
, 'megajoules':126
, 'joulesPerHours':247
, 'wattHours':18
, 'kilowattHours':19
, 'megawattHours':146
@ -581,6 +592,7 @@ class EngineeringUnits(Enumerated):
, 'pascals':53
, 'hectopascals':133
, 'kilopascals':54
, 'pascalSeconds':253
, 'millibars':134
, 'bars':55
, 'poundsForcePerSquareInch':56
@ -619,7 +631,9 @@ class EngineeringUnits(Enumerated):
, 'feetPerMinute':77
, 'milesPerHour':78
, 'cubicFeet':79
, 'cubicFeetPerDay':248
, 'cubicMeters':80
, 'cubicMetersPerDay':249
, 'imperialGallons':81
, 'milliliters':197
, 'liters':82
@ -681,6 +695,8 @@ class EngineeringUnits(Enumerated):
, 'microgramsPerCubicMeter':219
, 'nanogramsPerCubicMeter':220
, 'gramsPerCubicCentimeter':221
, 'wattHoursPerCubicMeter':250
, 'joulesPerCubicMeter':251
, 'becquerels':222
, 'kilobecquerels':223
, 'megabecquerels':224