Add the ability to set sensitivity for each channel separately. #1

Squashed commit of the following:

commit 92c7caf23deb1558fca2dcc68f34f666a011dad3
Author: Alessandro Ranellucci <[email protected]>
Date:   Tue Jan 12 15:31:20 2021 +0100

    Rename setSensorsSensitivityChannel() to setSensorsSensitivity(). #1

commit cdf69f9
Author: marqdevx <[email protected]>
Date:   Tue Jan 12 15:18:58 2021 +0100

    Update src/Arduino_MCHPTouch.h

    Co-authored-by: Alessandro Ranellucci <[email protected]>

commit b51abcf
Author: marqdevx <[email protected]>
Date:   Mon Jan 11 13:26:31 2021 +0100

    Update version to 1.1.0

    Update version to 1.1.0

commit c200d9a
Author: marqdevx <[email protected]>
Date:   Mon Dec 28 10:17:45 2020 +0100

    Update examples/setCustomSensitivity/setCustomSensitivity.ino

    Co-authored-by: per1234 <[email protected]>

commit 01612e7
Author: marqdevx <[email protected]>
Date:   Mon Dec 28 10:15:24 2020 +0100

    Update examples/setCustomSensitivity/setCustomSensitivity.ino

    Co-authored-by: per1234 <[email protected]>

commit 504779a
Author: marqdevx <[email protected]>
Date:   Mon Dec 28 10:15:03 2020 +0100

    Update examples/setCustomSensitivity/setCustomSensitivity.ino

    Co-authored-by: per1234 <[email protected]>

commit e5df053
Author: marqdevx <[email protected]>
Date:   Wed Dec 23 11:41:12 2020 +0100

    Added custom sensitivity example

commit 4d2c11c
Author: marqdevx <[email protected]>
Date:   Wed Dec 23 11:36:19 2020 +0100

    added individual sens config

    * Added the feature to customize each channel configuration (5 channels by default, meant to be used in the MKR IoT Carrier)

Author: alranel

examples/setCustomSensitivity/setCustomSensitivity.ino

@@ -0,0 +1,58 @@
+/*
+  Arduino_MCHPTouch - Sensor data read Example
+  This example shows how to configure and read data
+  from touch sensor buttons on MKR IoT Carrier and
+
+  prints updates to the Serial Monitor.
+
+  The circuit:
+  - Arduino MKR board;
+
+  - MKR IoT carrier.
+
+  This example code is in the public domain.
+*/
+#include "Arduino_MCHPTouch.h"
+
+void setup()
+{
+  Serial.begin(9600);
+  while (!Serial)
+    ;
+  //Set custom sens on X channel
+  //TOUCH.setSensorsSensitivity(*channel*, *newSensitivity*);
+  TOUCH.setSensorsSensitivity(0, 98);
+  // Qtouch initialization
+  if (!TOUCH.begin())
+  {
+    Serial.println("Error in sensors initialization!");
+    while (1)
+      ;
+  }
+  Serial.println("Touch initialization Done!");
+}
+
+void loop()
+{
+  // polling the sensor for new measure
+  TOUCH.poll();
+
+  // Checks if new data are available
+  if (TOUCH.available())
+  {
+    //reads sensors
+
+    Serial.print("Sensor 1 status: ");
+    Serial.println(TOUCH.read(0));
+    Serial.print("Sensor 2 status: ");
+    Serial.println(TOUCH.read(1));
+    Serial.print("Sensor 3 status: ");
+    Serial.println(TOUCH.read(2));
+    Serial.print("Sensor 4 status: ");
+    Serial.println(TOUCH.read(3));
+    Serial.print("Sensor 5 status: ");
+    Serial.println(TOUCH.read(4));
+    Serial.println();
+  }
+  delay(100);
+}

library.properties

@@ -1,5 +1,5 @@
 name=Arduino_MCHPTouch
-version=1.0.0
+version=1.1.0
 author=Arduino
 maintainer=Arduino <[email protected]>
 sentence=A library for the Atmel touch sensors

src/Arduino_MCHPTouch.cpp

@@ -86,7 +86,7 @@ int QtouchClass::read(int sensor_id)
 
 /*******************************************************************************
  * Function Name  : setSensorsSensitivity
- * Description    : Sets the sensors sensitivity value
+ * Description    : Sets all the sensors sensitivity value
  * Input          : newSens - new configure Sensitivity value
  * Return         : NONE
  *******************************************************************************/
@@ -95,6 +95,17 @@ void QtouchClass::setSensorsSensitivity(unsigned int newSens)
   setSensitivity(newSens);
 }
 
