Diff: main.cpp

Revision:

7:76f16051b775

Parent:

6:27a323008a53

Child:

8:dd65c0eb9927

--- a/main.cpp	Thu Apr 30 16:38:37 2015 +0000
+++ b/main.cpp	Thu Apr 30 20:21:07 2015 +0000
@@ -30,7 +30,7 @@
 
 
 /*---------------- Sample Speed Timer --------------*/
-#define TIMER_RATE 1
+#define TIMER_RATE 5
 
 /*-----READS THE ANALOG SIGNAL FROM THE SENSORS-----*/
 
@@ -58,7 +58,7 @@
 /*------------BUFFER TO STORE DATA------------------*/
 
 uint16_t buffer_16[4] = {0,0,0,0};
-uint8_t buffer_8[8] = {0,0,0,0,0,0,0,0};
+char buffer_8[8] = {0,0,0,0,0,0,0,0};
 
 
 int main() {
@@ -91,23 +91,22 @@
 //Falta rotacionar:
 //Ver Ser a rotação está correta
 
-        buffer_8[LSB_ECG1] = (buffer_16[ECG1]&&0x0F);
-        buffer_8[MSB_ECG1] = ((buffer_16[ECG1]&&0xF)>>8);
+        buffer_8[LSB_ECG1] = (char)(buffer_16[ECG1]);
+        buffer_8[MSB_ECG1] = (char)((buffer_16[ECG1]&0xFF)>>8);
         
-        buffer_8[LSB_ECG2] = (buffer_16[ECG2]&&0x0F);
-        buffer_8[LSB_ECG2] = ((buffer_16[ECG2]&&0xF)>>8);
+        buffer_8[LSB_ECG2] = (char)(buffer_16[ECG2]);
+        buffer_8[LSB_ECG2] = (char)((buffer_16[ECG2]&0xFF)>>8);
         
-        buffer_8[LSB_RESP] = (buffer_16[RESP]&&0x0F);
-        buffer_8[MSB_RESP] = ((buffer_16[RESP]&&0xF)>>8);
+        buffer_8[LSB_RESP] = (char)(buffer_16[RESP]);
+        buffer_8[MSB_RESP] = (char)((buffer_16[RESP]&0xFF)>>8);
         
-        buffer_8[LSB_PPG] = (buffer_16[PPG]&&0x0F);
-        buffer_8[MSB_PPG] = ((buffer_16[PPG]&&0xF)>>8);
+        buffer_8[LSB_PPG] = (char)(buffer_16[PPG]);
+        buffer_8[MSB_PPG] = (char)((buffer_16[PPG]&0xFF)>>8);
     
 //Sends to the computer
-        pc.printf("%i,%i,%i,%i\n",buffer_16[ECG1],buffer_16[ECG2],buffer_16[RESP],buffer_16[PPG]);//PUTC
         
         for (int j = 0;j<8;j++){
-        pc.putc(buffer_8[j]);
+        pc.putc(buffer_8[j]);       //texto se foi bem sucedida?
         }