fixed merge issues

Author: Kirk

library.properties

@@ -1,5 +1,5 @@
 name=SparkFun Qwiic OLED Graphics Library
-version=1.0.2
+version=1.0.4
 author=SparkFun Electronics <techsupport@sparkfun.com>
 maintainer=SparkFun Electronics <sparkfun.com>
 sentence=Library for SparkFun SSD1306 based OLED display products.

src/SparkFun_Qwiic_OLED.h

@@ -172,11 +172,12 @@ class QwiicOLEDBaseClass : public Print { // NOTE: implementing Arduino Print
     //
     //  Parameter   Description
     //  ---------   -----------------------------
+    //  clearDisplay true - clear the internal buffers during reset    
     //  retval      true on success, false on  failure
 
-    bool reset(void)
+    bool reset(bool clearDisplay)
     {
-        return m_device.reset();
+        return m_device.reset(clearDisplay);
     }
 
     ///////////////////////////////////////////////////////////////////////

src/qwiic_grssd1306.cpp

@@ -291,7 +291,7 @@ bool QwGrSSD1306::init(void)
 //
 // Returns true on success, false on failure
 
-bool QwGrSSD1306::reset(void)
+bool QwGrSSD1306::reset(bool clearDisplay)
 {
     // If we are not in an init state, just call init
     if (!m_isInitialized)
@@ -302,11 +302,11 @@ bool QwGrSSD1306::reset(void)
         return false;
 
     // setup oled
-    setupOLEDDevice();
+    setupOLEDDevice(clearDisplay);
 
     // Init internal/drawing buffers and device screen buffer
-
-    initBuffers();
+    if(clearDisplay)
+        initBuffers();
 
     return true;
 }
@@ -349,11 +349,16 @@ void QwGrSSD1306::setContrast(uint8_t contrast)
 // Method sends the init/setup commands to the OLED device, placing
 // it in a state for use by this driver/library.
 
-void QwGrSSD1306::setupOLEDDevice(void)
+void QwGrSSD1306::setupOLEDDevice(bool clearDisplay)
 {
     // Start the device setup - sending commands to device. See command defs in
     // header, and device datasheet
-    sendDevCommand(kCmdDisplayOff);
+    if(clearDisplay)    
+        sendDevCommand(kCmdDisplayOff);
+
+    send_dev_command(kCmdSetDisplayClockDiv, 0x80);
+    send_dev_command(kCmdSetMultiplex, _viewport.height - 1);
+    send_dev_command(kCmdSetDisplayOffset, 0x0);
 
     sendDevCommand(kCmdSetDisplayClockDiv, 0x80);
     sendDevCommand(kCmdSetMultiplex, m_viewport.height - 1);
@@ -375,7 +380,8 @@ void QwGrSSD1306::setupOLEDDevice(void)
     sendDevCommand(kCmdSetVComDeselect, m_initVCOMDeselect);
     sendDevCommand(kCmdDeactivateScroll);
 
-    sendDevCommand(kCmdDisplayOn);
+    if(clearDisplay)
+        sendDevCommand(kCmdDisplayOn);
 }
 ////////////////////////////////////////////////////////////////////////////////////
 // setCommBus()

src/qwiic_grssd1306.h

@@ -166,8 +166,9 @@ class QwGrSSD1306 : public QwGrBufferDevice {
 
     // Device setup
     virtual bool init(void);
+
     bool isInitialized(void) { return m_isInitialized; };
-    bool reset(void);
+    bool reset(bool clearDisplay = true);
 
     // method to set the communication bus this object should use
     void setCommBus(QwI2C& theBus, uint8_t id_bus);
@@ -236,7 +237,7 @@ class QwGrSSD1306 : public QwGrBufferDevice {
     void initBuffers(void); // clear graphics and screen buffer
     void clearScreenBuffer(void);
     void resendGraphics(void);
-    void setupOLEDDevice(void);
+    void setupOLEDDevice(bool clearDisplay = true);
 
     // device communication methods
     void sendDevCommand(uint8_t command);