Diff: main.cpp

Revision:

3:f24de3613c5c

Parent:

2:153ec87771a0

Child:

4:558b29109618

--- a/main.cpp	Sun Jun 01 08:05:23 2014 +0000
+++ b/main.cpp	Sun Jun 01 11:07:01 2014 +0000
@@ -3,6 +3,8 @@
 #include <fstream>
 #include <cmath>
 #include <queue>
+#include "rtos.h"
+
 
 
 #define PACKET_COUNT 4
@@ -70,25 +72,22 @@
 vector<int> numbers;
 
 std::queue<string> buffer2;
+std::queue<vector<char> > buffer3;
+
+Queue<char*, 7> buffer4;
+
 
 int main() {
-    
-   // numbers.push_back(1);
-   // numbers.push_back(2);
-   // numbers.push_back(3);
-    string a;
-    
-    a[0] = 'a';
-    a[1] = 'b';
-    
-    
-  //  queue.push(numbers);
-
+    char* a;
+   // string a;
+   // string result;
+   // buffer2.push(a);
     
     myled4 = 1;
     
     int index = 0; 
     int num_packets = 0;
+   
    /*
     while(1){
     pc.printf("PYTHON PLZ");
@@ -98,20 +97,20 @@
     
     return 0;
     */
-    
+   // a[0] = 'x';
+   // a[1] = 'y';
     
     FILE *fp = fopen("/local/packet.txt", "w");    
-    fprintf(fp,"%s",a);
-    fclose(fp);
-    return 0;
+   // fprintf(fp,"%c",a[0]);
+   // fclose(fp);
+   // return 0;
     
 for(; num_packets < PACKET_COUNT; num_packets++){
-    
+    a = (char *) malloc(sizeof(char) * 20);
     for(; index < 19; index++){
-     read_buffer[num_packets][index] = pc.getc() - 48;
-     fprintf(fp,"%d",read_buffer[num_packets][index]);
-     
-     
+    a[index] = char(pc.getc());
+
+     fprintf(fp,"%c",a[index]);    
      if(index == 1)
         fprintf(fp,".");
      if(index == 5)
@@ -124,12 +123,39 @@
         fprintf(fp,".");
       
     }
-     index = 0;  
+    
+    
+     index = 0;
      fprintf(fp,"\n");
+    // buffer2.push(a);
+     
+     
+     buffer4.put((char**)&a);
+    
+    
+     osEvent evt = buffer4.get();
+        if (evt.status != osEventMessage) {
+            printf("Furnace: queue->get() returned %02x status\n\r", evt.status);
+        } else {
+            fprintf(fp,"Queue: %s\n\r",evt.value.v);
+            //printf("Furnace: %s", evt.value.v);
+        }
+    
+    free(a);
+
+
+
+ //     myled3 = 1; 
+  //   result = buffer2.back();
+   //  fprintf(fp,"BufferVal=%s\n",result); 
+     myled3 = 1; 
+      fclose(fp);
+     return 0;
+     
      
      }
      
-    fclose(fp);
+    //fclose(fp);
     
 }
 
@@ -137,4 +163,3 @@
 
 
 
-