Changed I2C to allow optional bit bang mode

Author: bitbank2

library.properties

@@ -1,5 +1,5 @@
 name=FastEPD
-version=1.4.2
+version=1.4.3
 author=Larry Bank
 maintainer=Larry Bank
 sentence=A frustration-free e-paper library for parallel eink panels.

src/FastEPD.cpp

@@ -184,6 +184,11 @@ uint8_t FASTEPD::ioRead(uint8_t u8Pin)
     return val;
 }
 
+void FASTEPD::setBitBang(bool bBitBang)
+{
+    _state.bit_bang = (uint8_t)bBitBang;
+} /* setBitBang() */
+
 void FASTEPD::setItalic(bool bItalic)
 {
    _state.italic = (uint8_t)bItalic;

src/FastEPD.h

@@ -192,7 +192,7 @@ typedef struct tag_fastepdstate
 {
     int iPanelType;
     uint8_t wrap, last_error, pwr_on, mode;
-    uint8_t shift_data, anti_alias, italic;
+    uint8_t shift_data, anti_alias, italic, bit_bang;
     uint8_t u8LED1, u8LED2;
     int iCursorX, iCursorY;
     int width, height, native_width, native_height;
@@ -270,6 +270,7 @@ class FASTEPD
     int loadG5Image(const uint8_t *pG5, int x, int y, int iFG, int iBG, float fScale = 1.0f);
     void setFont(int iFont);
     void setItalic(bool bItalic);
+    void setBitBang(bool bBitBang);
     void setFont(const void *pFont, bool bAntiAliased = false);
     void drawLine(int x1, int y1, int x2, int y2, int iColor);
     void drawPixel(int x, int y, uint8_t color);

src/FastEPD.inl

@@ -982,7 +982,7 @@ int EPDiyV7IOInit(void *pBBEP)
 //    if (pState->panelDef.ioOE < 0x100) bbepPinMode(pState->panelDef.ioOE, OUTPUT);
     bbepPinMode(pState->panelDef.ioLE, OUTPUT);
     bbepPinMode(pState->panelDef.ioCL, OUTPUT);
-    bbepI2CInit((uint8_t)pState->panelDef.ioSDA, (uint8_t)pState->panelDef.ioSCL);
+    bbepI2CInit((uint8_t)pState->panelDef.ioSDA, (uint8_t)pState->panelDef.ioSCL, pState->bit_bang);
     memset(ioRegs, 0, sizeof(ioRegs)); // copy of IO expander registers
     for (int i=8; i<14; i++) { // set lower 6 bits as outputs
         bbepPCA9535PinMode(i, OUTPUT);
@@ -1018,7 +1018,7 @@ int EPDiyV7RAWIOInit(void *pBBEP)
 int epdInkyIOInit(void *pBBEP)
 {       
     FASTEPDSTATE *pState = (FASTEPDSTATE *)pBBEP;
-    bbepI2CInit((uint8_t)pState->panelDef.ioSDA, (uint8_t)pState->panelDef.ioSCL);
+    bbepI2CInit((uint8_t)pState->panelDef.ioSDA, (uint8_t)pState->panelDef.ioSCL, pState->bit_bang);
     bbepPinMode(pState->panelDef.ioPWR, OUTPUT);
     bbepPinMode(pState->panelDef.ioSPV, OUTPUT);
     bbepPinMode(pState->panelDef.ioCKV, OUTPUT);
@@ -1044,7 +1044,7 @@ int Inkplate6PlusIOInit(void *pBBEP)
     bbepPinMode(pState->panelDef.ioSPH, OUTPUT);
     bbepPinMode(pState->panelDef.ioLE, OUTPUT);
     bbepPinMode(pState->panelDef.ioCL, OUTPUT);
-    bbepI2CInit((uint8_t)pState->panelDef.ioSDA, (uint8_t)pState->panelDef.ioSCL);
+    bbepI2CInit((uint8_t)pState->panelDef.ioSDA, (uint8_t)pState->panelDef.ioSCL, pState->bit_bang);
     bbepMCP23017Init();
     bbepMCPPinMode(pState->panelDef.ioShiftMask, OUTPUT); // VCOM
     bbepMCPPinMode(pState->panelDef.ioPWR, OUTPUT); // PWRUP
@@ -1065,7 +1065,7 @@ int Inkplate6PlusIOInit(void *pBBEP)
 int Inkplate5V2IOInit(void *pBBEP)
 {
     FASTEPDSTATE *pState = (FASTEPDSTATE *)pBBEP;
-    bbepI2CInit((uint8_t)pState->panelDef.ioSDA, (uint8_t)pState->panelDef.ioSCL);
+    bbepI2CInit((uint8_t)pState->panelDef.ioSDA, (uint8_t)pState->panelDef.ioSCL, pState->bit_bang);
     bbepPCAL6416Init();
     bbepPCALDigitalWrite(9, LOW);
     bbepPinMode(pState->panelDef.ioCKV, OUTPUT);

src/arduino_io.inl

@@ -22,12 +22,10 @@
 #define __BB_EP_IO__
 
 // Since the Espressif I2C driver seems to corrupt memory with it's frequent allocs and frees, use bit banging
-#define BIT_BANG
 
-#ifdef BIT_BANG
 static uint8_t u8SDA_Pin, u8SCL_Pin;
+static uint8_t bBitBang;
 static int iDelay = 0; //1;
-#endif
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
 #include "rom/ets_sys.h"
@@ -91,7 +89,6 @@ void bbepPinMode(int iPin, int iMode)
     gpio_config(&io_conf); //configure GPIO with the given settings
 } /* bbepPinMode() */
 
-#ifdef BIT_BANG
 uint8_t SDA_READ(void)
 {
     return gpio_get_level((gpio_num_t)u8SDA_Pin);
@@ -257,24 +254,24 @@ uint8_t b = 0;
         i2cEnd();
      return response;
      } /* I2CTest() */
-#endif // BIT_BANG                       
 //
 // Initialize the Wire library on the given SDA/SCL GPIOs
 //
-int bbepI2CInit(uint8_t sda, uint8_t scl)
+int bbepI2CInit(uint8_t sda, uint8_t scl, int bb)
 {
-#ifdef BIT_BANG
-    u8SDA_Pin = sda;
-    u8SCL_Pin = scl;
+    bBitBang = bb;
+    if (bBitBang) {
+        u8SDA_Pin = sda;
+        u8SCL_Pin = scl;
 //    if (iSpeed >= 400000) iDelay = 1;
 //    else if (iSpeed >= 100000) iDelay = 10;
 //    else iDelay = 20;
-#else
+    } else {
 #ifdef ARDUINO
-    Wire.end();
-    Wire.begin(sda, scl);
-    Wire.setClock(400000);
-    Wire.setTimeout(100);
+        Wire.end();
+        Wire.begin(sda, scl);
+        Wire.setClock(400000);
+        Wire.setTimeout(100);
 #else
     i2c_config_t conf;
     ESP_ERROR_CHECK(i2c_driver_delete());
@@ -287,17 +284,17 @@ int bbepI2CInit(uint8_t sda, uint8_t scl)
     conf.clk_flags = 0; 
     ESP_ERROR_CHECK(i2c_param_config(I2C_NUM_0, &conf));
     ESP_ERROR_CHECK(i2c_driver_install(I2C_NUM_0, I2C_MODE_MASTER, 0, 0, 0));
-#endif
-#endif // BIT_BANG
+#endif // ARDUINO
+    } // !BitBang
     return BBEP_SUCCESS;
 } /* bbepI2CInit() */
 
 int bbepI2CWrite(unsigned char iAddr, unsigned char *pData, int iLen)
 {
-#ifdef BIT_BANG
-    I2CWrite(iAddr, pData, iLen);
-    return 1;
-#else
+    if (bBitBang) {
+        I2CWrite(iAddr, pData, iLen);
+        return 1;
+    } else {
 #ifdef ARDUINO
     int rc = 0;
     Wire.beginTransmission(iAddr);
@@ -316,16 +313,16 @@ int bbepI2CWrite(unsigned char iAddr, unsigned char *pData, int iLen)
     esp_err_t ret = i2c_master_cmd_begin(I2C_NUM_0, cmd, 1000 / portTICK_PERIOD_MS);
     i2c_cmd_link_delete(cmd);
     return (ret == ESP_OK);
-#endif
-#endif // BIT_BANG
+#endif // ARDUINO
+    } // !BitBang
 }
 
 int bbepI2CRead(unsigned char iAddr, unsigned char *pData, int iLen)
 {
 int i = 0;
-#ifdef BIT_BANG
+    if (bBitBang) {
     i = I2CRead(iAddr, pData, iLen);
-#else
+    } else {
 #ifdef ARDUINO
     Wire.requestFrom(iAddr, (unsigned char)iLen);
     while (i < iLen && Wire.available()) {
@@ -350,8 +347,8 @@ int i = 0;
         i = iLen;
     }
     i2c_cmd_link_delete(cmd);
-#endif
-#endif // BIT_BANG
+#endif // ARDUINO
+    } // !BitBang
     return i;
 }
 int bbepI2CReadRegister(unsigned char iAddr, unsigned char u8Register, unsigned char *pData, int iLen)