From 858b80b6a4f95867b6dbf1e3777ebc52bcd257d3 Mon Sep 17 00:00:00 2001 From: "Mikael Falkvidd git@mjo.se" Date: Sat, 6 Aug 2016 11:58:45 +0200 Subject: [PATCH] Use bool instead of boolean in examples In the Arduino IDE, boolean is an alias for bool. The Arduino IDE might deprecate boolean in the future, see https://github.com/arduino/Arduino/issues/4673 for details. --- examples/EnergyMeterPulseSensor/EnergyMeterPulseSensor.ino | 2 +- examples/MockMySensors/MockMySensors.ino | 2 +- examples/MotionSensor/MotionSensor.ino | 2 +- examples/MotionSensorRS485/MotionSensorRS485.ino | 2 +- examples/PHSensor/PHSensor.ino | 4 ++-- examples/SecretKnockSensor/SecretKnockSensor.ino | 4 ++-- examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/EnergyMeterPulseSensor/EnergyMeterPulseSensor.ino b/examples/EnergyMeterPulseSensor/EnergyMeterPulseSensor.ino index 27856796d..918873058 100644 --- a/examples/EnergyMeterPulseSensor/EnergyMeterPulseSensor.ino +++ b/examples/EnergyMeterPulseSensor/EnergyMeterPulseSensor.ino @@ -52,7 +52,7 @@ unsigned long SEND_FREQUENCY = 20000; // Minimum time between send (in milliseconds). We don't wnat to spam the gateway. double ppwh = ((double)PULSE_FACTOR)/1000; // Pulses per watt hour -boolean pcReceived = false; +bool pcReceived = false; volatile unsigned long pulseCount = 0; volatile unsigned long lastBlink = 0; volatile unsigned long watt = 0; diff --git a/examples/MockMySensors/MockMySensors.ino b/examples/MockMySensors/MockMySensors.ino index dfed9bedc..6de46a0e5 100644 --- a/examples/MockMySensors/MockMySensors.ino +++ b/examples/MockMySensors/MockMySensors.ino @@ -86,7 +86,7 @@ // Global Vars unsigned long SLEEP_TIME = 900000; // Sleep time between reads (in milliseconds) -boolean metric = true; +bool metric = true; long randNumber; diff --git a/examples/MotionSensor/MotionSensor.ino b/examples/MotionSensor/MotionSensor.ino index 77c01dfe4..d082c4da1 100644 --- a/examples/MotionSensor/MotionSensor.ino +++ b/examples/MotionSensor/MotionSensor.ino @@ -60,7 +60,7 @@ void presentation() { void loop() { // Read digital motion value - boolean tripped = digitalRead(DIGITAL_INPUT_SENSOR) == HIGH; + bool tripped = digitalRead(DIGITAL_INPUT_SENSOR) == HIGH; Serial.println(tripped); send(msg.set(tripped?"1":"0")); // Send tripped value to gw diff --git a/examples/MotionSensorRS485/MotionSensorRS485.ino b/examples/MotionSensorRS485/MotionSensorRS485.ino index 9252243ea..5af08fbd7 100644 --- a/examples/MotionSensorRS485/MotionSensorRS485.ino +++ b/examples/MotionSensorRS485/MotionSensorRS485.ino @@ -79,7 +79,7 @@ void presentation() { void loop() { // Read digital motion value - boolean tripped = digitalRead(DIGITAL_INPUT_SENSOR) == HIGH; + bool tripped = digitalRead(DIGITAL_INPUT_SENSOR) == HIGH; Serial.println(tripped); send(msg.set(tripped?"1":"0")); // Send tripped value to gw diff --git a/examples/PHSensor/PHSensor.ino b/examples/PHSensor/PHSensor.ino index befd8ec6d..713f1c6e7 100644 --- a/examples/PHSensor/PHSensor.ino +++ b/examples/PHSensor/PHSensor.ino @@ -36,8 +36,8 @@ unsigned long SLEEP_TIME = 60000; // Sleep time between reads (in milliseconds) float lastPH; -boolean receivedConfig = false; -boolean metric = true; +bool receivedConfig = false; +bool metric = true; // Initialize PH message MyMessage msg(0, V_PH); diff --git a/examples/SecretKnockSensor/SecretKnockSensor.ino b/examples/SecretKnockSensor/SecretKnockSensor.ino index d03219705..34349d4bd 100644 --- a/examples/SecretKnockSensor/SecretKnockSensor.ino +++ b/examples/SecretKnockSensor/SecretKnockSensor.ino @@ -85,7 +85,7 @@ const int knockComplete = 1200; // Longest time to wait for a knock before we byte secretCode[maximumKnocks] = {50, 25, 25, 50, 100, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // Initial setup: "Shave and a Hair Cut, two bits." int knockReadings[maximumKnocks]; // When someone knocks this array fills with the delays between knocks. int knockSensorValue = 0; // Last reading of the knock sensor. -boolean programModeActive = false; // True if we're trying to program a new knock. +bool programModeActive = false; // True if we're trying to program a new knock. bool lockStatus; @@ -242,7 +242,7 @@ void setLockState(bool state, bool doSend){ // Checks to see if our knock matches the secret. // Returns true if it's a good knock, false if it's not. -boolean validateKnock(){ +bool validateKnock(){ int i = 0; int currentKnockCount = 0; diff --git a/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino b/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino index 1c9163a14..b7ce981d3 100644 --- a/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino +++ b/examples/WaterMeterPulseSensor/WaterMeterPulseSensor.ino @@ -65,7 +65,7 @@ double ppl = ((double)PULSE_FACTOR)/1000; // Pulses per liter volatile unsigned long pulseCount = 0; volatile unsigned long lastBlink = 0; volatile double flow = 0; -boolean pcReceived = false; +bool pcReceived = false; unsigned long oldPulseCount = 0; unsigned long newBlink = 0; double oldflow = 0;