Diff: Display/BiosTouch.cpp

Revision:

31:d47cffcb0a3e

Parent:

28:8ae20cb0b943

Child:

33:8a0a99d54bf8

--- a/Display/BiosTouch.cpp	Mon Jan 26 15:24:15 2015 +0100
+++ b/Display/BiosTouch.cpp	Tue Feb 17 10:41:48 2015 +0100
@@ -124,31 +124,29 @@
   }
   memset(_latest, 0, _points*sizeof(touch_coordinate_t));
   while(true) {
-    SET_MEAS_PIN_1();
     osEvent evt = _mailbox.get(osWaitForever);
-    CLR_MEAS_PIN_1();
     if (evt.status == osEventMail) {
       touch_mail_t* mail = (touch_mail_t*)evt.value.p;
       memcpy(_latest, mail->touch, mail->num * sizeof(touch_coordinate_t));
       _mailbox.free(mail);
       _dbgRemoved++;
-      if (_points == 1) {
-        log->printf("{%3d,%3d,%d} at %u/%u, with %u lost\n", 
-                    _latest[0].x,
-                    _latest[0].y,
-                    _latest[0].z,
-                    _dbgRemoved, _dbgAdded,
-                    _lostData);
-      } else {
-        log->printf("{%d,%d,%d,%d,%d} at %u/%u, with %u lost\n", 
-                    _latest[0].z,
-                    _latest[1].z,
-                    _latest[2].z,
-                    _latest[3].z,
-                    _latest[4].z,
-                    _dbgRemoved, _dbgAdded,
-                    _lostData);
-      }
+      //if (_points == 1) {
+      //  log->printf("{%3d,%3d,%d} at %u/%u, with %u lost\n", 
+      //              _latest[0].x,
+      //              _latest[0].y,
+      //              _latest[0].z,
+      //              _dbgRemoved, _dbgAdded,
+      //              _lostData);
+      //} else {
+      //  log->printf("{%d,%d,%d,%d,%d} at %u/%u, with %u lost\n", 
+      //              _latest[0].z,
+      //              _latest[1].z,
+      //              _latest[2].z,
+      //              _latest[3].z,
+      //              _latest[4].z,
+      //              _dbgRemoved, _dbgAdded,
+      //              _lostData);
+      //}
     } else {
       log->printf("got non-mail event: 0x%x\n", evt.status);
       continue;
@@ -177,14 +175,11 @@
 
 void TouchHandler::handleTouchInterrupt()
 {
-  SET_MEAS_PIN_2();
   _bios->touchIrqHandler(_biosData);
-  CLR_MEAS_PIN_2();
 }
 
 void TouchHandler::handleNewData(touch_coordinate_t* coord, int num)
 {
-  SET_MEAS_PIN_4();
   touch_mail_t* mail = _mailbox.alloc(0);
   if (mail == NULL) {
     //DMBoard::instance().logger()->printf("Lost touch event\n");
@@ -195,7 +190,6 @@
     memcpy(&mail->touch, coord, mail->num*sizeof(touch_coordinate_t));
     _mailbox.put(mail);
   }
-  CLR_MEAS_PIN_4();
 }
 
 void TouchHandler::changeTouchInterrupt(bool enable, touch_irq_trigger_t trigger)