Changeset 864

Timestamp:

10/14/08 20:26:45 (17 months ago)

Author:

fxjiang

Message:

restored to rev.A hardware. use /sensorboard/ACme for rev.B hardware

Location:

code/ACMeter/tos/sensorboards/ACMeter

Files:

• ACMeterC.nc (modified) (1 diff)
• ACMeterM.nc (modified) (2 diffs)
• ADE7753.h (modified) (1 diff)
• ADE7753P.nc (modified) (12 diffs)

code/ACMeter/tos/sensorboards/ACMeter/ACMeterC.nc

@@ -23 +23 @@
         ACMeterM.onoff -> HplMsp430GeneralIOC.Port21;
         ADE7753P.SpiPacket -> SpiC;
-        ADE7753P.SPIFRM -> HplMsp430GeneralIOC.Port54;
+        ADE7753P.SPIFRM -> HplMsp430GeneralIOC.Port26;
         ADE7753P.Leds -> LedsC;
         ADE7753P.Resource -> SpiC;

code/ACMeter/tos/sensorboards/ACMeter/ACMeterM.nc

@@ -118 +118 @@
         event void Timer.fired() {
                 // at 1Hz, reading RENERGY is equal to power
-                 call ADE7753.getReg(ADE7753_RAENERGY, 4);
-                // call ADE7753.getReg(ADE7753_MODE, 3);
-                
+                call ADE7753.getReg(ADE7753_RAENERGY, 4);
         }
 
@@ -134 +132 @@
         
   task void setReg() {
-        call ADE7753.setReg(ADE7753_GAIN, 2, ADE7753_GAIN_VAL);
+    call ADE7753.setReg(ADE7753_GAIN, 2, ADE7753_GAIN_VAL);
   }
 

code/ACMeter/tos/sensorboards/ACMeter/ADE7753.h

@@ -19 +19 @@
 // #define ADE7753_GAIN_VAL        0x24
 // Try 0011 for CH1 gain
-// #define ADE7753_GAIN_VAL        0x22
- #define ADE7753_GAIN_VAL        0x24
-
+ #define ADE7753_GAIN_VAL        0x22
+// old
+// #define ADE7753_GAIN_VAL        0x2C
 
 // MSB enabled for no-creep
-#define ADE7753_MODE_VAL        0x800C
-// #define ADE7753_MODE_VAL        0x000C
+// #define ADE7753_MODE_VAL        0x800C
+#define ADE7753_MODE_VAL        0x000C

code/ACMeter/tos/sensorboards/ACMeter/ADE7753P.nc

@@ -30 +30 @@
   uint8_t mSPITxLen;
   uint8_t mSPIRxLen;
-
-//  bool lock;
+  
   uint8_t mState;
   bool misInited = FALSE;
@@ -65 +64 @@
   command error_t SplitControl.start() {
     error_t error = SUCCESS;
-//      atomic lock = FALSE;
     atomic {
       if (mState == STATE_STOPPED) { 
@@ -95 +93 @@
     error_t error = SUCCESS;
 
-//      atomic lock = FALSE;
     atomic {
       if (mState == STATE_IDLE) {
@@ -115 +112 @@
     error = call SpiPacket.send(mSPITxBuf,mSPIRxBuf,2);
         */
-        atomic mState = STATE_STOPPED;  
+        mState = STATE_STOPPED; 
         call SPIFRM.set();
         
@@ -145 +142 @@
   command error_t ADE7753.getReg(uint8_t regAddr, uint8_t len) {
     error_t error = SUCCESS;
-
-        atomic {
-                if (mState != STATE_IDLE) {
-                        return FAIL;
-                } else {
-                        mState = STATE_GETREG;
-                }
-        }
-
-        /*
+        
     //if((regAddr < 0x16) || (regAddr > 0x2F)) {
         if(regAddr > 0x3F) {
@@ -160 +148 @@
       return error;
     }
-        */
 
     mSPITxBuf[0] = regAddr;
@@ -174 +161 @@
         mSPIRxLen = len;
         
-//      atomic mState = STATE_GETREG;
+        atomic mState = STATE_GETREG;
 
         call Resource.request();
@@ -187 +174 @@
         
     return error;
-        
   }
 
@@ -197 +183 @@
     error_t error = SUCCESS;
 
-        atomic {
-                if (mState != STATE_IDLE) {
-                        return FAIL;
-                } else {
-                        mState = STATE_SETREG;
-                }
-        }
-        
     // if((regAddr < 0x16) || (regAddr > 0x2F)) {
-        /*
         if(regAddr > 0x3F) {
                  error = EINVAL;
       return error;
     }
-        */
-        
+
         // call Leds.led0On();
         
@@ -236 +212 @@
 //      call Leds.led0On();
 
-//      atomic mState = STATE_SETREG;
+        atomic mState = STATE_SETREG;
         
         call Resource.request();
@@ -257 +233 @@
         call SPIFRM.set(); // CS HIGH
         
-    atomic {
-                switch (mState) {
+    atomic switch (mState) {
     case STATE_GETREG:
                 mState = STATE_IDLE;
@@ -325 +300 @@
       break;
     }
-        }
+
         call Resource.release();