Diff: main.cpp

Revision:

2:74161080023f

Parent:

1:60e6225ef3e5

--- a/main.cpp	Sat Feb 07 19:29:59 2015 +0000
+++ b/main.cpp	Tue Jul 21 23:16:48 2015 +0000
@@ -23,7 +23,8 @@
 #include "EthernetInterface.h"
 #include "HTTPClient.h"
 
-#define KEYS "https://SERVER_IP/574d76fcb/keys.txt"
+#include <SDFileSystem.h>
+SDFileSystem sdCard(PTE3, PTE1, PTE2, PTE4, "sd");
 
 #define BUFFSIZE (50+1)
 
@@ -34,24 +35,21 @@
 
 void thread_main(void const *av)
 {
-    int ret ; 
     int i ;
-    char recvBuff[BUFFSIZE*6] ;
-    char dummy1[BUFFSIZE], dummy2[BUFFSIZE], dummy3[BUFFSIZE], dummy4[BUFFSIZE] ;
-    char feed_id[BUFFSIZE] ;
-    char api_key[BUFFSIZE] ;
     char ch_name[BUFFSIZE] ;
-  
-    memset(recvBuff, '\0', sizeof(recvBuff)) ;
-    ret = http.get(KEYS, recvBuff, sizeof(recvBuff));
-    if (ret) {
-        printf("Error - ret = %d - HTTP return code = %d\n", ret, http.getHTTPResponseCode());
+    FILE *fp ;
+    char id[BUFFSIZE], key[BUFFSIZE] ;
+    
+    fp = fopen("/sd/XivelyKey.txt", "r");
+    if (fp == NULL) {
+        printf("Cannot open \"XivelyKey.txt\"\n") ;
         return ;
     }
-
-    sscanf(recvBuff, "%50s\n%50s\n%50s\n%50s\n%50s\n%50s", feed_id, api_key,
-         dummy1, dummy2, dummy3, dummy4) ;
-    printf("ID=%s\nKey=%s\n",feed_id, api_key) ;
+    fgets(id, sizeof(id), fp) ; 
+    if((id[strlen(id)-2] == '\n')||(id[strlen(id)-2] == '\r'))id[strlen(id)-2] = '\0' ;
+    fgets(key, sizeof(key), fp) ; 
+    if((key[strlen(key)-2] == '\n')||(key[strlen(key)-2] == '\r'))key[strlen(key)-2] = '\0' ;
+    printf("ID=%s\nKey=%s\n",id, key) ;
     
     printf("Channel Name:") ;
     for(i=0; i<BUFFSIZE; i++) {
@@ -62,7 +60,7 @@
         } else putchar(ch_name[i]) ;
     }
     
-    xively_main(feed_id, api_key, ch_name) ;
+    xively_main(id, key, ch_name) ;
     
     while (true) {
         Thread::wait(1000);