Diff: main.cpp

Revision:

4:f9d364f10335

Parent:

3:b44ff6de81bd

Child:

5:73cd58b58f95

--- a/main.cpp	Mon Apr 02 05:33:44 2012 +0000
+++ b/main.cpp	Wed Apr 04 10:05:25 2012 +0000
@@ -238,7 +238,8 @@
         IO.scan_serial();
 
         // Finally, start again threaded display:
-        timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL); // the address of the object, member function, and interval (in seconds)
+         timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThread, RENDER_INTERVAL);
+       // timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL);
     }
 
     else if ( !strcmp(address[0], "mbedReset" ) ) mbed_reset();
@@ -249,7 +250,8 @@
         // RESCAN (and save LUT table):
         IO.scanLUT();
         // Finally, start again threaded display:
-        timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL);
+         timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThread, RENDER_INTERVAL);
+       // timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL);
     }
 
     // (II) ========================================= GLOBAL CONFIG and HARDWARE COMMANDS ===========================================
@@ -269,14 +271,16 @@
         blobconf.clearConfig();
         blobconf.addOneElasticContourFollowing();
         lsr.setConfigToRender(&blobconf);
-        timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL);
+          timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThread, RENDER_INTERVAL);
+       // timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL);
     } else if (!strcmp(address[0], "loop")) { //
         timerForRendering.detach();
         // blobconf.computeBoundingBox();
         blobconf.clearConfig();
         blobconf.addOneElasticLoopContractCentral();
         lsr.setConfigToRender(&blobconf);
-        timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL);
+          timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThread, RENDER_INTERVAL);
+       // timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL);
     }
 
     else if (!strcmp(address[0], "bouncing")) {
@@ -285,7 +289,8 @@
         blobconf.clearConfig();
         blobconf.addOneElasticBouncing();
         lsr.setConfigToRender(&blobconf);
-        timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL);
+          timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThread, RENDER_INTERVAL);
+       // timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL);
     }
 
     // other:
@@ -449,8 +454,8 @@
                 IO.scan_serial();
 
                 // Finally, start again threaded display:
-                timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL); // the address of the object, member function, and interval (in seconds)
-
+                timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThread, RENDER_INTERVAL);
+                 // timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL);
             }
 
             if (!strcmp(stringCommand , "REDON"))   IO.setRedPower(1); // pc.printf("%d\n",incomingByte);