Merge pull request #30 from sparkfun/bugfix/redefinition_warnings

Bugfix/redefinition warnings

Author: malcolm-sparkfun

src/SparkFun_Qwiic_OLED.h

@@ -744,8 +744,8 @@ template <typename DeviceType> class QwiicOLEDBaseClass : public Print // NOTE:
 
     void setCursor(uint8_t x, uint8_t y)
     {
-
-        if (x < 0 || x >= m_device.width() || y < 0 || y >= m_device.height())
+        // Note: x < 0 and y < 0 are also illegal but are not possible with uint8_t arguments
+        if (x >= m_device.width() || y >= m_device.height())
             return;
 
         m_cursorX = x;

src/qwiic_grch1120.cpp

@@ -466,7 +466,7 @@ void QwGrCH1120::clearScreenBuffer(void)
     // Clear out the screen buffer on the device
     uint8_t emptyPage[kPageMax] = {0};
 
-    for (int i = 0 ; i < kMaxPageNumber; i++)
+    for (int i = 0 ; i < kMaxPageNumberCH1120; i++)
     {
         setScreenBufferAddress(0, i);
         sendDevData(emptyPage, kPageMax);

src/qwiic_grch1120.h

@@ -42,7 +42,7 @@
 #include "res/qwiic_resdef.h"
 #include "qwiic_grcommon.h"
 
-#define kMaxPageNumber 20
+#define kMaxPageNumberCH1120 20
 #define kMaxCH1120Width 160
 
 /////////////////////////////////////////////////////////////////////////////
@@ -159,8 +159,8 @@ class QwGrCH1120 : public QwGrBufferDevice {
         // Buffer variables
         uint8_t *m_pBuffer;                      // Pointer to the graphics buffer
         uint8_t m_nPages;                        // number of pages for current device
-        pageState_t m_pageState[kMaxPageNumber]; // page state descriptors
-        pageState_t m_pageErase[kMaxPageNumber]; // keep track of erase boundaries
+        pageState_t m_pageState[kMaxPageNumberCH1120]; // page state descriptors
+        pageState_t m_pageErase[kMaxPageNumberCH1120]; // keep track of erase boundaries
         bool m_pendingErase;
 
         // display variables

src/qwiic_grssd1306.cpp

@@ -413,7 +413,7 @@ void QwGrSSD1306::clearScreenBuffer(void)
     // Clear out the screen buffer on the device
     uint8_t emptyPage[kPageMax] = {0};
 
-    for (int i = 0; i < kMaxPageNumber; i++)
+    for (int i = 0; i < kMaxPageNumberSSD1306; i++)
     {
         setScreenBufferAddress(i, 0);                // start of page
         sendDevData((uint8_t *)emptyPage, kPageMax); // clear out page

src/qwiic_grssd1306.h

@@ -106,7 +106,7 @@
 //
 // Define variables to manage page state
 
-#define kMaxPageNumber 8
+#define kMaxPageNumberSSD1306 8
 
 // moved to common for now...
 // typedef struct
@@ -231,8 +231,8 @@ class QwGrSSD1306 : public QwGrBufferDevice
     // Buffer variables
     uint8_t *m_pBuffer;                      // Pointer to the graphics buffer
     uint8_t m_nPages;                        // number of pages for current device
-    pageState_t m_pageState[kMaxPageNumber]; // page state descriptors
-    pageState_t m_pageErase[kMaxPageNumber]; // keep track of erase boundaries
+    pageState_t m_pageState[kMaxPageNumberSSD1306]; // page state descriptors
+    pageState_t m_pageErase[kMaxPageNumberSSD1306]; // keep track of erase boundaries
     bool m_pendingErase;
 
     // display variables