added Backward compatibility for previous software version

Author: Rocketct

examples/TouchPads/Custom_Sensitivity/Custom_Sensitivity.ino

@@ -44,7 +44,7 @@ void loop() {
     Serial.println("touching 3");
   }
 
-  if (carrier.Buttons.getTouch(4)) {
+  if (carrier.Buttons.getTouch(TOUCH4)) {
     Serial.println("touching 4");
   }
 }

examples/TouchPads/TouchTypes/TouchTypes.ino

@@ -33,10 +33,10 @@ void loop() {
   if (carrier.Buttons.onTouchDown(TOUCH0)) {
     Serial.println("Touched Down Button 0");
   }
-  if (carrier.Buttons..onTouchUp(TOUCH1)) {
+  if (carrier.Buttons.onTouchUp(TOUCH1)) {
     Serial.println("Release Touch Button 1");
   }
-  if (carrier.Buttons..onTouchChange(TOUCH2)) {
+  if (carrier.Buttons.onTouchChange(TOUCH2)) {
     Serial.println("Changed Touch Button 2");
   }
   if (carrier.Buttons.getTouch(TOUCH3)) {

src/Arduino_MKRIoTCarrier.h

@@ -18,7 +18,7 @@
 */
 
 
-#ifndef ARDUINO_MKRIoTCarrier_h
+ifndef ARDUINO_MKRIoTCarrier_h
 #define ARDUINO_MKRIoTCarrier_h
 
 #include <Arduino.h>
@@ -110,6 +110,13 @@ class MKRIoTCarrier{
     //Buttons
     MKRIoTCarrierQtouch Buttons = MKRIoTCarrierQtouch();
 
+
+    MKRIoTCarrierQtouch Button0 __attribute__((deprecated)) = MKRIoTCarrierQtouch(TOUCH0);
+    MKRIoTCarrierQtouch Button1 __attribute__((deprecated)) = MKRIoTCarrierQtouch(TOUCH1);
+    MKRIoTCarrierQtouch Button2 __attribute__((deprecated)) = MKRIoTCarrierQtouch(TOUCH2);
+    MKRIoTCarrierQtouch Button3 __attribute__((deprecated)) = MKRIoTCarrierQtouch(TOUCH3);
+    MKRIoTCarrierQtouch Button4 __attribute__((deprecated)) = MKRIoTCarrierQtouch(TOUCH4); 
+
     //Display
     Adafruit_ST7789 display = Adafruit_ST7789(&SPI, TFT_CS, TFT_DC, -1);
 

src/Arduino_MKRIoTCarrier_Qtouch.cpp

@@ -25,13 +25,22 @@
 MKRIoTCarrierQtouch::MKRIoTCarrierQtouch() {
 }
 
+//Individual pad
+MKRIoTCarrierQtouch::MKRIoTCarrierQtouch(touchButtons padIndex) {
+  _padID = padIndex;
+}
+
 bool MKRIoTCarrierQtouch::getTouch(touchButtons padIndex) {
   if(_available) {
     return TOUCH.read(padIndex);
   }
   return false;
 }
 
+bool MKRIoTCarrierQtouch::getTouch() {
+  return getTouch(_padID);
+}
+
 bool MKRIoTCarrierQtouch::onTouchDown(touchButtons padIndex) {
   if(_available) {
     if(getTouch(padIndex) && _touchesPrev[padIndex] == 0) {
@@ -43,6 +52,10 @@ bool MKRIoTCarrierQtouch::onTouchDown(touchButtons padIndex) {
   return false;
 }
 
+bool MKRIoTCarrierQtouch::onTouchDown() {
+  return onTouchDown(_padID);
+}
+
 bool MKRIoTCarrierQtouch::onTouchUp(touchButtons padIndex) {
   if(_available) {
     if(!getTouch(padIndex) && _touchesPrev[padIndex] == 1) {
@@ -54,6 +67,10 @@ bool MKRIoTCarrierQtouch::onTouchUp(touchButtons padIndex) {
   return false;
 }
 
+bool MKRIoTCarrierQtouch::onTouchUp() {
+  return onTouchUp(_padID);
+}
+
 bool MKRIoTCarrierQtouch::onTouchChange(touchButtons padIndex) {
   if(_available) {
     if(_touchesPrev[padIndex] != getTouch(padIndex)){
@@ -64,6 +81,9 @@ bool MKRIoTCarrierQtouch::onTouchChange(touchButtons padIndex) {
   return false;
 }
 
+bool MKRIoTCarrierQtouch::onTouchChange() {
+  return onTouchChange(_padID);
+}
 
 void MKRIoTCarrierQtouch::updateConfig(int newSens, touchButtons padIndex) {
   TOUCH.setSensorsSensitivity(newSens, padIndex);
@@ -80,10 +100,10 @@ bool MKRIoTCarrierQtouch::update() {
   TOUCH.poll();
   if(TOUCH.available()) {
     _available = true;
-    return true;
+    return _available;
   }
   _available =  false;
-  return false;
+  return _available;
 }
 
 void MKRIoTCarrierQtouch::updateConfig(int newSens) {

src/Arduino_MKRIoTCarrier_Qtouch.h

@@ -24,35 +24,41 @@
 #include "Arduino.h"
 #include "Arduino_MCHPTouch.h"
 
+static bool _available = false;
+
 typedef enum {
-  TOUCH1 = 0,
+  TOUCH0 = 0,
+  TOUCH1,
   TOUCH2,
   TOUCH3,
-  TOUCH4,
-  TOUCH5
+  TOUCH4
 } touchButtons;
 
 class MKRIoTCarrierQtouch{
   public:
     MKRIoTCarrierQtouch();
+    MKRIoTCarrierQtouch(touchButtons padIndex);
     bool begin();
     bool update();
 
     //Set touch settings
     void updateConfig(int newSens, touchButtons padIndex);
-  
+    void updateConfig(int newSens);
     bool getTouch(touchButtons _padIndex);
+    bool getTouch() __attribute__((deprecated));
     bool onTouchDown(touchButtons _padIndex);
+    bool onTouchDown() __attribute__((deprecated));
     bool onTouchUp(touchButtons _padIndex);
+    bool onTouchUp() __attribute__((deprecated));
     bool onTouchChange(touchButtons _padIndex);
-
-    void updateConfig(int newSens);
+    bool onTouchChange() __attribute__((deprecated));
 
     bool customSens = false;
 
   private:
+    touchButtons _padID;
     int _padIndex;
-    bool _available = false;
+
 
     bool _touchesPrev[5] = {0, 0, 0, 0, 0};   //To know last touches