Changeset 122 for flukso

Timestamp:

04/09/10 16:20:22 (2 years ago)

Author:

icarus75

Message:

uc: add support for US split-phase supplies

Location:

flukso/trunk/uc

Files:

• Makefile (modified) (2 diffs)
• main.c (modified) (1 diff)
• main.h (modified) (1 diff)

flukso/trunk/uc/Makefile

@@ -45 +45 @@
 # Predefine the TYPE and SENSORx C macros in main.h via this Makefile.
 # Override the defaults on the command line by typing:
-# make TYPE=xxxx SENSOR0=yyyy ...
+# make PHASE=x METERCONST=y SENSOR0=z ...
 #
 DBG = 0
 #
 TYPE = 2300501
+PHASE = 1
 METERCONST= 5508
 #
@@ -57 +58 @@
 SENSOR3 = 0123456789abcdef0123456789abcde3
 #
-CEXTRA = -D DBG=$(DBG) -D METERCONST=$(METERCONST) -D 'SENSOR0="$(SENSOR0)"' -D 'SENSOR1="$(SENSOR1)"' -D 'SENSOR2="$(SENSOR2)"' -D 'SENSOR3="$(SENSOR3)"'
+CEXTRA = -D DBG=$(DBG) -D PHASE=$(PHASE) -D METERCONST=$(METERCONST) -D 'SENSOR0="$(SENSOR0)"' -D 'SENSOR1="$(SENSOR1)"' -D 'SENSOR2="$(SENSOR2)"' -D 'SENSOR3="$(SENSOR3)"'
 ###############################################################################
 

flukso/trunk/uc/main.c

@@ -80 +80 @@
   // read ADC result
   // add to nano(Wh) counter
+#if PHASE == 2
+  MacU16X16to32(aux[0].nano, METERCONST, ADC);
+#else
   MacU16X16to32(aux[muxn].nano, METERCONST, ADC);
-
+#endif
   if (aux[muxn].nano > WATT) {
      measurements[muxn].value++;

flukso/trunk/uc/main.h

@@ -41 +41 @@
 #ifndef SENSOR3
   #error "SENSOR3 not defined"
+#endif
+
+#ifndef PHASE
+  #error "PHASE not defined"
 #endif