From b6936009fff1fbe2fa56a07fdcd90683984795ec Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Fri, 13 May 2022 21:27:36 +0200 Subject: [PATCH] Replace `boolean` type by `bool` The Arduino-specific `boolean' type is being phased out. Use the standard `bool' type instead. --- src/RTC_DS1307.cpp | 2 +- src/RTC_DS3231.cpp | 2 +- src/RTC_PCF8523.cpp | 6 +++--- src/RTC_PCF8563.cpp | 4 ++-- src/RTClib.h | 14 +++++++------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/RTC_DS1307.cpp b/src/RTC_DS1307.cpp index f9d7eadd..f353e291 100644 --- a/src/RTC_DS1307.cpp +++ b/src/RTC_DS1307.cpp @@ -11,7 +11,7 @@ @return True if Wire can find DS1307 or false otherwise. */ /**************************************************************************/ -boolean RTC_DS1307::begin(TwoWire *wireInstance) { +bool RTC_DS1307::begin(TwoWire *wireInstance) { if (i2c_dev) delete i2c_dev; i2c_dev = new Adafruit_I2CDevice(DS1307_ADDRESS, wireInstance); diff --git a/src/RTC_DS3231.cpp b/src/RTC_DS3231.cpp index 06f46dcc..5c74847d 100644 --- a/src/RTC_DS3231.cpp +++ b/src/RTC_DS3231.cpp @@ -17,7 +17,7 @@ @return True if Wire can find DS3231 or false otherwise. */ /**************************************************************************/ -boolean RTC_DS3231::begin(TwoWire *wireInstance) { +bool RTC_DS3231::begin(TwoWire *wireInstance) { if (i2c_dev) delete i2c_dev; i2c_dev = new Adafruit_I2CDevice(DS3231_ADDRESS, wireInstance); diff --git a/src/RTC_PCF8523.cpp b/src/RTC_PCF8523.cpp index 01a97887..17debef7 100644 --- a/src/RTC_PCF8523.cpp +++ b/src/RTC_PCF8523.cpp @@ -17,7 +17,7 @@ @return True if Wire can find PCF8523 or false otherwise. */ /**************************************************************************/ -boolean RTC_PCF8523::begin(TwoWire *wireInstance) { +bool RTC_PCF8523::begin(TwoWire *wireInstance) { if (i2c_dev) delete i2c_dev; i2c_dev = new Adafruit_I2CDevice(PCF8523_ADDRESS, wireInstance); @@ -37,7 +37,7 @@ boolean RTC_PCF8523::begin(TwoWire *wireInstance) { after the bit is cleared, for instance with adjust() */ /**************************************************************************/ -boolean RTC_PCF8523::lostPower(void) { +bool RTC_PCF8523::lostPower(void) { return read_register(PCF8523_STATUSREG) >> 7; } @@ -48,7 +48,7 @@ boolean RTC_PCF8523::lostPower(void) { @return True if the PCF8523 has been set up, false if not */ /**************************************************************************/ -boolean RTC_PCF8523::initialized(void) { +bool RTC_PCF8523::initialized(void) { return (read_register(PCF8523_CONTROL_3) & 0xE0) != 0xE0; } diff --git a/src/RTC_PCF8563.cpp b/src/RTC_PCF8563.cpp index 6707c8ba..8f2e56a8 100644 --- a/src/RTC_PCF8563.cpp +++ b/src/RTC_PCF8563.cpp @@ -14,7 +14,7 @@ @return True if Wire can find PCF8563 or false otherwise. */ /**************************************************************************/ -boolean RTC_PCF8563::begin(TwoWire *wireInstance) { +bool RTC_PCF8563::begin(TwoWire *wireInstance) { if (i2c_dev) delete i2c_dev; i2c_dev = new Adafruit_I2CDevice(PCF8563_ADDRESS, wireInstance); @@ -34,7 +34,7 @@ boolean RTC_PCF8563::begin(TwoWire *wireInstance) { cleared using adjust() */ /**************************************************************************/ -boolean RTC_PCF8563::lostPower(void) { +bool RTC_PCF8563::lostPower(void) { return read_register(PCF8563_VL_SECONDS) >> 7; } diff --git a/src/RTClib.h b/src/RTClib.h index 380ada80..a018a8dd 100644 --- a/src/RTClib.h +++ b/src/RTClib.h @@ -350,7 +350,7 @@ class RTC_I2C { /**************************************************************************/ class RTC_DS1307 : RTC_I2C { public: - boolean begin(TwoWire *wireInstance = &Wire); + bool begin(TwoWire *wireInstance = &Wire); void adjust(const DateTime &dt); uint8_t isrunning(void); DateTime now(); @@ -369,7 +369,7 @@ class RTC_DS1307 : RTC_I2C { /**************************************************************************/ class RTC_DS3231 : RTC_I2C { public: - boolean begin(TwoWire *wireInstance = &Wire); + bool begin(TwoWire *wireInstance = &Wire); void adjust(const DateTime &dt); bool lostPower(void); DateTime now(); @@ -401,10 +401,10 @@ class RTC_DS3231 : RTC_I2C { /**************************************************************************/ class RTC_PCF8523 : RTC_I2C { public: - boolean begin(TwoWire *wireInstance = &Wire); + bool begin(TwoWire *wireInstance = &Wire); void adjust(const DateTime &dt); - boolean lostPower(void); - boolean initialized(void); + bool lostPower(void); + bool initialized(void); DateTime now(); void start(void); void stop(void); @@ -428,8 +428,8 @@ class RTC_PCF8523 : RTC_I2C { /**************************************************************************/ class RTC_PCF8563 : RTC_I2C { public: - boolean begin(TwoWire *wireInstance = &Wire); - boolean lostPower(void); + bool begin(TwoWire *wireInstance = &Wire); + bool lostPower(void); void adjust(const DateTime &dt); DateTime now(); void start(void);