Replace Arduino types boolean and byte with cpp bool and uint8_t

Author: rob040

lib/ESP_WiFiManager_Lite/src/ESP_WiFiManager_Lite.h

@@ -1392,7 +1392,7 @@ class ESP_WiFiManager_Lite
     // updated_flags is an internal structure to keep track of which key-value pairs
     // are already handled in handleRequest()
     struct updated_flags_s {
-      byte number_items;
+      uint8_t number_items;
       struct wificreds_s{
         bool wfidn;
         bool wfpwn;
@@ -1473,7 +1473,7 @@ class ESP_WiFiManager_Lite
 
       for (uint16_t index = 0; index < (sizeof(ESP_WM_LITE_config) - sizeof(ESP_WM_LITE_config.checkSum)); index++)
       {
-        checkSum += * ( ( (byte*) &ESP_WM_LITE_config ) + index);
+        checkSum += * ( ( (uint8_t*) &ESP_WM_LITE_config ) + index);
       }
 
       return checkSum;

lib/arduino-Max72xxPanel/Max72xxPanel.cpp

@@ -35,19 +35,19 @@
 #define OP_SHUTDOWN    12
 #define OP_DISPLAYTEST 15
 
-Max72xxPanel::Max72xxPanel(byte csPin, byte hDisplays, byte vDisplays) : Adafruit_GFX(hDisplays << 3, vDisplays << 3) {
+Max72xxPanel::Max72xxPanel(uint8_t csPin, uint8_t hDisplays, uint8_t vDisplays) : Adafruit_GFX(hDisplays << 3, vDisplays << 3) {
 
   Max72xxPanel::SPI_CS = csPin;
 
-  byte displays = hDisplays * vDisplays;
+  uint8_t displays = hDisplays * vDisplays;
   Max72xxPanel::hDisplays = hDisplays;
   Max72xxPanel::bitmapSize = displays << 3;
 
-  Max72xxPanel::bitmap = (byte*)malloc(bitmapSize);
-  Max72xxPanel::matrixRotation = (byte*)malloc(displays);
-  Max72xxPanel::matrixPosition = (byte*)malloc(displays);
+  Max72xxPanel::bitmap = (uint8_t*)malloc(bitmapSize);
+  Max72xxPanel::matrixRotation = (uint8_t*)malloc(displays);
+  Max72xxPanel::matrixPosition = (uint8_t*)malloc(displays);
 
-  for ( byte display = 0; display < displays; display++ ) {
+  for ( uint8_t display = 0; display < displays; display++ ) {
     matrixPosition[display] = display;
     matrixRotation[display] = 0;
   }
@@ -76,23 +76,23 @@ Max72xxPanel::Max72xxPanel(byte csPin, byte hDisplays, byte vDisplays) : Adafrui
   setIntensity(7);
 }
 
-void Max72xxPanel::setPosition(byte display, byte x, byte y) {
+void Max72xxPanel::setPosition(uint8_t display, uint8_t x, uint8_t y) {
   matrixPosition[x + hDisplays * y] = display;
 }
 
-void Max72xxPanel::setRotation(byte display, byte rotation) {
+void Max72xxPanel::setRotation(uint8_t display, uint8_t rotation) {
   matrixRotation[display] = rotation;
 }
 
 void Max72xxPanel::setRotation(uint8_t rotation) {
   Adafruit_GFX::setRotation(rotation);
 }
 
-void Max72xxPanel::shutdown(boolean b) {
+void Max72xxPanel::shutdown(bool b) {
   spiTransfer(OP_SHUTDOWN, b ? 0 : 1);
 }
 
-void Max72xxPanel::setIntensity(byte intensity) {
+void Max72xxPanel::setIntensity(uint8_t intensity) {
   spiTransfer(OP_INTENSITY, intensity);
 }
 
@@ -132,11 +132,11 @@ void Max72xxPanel::drawPixel(int16_t xx, int16_t yy, uint16_t color) {
   // Translate the x, y coordinate according to the layout of the
   // displays. They can be ordered and rotated (0, 90, 180, 270).
 
-  byte display = matrixPosition[(x >> 3) + hDisplays * (y >> 3)];
+  uint8_t display = matrixPosition[(x >> 3) + hDisplays * (y >> 3)];
   x &= 0b111;
   y &= 0b111;
 
-  byte r = matrixRotation[display];
+  uint8_t r = matrixRotation[display];
   if ( r >= 2 ) {                      // 180 or 270 degrees
     x = 7 - x;
   }
@@ -147,14 +147,14 @@ void Max72xxPanel::drawPixel(int16_t xx, int16_t yy, uint16_t color) {
     tmp = x; x = y; y = tmp;
   }
 
-  byte d = display / hDisplays;
+  uint8_t d = display / hDisplays;
   x += (display - d * hDisplays) << 3; // x += (display % hDisplays) * 8
   y += d << 3;                         // y += (display / hDisplays) * 8
 
   // Update the color bit in our bitmap buffer.
 
-  byte *ptr = bitmap + x + WIDTH * (y >> 3);
-  byte val = 1 << (y & 0b111);
+  uint8_t *ptr = bitmap + x + WIDTH * (y >> 3);
+  uint8_t val = 1 << (y & 0b111);
 
   if ( color ) {
     *ptr |= val;
@@ -167,12 +167,12 @@ void Max72xxPanel::drawPixel(int16_t xx, int16_t yy, uint16_t color) {
 void Max72xxPanel::write() {
   // Send the bitmap buffer to the displays.
 
-  for ( byte row = OP_DIGIT7; row >= OP_DIGIT0; row-- ) {
+  for ( uint8_t row = OP_DIGIT7; row >= OP_DIGIT0; row-- ) {
     spiTransfer(row);
   }
 }
 
-void Max72xxPanel::spiTransfer(byte opcode, byte data) {
+void Max72xxPanel::spiTransfer(uint8_t opcode, uint8_t data) {
   // If opcode > OP_DIGIT7, send the opcode and data to all displays.
   // If opcode <= OP_DIGIT7, display the column with data in our buffer for all displays.
   // We do not support (nor need) to use the OP_NOOP opcode.
@@ -182,8 +182,8 @@ void Max72xxPanel::spiTransfer(byte opcode, byte data) {
 
   // Now shift out the data, two bytes per display. The first byte is the opcode,
   // the second byte the data.
-  byte end = opcode - OP_DIGIT0;
-  byte start = bitmapSize + end;
+  uint8_t end = opcode - OP_DIGIT0;
+  uint8_t start = bitmapSize + end;
   do {
     start -= 8;
     SPI.transfer(opcode);

lib/arduino-Max72xxPanel/Max72xxPanel.h

@@ -40,13 +40,13 @@ class Max72xxPanel : public Adafruit_GFX {
    * hDisplays  number of displays horizontally
    * vDisplays  number of displays vertically
    */
-  Max72xxPanel(byte csPin, byte hDisplays=1, byte vDisplays=1);
+  Max72xxPanel(uint8_t csPin, uint8_t hDisplays=1, uint8_t vDisplays=1);
 
   /*
    * Define how the displays are ordered. The first display (0)
    * is the one closest to the Arduino.
    */
-  void setPosition(byte display, byte x, byte y);
+  void setPosition(uint8_t display, uint8_t x, uint8_t y);
 
   /*
    * Define if and how the displays are rotated. The first display
@@ -56,14 +56,14 @@ class Max72xxPanel : public Adafruit_GFX {
    *   2: 180 degrees
    *   3: 90 degrees counter clockwise
    */
-  void setRotation(byte display, byte rotation);
+  void setRotation(uint8_t display, uint8_t rotation);
 
   /*
    * Implementation of Adafruit's setRotation(). Probably, you don't
    * need this function as you can achieve the same result by using
    * the previous two functions.
    */
-  void setRotation(byte rotation);
+  void setRotation(uint8_t rotation);
 
   /*
    * Draw a pixel on your canvas. Note that for performance reasons,
@@ -85,14 +85,14 @@ class Max72xxPanel : public Adafruit_GFX {
    * status If true the device goes into power-down mode. Set to false
    *    for normal operation.
    */
-  void shutdown(boolean status);
+  void shutdown(bool status);
 
   /*
    * Set the brightness of the display.
    * Parameters:
    * intensity  the brightness of the display. (0..15)
    */
-  void setIntensity(byte intensity);
+  void setIntensity(uint8_t intensity);
 
   /*
    * After you're done filling the bitmap buffer with your picture,
@@ -101,18 +101,18 @@ class Max72xxPanel : public Adafruit_GFX {
   void write();
 
 private:
-  byte SPI_CS; /* SPI chip selection */
+  uint8_t SPI_CS; /* SPI chip selection */
 
   /* Send out a single command to the device */
-  void spiTransfer(byte opcode, byte data=0);
+  void spiTransfer(uint8_t opcode, uint8_t data=0);
 
   /* We keep track of the led-status for 8 devices in this array */
-  byte *bitmap;
+  uint8_t *bitmap;
   uint16_t bitmapSize; // [rob040] fix 32 display limit
 
-  byte hDisplays;
-  byte *matrixPosition;
-  byte *matrixRotation;
+  uint8_t hDisplays;
+  uint8_t *matrixPosition;
+  uint8_t *matrixRotation;
 };
 
 #endif  // Max72xxPanel_h

marquee/MqttClient.cpp

@@ -63,7 +63,7 @@ String MqttClient::getError() {
 
 void MqttClient::loop() {
   if (!client.connected()) {
-    boolean connectstatus;
+    bool connectstatus;
     if (strlen(authUser) > 0) {
       connectstatus = client.connect("marquee", authUser, authPass);
     } else {

marquee/Settings.h

@@ -88,31 +88,31 @@ String geoLocation = "Breda,NL";
 String marqueeMessage = "";
 
 // Default Weather Settings
-boolean showTemperature = true;
-boolean showDate = false;
-boolean showCity = true;
-boolean showCondition = true;
-boolean showHumidity = true;
-boolean showWind = true;
-boolean showWindDir = true;
-boolean showPressure = false;
-boolean showHighLow = true;
+bool showTemperature = true;
+bool showDate = false;
+bool showCity = true;
+bool showCondition = true;
+bool showHumidity = true;
+bool showWind = true;
+bool showWindDir = true;
+bool showPressure = false;
+bool showHighLow = true;
 
 const int staticDisplayTime = 5000;  // static display time per item, in ms
-boolean isStaticDisplay = false; // static display above SHOW_* items
-boolean isMetric = true; // false = Imperial and true = Metric
-boolean is24hour = true; // 24 hour clock is displayed, false = 12 hour clock (for configuration, 24h time is always used)
-boolean isPmIndicator = true; // Show PM indicator on Clock when in AM/PM mode
-boolean isSysLed = true; // flash onboard LED on system actions
+bool isStaticDisplay = false; // static display above SHOW_* items
+bool isMetric = true; // false = Imperial and true = Metric
+bool is24hour = true; // 24 hour clock is displayed, false = 12 hour clock (for configuration, 24h time is always used)
+bool isPmIndicator = true; // Show PM indicator on Clock when in AM/PM mode
+bool isSysLed = true; // flash onboard LED on system actions
 const int WEBSERVER_PORT = 80; // The port you can access this device on over HTTP
-const boolean isWebserverEnabled = true;  // Device will provide a web interface via http://[ip]:[port]/
-boolean isBasicAuth = false;  // Use Basic Authorization for Configuration security on Web Interface
+const bool isWebserverEnabled = true;  // Device will provide a web interface via http://[ip]:[port]/
+bool isBasicAuth = false;  // Use Basic Authorization for Configuration security on Web Interface
 char www_username[32] = {"admin"};  // User account for the Web Interface
 char www_password[32] = {"password"};  // Password for the Web Interface
 int refreshDataInterval = 15;  // Time in minutes between data refresh (default 15 minutes)
 int displayScrollingInterval = 1; // Time in minutes between scrolling data (default 1 minutes and max is 10)
 int displayScrollSpeed = 25; // In milliseconds -- Configurable by the web UI (slow = 35, normal = 25, fast = 15, very fast = 5)
-boolean flashOnSeconds = true; // when true the ':' character in the time will blink as a seconds indicator
+bool flashOnSeconds = true; // when true the ':' character in the time will blink as a seconds indicator
 
 // New wide clock style config, different screen formats for 8+ tiles:
 int wideClockStyle = 1; // 1=HH:MM, 2=HH:MM:SS, 3=HH:MM *CF, 4=HH:MM %RH, 5=mm dd HH:MM, 6=HH:MM mmdd, 7=HH:MM ddmm, 8=HH:MM WwwDD (or HH:MM Www DD on >= 10 tile display)
@@ -142,14 +142,14 @@ int quietTimeDimlevel = 0;
 
 #if COMPILE_MQTT
 // Mqtt add scrolling messages with Mqtt
-boolean isMqttEnabled = false;             // Set true to display mqtt messages
+bool isMqttEnabled = false;             // Set true to display mqtt messages
 String MqttServer = "";               // IP or Address only (DO NOT include http://)
 int MqttPort = 1883;                  // Port of your mqtt server (default 1883)
 String MqttTopic = "display/message"; // Topic on which to listen
 String  MqttAuthUser, MqttAuthPass;   // mqtt server authentication
 #endif
 
-const boolean isOTAenabled = true;    // this will allow you to load firmware to the device over WiFi (see OTA for ESP8266)
+const bool isOTAenabled = true;    // this will allow you to load firmware to the device over WiFi (see OTA for ESP8266)
 String OTA_Password = "";     // Set an OTA password here -- leave blank if you don't want to be prompted for password
 
 //blue-grey