Merge pull request #17 from arduino-libraries/v0.9.7-b

V0.9.8

Author: marqdevx

Readme.md

@@ -10,7 +10,7 @@ Read more about the Kits:
 
 
 For more information about this library please visit us at
-https://www.arduino.cc/reference/en/libraries/arduino_mkriotcarrier/
+http://www.arduino.cc/en/Reference/MKRIoTCarrier
 
 ## License 
 

examples/Actuators/Buzzer_Melody/Buzzer_Melody.ino

@@ -8,7 +8,6 @@
 #include "pitches.h"
 
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 // notes in the melody:
 int melody[] = {
@@ -21,6 +20,9 @@ int noteDurations[] = {
 };
 
 void setup() {
+  CARRIER_CASE = false;
+  carrier.begin();
+  
   // iterate over the notes of the melody:
   for (int thisNote = 0; thisNote < 8; thisNote++) {
 

examples/Actuators/Relays_blink/Relays_blink.ino

@@ -1,12 +1,12 @@
 #include <Arduino_MKRIoTCarrier.h>
 
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 void setup() {
 
   Serial.begin(9600);
   Serial.println("Init");
+  CARRIER_CASE = false;
   carrier.begin();
 }
 

examples/All_Features/All_Features.ino

@@ -6,9 +6,6 @@ Unless the touch pads
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier; //Constructor of the carrier maybe we can include it on the library itself
 
-//Set the pad sense distance for using them with or without the enclosure
-bool CARRIER_CASE = false;
-
 float temperature;
 float humidity;
 
@@ -27,6 +24,7 @@ void setup() {
   while (!Serial);  //Wait to open the Serial monitor to start the program and see details on errors
 
   //Init everything and outputs the errors
+  CARRIER_CASE = false;
   carrier.begin();
 }
 

examples/Display/Compose_images/Compose_images.ino

@@ -10,12 +10,12 @@
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
 
-bool CARRIER_CASE = false;
 
 uint32_t orange = carrier.leds.Color(50, 242, 0);
 
 void setup() {
   Serial.begin(9600);
+  CARRIER_CASE = false;
   carrier.begin();
 
   uint16_t time = millis();

examples/Display/Graphics/Graphics.ino

@@ -6,12 +6,12 @@
 MKRIoTCarrier carrier;
 
 float p = 3.1415926;
-bool CARRIER_CASE = false;
 
 void setup(void) {
 
   Serial.begin(9600);
   Serial.print(F("Hello! ST77xx TFT Test"));
+  CARRIER_CASE = false;
   carrier.begin();
 
   uint16_t time = millis();

examples/Grove_Inputs/Grove_Inputs.ino

@@ -1,9 +1,6 @@
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier; //Constructor of the carrier maybe we can include it on the library itself
 
-//Set the pad sense distance for using them with or without the enclosure
-bool CARRIER_CASE = false;
-
 //Be sure that the Pins are the same as your wiring
 int moisture = A5;
 int moist;
@@ -14,6 +11,7 @@ void setup() {
   // put your setup code here, to run once:
   Serial.begin(9600);
   while(!Serial);
+  CARRIER_CASE = false;
   carrier.begin();
   pinMode(moisture,INPUT);
   pinMode(pir,INPUT);

examples/LEDs-Examples/strandtest/strandtest.ino

@@ -1,10 +1,10 @@
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE;
 
 #define NUMPIXELS 5
 
 void setup() {
+  CARRIER_CASE = false;
   carrier.begin();
 }
 

examples/SD_card/SD_card.ino

@@ -1,6 +1,5 @@
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 File myFile;
 
@@ -12,6 +11,7 @@ void setup() {
   }
 
   //  Init the entire Carrier
+  CARRIER_CASE = false;
   carrier.begin();
 
   // open the file. note that only one file can be open at a time,

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

@@ -4,13 +4,13 @@
 
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 
 void setup() {
   Serial.begin(9600);
   while (!Serial);
 
+  CARRIER_CASE = false;
   carrier.begin();
 }
 

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

@@ -5,12 +5,12 @@
 
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 void setup() {
   Serial.begin(9600);
   while (!Serial);
 
+  CARRIER_CASE = false;
   carrier.begin();
 }
 

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

@@ -16,7 +16,6 @@
 
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 void setup() {
   Serial.begin(9600);

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

@@ -16,12 +16,12 @@
 
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 void setup() {
   Serial.begin(9600);
   while (!Serial);
 
+  CARRIER_CASE = false;
   if (!carrier.begin()) {
     Serial.println("Failed to initialize!");
 

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

@@ -16,12 +16,12 @@
 
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 void setup() {
   Serial.begin(9600);
   while (!Serial); // Wait for serial monitor to open
 
+  CARRIER_CASE = false;
   if (!carrier.begin()) {
     Serial.println("Error");
     while (true); // Stop forever

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

@@ -18,12 +18,12 @@
 
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 void setup() {
   Serial.begin(9600);
   while (!Serial);
 
+  CARRIER_CASE = false;
   if (!carrier.begin()) {
     Serial.println("Error");
   }

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

@@ -13,12 +13,12 @@
 
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 void setup() {
   Serial.begin(9600);
   while (!Serial);
 
+  CARRIER_CASE = false;
   if (!carrier.begin()) {
     Serial.println("Error initializing APDS9960 sensor!");
   }

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

@@ -4,12 +4,12 @@
 
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 void setup() {
   Serial.begin(9600);
   while (!Serial);
 
+  CARRIER_CASE = false;
   carrier.begin();
 }
 

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

@@ -13,12 +13,12 @@
 
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 void setup() {
   Serial.begin(9600);
   while (!Serial);
-
+  
+  CARRIER_CASE = false;
   if (!carrier.begin()) {
     Serial.println("Failed to initialize!");
     while (1);

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

@@ -13,12 +13,12 @@
 
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 void setup() {
   Serial.begin(9600);
   while (!Serial);
 
+  CARRIER_CASE = false;
   if (!carrier.begin()) {
     Serial.println("Failed to initialize!");
     while (1);

examples/TouchPads/Custom_Sensitivity/Custom_Sensitivity.ino

@@ -1,28 +1,28 @@
 #include "Arduino_MKRIoTCarrier.h"
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 // When CARRIER_CASE is false it's set to 100 (closer)
 // When CARRIER_CASE is true it's set to 4  (further)
 // But if you use Buttons.updateConfig(value) It will not set the above values
 
-unsigned int trheshold = 100;
+unsigned int threshold = 100;
 
 void setup() {
   // put your setup code here, to run once:
   Serial.begin(9600);
   while (!Serial);
 
-  //Now we can set our custom touch trheshold
-  carrier.Buttons.updateConfig(trheshold);
+  //CARRIER_CASE = false;
+  //Now we can set our custom touch threshold
+  carrier.Buttons.updateConfig(threshold);
   carrier.begin();
 }
 
 void loop() {
   // put your main code here, to run repeatedly:
   carrier.Buttons.update();
   //Lets test 1 button, they should all react in the same way
-  if (carrier.Button1.getTouch()) {
+  if (carrier.Button0.getTouch()) {
     Serial.println("touching");
   }
 }

examples/TouchPads/Relays_control_Qtouch/Relays_control_Qtouch.ino

@@ -3,7 +3,6 @@
 */
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 //False means Normally closed
 bool newRelay1 = false;
@@ -16,6 +15,8 @@ uint32_t c_green = carrier.leds.Color(40, 0, 0);
 void setup() {
   // put your setup code here, to run once:
   Serial.begin(9600);
+  
+  CARRIER_CASE = false;
   carrier.begin();
 
   carrier.leds.setPixelColor(0, c_green);
@@ -42,7 +43,7 @@ void loop() {
   //The LED changes to Green its going to be NC (Normally Closed) or Orange to NO (Normally Open)
   //Then the middle pad its going to upload the relay status, to confirm both new status
 
-  if (carrier.Button1.onTouchDown()) {
+  if (carrier.Button0.onTouchDown()) {
     newRelay2 = !newRelay2;
     if (newRelay2) {
       carrier.leds.setPixelColor(0, c_orange);
@@ -52,7 +53,7 @@ void loop() {
     carrier.leds.show();
 
   }
-  if (carrier.Button5.onTouchDown()) {
+  if (carrier.Button4.onTouchDown()) {
     newRelay1 = !newRelay1;
     if (newRelay1) {
       carrier.leds.setPixelColor(4, c_orange);
@@ -62,7 +63,7 @@ void loop() {
     carrier.leds.show();
   }
 
-  if (carrier.Button3.onTouchDown()) {
+  if (carrier.Button2.onTouchDown()) {
     carrier.leds.setPixelColor(2, c_orange);
     carrier.leds.show();
 
@@ -90,4 +91,4 @@ void loop() {
 
   delay(20);
 
-}
+}

examples/TouchPads/TouchTypes/TouchTypes.ino

@@ -12,13 +12,13 @@
 */
 #include <Arduino_MKRIoTCarrier.h>
 MKRIoTCarrier carrier;
-bool CARRIER_CASE = false;
 
 
 void setup() {
   Serial.begin(9600);
   while (!Serial);
   // Qtouch initialization
+  CARRIER_CASE = false;
   if (!carrier.begin()) {
     Serial.println("Error in sensors initialization!");
     while (1);
@@ -30,19 +30,19 @@ void loop() {
   // polling the sensor for new measure
   carrier.Buttons.update();
 
-  if (carrier.Button1.onTouchDown()) {
+  if (carrier.Button0.onTouchDown()) {
     Serial.println("Touched Down Button 1");
   }
-  if (carrier.Button2.onTouchUp()) {
+  if (carrier.Button1.onTouchUp()) {
     Serial.println("Release Touch Button 2");
   }
-  if (carrier.Button3.onTouchChange()) {
+  if (carrier.Button2.onTouchChange()) {
     Serial.println("Changed Touch Button 3");
   }
-  if (carrier.Button4.getTouch()) {
+  if (carrier.Button3.getTouch()) {
     Serial.println("Touching Button 4");
   }
-  if (carrier.Button5.getTouch()) {
+  if (carrier.Button4.getTouch()) {
     Serial.println("Touching Button 5");
   }
   delay(20);