+/*******************************************************************************
+ * Function Name  : setSensorsSensitivity
+ * Description    : Sets a sensor sensitivity value
+ * Input          : newSens - new configure Sensitivity value  , btn_channel - channel to apply that Sensitivity
+ * Return         : NONE
+ *******************************************************************************/
+void QtouchClass::setSensorsSensitivity(unsigned int newSens, unsigned int btn_channel)
+{
+  setSensitivityChannel(newSens, btn_channel);
+}
+
 /*******************************************************************************
  * Function Name  : setSensorsHysteresis
  * Description    : Set the sensors hysteresis value

src/Arduino_MCHPTouch.h

@@ -23,6 +23,7 @@ class QtouchClass
   int available();
   int read(int sensor_id);
   void setSensorsSensitivity(unsigned int newSens);
+  void setSensorsSensitivity(unsigned int newSens ,unsigned int btn_channel);
   void setSensorsHysteresis(hysteresis_t newHyst);
   unsigned int getSensorsSensitivity();
   hysteresis_t getSensorsHysteresis();

src/touch.c

@@ -88,10 +88,12 @@ touch_measure_data_t *p_selfcap_measure_data = NULL;
 
 /**
  * Default variables for the sensor config, then they are changed with
- * setHysteresis() and setSensivity() before the init
+ * setHysteresis() , setSensitivity() and setSensitivityChannel before the init
  */
 unsigned int _sensitivity = 5u;
-hysteresis_t _hysteresis = HYST_6_25;
+unsigned int _sensitivity_ch[5] = {5u , 5u, 5u, 5u, 5u};
+
+hysteresis_t _hysteresis = HYST_50;
 
 /*----------------------------------------------------------------------------
 *                               static variables
@@ -335,7 +337,7 @@ touch_ret_t touch_sensors_config(void)
 	sensor_id_t sensor_id;
 
 touch_ret = touch_selfcap_sensor_config(SENSOR_TYPE_KEY, CHANNEL_0,
-			CHANNEL_0, NO_AKS_GROUP,_sensitivity,
+			CHANNEL_0, NO_AKS_GROUP,_sensitivity_ch[0],
 			_hysteresis, RES_1_BIT,
 			&sensor_id);
 	if (touch_ret != TOUCH_SUCCESS) {
@@ -344,7 +346,7 @@ touch_ret = touch_selfcap_sensor_config(SENSOR_TYPE_KEY, CHANNEL_0,
 	}
 
 	touch_ret = touch_selfcap_sensor_config(SENSOR_TYPE_KEY, CHANNEL_1,
-			CHANNEL_1, NO_AKS_GROUP, _sensitivity,
+			CHANNEL_1, NO_AKS_GROUP, _sensitivity_ch[1],
 			_hysteresis, RES_1_BIT,
 			&sensor_id);
 	if (touch_ret != TOUCH_SUCCESS) {
@@ -353,7 +355,7 @@ touch_ret = touch_selfcap_sensor_config(SENSOR_TYPE_KEY, CHANNEL_0,
 	}
 
 	touch_ret = touch_selfcap_sensor_config(SENSOR_TYPE_KEY, CHANNEL_2,
-			CHANNEL_2,  NO_AKS_GROUP, _sensitivity,
+			CHANNEL_2,  NO_AKS_GROUP, _sensitivity_ch[2],
 			_hysteresis, RES_1_BIT,
 			&sensor_id);
 	if (touch_ret != TOUCH_SUCCESS) {
@@ -362,7 +364,7 @@ touch_ret = touch_selfcap_sensor_config(SENSOR_TYPE_KEY, CHANNEL_0,
 	}
 
 	touch_ret = touch_selfcap_sensor_config(SENSOR_TYPE_KEY, CHANNEL_3,
-			CHANNEL_3,  NO_AKS_GROUP, _sensitivity,
+			CHANNEL_3,  NO_AKS_GROUP, _sensitivity_ch[3],
 			_hysteresis, RES_1_BIT,
 			&sensor_id);
 	if (touch_ret != TOUCH_SUCCESS) {
@@ -371,7 +373,7 @@ touch_ret = touch_selfcap_sensor_config(SENSOR_TYPE_KEY, CHANNEL_0,
 	}
 
 		touch_ret = touch_selfcap_sensor_config(SENSOR_TYPE_KEY, CHANNEL_4,
-			CHANNEL_4,  NO_AKS_GROUP, _sensitivity,
+			CHANNEL_4,  NO_AKS_GROUP, _sensitivity_ch[4],
 			_hysteresis, RES_1_BIT,
 			&sensor_id);
 	if (touch_ret != TOUCH_SUCCESS) {
@@ -408,12 +410,18 @@ void setHysteresis(hysteresis_t newHyst){
 
 void setSensitivity(unsigned int newSens){
 	_sensitivity = newSens;
+	for (int i = 0; i < 5; i++){
+		_sensitivity_ch[i] = _sensitivity;
+	}
+}
+void setSensitivityChannel(unsigned int newSens, unsigned int btn_channel){
+	_sensitivity_ch[btn_channel] = newSens;
 }
 
 hysteresis_t getHysteresis() {
- return _hysteresis;
+ 	return _hysteresis;
 }
 
 unsigned int getSensitivity() {
- return _sensitivity;
+ 	return _sensitivity;
 }

src/touch_api_SAMD.h

@@ -984,6 +984,7 @@ void touch_sensors_update_time(void);
  * */
 void setHysteresis(hysteresis_t newHyst);
 void setSensitivity(unsigned int newSens);
+void setSensitivityChannel(unsigned int newSens, unsigned int btn_channel);
 hysteresis_t getHysteresis();
 unsigned int getSensitivity();