Merge branch 'master' of https://github.com/CircuitSetup/Split-Single…

…-Phase-Energy-Meter
CircuitSetup · Dec 3, 2019 · f26db6c · f26db6c
2 parents c7250d4 + 8968f67
commit f26db6c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Software/examples/ATM90E32_Basic_SPI/ATM90E32_Basic_SPI.ino b/Software/examples/ATM90E32_Basic_SPI/ATM90E32_Basic_SPI.ino
@@ -37,6 +37,8 @@ unsigned short PGAGain = 21;
  *    37106 - 9v AC Transformer - Jameco 157041
  *    38302 - 9v AC Transformer - Jameco 112336
  *    29462 - 12v AC Transformer - Jameco 167151
+ * For Meters > v1.4 purchased after 11/1/2019 and rev.3
+ *    7611 - 9v AC Transformer - Jameco 157041
  */
 unsigned short VoltageGain = 37106;     
 

diff --git a/Software/examples/ATM90E32_MQTT/ATM90E32_MQTT.ino b/Software/examples/ATM90E32_MQTT/ATM90E32_MQTT.ino
@@ -49,6 +49,8 @@ unsigned short PGAGain = 21;
  *    37106 - 9v AC Transformer - Jameco 157041
  *    38302 - 9v AC Transformer - Jameco 112336
  *    29462 - 12v AC Transformer - Jameco 167151
+ * For Meters > v1.4 purchased after 11/1/2019 and rev.3
+ *    7611 - 9v AC Transformer - Jameco 157041
  */
 unsigned short VoltageGain = 37106;     
 

diff --git a/Software/examples/Home_Assistant_MQTT/Home_Assistant_MQTT/Home_Assistant_MQTT.ino b/Software/examples/Home_Assistant_MQTT/Home_Assistant_MQTT/Home_Assistant_MQTT.ino
@@ -44,6 +44,8 @@ unsigned short PGAGain = 21;
  *    37106 - 9v AC Transformer - Jameco 157041
  *    38302 - 9v AC Transformer - Jameco 112336
  *    29462 - 12v AC Transformer - Jameco 167151
+ * For Meters > v1.4 purchased after 11/1/2019 and rev.3
+ *    7611 - 9v AC Transformer - Jameco 157041
  */
 unsigned short VoltageGain = 37106;     
 
@@ -171,7 +173,7 @@ void loop() {
   powerFactor = eic.GetTotalPowerFactor();
   temp = eic.GetTemperature();
   freq = eic.GetFrequency();
-  totalWatts = (voltageA * currentCT1) + (voltageC * currentCT2);
+  //totalWatts = (voltageA * currentCT1) + (voltageC * currentCT2);
 
   Serial.println("Voltage 1: " + String(voltageA) + "V");
   Serial.println("Voltage 2: " + String(voltageC) + "V");
@@ -193,7 +195,6 @@ void loop() {
   meterData["I1"] = currentCT1;
   meterData["I2"] = currentCT2;
   meterData["totI"] = totalCurrent;
-  meterData["W"] = totalWatts;
   meterData["AP"] = realPower;
   meterData["PF"] = powerFactor;
   meterData["t"] = temp;

diff --git a/Software/examples/Home_Assistant_MQTT/sensor.yaml b/Software/examples/Home_Assistant_MQTT/sensor.yaml
@@ -27,11 +27,6 @@ sensor:
 - platform: mqtt
   name: "Total Watts"
   state_topic: "home/energy/sensor"
-  value_template: '{{ value_json["W"] }}'
-  unit_of_measurement: "Watts"
-- platform: mqtt
-  name: "Apparent Power"
-  state_topic: "home/energy/sensor"
   value_template: '{{ value_json["AP"] }}'
   unit_of_measurement: "Watts"
 - platform: mqtt