Diff: main.cpp

Revision:

3:7ad3f6543b6e

Parent:

1:0a61d7ab702c

Child:

4:e7ca62a11595

diff -r 51b141cc909a -r 7ad3f6543b6e main.cpp
--- a/main.cpp	Wed Jun 26 10:41:18 2013 +0000
+++ b/main.cpp	Wed Jun 26 11:45:42 2013 +0000
@@ -8,15 +8,19 @@
 #include <stdio.h>
 
 #include "MMA7660.h"
+#include "LM75B.h"
 
-#define XI_FEED_ID 123 // set Xively Feed ID (numerical, no quoutes
-#define XI_API_KEY "T4KXAH_dasgw1PWBPc3fdsfsdgsdy-dUc4ND0g" // set Xively API key (double-quoted string) 
+//#define XI_FEED_ID 123 // set Xively Feed ID (numerical, no quoutes
+//#define XI_API_KEY "T4KXAH_dasgw1PWBPc3fdsfsdgsdy-dUc4ND0g" // set Xively API key (double-quoted string) 
+#define XI_FEED_ID 128488
+#define XI_API_KEY "9YL5ZOL8pV0gLeJMKJeQPy5TaQJkz06IpgccQD2fXvjezSll"
 
 #include "C12832_lcd.h"
 
 C12832_LCD lcd;
 
 MMA7660 axl(p28, p27);
+LM75B tmp(p28, p27);
 
 extern "C" {
 
@@ -72,7 +76,7 @@
     memset( &feed, NULL, sizeof( xi_feed_t ) );
     
     feed.feed_id = XI_FEED_ID;
-    feed.datastream_count = 2;
+    feed.datastream_count = 3;
     
     feed.datastreams[0].datapoint_count = 1;
     xi_datastream_t* orientation_datastream = &feed.datastreams[0];
@@ -84,6 +88,11 @@
     strcpy( side_rotation_datastream->datastream_id, "side_rotation" );
     xi_datapoint_t* current_side_rotation = &side_rotation_datastream->datapoints[0];
     
+    feed.datastreams[2].datapoint_count = 1;
+    xi_datastream_t* temperature_datastream = &feed.datastreams[2];
+    strcpy( temperature_datastream->datastream_id, "temperature" );
+    xi_datapoint_t* current_temperature = &temperature_datastream->datapoints[0];
+    
     // create the cosm library context
     xi_context_t* xi_context
         = xi_create_context( XI_HTTP, XI_API_KEY, feed.feed_id );
@@ -137,9 +146,13 @@
           xi_set_value_str( current_orientation, "unknown" );
           break;
       }
-        
+      
+      xi_set_value_f32( current_temperature, tmp.read() );
+      
       mbed_printf( "update...\n" );
       xi_feed_update(xi_context, &feed);
       mbed_printf( "done...\n" );
+      
+      wait( 15.0 );
     }
 }
\ No newline at end of file