Calibration functions fixed

Author: mcmchris

MCM_ATM90E32.cpp

@@ -127,10 +127,20 @@ int ATM90E32::Read32Register(signed short regh_addr, signed short regl_addr)
   return (val);
 }
 
-void ATM90E32::setOffset(unsigned short offset_reg, unsigned short val)
+void ATM90E32::setVIOffset(unsigned short VoffA, unsigned short VoffB, unsigned short VoffC, unsigned short IoffA, unsigned short IoffB, unsigned short IoffC)
 {
   CommEnergyIC(WRITE, CfgRegAccEn, 0x55AA); // 7F enable register config access
-  CommEnergyIC(WRITE, offset_reg, (unsigned short)val);
+
+  // Voltage Offset Calibration
+  CommEnergyIC(WRITE, UoffsetA, VoffA);
+  CommEnergyIC(WRITE, UoffsetB, VoffB);
+  CommEnergyIC(WRITE, UoffsetC, VoffC);
+
+  // Current Offset Calibration
+  CommEnergyIC(WRITE, IoffsetA, IoffA);
+  CommEnergyIC(WRITE, IoffsetB, IoffB);
+  CommEnergyIC(WRITE, IoffsetC, IoffC);
+
   CommEnergyIC(WRITE, CfgRegAccEn, 0x0000); // 7F end configuration
 }
 
@@ -203,7 +213,7 @@ double ATM90E32::CalculatePowerOffset(unsigned short regh_addr, unsigned short r
   Serial.print("Reading: ");
   Serial.print(val);
 
-  val = (~val) + 1;  // 2s compliment
+  val = (~val) + 1; // 2s compliment
 
   offset = val; // keep lower 16 bits
 

MCM_ATM90E32.h

@@ -329,7 +329,7 @@ class ATM90E32
 		unsigned short GetMeterStatus1();
 
 		/*Set Offsets*/
-		void setOffset(unsigned short address, unsigned short val);
+		void setVIOffset(unsigned short VoffA, unsigned short VoffB, unsigned short VoffC, unsigned short IoffA, unsigned short IoffB, unsigned short IoffC);
 
 	};
 #endif

examples/Basic_Energy_Meter/Basic_Energy_Meter.ino

@@ -51,7 +51,7 @@ void setup() {
 
   Serial.println("Start ATM90E32");
   mcm.begin(CS_pin, LineFreq, SumMode, IAGain, IBGain, ICGain, VoltageCal, CT1Cal, 0, CT2Cal);
-  setVIoffset(64608, 64608, 64608, 64606, 64608, 64606); // Values obtained with VIoffsetCal()
+  mcm.setVIOffset(64608, 64608, 64608, 64606, 64608, 64606); // Values obtained with VIoffsetCal()
   delay(1000);
   unsigned short sys0 = mcm.GetSysStatus0();  //EMMState0
 

examples/Calibration_Example/Calibration_Example.ino

@@ -69,7 +69,7 @@ void setup()
 
   Serial.println("Start ATM90E32");
   mcm.begin(CS_pin, LineFreq, SumMode, IAGain, IBGain, ICGain, VoltageCal, CT1Cal, 0, CT2Cal);
-  setVIoffset(64608, 64608, 64608, 64606, 64608, 64606); // Values obtained with VIoffsetCal()
+  mcm.setVIOffset(64608, 64608, 64608, 64606, 64608, 64606); // Values obtained with VIoffsetCal()
   delay(1000);
   unsigned short sys0 = mcm.GetSysStatus0(); // EMMState0
 
@@ -222,18 +222,6 @@ void VIoffsetCal()
   mcm.CalculateVIOffset(IrmsC, IrmsCLSB, IoffsetC);
 }
 
-void setVIoffset(unsigned short VoffA, unsigned short VoffB, unsigned short VoffC, unsigned short IoffA, unsigned short IoffB, unsigned short IoffC)
-{
-  // Voltage Offset Calibration
-  mcm.setOffset(UoffsetA, VoffA);
-  mcm.setOffset(UoffsetB, VoffB);
-  mcm.setOffset(UoffsetC, VoffC);
-
-  // Current Offset Calibration
-  mcm.setOffset(IoffsetA, IoffA);
-  mcm.setOffset(IoffsetB, IoffB);
-  mcm.setOffset(IoffsetC, IoffC);
-}
 
 /*
   - Calibrate the Voltage Readings