mapping change

lib/touch_controls/include/touch_control.h

@@ -43,6 +43,8 @@ class TouchControl
 
     virtual void init(int32_t pos_x, int32_t pos_y, int32_t pos_r);
 
+    virtual void reset();
+
     virtual TouchState touch(int8_t fid, int32_t tx, int32_t ty) = 0;
 
     int8_t getTouching() {return touching;}

lib/touch_controls/include/touch_dpad.h

@@ -31,6 +31,8 @@ class TouchDpad : public TouchControl
     TouchDpad(int32_t pos_x, int32_t pos_y, int32_t pos_r, DpadType dpad_type = DPAD_TYPE_SECTOR_4);
 
     void init(int32_t pos_x, int32_t pos_y, int32_t pos_r, DpadType dpad_type = DPAD_TYPE_SECTOR_4);
+
+    void reset();
     
     void setDeadZoneInner(int32_t dead_zone_inner);
 

lib/touch_controls/include/touch_joystick.h

@@ -35,6 +35,8 @@ class TouchJoystick : public TouchControl
 
     void init(int32_t pos_x, int32_t pos_y, int32_t pos_r, int16_t usb_x, int16_t usb_y, int16_t usb_r);
 
+    void reset();
+
     void setDeadZoneInner(int32_t dead_zone_inner);
     void setDeadZoneOuter(int32_t dead_zone_outer);
 

lib/touch_controls/include/touch_mouse_joystick.h

@@ -23,6 +23,8 @@ class TouchMouseJoystick : public TouchJoystick
     public:
 
     void init(int32_t pos_x, int32_t pos_y, int32_t pos_r, int16_t usb_x, int16_t usb_y, int16_t usb_r);
+
+    void reset();
     
     void setSensitivity(float sensitivity);
 

lib/touch_controls/src/touch_control.cpp

@@ -18,3 +18,9 @@ void TouchControl::init(int32_t pos_x, int32_t pos_y, int32_t pos_r)
 
     this->touching = TS_NONE;
 }
+
+void TouchControl::reset()
+{
+    this->finger_id = -1;
+    this->touching = TS_NONE;
+}

lib/touch_controls/src/touch_dpad.cpp

@@ -31,6 +31,12 @@ void TouchDpad::init(int32_t pos_x, int32_t pos_y, int32_t pos_r, DpadType dpad_
     this->button = 0;
 }
 
+void TouchDpad::reset()
+{
+    TouchControl::reset();
+    this->button = 0;
+}
+
 void TouchDpad::setDeadZoneInner(int32_t dead_zone_inner)
 {
     this->dead_zone_inner = dead_zone_inner;

lib/touch_controls/src/touch_joystick.cpp

@@ -31,6 +31,13 @@ void TouchJoystick::init(int32_t pos_x, int32_t pos_y, int32_t pos_r, int16_t us
     this->y = usb_y;
 }
 
+void TouchJoystick::reset()
+{
+    TouchControl::reset();
+    this->x = usb_x;
+    this->y = usb_y;;
+}
+
 void TouchJoystick::setDeadZoneInner(int32_t dead_zone_inner)
 {
     this->dead_zone_inner = dead_zone_inner;

lib/touch_controls/src/touch_mouse_joystick.cpp

@@ -19,6 +19,15 @@ void TouchMouseJoystick::init(int32_t pos_x, int32_t pos_y, int32_t pos_r, int16
     this->time0 = 0;
 }
 
+void TouchMouseJoystick::reset()
+{
+    TouchJoystick::reset();
+    this->trackball_vel_x = 0;
+    this->trackball_vel_y = 0;
+    this->dx = 0;
+    this->dy = 0;
+}
+
 void TouchMouseJoystick::setSensitivity(float sensitivity)
 {
     this->sensitivity = this->pos2usb * sensitivity;

src/input_mapper.cpp

@@ -60,7 +60,7 @@ namespace InputMapper
         USB_Device::HOME,
         USB_Device::FACE_A,
         USB_Device::JOYSTICK_RIGHT,
-        USB_Device::FACE_A,
+        USB_Device::FACE_B,
         USB_Device::JOYSTICK_LEFT,
     };
 
@@ -187,7 +187,7 @@ namespace InputMapper
         gyro.setMappedId(1);
         //gyro.setInvertX();
         gyro.setInvertY();
-        gyro.setSensitivity(0.75f);
+        gyro.setSensitivity(1.0f);
         gyro.setDeadzone(0);
         gyro.setMinDelta(1000);
         gyro.setBindToX(Gyro::BIND_XZ);
@@ -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]);
             }
         }
 
@@ -337,6 +337,8 @@ namespace InputMapper
             
             case HardwareButtons::BUMPER_LEFT:
 
+                tcontrols[1][0]->reset();
+
                 if (value)
                 {
                     tcontrols[1][0] = &tjoystick_right_wheel;

src/main.cpp

@@ -3,6 +3,8 @@
 #include "trackpad.h"
 #include "input_mapper.h"
 
+//#define DISABLE_TRACKPADS
+
 const uint8_t pin_trigger[2] = {PA1, PA0};
 
 const uint8_t pin_button[]  =
@@ -10,27 +12,31 @@ 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};
 
+const uint8_t gyro_int = PC14;
+
+#ifndef DISABLE_TRACKPADS
+
 const uint8_t pin_trackpad_data[2]  = {PA2, PB9};
 const uint8_t pin_trackpad_clock[2] = {PA3, PB8};
 
-const uint8_t gyro_int = PC14;
-
 TrackPad trackpad[2]; // 0 - left, 1 - right
 
 int32_t trackpad_maxX, trackpad_maxY;
 
+#endif
+
 void setup()
 {
     // Turn on LED
@@ -50,6 +56,8 @@ void setup()
         pinMode(pin_button[i], pin_button[i + 1]? INPUT_PULLDOWN : INPUT_PULLUP);
     }
     
+    #ifndef DISABLE_TRACKPADS
+
     for (uint8_t i = 0; i < sizeof(pin_trackpad_clock); ++i)
     {
         trackpad[i].initialize(pin_trackpad_clock[i], pin_trackpad_data[i]);
@@ -58,6 +66,8 @@ void setup()
     trackpad_maxX = trackpad[0].getMaxX();
     trackpad_maxY = trackpad[0].getMaxY();
 
+    #endif
+
     InputMapper::begin();
 
     // Turn off LED
@@ -69,6 +79,8 @@ TouchEvent tevent[5];
 
 void loop()
 {
+    #ifndef DISABLE_TRACKPADS
+
     for (uint8_t t = 0; t < 2; ++t)
     {
         if (trackpad[t].poll(tevent, tevent_size) > 0)
@@ -117,7 +129,18 @@ 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)