Skip to content

Commit 6212fcf

Browse files
marqdevxmarqdevx
authored
Add files via upload
1 parent 2bca785 commit 6212fcf

File tree

9 files changed

+34
-30
lines changed

9 files changed

+34
-30
lines changed

‎Readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Read more about the Kits:
1010

1111

1212
For more information about this library please visit us at
13-
https://www.arduino.cc/reference/en/libraries/arduino_mkriotcarrier/
13+
http://www.arduino.cc/en/Reference/MKRIoTCarrier
1414

1515
## License
1616

‎examples/TouchPads/Custom_Sensitivity/Custom_Sensitivity.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ bool CARRIER_CASE = false;
66
// When CARRIER_CASE is true it's set to 4 (further)
77
// But if you use Buttons.updateConfig(value) It will not set the above values
88

9-
unsigned int trheshold = 100;
9+
unsigned int threshold = 100;
1010

1111
void setup() {
1212
// put your setup code here, to run once:
1313
Serial.begin(9600);
1414
while (!Serial);
1515

16-
//Now we can set our custom touch trheshold
17-
carrier.Buttons.updateConfig(trheshold);
16+
//Now we can set our custom touch threshold
17+
carrier.Buttons.updateConfig(threshold);
1818
carrier.begin();
1919
}
2020

