phase fix

Author: mcmchris

MCM_ATM90E32.cpp

@@ -47,7 +47,7 @@ unsigned short ATM90E32::CommEnergyIC(unsigned char RW, unsigned short address,
 #endif
 
 #if defined(ESP32)
-  SPISettings settings(200000, MSBFIRST, SPI_MODE3);
+  SPISettings settings(200000, MSBFIRST, SPI_MODE0);
 #endif
 
 #if defined(ARDUINO_ARCH_SAMD)
@@ -116,15 +116,9 @@ unsigned short ATM90E32::CommEnergyIC(unsigned char RW, unsigned short address,
 
 int ATM90E32::Read32Register(signed short regh_addr, signed short regl_addr)
 {
-  int val, val_h, val_l;
-  val_h = CommEnergyIC(READ, regh_addr, 0xFFFF);
-  val_l = CommEnergyIC(READ, regl_addr, 0xFFFF);
-  val = CommEnergyIC(READ, regh_addr, 0xFFFF);
-
-  val = val_h << 16;
-  val |= val_l; // concatenate the 2 registers to make 1 32 bit number
-
-  return (val);
+  unsigned int val_h = CommEnergyIC(READ, regh_addr, 0xFFFF);
+  unsigned int val_l = CommEnergyIC(READ, regl_addr, 0xFFFF);
+  return (int)((val_h << 16) | val_l);
 }
 
 void ATM90E32::setVIOffset(unsigned short VoffA, unsigned short VoffB, unsigned short VoffC, unsigned short IoffA, unsigned short IoffB, unsigned short IoffC)
@@ -312,9 +306,9 @@ double ATM90E32::CalibrateVI(unsigned short reg, float actualVal)
   gain = m;
 
   // write new value to gain register
-  CommEnergyIC(WRITE, CfgRegAccEn, 0x55AA); // 7F enable register config access
-  CommEnergyIC(WRITE, gainReg, gain);
-  CommEnergyIC(WRITE, CfgRegAccEn, 0x0000); // 7F end configuration
+  //CommEnergyIC(WRITE, CfgRegAccEn, 0x55AA); // 7F enable register config access
+  //CommEnergyIC(WRITE, gainReg, gain);
+  //CommEnergyIC(WRITE, CfgRegAccEn, 0x0000); // 7F end configuration
 
   Serial.print("Gain: ");
   Serial.print(gainReg, HEX);
@@ -664,7 +658,7 @@ void ATM90E32::begin(int pin, unsigned short lineFreq, unsigned short phases, un
     return 0b00;
   };
 
-  uint16_t config = 0b0000000110011101; // 0x019D
+  uint16_t config = 0b0000000110011111; // 0x019D
 
   // ---- LINE FREQ bit12
   config &= ~(1u << 12);
@@ -719,8 +713,8 @@ void ATM90E32::begin(int pin, unsigned short lineFreq, unsigned short phases, un
   if (_phases == 2)
   {
     Serial.println("Split-Phase Mode");
-    config |= 0b101u;    // bits 2..0
-    config |= (1u << 8); // bit8 = 1 for split-phase
+    config |= 0b111u;    // bits 2..0
+    //config |= (1u << 8); // bit8 = 1 for split-phase
   }
   else if (_phases == 3)
   {
@@ -731,21 +725,20 @@ void ATM90E32::begin(int pin, unsigned short lineFreq, unsigned short phases, un
   else
   {
     Serial.println("IC phase mode out of range, using default Split-phase");
-    config |= 0b101u;
-    config |= (1u << 8);
+    config |= 0b111u;
+    //config |= (1u << 8);
   }
 
   // --- print as 16 bits with leading zeros
-  Serial.print("MMODE: ");
+  /*Serial.print("MMODE: ");
   for (int i = 15; i >= 0; --i)
     Serial.print((config >> i) & 1);
-  Serial.println();
+  Serial.println();*/
 
   // Initialize registers
   CommEnergyIC(WRITE, SoftReset, 0x789A);   // 70 Perform soft reset
   CommEnergyIC(WRITE, CfgRegAccEn, 0x55AA); // 7F enable register config access
-  CommEnergyIC(WRITE, MeterEn, 0x0001);     // 00 Enable Metering
-
+  
   CommEnergyIC(WRITE, SagPeakDetCfg, 0x143F);  // 05 Sag and Voltage peak detect period set to 20ms
   CommEnergyIC(WRITE, SagTh, vSagTh);          // 08 Voltage sag threshold
   CommEnergyIC(WRITE, FreqHiTh, FreqHiThresh); // 0D High frequency threshold
@@ -790,6 +783,13 @@ void ATM90E32::begin(int pin, unsigned short lineFreq, unsigned short phases, un
   CommEnergyIC(WRITE, PGainBF, 0x0000);   // 55 B Fund. active power gain
   CommEnergyIC(WRITE, PGainCF, 0x0000);   // 56 C Fund. active power gain
 
+  // Route of ADC Channels
+
+  // IA->Phase A, IB->Phase B, IC->Phase C (no usada)
+  //CommEnergyIC(WRITE, ChannelMapI, 0x3210); // ejemplo conservador; ajusta a tu pinout
+  // VA->Phase A, VB->Phase B, VC->Phase C (no usada)
+  //CommEnergyIC(WRITE, ChannelMapU, 0x3210);
+
   // Set measurement calibration values (ADJUST)
   CommEnergyIC(WRITE, UgainA, _ucal);    // 61 A Voltage rms gain
   CommEnergyIC(WRITE, IgainA, _icalA);   // 62 A line current gain
@@ -803,6 +803,7 @@ void ATM90E32::begin(int pin, unsigned short lineFreq, unsigned short phases, un
   CommEnergyIC(WRITE, IgainC, _icalC);   // 6A C line current gain
   CommEnergyIC(WRITE, UoffsetC, 0x0000); // 6B C Voltage offset - 1D4C
   CommEnergyIC(WRITE, IoffsetC, 0x0000); // 6C C line current offset
+  CommEnergyIC(WRITE, MeterEn, 0x0001);     // 00 Enable Metering
 
   CommEnergyIC(WRITE, CfgRegAccEn, 0x0000); // 7F end configuration
 }