Diff: main.cpp

Revision:

4:75498bd2e742

Parent:

3:7e568908f1c4

Child:

5:495d64d8934d

--- a/main.cpp	Fri May 01 01:43:57 2015 +0000
+++ b/main.cpp	Fri May 01 03:26:50 2015 +0000
@@ -264,67 +264,49 @@
     } 
     else if(display_mode == 2)
     {
-        // Eight sided star
-        Line line1(15, 0, 0, 15, 90, 7, &work_buffer);
-        Line line2(15, 90, 7, 15, 180, 0, &work_buffer);
-        Line line3(15, 180, 0, 15, 270, 7, &work_buffer);
-        Line line4(15, 270, 7, 15, 0, 0, &work_buffer);
-        line1.draw();
-        line2.draw();
-        line3.draw();
-        line4.draw();
+        Line line1(10, 10, 0, 10, -10, 0, &work_buffer);  
+        Line line2(10, -10, 0, -10, -10, 0, &work_buffer); 
+        Line line3(-10, -10, 0, -10, 10, 0, &work_buffer); 
+        Line line4(-10, 10, 0, 10, 10, 0, &work_buffer); 
+        
+        line1.draw(); 
+        line2.draw(); 
+        line3.draw(); 
+        line4.draw(); 
+        
+        Line line5(10, 10, 7, 10, -10, 7, &work_buffer);  
+        Line line6(10, -10, 7, -10, -10, 7, &work_buffer); 
+        Line line7(-10, -10, 7, -10, 10, 7, &work_buffer); 
+        Line line8(-10, 10, 7, 10, 10, 7, &work_buffer);
         
-        Line line5(15, 45, 0, 15, 135, 7, &work_buffer);
-        Line line6(15, 135, 7, 15, 225, 0, &work_buffer);
-        Line line7(15, 225, 0, 15, 315, 7, &work_buffer);
-        Line line8(15, 315, 7, 15, 45, 0, &work_buffer);
-        line5.draw();
-        line6.draw();
-        line7.draw();
+        line5.draw(); 
+        line6.draw(); 
+        line7.draw(); 
         line8.draw(); 
+        
+        Line line9(10, 10, 0, 10, 10, 7, &work_buffer); 
+        Line line10(10, -10, 0, 10, -10, 7, &work_buffer); 
+        Line line11(-10, -10, 0, -10, -10, 7, &work_buffer); 
+        Line line12(-10, 10, 0, -10, 10, 7, &work_buffer); 
+        
+        line9.draw();   
+        line10.draw(); 
+        line11.draw(); 
+        line12.draw(); 
     } 
     else if(display_mode == 3)
     {
-        Line line1(1, 0, 0, 1, 0, 7, &work_buffer);
-        Line line2(9, 35, 0, 9, 35, 7, &work_buffer);
-        Line line3(9, 325, 0, 9, 325, 7, &work_buffer);
-        Line line4(13, 0, 0, 13, 0, 7, &work_buffer);
-        
-        line1.draw();
-        line2.draw();
-        line3.draw();
-        line4.draw();
-    
-        Line line5(M_PI * 320 / 180, 0.777030, 0, 0, 35, 0, &work_buffer);
-        Line line6(M_PI * 40 / 180, 0.777030, 0, 0, 325, 0, &work_buffer);
-        Line line7(M_PI * 320 / 180, 8.787681, 325, 0, 0, 0, &work_buffer);
-        Line line8(M_PI * 40 / 180, 8.787681, 35, 0, 0, 0, &work_buffer);
-        
-        line5.draw();
-        line6.draw();  
-        line7.draw();
-        line8.draw();
-    
-        Line line9(M_PI * 320 / 180, 0.777030, 0, 7, 35, 7, &work_buffer);
-        Line line10(M_PI * 40 / 180, 0.777030, 0, 7, 325, 7, &work_buffer);
-        Line line11(M_PI * 320 / 180, 8.787681, 325, 7, 0, 7, &work_buffer);
-        Line line12(M_PI * 40 / 180, 8.787681, 35, 7, 0, 7, &work_buffer);
-        
-        line9.draw();
-        line10.draw();
-        line11.draw();
-        line12.draw();    
+          
     } else if(display_mode == 4){
-        CartLine line1(0, 16, 0, 0, -16, 7, &work_buffer);
-        CartLine line2(4, 16, 0, 4, -16, 7, &work_buffer);   
-        CartLine line3(8, 16, 0, 8, -16, 7, &work_buffer);
-        CartLine line4(12, 16, 0, 12, -16, 7, &work_buffer);
-        CartLine line5(-4, 16, 0, -4, -16, 7, &work_buffer);   
-        CartLine line6(-8, 16, 0, -8, -16, 7, &work_buffer);
-        CartLine line7(-12, 16, 0, -12, -16, 7, &work_buffer);
 
-        
-        
+        Line line1(0, 16, 0, 0, -16, 7, &work_buffer);
+        Line line2(4, 16, 0, 4, -16, 7, &work_buffer);   
+        Line line3(8, 16, 0, 8, -16, 7, &work_buffer);
+        Line line4(12, 16, 0, 12, -16, 7, &work_buffer);
+        Line line5(-4, 16, 0, -4, -16, 7, &work_buffer);   
+        Line line6(-8, 16, 0, -8, -16, 7, &work_buffer);
+        Line line7(-12, 16, 0, -12, -16, 7, &work_buffer);
+  
         line1.draw();
         line2.draw();
         line3.draw();
@@ -332,6 +314,22 @@
         line5.draw();
         line6.draw();
         line7.draw();
+
+        Line line11(16, 4, 0, -16, 4, 7, &work_buffer);
+        Line line21(16, 8, 0, -16, 8, 7, &work_buffer);   
+        Line line31(16, 12, 0, -16, 12, 7, &work_buffer);
+        Line line41(16, 0, 0, -16, 0, 7, &work_buffer);
+        Line line51(16, -4, 0, -16, -4, 7, &work_buffer);   
+        Line line61(16, -8, 0, -16, -8, 7, &work_buffer);
+        Line line71(16, -12, 0, -16, -12, 7, &work_buffer);
+
+        line11.draw();
+        line21.draw();
+        line31.draw();
+        line41.draw();  
+        line51.draw();
+        line61.draw();
+        line71.draw();
     }
     
     convert_array(); 
@@ -344,7 +342,7 @@
 
 int main (void)
 {
-    display_mode = 4;
+    display_mode = 2;
         
     InterruptIn hall_pin(p25);
     hall_pin.fall(&rotate_sense);