2121
void loop() {
2222
// put your main code here, to run repeatedly:
2323
carrier.Buttons.update();
2424
//Lets test 1 button, they should all react in the same way
25-
if (carrier.Button1.getTouch()) {
25+
if (carrier.Button0.getTouch()) {
2626
Serial.println("touching");
2727
}
2828
}

‎examples/TouchPads/Relays_control_Qtouch/Relays_control_Qtouch.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void loop() {
4242
//The LED changes to Green its going to be NC (Normally Closed) or Orange to NO (Normally Open)
4343
//Then the middle pad its going to upload the relay status, to confirm both new status
4444

45-
if (carrier.Button1.onTouchDown()) {
45+
if (carrier.Button0.onTouchDown()) {
4646
newRelay2 = !newRelay2;
4747
if (newRelay2) {
4848
carrier.leds.setPixelColor(0, c_orange);
@@ -52,7 +52,7 @@ void loop() {
5252
carrier.leds.show();
5353

5454
}
55-
if (carrier.Button5.onTouchDown()) {
55+
if (carrier.Button4.onTouchDown()) {
5656
newRelay1 = !newRelay1;
5757
if (newRelay1) {
5858
carrier.leds.setPixelColor(4, c_orange);
@@ -62,7 +62,7 @@ void loop() {
6262
carrier.leds.show();
6363
}
6464

65-
if (carrier.Button3.onTouchDown()) {
65+
if (carrier.Button2.onTouchDown()) {
6666
carrier.leds.setPixelColor(2, c_orange);
6767
carrier.leds.show();
6868

@@ -90,4 +90,4 @@ void loop() {
9090

9191
delay(20);
9292

93-
}
93+
}

‎examples/TouchPads/TouchTypes/TouchTypes.ino‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ void loop() {
3030
// polling the sensor for new measure
3131
carrier.Buttons.update();
3232

33-
if (carrier.Button1.onTouchDown()) {
33+
if (carrier.Button0.onTouchDown()) {
3434
Serial.println("Touched Down Button 1");
3535
}
36-
if (carrier.Button2.onTouchUp()) {
36+
if (carrier.Button1.onTouchUp()) {
3737
Serial.println("Release Touch Button 2");
3838
}
39-
if (carrier.Button3.onTouchChange()) {
39+
if (carrier.Button2.onTouchChange()) {
4040
Serial.println("Changed Touch Button 3");
4141
}
42-
if (carrier.Button4.getTouch()) {
42+
if (carrier.Button3.getTouch()) {
4343
Serial.println("Touching Button 4");
4444
}
45-
if (carrier.Button5.getTouch()) {
45+
if (carrier.Button4.getTouch()) {
4646
Serial.println("Touching Button 5");
4747
}
4848
delay(20);

‎examples/TouchPads/Touch_and_LEDs/Touch_and_LEDs.ino‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void loop() {
2222

2323
//Different types of touches
2424
//When you first touch it
25-
if (carrier.Button1.onTouchDown()) {
25+
if (carrier.Button0.onTouchDown()) {
2626
Serial.println("Touched Down Button 1");
2727
carrier.leds.setPixelColor(0, 20, 20, 20); // 'Off' pixel at tail
2828
carrier.leds.show(); // Refresh strip
@@ -33,7 +33,7 @@ void loop() {
3333
}
3434

3535
//When you release it
36-
if (carrier.Button2.onTouchUp()) {
36+
if (carrier.Button1.onTouchUp()) {
3737
Serial.println("Release Touch Button 2");
3838
carrier.leds.setPixelColor(1, 20, 20, 20); // 'Off' pixel at tail
3939
carrier.leds.show(); // Refresh strip
@@ -44,7 +44,7 @@ void loop() {
4444
}
4545

4646
//When it detects a change, down or up
47-
if (carrier.Button3.onTouchChange()) {
47+
if (carrier.Button2.onTouchChange()) {
4848
Serial.println("Changed Touch Button 3");
4949
carrier.leds.setPixelColor(2, 20, 20, 20); // 'Off' pixel at tail
5050
carrier.leds.show(); // Refresh strip
@@ -55,7 +55,7 @@ void loop() {
5555
}
5656

5757
//Normal, if it is being pressed
58-
if (carrier.Button4.getTouch()) {
58+
if (carrier.Button3.getTouch()) {
5959
Serial.println("Touching Button 4");
6060
carrier.leds.setPixelColor(3, 20, 20, 20); // 'Off' pixel at tail
6161
carrier.leds.show(); // Refresh strip
@@ -65,7 +65,7 @@ void loop() {
6565
carrier.leds.show(); // Refresh strip
6666
}
6767

68-
if (carrier.Button5.getTouch()) {
68+
if (carrier.Button4.getTouch()) {
6969
Serial.println("Touching Button 5");
7070
carrier.leds.setPixelColor(4, 20, 20, 20); // 'Off' pixel at tail
7171
carrier.leds.show(); // Refresh strip

‎examples/TouchPads/getTouch/getTouch.ino‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ void loop() {
3131
carrier.Buttons.update();
3232

3333
// Checks if new data are available
34-
if (carrier.Button1.getTouch()) {
34+
if (carrier.Button0.getTouch()) {
3535
Serial.println("Touching Button 1");
3636
}
37-
if (carrier.Button2.getTouch()) {
37+
if (carrier.Button1.getTouch()) {
3838
Serial.println("Touching Button 2");
3939
}
40-
if (carrier.Button3.getTouch()) {
40+
if (carrier.Button2.getTouch()) {
4141
Serial.println("Touching Button 3");
4242
}
43-
if (carrier.Button4.getTouch()) {
43+
if (carrier.Button3.getTouch()) {
4444
Serial.println("Touching Button 4");
4545
}
46-
if (carrier.Button5.getTouch()) {
46+
if (carrier.Button4.getTouch()) {
4747
Serial.println("Touching Button 5");
4848
}
4949

‎library.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Arduino_MKRIoTCarrier
2-
version=0.9.6
2+
version=0.9.7
33
author=Riccardo Rizzo, Jose García, Pablo Marquínez
44
maintainer=Arduino <[email protected]>
55
sentence=Controlling the IoT MKR Carrier

‎src/Arduino_MKRIoTCarrier.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919

2020

2121
#include <Arduino_MKRIoTCarrier.h>
22+
23+
//Touch pads values for using the case or just directly on the board
24+
//Define on the sketch to use it
25+
bool CARRIER_CASE = false;
2226

2327
MKRIoTCarrier::MKRIoTCarrier(){
2428
//Restart cleaner

‎src/Arduino_MKRIoTCarrier.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ class MKRIoTCarrier{
109109

110110
//Buttons
111111
MKRIoTCarrier_Qtouch_Manager Buttons = MKRIoTCarrier_Qtouch_Manager();
112-
MKRIoTCarrier_Qtouch Button1 = MKRIoTCarrier_Qtouch(0, &Buttons);
113-
MKRIoTCarrier_Qtouch Button2 = MKRIoTCarrier_Qtouch(1, &Buttons);
114-
MKRIoTCarrier_Qtouch Button3 = MKRIoTCarrier_Qtouch(2, &Buttons);
115-
MKRIoTCarrier_Qtouch Button4 = MKRIoTCarrier_Qtouch(3, &Buttons);
116-
MKRIoTCarrier_Qtouch Button5 = MKRIoTCarrier_Qtouch(4, &Buttons);
112+
MKRIoTCarrier_Qtouch Button0 = MKRIoTCarrier_Qtouch(0, &Buttons);
113+
MKRIoTCarrier_Qtouch Button1 = MKRIoTCarrier_Qtouch(1, &Buttons);
114+
MKRIoTCarrier_Qtouch Button2 = MKRIoTCarrier_Qtouch(2, &Buttons);
115+
MKRIoTCarrier_Qtouch Button3 = MKRIoTCarrier_Qtouch(3, &Buttons);
116+
MKRIoTCarrier_Qtouch Button4 = MKRIoTCarrier_Qtouch(4, &Buttons);
117117

118118
//Display
119119
Adafruit_ST7789 display = Adafruit_ST7789(&SPI, TFT_CS, TFT_DC, -1);

0 commit comments

Comments
 (0)