Diff: main.cpp

Revision:

8:6ce08e44a28e

Parent:

7:79a10204cb3b

--- a/main.cpp	Fri Oct 30 19:45:13 2015 +0000
+++ b/main.cpp	Mon Nov 02 17:09:22 2015 +0000
@@ -4,6 +4,7 @@
 #include "MODSERIAL.h"
 #include "HIH_5030.h"
 #include "ADXL345.h"
+#include "I2C.h"
 
 #define MESSAGE_BUFFER_SIZE 100
 
@@ -17,6 +18,7 @@
 //AnalogIn ain_UseD(p18);
 //AnalogIn ain_UseE(p19);
 ADXL345 accelerometer(p5, p6, p7, p8);
+I2C i2c(p28, p27);
 
 MODSERIAL messageSystem(p13, p14);
 
@@ -319,10 +321,32 @@
         accelerometer.getOutput(readings);
         
         //13-bit, sign extended values.
-        messageSystem.printf("\r\nX:%i, Y:%i, Z:%i \r\n", (int16_t)readings[0], (int16_t)readings[1], (int16_t)readings[2]);
+        messageSystem.printf("X:%i, Y:%i, Z:%i \r\n", (int16_t)readings[0], (int16_t)readings[1], (int16_t)readings[2]);
         led4 = !led4;
     
     ///ACCELEROMETER
+    
+    //ETC
+    unsigned char ttal, ttalm, ttahm, ttalh, evntl, evnth;
+    long int tmp;
+
+    i2c.start();
+    i2c.write(0xD6);
+    i2c.write(5);
+    i2c.start();
+    i2c.write(0xD6  | 1);
+    ttal = i2c.read(5);
+    ttalm = i2c.read(6);
+    ttahm = i2c.read(7);
+    ttalh = i2c.read(8);
+    i2c.stop();
+    tmp = ((long int) ttalh << 24) + ((long int) ttahm << 16) + ((long int) ttalm << 8) + (long int) ttal;
+    tmp >>= 2;
+    messageSystem.printf("Event Time: %d sec \r\n", tmp);
+    i2c.stop();
+    
+    
+    //ETC
     }