changed unit standard to coulomb, moved fields to optional

ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml

@@ -74,10 +74,10 @@ OM:
   - output_phase1_current_sensor
   - output_phase2_current_sensor
   - output_phase3_current_sensor
+  opt_uses:
+  - output_apparent_power_sensor
   - output_frequency_sensor
   - output_power_sensor
-  - output_apparent_power_sensor
-  opt_uses:
   - bypass_status
 
 
@@ -160,7 +160,6 @@ BTEPM:
   - battery_current_sensor
   - line_frequency_sensor  
 
-
 UPSBM:
   guid: "71050ae3-45e3-49f2-b7e2-12059dd8f049"
   description: "UPS battery monitoring points"

ontology/yaml/resources/subfields/subfields.yaml

@@ -262,7 +262,7 @@ measurement:
   angularmomentum: "The quantity of rotation of a body, which is the product of its moment of inertia and its angular velocity."
   aqi: "Air quality index, a set of special standard gradings for the pollution in air."
   area: "Amount of space within the perimeter of a 2D shape"
-  electriccharge: "Energy charge in a battery"
+  electriccharge: "The amount of energy or electrons that pass from one body to another by different modes like conduction, induction or other specific methods (e.g., the charge stored in a battery)."
   concentration: "Concentration of something relative to something else (usually in parts per million or parts per billion)."
   current: "Flow of electric charge."
   currentratio: "The ratio of primary amps divided by secondary amps."

ontology/yaml/resources/units/units.yaml

@@ -102,9 +102,12 @@ distance:
 electriccapacitance:
   farads: STANDARD
 electriccharge:
-  milliampere_hours: STANDARD
+  coulomb: STANDARD
+  milliampere_hours: 
+    multiplier: 0.277778
+    offset: 0
   ampere_hours:
-    multiplier: 1000
+    multiplier: 0.000277778
     offset: 0
 electricconductance:
   siemens: STANDARD