diff --git a/src/dvparser.h b/src/dvparser.h index c05ba32..8f6a302 100644 --- a/src/dvparser.h +++ b/src/dvparser.h @@ -36,7 +36,7 @@ X(HeatCostAllocation,0x6E,0x6E) \ X(Date,0x6C,0x6C) \ X(DateTime,0x6D,0x6D) \ - X(EnergyMJ,0x0e,0x0e) \ + X(EnergyMJ,0x0E,0x0F) \ X(EnergyWh,0x00,0x07) \ X(PowerW,0x28,0x2f) \ diff --git a/src/units.cc b/src/units.cc index da1aa22..984c7f7 100644 --- a/src/units.cc +++ b/src/units.cc @@ -34,7 +34,9 @@ using namespace std; X(MJ, KWH,{vto=vfrom/1000.0/0.0036;}) \ X(GJ, MJ, {vto=vfrom*1000.0;}) \ X(M3, L, {vto=vfrom*1000.0;}) \ + X(M3H, LH, {vto=vfrom*1000.0;}) \ X(L, M3, {vto=vfrom/1000.0;}) \ + X(LH, M3H,{vto=vfrom/1000.0;}) \ X(C, F, {vto=(vfrom*9.0/5.0)+32.0;}) \ X(F, C, {vto=(vfrom-32)*5.0/9.0;}) \ diff --git a/src/units.h b/src/units.h index 82265dc..1ea529d 100644 --- a/src/units.h +++ b/src/units.h @@ -45,6 +45,7 @@ X(L,l,"l",Volume,"litre") \ X(KW,kw,"kW",Power,"kilo Watt") \ X(M3H,m3h,"m3/h",Flow,"cubic meters per hour") \ + X(LH,lh,"l/h",Flow,"liters per hour") \ X(C,c,"°C",Temperature,"celsius") \ X(F,f,"°F",Temperature,"fahrenheit") \ X(RH,rh,"RH",RelativeHumidity,"relative humidity") \