Changeset 21

Timestamp:

10/17/08 14:51:22 (4 years ago)

Author:

jschild

Message:

cleanup

Location:

trunk/avango-daemon

Files:

• include/avango/daemon/WacomTablet.h (modified) (1 diff)
• src/avango/daemon/HIDInput.cpp (modified) (1 diff)
• src/avango/daemon/WacomTablet.cpp (modified) (5 diffs)

trunk/avango-daemon/include/avango/daemon/WacomTablet.h

@@ -91 +91 @@
       int parse_features();
 
+      /**
+       * toggle switch to reset absolute axes when pen is lifted up to zero
+       */
       bool mToggleReset;
     };

trunk/avango-daemon/src/avango/daemon/HIDInput.cpp

@@ -286 +286 @@
   mResetRelCycle = scanForOptionalFeature<int>("reset-rel-values-cycle", 0);
   mTimeout = scanForOptionalFeature<unsigned int>("timeout", 200);
-  std::cout << "Parse Features, mNormAbs = " << mNormAbs << std::endl;
+
   return 1;
 }

trunk/avango-daemon/src/avango/daemon/WacomTablet.cpp

@@ -26 +26 @@
 #include <avango/Logger.h>
 #include <avango/daemon/WacomTablet.h>
-#include <iostream>
 #include <math.h>
 
@@ -37 +36 @@
 
 av::daemon::WacomTablet::WacomTablet()
-{
-}
+{}
 
 av::daemon::WacomTablet::~WacomTablet()
@@ -234 +232 @@
     break;
   case ABS_PRESSURE:
-    if (iter != mAbsInfoMap.end())
-    {
-      //info = (*iter).second;
-      normalized_value = (float)event.value / (float)(info.maximum - info.minimum);
-    }
+    if (event.value>0.0)
+      normalized_value = ((float)event.value -(float)info.minimum)/ (float)(info.maximum - info.minimum);
     break;
   case ABS_DISTANCE:
@@ -253 +248 @@
     normalized_value = -2.0f* ((float)event.value -(float)info.minimum) / (float)(info.maximum + info.minimum ) + 1.0f;
     break;
-  case ABS_MISC:
-    std::cout << event.value << std::endl;
-    if (iter != mAbsInfoMap.end())
-    {
-       //info = (*iter).second;
-       std::cout << info.maximum << " <-max min-> " << info.minimum << std::endl;
-    }
-    break;
   default:
     normalized_value = HIDInput::normalizeAbsValue(event);
@@ -273 +260 @@
   if (HIDInput::parse_features())
     mToggleReset = HIDInput::scanForOptionalFeature<bool>("toggle-reset", false);
-  std::cout << "Parse Features, mToggleReset = " << mToggleReset << std::endl;
   return 1;
 }