From: r-studio <r-studio>
Date: Wed, 21 Apr 2010 12:33:40 +0000 (+0000)
Subject: Changed the chip wiring of the RV8564 and DS2782 chips on Mulle compatible with the... 
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=78a633ce16cfdd168ac8442a9812fec02b485376

Changed the chip wiring of the RV8564 and DS2782 chips on Mulle compatible with the new software I2C changes.
---

diff --git a/tos/chips/ds2782/HplDS2782LogicP.nc b/tos/chips/ds2782/HplDS2782LogicP.nc
index dcd0266b..4040cf62 100644
--- a/tos/chips/ds2782/HplDS2782LogicP.nc
+++ b/tos/chips/ds2782/HplDS2782LogicP.nc
@@ -247,9 +247,9 @@ implementation {
 
   event void I2CResource.granted() {
     if (read) {
-      call I2CPacket.write(I2C_START,devAddr,1,mI2CBuffer);
+      call I2CPacket.write(I2C_START | I2C_STOP,devAddr,1,mI2CBuffer);
     } else {
-      call I2CPacket.write((I2C_START | I2C_STOP),devAddr,2,mI2CBuffer);
+      call I2CPacket.write(I2C_START | I2C_STOP,devAddr,2,mI2CBuffer);
     }
   }
 
diff --git a/tos/platforms/mulle/chips/ds2782/DS2782InternalC.nc b/tos/platforms/mulle/chips/ds2782/DS2782InternalC.nc
index d957cf8d..de4d272d 100644
--- a/tos/platforms/mulle/chips/ds2782/DS2782InternalC.nc
+++ b/tos/platforms/mulle/chips/ds2782/DS2782InternalC.nc
@@ -45,7 +45,7 @@ configuration DS2782InternalC {
 }
 
 implementation {
-  components new SoftI2CBatteryMonitorRTCC() as I2C;
+  components new SoftwareI2C2C() as I2C;
   components new HplDS2782LogicP(0x68) as Logic;
   
   Logic.I2CPacket -> I2C;
diff --git a/tos/platforms/mulle/chips/rv8564/RV8564C.nc b/tos/platforms/mulle/chips/rv8564/RV8564C.nc
index 1f484f9e..5b101a10 100755
--- a/tos/platforms/mulle/chips/rv8564/RV8564C.nc
+++ b/tos/platforms/mulle/chips/rv8564/RV8564C.nc
@@ -47,7 +47,7 @@ configuration RV8564C
 implementation
 {
   components RV8564P as RTCP,
-    new SoftI2CBatteryMonitorRTCC() as I2C,
+    new SoftwareI2C2C() as I2C,
     HplM16c62pGeneralIOC as IOs,
     HplM16c62pInterruptC as Irqs,
     new M16c62pInterruptC() as Irq;
diff --git a/tos/platforms/mulle/chips/rv8564/RV8564P.nc b/tos/platforms/mulle/chips/rv8564/RV8564P.nc
index 84dab98e..35c0c0a6 100755
--- a/tos/platforms/mulle/chips/rv8564/RV8564P.nc
+++ b/tos/platforms/mulle/chips/rv8564/RV8564P.nc
@@ -147,7 +147,7 @@ implementation
     atomic {
       if (state == READING)
       {
-        call I2C.write(I2C_START, RV8564_ADDR, 1, &read_register);
+        call I2C.write(I2C_START | I2C_STOP, RV8564_ADDR, 1, &read_register);
       }
       else if (state == WRITING)
       {