Xively Jumpstart Demo with WiFly module

Dependencies:   C12832_lcd LM75B MMA7660 WiflyInterface libxively mbed-rtos mbed

Fork of xively-jumpstart-demo by Xively Official

Files at this revision

API Documentation at this revision

Comitter:
errordeveloper
Date:
Mon Oct 14 12:08:18 2013 +0000
Parent:
9:c5dc85d192e2
Child:
11:bdf601a405fc
Commit message:
Updated all dependencies and fixed issue with mixing C and C++

Changed in this revision

EthernetInterface.lib Show annotated file Show diff for this revision Revisions of this file
app_board_io.cpp Show annotated file Show diff for this revision Revisions of this file
app_board_io.h Show annotated file Show diff for this revision Revisions of this file
libxively.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
mbed-rtos.lib Show annotated file Show diff for this revision Revisions of this file
mbed.bld Show annotated file Show diff for this revision Revisions of this file
--- a/EthernetInterface.lib	Mon Oct 14 11:58:41 2013 +0100
+++ b/EthernetInterface.lib	Mon Oct 14 12:08:18 2013 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/EthernetInterface/#9b2d10dc0392
+http://mbed.org/users/mbed_official/code/EthernetInterface/#cba86db5ab96
--- a/app_board_io.cpp	Mon Oct 14 11:58:41 2013 +0100
+++ b/app_board_io.cpp	Mon Oct 14 12:08:18 2013 +0000
@@ -1,4 +1,5 @@
 #include "app_board_io.h"
+#include "C12832_lcd.h"
 
 C12832_LCD lcd;
 
--- a/app_board_io.h	Mon Oct 14 11:58:41 2013 +0100
+++ b/app_board_io.h	Mon Oct 14 12:08:18 2013 +0000
@@ -1,9 +1,7 @@
-#include "MMA7660.h"
-#include "LM75B.h"
-
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "C12832_lcd.h"
-
-extern "C" void lcd_printf( const char* fmt, ...  );
\ No newline at end of file
+#ifdef __cplusplus
+extern "C"
+#endif
+void lcd_printf( const char* fmt, ...  );
\ No newline at end of file
--- a/libxively.lib	Mon Oct 14 11:58:41 2013 +0100
+++ b/libxively.lib	Mon Oct 14 12:08:18 2013 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/xively/code/libxively/#037241ec3163
+http://mbed.org/users/xively/code/libxively/#4ce6299f7535
--- a/main.cpp	Mon Oct 14 11:58:41 2013 +0100
+++ b/main.cpp	Mon Oct 14 12:08:18 2013 +0000
@@ -2,11 +2,16 @@
 #include "EthernetInterface.h"
 
 #define XI_FEED_ID 128488 // set Xively Feed ID (numerical, no quoutes
-#define XI_API_KEY "T4KXAH_dasgw1PWBPc3fdsfsdgsdy-dUc4ND0g" // set Xively API key (double-quoted string) 
+#define XI_API_KEY "T4KXAH_dasgw1PWBPc3fdsfsdgsdy-dUc4ND0g" // set Xively API key (double-quoted string)
+
+#include "app_board_io.h"
 
 #include "xively.h"
 #include "xi_err.h"
 
+#include "MMA7660.h"
+#include "LM75B.h"
+
 MMA7660 axl(p28, p27);
 LM75B tmp(p28, p27);
 
--- a/mbed-rtos.lib	Mon Oct 14 11:58:41 2013 +0100
+++ b/mbed-rtos.lib	Mon Oct 14 12:08:18 2013 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed-rtos/#db1fc233faa9
+http://mbed.org/users/mbed_official/code/mbed-rtos/#ee87e782d34f
--- a/mbed.bld	Mon Oct 14 11:58:41 2013 +0100
+++ b/mbed.bld	Mon Oct 14 12:08:18 2013 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/b3110cd2dd17
\ No newline at end of file
+http://mbed.org/users/mbed_official/code/mbed/builds/a9913a65894f
\ No newline at end of file