Diff: main.cpp

Revision:

5:d7d16cb9c974

Parent:

2:891b3618be4f

--- a/main.cpp	Tue May 12 16:21:33 2015 +0000
+++ b/main.cpp	Mon Aug 17 21:56:25 2015 +0000
@@ -1,6 +1,6 @@
 #include "mbed.h"
 #include <vector>
-#define BUFFER_SIZE 16
+#define BUFFER_ 16
 #define NUMBER_OF_SLICES 360
 #include "Point.h"
 #include "View.h"
@@ -29,7 +29,7 @@
 //the View
 View display;
 
-Block blocks [3];
+Block blocks [8];
 
 
 
@@ -42,6 +42,11 @@
     display.addBlock(blocks[0]);
     display.addBlock(blocks[1]);
     display.addBlock(blocks[2]);
+    display.addBlock(blocks[3]);
+    display.addBlock(blocks[4]);
+    display.addBlock(blocks[5]);
+    display.addBlock(blocks[6]);
+    display.addBlock(blocks[7]);
 }
 
 void rotate_sense(){
@@ -97,25 +102,25 @@
 void parseMapMode(char c){
     switch(c){
         case 'w': 
-        for (int i = 0; i < 3; i ++){
+        for (int i = 0; i < 8; i ++){
             blocks[i].moveOut();
         }
         updateMap();
             break;
         case 's':
-        for (int i = 0; i < 3; i ++){
+        for (int i = 0; i < 8; i ++){
             blocks[i].moveIn();
         }
         updateMap();
             break;
         case 'a':
-        for (int i = 0; i < 3; i ++){
+        for (int i = 0; i < 8; i ++){
             blocks[i].moveLeft();
         }
         updateMap();
             break;
         case 'd':
-        for (int i = 0; i < 3; i ++){
+        for (int i = 0; i < 8; i ++){
             blocks[i].moveRight();
         }
         updateMap();
@@ -149,13 +154,7 @@
             break;
         default: return;
     }
-    Point startPoint = eucPointer.getPoint();
-    Point endPoint = eucPointer.getEndPoint();
-    //bt.printf("\r\n");
-    //bt.printf("points%i , %i , %X \r\n", eucPointer.x, eucPointer.y,eucPointer.z);
-    //bt.printf("drawingEucPointer Starting %i , %i , %X \r\n", startPoint.getArraySlice(), startPoint.getPositionDistance(),startPoint.getIdentifyingChar());
-    //bt.printf("drawingEucPointer Ending %i , %i , %X \r\n", endPoint.getArraySlice(), endPoint.getPositionDistance(),endPoint.getIdentifyingChar());
-    display.addEucPoint(eucPointer);
+    display.addFilledEucPoint(eucPointer);
 }
 
 void parseBt(char c){
@@ -202,9 +201,15 @@
     blocks[0] = Block( 3, 4, 0, 4,6);
     blocks[1] = Block ( -4, -4, 1 ,4, 3);
     blocks[2] = Block ( 5, -7, 2 ,5, 4);
+    blocks[3] = Block (-5, 5, 0, 3, 7);
+    blocks[4] = Block( 15, 8, 1, 4,6);
+    blocks[5] = Block ( 15, -4, 0 ,5, 7);
+    blocks[6] = Block ( 22, -7, 2 ,6, 4);
+    blocks[7] = Block (21, 5, 2, 4, 4);
+    
     pc.printf("started");
     bt.printf("bluetooth started");
-    mode = eucDraw;
+    mode = map;
     firstTime = true;
     current_slice = 100;
     display.resetDisplay();