diff --git a/src/input_mapper.cpp b/src/input_mapper.cpp
index 1a05d25..570363f 100644
--- a/src/input_mapper.cpp
+++ b/src/input_mapper.cpp
@@ -297,24 +297,24 @@ namespace InputMapper
 
     void mapTriggers(uint32_t value[2])
     {
-        static const uint32_t max = 70;
-        static const uint32_t min = 13;
+        static const uint32_t min[] = {522, 523};
+        static const uint32_t max[] = {797, 795};
 
         uint8_t mapped_value[2];
  
         for (uint8_t i = 0; i < 2; ++i)
         {
-            if (value[i] < min)
+            if (value[i] < min[i])
             {
                 mapped_value[i] = 0;
             }
-            else if (value[i] > max)
+            else if (value[i] > max[i])
             {
                 mapped_value[i] = 255;
             }
             else
             {
-                mapped_value[i] = (value[i] - min) * 255 / (max - min);
+                mapped_value[i] = (value[i] - min[i]) * 255 / (max[i] - min[i]);
             }
         }
 
diff --git a/src/main.cpp b/src/main.cpp
index 7853663..8558452 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,14 +12,14 @@ const uint8_t pin_button[]  =
     PB12, 0, // START
     PB13, 0, // SELECT
     PB5,  0, // BUMPER_LEFT
-    PA8,  1, // BUMPER_RIGHT
+    PA8,  0, // BUMPER_RIGHT
     PB1,  0, // HOME
-    PB14, 1, // GRIP_A
-    PB15, 1, // GRIP_B
+    PB14, 0, // GRIP_A
+    PB15, 0, // GRIP_B
     PA4,  0, // GRIP_X
     PB4,  0, // GRIP_Y
     PC15, 0, // TRACKPAD_LEFT
-    PB3,  1, // TRACKPAD_RIGHT
+    PB3,  0, // TRACKPAD_RIGHT
 };
 
 uint8_t button_state[sizeof(pin_button) / 2] = {0};
@@ -132,6 +132,15 @@ void loop()
     #endif
 
     uint32_t triggers[] = {analogRead(pin_trigger[0]), analogRead(pin_trigger[1])};
+
+    //Serial.print(0);
+    //Serial.print('\t');
+    //Serial.print(triggers[0]);
+    //Serial.print('\t');
+    //Serial.print(triggers[1]);
+    //Serial.print('\t'); 
+    //Serial.println(1000);
+
     InputMapper::mapTriggers(triggers);
 
     for (uint8_t i = 0; i < sizeof(pin_button); i += 2)