Merge remote-tracking branch 'Hasty/granbery/new_energy_money_data_type' into energy-gateway-app

Author: jamesharrow

src/app/zap-templates/zcl/data-model/chip/chip-types.xml

@@ -55,10 +55,16 @@ limitations under the License.
     <type id="0x42" description="Character String"         name="char_string"                 composite="true"/>
     <type id="0x44" description="Long Character String"    name="long_char_string"            composite="true"/>
 
+    <type id="0xD6" description="Power millivolt-amps"     name="power_mva"         size="8"  analog="true"     signed="true"/>
+    <type id="0xD7" description="Power millivolt-amps reactive" name="power_mvar"   size="8"  analog="true"     signed="true"/>
     <type id="0xD9" description="Power milliwatts"         name="power_mw"          size="8"  analog="true"     signed="true"/>
+      
     <type id="0xDA" description="Amperage milliamps"       name="amperage_ma"       size="8"  analog="true"     signed="true"/>
     <type id="0xDB" description="Voltage millivolts"       name="voltage_mv"        size="8"  analog="true"     signed="true"/>
+      
     <type id="0xDC" description="Energy milliwatt-hours"   name="energy_mwh"        size="8"  analog="true"     signed="true"/>
+    <type id="0xDD" description="Energy millivolt-amp-hours" name="energy_mvah"        size="8"  analog="true"     signed="true"/>
+    <type id="0xDE" description="Energy millivolt-amp-hours reactive" name="energy_mvarh"        size="8"  analog="true"     signed="true"/>
 
     <type id="0xE6" description="Percentage units 1%"      name="percent"           size="1"  analog="true"   />
     <type id="0xE7" description="Percentage units 0.01%"   name="percent100ths"     size="2"  analog="true"   />
@@ -74,6 +80,7 @@ limitations under the License.
     <type id="0xD2" description="Elapsed Time Seconds"     name="elapsed_s"         size="4"  analog="true"   />
 
     <type id="0xD8" description="Temperature"              name="temperature"       size="2"  analog="true"     signed="true" />
+    <type id="0xF7" description="Money"                    name="money"             size="8"  analog="true"     signed="true"/>
 
     <type id="0x30" description="8-bit enumeration"        name="enum8"             size="1"  discrete="true" />
     <type id="0x31" description="16-bit enumeration"       name="enum16"            size="2"  discrete="true" />