Skip to content

Commit 08cac59

Browse files
authored
Merge pull request #39 from arduino-libraries/withcase-nocase
Add more Arduinish methods to set CARRIER_CASE
2 parents d391437 + b22b654 commit 08cac59

File tree

25 files changed

+29
-32
lines changed

25 files changed

+29
-32
lines changed

docs/readme.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ MKRIoTCarrier carrier;
5858

5959
setup(){
6060
Serial.begin(9600);
61-
//This will adjust the sensitivity of the touch pads, not mandatory to set it, by default is false
62-
CARRIER_CASE = false;
6361
if(!carrier.begin(){ //It will see any sensor failure
6462
Serial.println("Failure on init");
6563
while(1);
@@ -84,7 +82,6 @@ MKRIoTCarrier carrier;
8482
File myFile;
8583

8684
setup(){
87-
CARRIER_CASE = false;
8885
carrier.begin(); //SD card initialized here
8986

9087
myFile = SD.open("test.txt", FILE_WRITE);
@@ -125,7 +122,7 @@ Buttons.onTouchChange(TOUCHX)
125122
```
126123

127124
In case you have another enclosure you can change the sensitivity of the pads, 3-100
128-
Automatically configured when you set the `CARRIER_CASE` boolean, by default is false (sensitivity threshold 4)
125+
Automatically configured when you call `carrier.withCase()`, by default is false (sensitivity threshold 4)
129126

130127
```cpp
131128
Buttons.updateConfig(int newSens)
@@ -138,7 +135,6 @@ MKRIoTCarrier carrier;
138135

139136
void setup(){
140137
Serial.begin(9600);
141-
CARRIER_CASE = true/false;
142138
carrier.begin();
143139
}
144140

@@ -202,7 +198,6 @@ MKRIoTCarrier carrier;
202198
uint32_t myCustomColor = carrier.leds.Color(255,100,50);
203199

204200
void setup(){
205-
CARRIER_CASE = false;
206201
carrier.begin();
207202
carrier.leds.fill(myCustomColor, 0, 5);
208203
carrier.leds.show();

examples/Actuators/Buzzer_Melody/Buzzer_Melody.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ int noteDurations[] = {
2020
};
2121

2222
void setup() {
23-
CARRIER_CASE = false;
2423
carrier.begin();
2524

2625
// iterate over the notes of the melody:

examples/Actuators/Relays_blink/Relays_blink.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ void setup() {
66

77
Serial.begin(9600);
88
Serial.println("Init");
9-
CARRIER_CASE = false;
9+
carrier.noCase();
1010
carrier.begin();
1111
}
1212

examples/All_Features/All_Features.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void setup() {
2424
while (!Serial); //Wait to open the Serial monitor to start the program and see details on errors
2525

2626
//Init everything and outputs the errors
27-
CARRIER_CASE = false;
27+
carrier.noCase();
2828
carrier.begin();
2929
}
3030

examples/Display/Compose_images/Compose_images.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ uint32_t orange = carrier.leds.Color(50, 242, 0);
1515

1616
void setup() {
1717
Serial.begin(9600);
18-
CARRIER_CASE = false;
18+
carrier.noCase();
1919
carrier.begin();
2020

2121
uint16_t time = millis();

examples/Display/Graphics/Graphics.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void setup(void) {
1111

1212
Serial.begin(9600);
1313
Serial.print(F("Hello! ST77xx TFT Test"));
14-
CARRIER_CASE = false;
14+
carrier.noCase();
1515
carrier.begin();
1616

1717
uint16_t time = millis();

examples/Display/Show_GIF/Show_GIF.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ void setup() {
1818
Serial.begin(9600);
1919
while (!Serial);
2020

21-
CARRIER_CASE = false;
21+
carrier.noCase();
2222

2323
carrier.begin();
2424
carrier.display.setRotation(4);

examples/Grove_Inputs/Grove_Inputs.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void setup() {
1111
// put your setup code here, to run once:
1212
Serial.begin(9600);
1313
while(!Serial);
14-
CARRIER_CASE = false;
14+
carrier.noCase();
1515
carrier.begin();
1616
pinMode(moisture,INPUT);
1717
pinMode(pir,INPUT);

examples/LEDs-Examples/strandtest/strandtest.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MKRIoTCarrier carrier;
44
#define NUMPIXELS 5
55

66
void setup() {
7-
CARRIER_CASE = false;
7+
carrier.noCase();
88
carrier.begin();
99
}
1010

examples/SD_card/SD_card.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void setup() {
1111
}
1212

1313
// Init the entire Carrier
14-
CARRIER_CASE = false;
14+
carrier.noCase();
1515
carrier.begin();
1616

1717
// open the file. note that only one file can be open at a time,

examples/Sensors/ENV-HTS221/ReadSensors/ReadSensors.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ void setup() {
1010
Serial.begin(9600);
1111
while (!Serial);
1212

13-
CARRIER_CASE = false;
13+
carrier.noCase();
1414
carrier.begin();
1515
}
1616

examples/Sensors/ENV-HTS221/ReadSensorsImperial/ReadSensorsImperial.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ void setup() {
1010
Serial.begin(9600);
1111
while (!Serial);
1212

13-
CARRIER_CASE = false;
13+
carrier.noCase();
1414
carrier.begin();
1515
}
1616

examples/Sensors/IMU-LSM6DS3/SimpleGyroscope/SimpleGyroscope.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ void setup() {
2121
Serial.begin(9600);
2222
while (!Serial);
2323

24-
CARRIER_CASE = false;
24+
carrier.noCase();
2525
if (!carrier.begin()) {
2626
Serial.println("Failed to initialize!");
2727

examples/Sensors/Light-APDS9960/FullExample/FullExample.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ void setup() {
2121
Serial.begin(9600);
2222
while (!Serial); // Wait for serial monitor to open
2323

24-
CARRIER_CASE = false;
24+
carrier.noCase();
2525
if (!carrier.begin()) {
2626
Serial.println("Error");
2727
while (true); // Stop forever

examples/Sensors/Light-APDS9960/GestureSensor/GestureSensor.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void setup() {
2323
Serial.begin(9600);
2424
while (!Serial);
2525

26-
CARRIER_CASE = false;
26+
carrier.noCase();
2727
if (!carrier.begin()) {
2828
Serial.println("Error");
2929
}

examples/Sensors/Light-APDS9960/ProximitySensor/ProximitySensor.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ void setup() {
1818
Serial.begin(9600);
1919
while (!Serial);
2020

21-
CARRIER_CASE = false;
21+
carrier.noCase();
2222
if (!carrier.begin()) {
2323
Serial.println("Error initializing APDS9960 sensor!");
2424
}

examples/Sensors/Light-APDS9960/Read_Colors/Read_Colors.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ void setup() {
99
Serial.begin(9600);
1010
while (!Serial);
1111

12-
CARRIER_CASE = false;
12+
carrier.noCase();
1313
carrier.begin();
1414
}
1515

examples/Sensors/Pressure-LPS22HB/ReadPressure/ReadPressure.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ void setup() {
1818
Serial.begin(9600);
1919
while (!Serial);
2020

21-
CARRIER_CASE = false;
21+
carrier.noCase();
2222
if (!carrier.begin()) {
2323
Serial.println("Failed to initialize!");
2424
while (1);

examples/Sensors/Pressure-LPS22HB/ReadPressureImperial/ReadPressureImperial.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ void setup() {
1818
Serial.begin(9600);
1919
while (!Serial);
2020

21-
CARRIER_CASE = false;
21+
carrier.noCase();
2222
if (!carrier.begin()) {
2323
Serial.println("Failed to initialize!");
2424
while (1);

examples/TouchPads/Custom_Sensitivity/Custom_Sensitivity.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "Arduino_MKRIoTCarrier.h"
22
MKRIoTCarrier carrier;
33

4-
// When CARRIER_CASE is false it's set to 100 (closer)
5-
// When CARRIER_CASE is true it's set to 4 (further)
4+
// When calling carrier.noCase() (default) it's set to 100 (closer)
5+
// When calling carrier.case() it's set to 4 (further)
66
// But if you use Buttons.updateConfig(value) It will not set the above values
77

88
unsigned int threshold = 98;
@@ -14,7 +14,7 @@ void setup() {
1414
while (!Serial);
1515

1616
carrier.begin();
17-
//CARRIER_CASE = false;
17+
//carrier.noCase();
1818
//Now we can set our custom touch threshold
1919
// First we update all the buttons with the new threshold
2020
// Then we overwrite individually one of them (they can be all set individually too)

examples/TouchPads/Relays_control_Qtouch/Relays_control_Qtouch.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ void setup() {
1616
// put your setup code here, to run once:
1717
Serial.begin(9600);
1818

19-
CARRIER_CASE = false;
19+
carrier.noCase();
2020
carrier.begin();
2121

2222
carrier.leds.setPixelColor(0, c_green);

examples/TouchPads/TouchTypes/TouchTypes.ino

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ MKRIoTCarrier carrier;
1717
void setup() {
1818
Serial.begin(9600);
1919
while (!Serial);
20-
// Qtouch initialization
21-
CARRIER_CASE = false;
20+
carrier.noCase();
2221
if (!carrier.begin()) {
2322
Serial.println("Error in sensors initialization!");
2423
while (1);

examples/TouchPads/Touch_and_LEDs/Touch_and_LEDs.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ void setup() {
88
while (!Serial);
99

1010
//Init all the components from the board
11-
CARRIER_CASE = false;
11+
carrier.noCase();
1212
carrier.begin();
1313
}
1414

examples/TouchPads/Touch_signals/Touch_signals.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ int msr[5];
77

88
void setup() {
99
// put your setup code here, to run once:
10-
//CARRIER_CASE = false; //No needed to use it, default false
10+
//carrier.noCase(); //No need to use it, default false
1111
Serial.begin(9600);
1212
carrier.begin();
1313

src/Arduino_MKRIoTCarrier.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ class MKRIoTCarrier{
9393
MKRIoTCarrier();
9494
int begin();
9595

96+
// Case
97+
void withCase() { CARRIER_CASE = true; };
98+
void noCase() { CARRIER_CASE = false; };
99+
96100
//Sensors
97101
APDS9960& Light = APDS;
98102
LPS22HBClass& Pressure = BARO;

0 commit comments

Comments
 (0)