Revision 4:1428775752f7, committed 2014-12-10

Comitter:

mbedalvaro

Date:

Wed Dec 10 07:22:41 2014 +0000

Parent:

3:89f592efbe84

Child:

5:cea6da0fe2f0

Commit message:

added circle with timer

Changed in this revision

--- a/laserProjectorHardware/laserProjectorHardware.cpp	Wed Jun 04 09:47:04 2014 +0000
+++ b/laserProjectorHardware/laserProjectorHardware.cpp	Wed Dec 10 07:22:41 2014 +0000
@@ -105,7 +105,14 @@
     Laser_Blue =color&0x01;
 }
 
+void HardwareIO::drawCircle(int X, int Y, int R, int numPoints, int seconds) {
+     Timer t;
+     t.start();
+    while(t.read_ms()<seconds*1000) drawCircle( X, Y, R, numPoints);
+     t.stop();
+ }
 void HardwareIO::drawCircle(int X, int Y, int R, int numPoints) {
+    
     float alpha=2*3.141592/numPoints;
     float theta=0;
     for (int i=0; i<numPoints; i++) {

--- a/laserProjectorHardware/laserProjectorHardware.h	Wed Jun 04 09:47:04 2014 +0000
+++ b/laserProjectorHardware/laserProjectorHardware.h	Wed Dec 10 07:22:41 2014 +0000
@@ -5,7 +5,7 @@
 #include "mbed.h"
 
 
-//SPI library (for ADC MCP4922 chip) uses the following pins, but we don't have to set them and inputs or outputs 
+//SPI library (for DAC MCP4922 chip) uses the following pins, but we don't have to set them and inputs or outputs 
 // (this is done when the library is initialized, which is done by pre-instantiation:
 #define SCK_PIN   D13 //SPI Clock
 #define MISO_PIN  D12 //SPI input (data comming from DAC, here not connected) 
@@ -66,8 +66,9 @@
     void setRGBPower(unsigned char color); // we will use the 3 LSB bits to set each color
     
     // More complex functions: 
-    void showLimitsMirrors( int times );
+    void showLimitsMirrors( int seconds );
     void drawCircle(int X, int Y, int R, int numPoints);
+    void drawCircle(int X, int Y, int R, int numPoints, int seconds);
     
 private:
 

--- a/main.cpp	Wed Jun 04 09:47:04 2014 +0000
+++ b/main.cpp	Wed Dec 10 07:22:41 2014 +0000
@@ -7,7 +7,7 @@
 
 unsigned int X, Y; // position of the mirrors (note: in fact, azimuth and elevation)
 bool newPositionReady=false;
-
+bool handshakeMode=true;
 unsigned long counter=0;
 
 int main() {
@@ -55,7 +55,6 @@
 
  while(pc.readable()>0) {
    
-      
     char val =pc.getc();
   
   // Save ASCII numeric characters (ASCII 0 - 9) on stringData:
@@ -78,6 +77,13 @@
     Y=atoi(stringData);
     indexStringData=0;
     newPositionReady=true;
+    if (handshakeMode) pc.putc('A');// send acknowledgement of correctly received position:
+   }
+   
+   else if (val=='H') { // this sets handshake mode to ON or OFF:
+    stringData[indexStringData] = 0 ;
+    if(atoi(stringData)>0) handshakeMode=true; else handshakeMode=false;
+    indexStringData=0;
    }
    
     else if (val=='L') {     
@@ -92,6 +98,14 @@
    IO.showLimitsMirrors(int(atoi(stringData)));
     indexStringData=0;
   }
+  
+  else if (val=='C') {     
+    stringData[indexStringData] = 0 ;
+    if(atoi(stringData)>0) {
+   IO.drawCircle(2048, 2048, 1500, 1000, int(atoi(stringData)));
+   }
+    indexStringData=0;
+  }
  
  }
 }
\ No newline at end of file