Diff: main.cpp

Revision:

16:dc9956bac1a3

Parent:

15:bc4f8c597c26

--- a/main.cpp	Mon Feb 27 01:35:10 2017 +0000
+++ b/main.cpp	Wed Mar 01 23:50:26 2017 +0000
@@ -231,14 +231,14 @@
 // this is an ISR, so do not spend too much time here and be careful with printing debug info
 void readerCallback()
 {
-    //if(serial.readable()) {
-//        laserPtr->processRxData(serial.getc());
-//    }
+    if(serialPtr->readable()) {
+        laserPtr->processRx();
+    }
 }
 
 /* This method is called when a distance measurement is ready to be sent to the client.
     send distance measurement to the connected BLE client */
-void distanceCallcack(float distance, float elapsedTime)
+void distanceCallback(float distance, float elapsedTime)
 {
     uint8_t buf[10];
     uint16_t arrayLen = 2;
@@ -261,7 +261,6 @@
 }
 
 
-
 /* processor for the hardware trigger button */
 void triggerFall()
 {
@@ -342,7 +341,7 @@
     serialPtr = new Serial(p27, p26);
     disableFlowControl();
     serialPtr->baud(READER_BAUD_RATE);
-    // serial.attach(&readerCallback);
+    serialPtr->attach(&readerCallback);
 
     // processors for the trigger button
     triggerButton.fall(&triggerFall);
@@ -350,8 +349,9 @@
 
     // setup laser
     laserPtr = new Laser(*serialPtr);
+    //laserPtr->init();
     laserPtr->enableMeasurement(true);
-    laserPtr->setDistaceCallback(&distanceCallcack);
+    laserPtr->setDistaceCallback(&distanceCallback);
     laserPtr->turnLaserPowerOn();
 
     while (true) {