Diff: TouchController.cpp

Revision:

3:710534c5a240

Parent:

2:d0930962a3bb

Child:

4:ab2e56595286

--- a/TouchController.cpp	Fri Sep 16 04:36:15 2016 +0200
+++ b/TouchController.cpp	Fri Sep 16 02:50:22 2016 +0000
@@ -1,6 +1,6 @@
 #include "TouchController.hpp"
 
-TouchController::TouchController(PinName ur, PinName lr, PinName s, PinName ul, PinName ll, int num_of_samples = 5, uint32_t settle = 80) :
+TouchController::TouchController(PinName ur, PinName lr, PinName s, PinName ul, PinName ll, int num_of_samples) :
   _UR(ur),
   _LR(lr),
   _UL(ul),
@@ -55,7 +55,7 @@
   return MeasureS();
 }
 
-float TouchController::X()
+float TouchController::GetX()
 {
   ConfigPins(X);
   Thread::wait(settle);
@@ -68,7 +68,7 @@
   return (A*x_t+B*y_t+C);
 }
 
-float TouchController::Y()
+float TouchController::GetY()
 {
   ConfigPins(X);
   Thread::wait(settle);
@@ -91,7 +91,7 @@
   F = Y_D3-D*X_T3-E*Y_T3;
 }
 
-void TouchDetected::ConfigPins(char mode)
+void TouchController::ConfigPins(char mode)
 {
   switch (mode)
   {