Diff: master_i2c.cpp

Revision:

4:fc56fa8aa794

Parent:

3:764ccaf29ce9

Child:

7:b98d752b7b95

diff -r 764ccaf29ce9 -r fc56fa8aa794 master_i2c.cpp
--- a/master_i2c.cpp	Thu Sep 20 23:45:05 2012 +0000
+++ b/master_i2c.cpp	Sat Sep 29 19:22:38 2012 +0000
@@ -95,13 +95,13 @@
 void master_read(int* ro_reading)
 {
     char* data_read;
-    data_read = new char [64*5+2];
-    for(int i=0; i<64*5+2; i++) {
+    data_read = new char [64*5+12];
+    for(int i=0; i<64*5+12; i++) {
         data_read[i]=(char)47;
     }
     while(data_read[0]==47) {
         wait(18);
-        master.read(SLAVEADDR|1, data_read, 64*5, true);
+        master.read(SLAVEADDR|1, data_read, 64*5+12, true);
     }
     for(int i=0; i<64; i++) {
         int out = 0;
@@ -116,4 +116,10 @@
         out += data_read[i*5+0]-48;
         ro_reading[i] = out;
     }
+    ro_reading[64] = data_read[64*5]+data_read[64*5+1]*0x100;
+    ro_reading[65] = data_read[64*5+2]+data_read[64*5+3]*0x100;
+    ro_reading[66] = data_read[64*5+4]+data_read[64*5+5]*0x100; //RVTP
+    ro_reading[67] = data_read[64*5+6]+data_read[64*5+7]*0x100; //HVTP
+    ro_reading[68] = data_read[64*5+8]+data_read[64*5+9]*0x100; //RVTN
+    ro_reading[69] = data_read[64*5+10]+data_read[64*5+11]*0x100; //HVTN
 }