Latest changes

Author: bitbank2

src/Group5.h

@@ -148,6 +148,7 @@ typedef struct g5_enc_image_tag
 // 16-bit marker at the start of a BB_BITMAP file
 // (BitBank BitmapFile)
 #define BB_BITMAP_MARKER 0xBBBF
+#define BB_BITMAP2_MARKER 0xBBB2
 
 // Font info per large character (glyph)
 typedef struct {

src/OneBitDisplay.cpp

@@ -17,13 +17,11 @@
 // This define (WIMPY_MCU) precludes the use of hardware interfaces
 // such as I2C & SPI
 //
-#include "OneBitDisplay.h"
-
 #if defined (__AVR_ATtiny85__) || defined (ARDUINO_ARCH_MCS51)
 #define WIMPY_MCU
 #endif
 #include "Group5.h"
-#ifdef _LINUX_
+#ifdef __LINUX__
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -34,31 +32,39 @@
 #include <sys/ioctl.h>
 #include <linux/i2c-dev.h>
 #include <math.h>
-#include <armbianio.h>
 #endif // MEMORY_ONLY
 // convert wire library constants into ArmbianIO values
+#ifdef GPIO_OUT
 #define OUTPUT GPIO_OUT
 #define INPUT GPIO_IN
 #define INPUT_PULLUP GPIO_IN_PULLUP
+#else
+#define OUTPUT 0
+#define INPUT  1
+#define INPUT_PULLUP 2
+#endif
 #define HIGH 1
 #define LOW 0
 void delay(int);
-#else // Arduino/IDF
-#ifdef ARDUINO
+#else // Arduino
+
 #include <Arduino.h>
-#include "obd_io.inl" // I/O (non-portable) code is in here
 #ifdef __AVR__
 #include <avr/pgmspace.h>
 #endif
 
 #ifndef WIMPY_MCU
 #include <SPI.h>
 #endif
-#else // !ARDUINO
-#include "esp_generic.inl"
-#endif
 
-#endif // !_LINUX_
+#endif // __LINUX__
+#include "OneBitDisplay.h"
+#ifdef __LINUX__
+#include "linux_io.inl"
+#endif // __LINUX__
+#ifdef ARDUINO
+#include "obd_io.inl" // I/O (non-portable) code is in here
+#endif
 #include "obd.inl" // All of the display interface code is in here
 #include "obd_gfx.inl" // drawing code
 #ifdef __cplusplus
@@ -100,6 +106,9 @@ void ONE_BIT_DISPLAY::setI2CPins(int iSDA, int iSCL, int iReset)
     _obd.iSDAPin = iSDA;
     _obd.iSCLPin = iSCL;
     _obd.iRSTPin = iReset;
+#ifdef __LINUX__
+    _obd.bbi2c.file_i2c = -1;
+#endif
 }
 void ONE_BIT_DISPLAY::setBitBang(bool bBitBang)
 {
@@ -192,7 +201,7 @@ void ONE_BIT_DISPLAY::fillRect(int16_t x, int16_t y, int16_t w, int16_t h, uint1
     obdRectangle(&_obd, x, y, x+w-1, y+h-1, color, 1);
 } /* fillRect() */
 
-void ONE_BIT_DISPLAY::setWordWrap(bool bWrap)
+void ONE_BIT_DISPLAY::setTextWrap(bool bWrap)
 {
   _obd.wrap = (int)bWrap;
 }
@@ -211,11 +220,11 @@ void ONE_BIT_DISPLAY::setCursor(int x, int y)
     _obd.iCursorY = y;
 } /* setCursor() */
 
-int ONE_BIT_DISPLAY::drawG5Image(const uint8_t *pG5, int x, int y, int iFG, int iBG, float fScale)
+int ONE_BIT_DISPLAY::loadG5Image(const uint8_t *pG5, int x, int y, int iFG, int iBG, float fScale)
 {
     return obdLoadG5(&_obd, pG5, x, y, iFG, iBG, fScale);
 }
-int ONE_BIT_DISPLAY::drawBMP(const uint8_t *pBMP, int x, int y, int iFG, int iBG)
+int ONE_BIT_DISPLAY::loadBMP(const uint8_t *pBMP, int x, int y, int iFG, int iBG)
 {
     return obdLoadBMP(&_obd, pBMP, x, y, iFG, iBG);
 } /* loadBMP() */
@@ -266,7 +275,8 @@ int y, iLines;
     }
     memset(&pOBD->ucScreen[(iLines-iAmount) * pOBD->width], (char)pOBD->iBG, pOBD->width*iAmount);
 } /* obdScroll1Line() */
-#ifdef _LINUX_
+#ifdef __LINUX__
+#ifdef FUTURE
 void ONE_BIT_DISPLAY::print(const string &str)
 {
    print(str.c_str());
@@ -282,7 +292,7 @@ char ucTemp[4];
    ucTemp[2] = 0;
    print((const char *)ucTemp);
 } /* print() */
-
+#endif // FUTURE
 void ONE_BIT_DISPLAY::print(const char *pString)
 {
 uint8_t *s = (uint8_t *)pString;
@@ -363,11 +373,11 @@ char ucTemp[4];
 	print((const char *)ucTemp);
 } /* println() */
 
-#endif // _LINUX_
+#endif // __LINUX__
 //
 // write (Arduino Print friend class)
 //
-#if !defined( __AVR__ ) && defined( ARDUINO )
+#ifndef __AVR__
 size_t ONE_BIT_DISPLAY::write(uint8_t c) {
 char szTemp[2]; // used to draw 1 character at a time to the C methods
 int w, h;
@@ -448,8 +458,8 @@ static uint8_t u8Unicode0, u8Unicode1;
   } else { // Custom font
     BB_FONT *pBBF;
     BB_FONT_SMALL *pBBFS;
-    BB_GLYPH *pGlyph;
-    BB_GLYPH_SMALL *pSmallGlyph;
+    BB_GLYPH *pGlyph=NULL;
+    BB_GLYPH_SMALL *pSmallGlyph=NULL;
     int first, last;
     if (pgm_read_word(_obd.pFont) == BB_FONT_MARKER) {
         pBBF = (BB_FONT *)_obd.pFont; pBBFS = NULL;
@@ -518,6 +528,14 @@ void ONE_BIT_DISPLAY::getStringBox(const String &str, BB_RECT *pRect)
     obdGetStringBox(&_obd, str.c_str(), pRect);
 }
 #endif
+int ONE_BIT_DISPLAY::dataTime(void)
+{
+    return _obd.iDataTime;
+}
+int ONE_BIT_DISPLAY::opTime(void)
+{
+    return _obd.iOpTime;
+}
 int16_t ONE_BIT_DISPLAY::width(void)
 {
    return _obd.width;
@@ -602,7 +620,7 @@ void ONE_BIT_DISPLAY::drawString(String text, int x, int y)
 {
     drawString(text.c_str(), x, y);
 } /* drawString() */
-#endif // ARDUINO
+#endif
 void ONE_BIT_DISPLAY::backlight(int bOn)
 {
     obdBacklight(&_obd, bOn);

src/OneBitDisplay.h

@@ -15,28 +15,24 @@
 // limitations under the License.
 #ifndef __ONEBITDISPLAY__
 #define __ONEBITDISPLAY__
-#include <stdint.h>
-#include <string.h>
-#if defined( ARDUINO ) && !defined( MEMORY_ONLY )
+
+#if !defined( MEMORY_ONLY ) && defined(ARDUINO)
 #include <BitBang_I2C.h>
-#else
+#endif
+
+// For Linux and esp-idf we add a file/device handle member
+// to the BBI2C structure
+#if !defined( ARDUINO ) && !defined(__BB_I2C__)
+#define __BB_I2C__
 typedef struct _tagbbi2c
 {
   int file_i2c;
   uint8_t iSDA, iSCL;
   uint8_t bWire;
 } BBI2C;
-#define PROGMEM 
-#define LOW 0
-#define HIGH 1
-#define pgm_read_byte(a) (*(uint8_t *)a)
-#define pgm_read_word(a) (*(uint16_t *)a)
-#define memcpy_P memcpy
-static void delayMicroseconds(uint32_t iTime);
-static void _delay(int ms);
 #endif
 
-#if defined ( IDF_PLATFORM ) || defined( _LINUX_ )
+#ifdef __LINUX__
 // for Print support
 #define DEC 10
 #define HEX 16
@@ -46,7 +42,7 @@ static void _delay(int ms);
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#endif // _LINUX_
+#endif // __LINUX__
 
 // error messages
 enum {
@@ -136,14 +132,12 @@ enum {
   ANGLE_FLIPY
 };
 
-#ifndef __BB_EPAPER__
 typedef struct {
     int x; 
     int y;
     int w;
     int h;
 } BB_RECT; 
-#endif
 
 typedef struct obdstruct
 {
@@ -174,20 +168,20 @@ uint8_t bBitBang;
 } OBDISP;
 
 #ifdef __cplusplus
-#ifdef _LINUX_
+#ifdef __LINUX__
 #include <string>
 using namespace std;
 class ONE_BIT_DISPLAY
 #else // Arduino
-#if !defined( __AVR__ ) && defined( ARDUINO )
+#ifndef __AVR__
 class ONE_BIT_DISPLAY : public Print
 #else
 class ONE_BIT_DISPLAY
 #endif // !__AVR__
-#endif // _LINUX_
+#endif // __LINUX__
 {
   public:
-    ONE_BIT_DISPLAY() { memset(&_obd, 0, sizeof(_obd)); _obd.iFG = OBD_BLACK; _obd.render = 1; _obd.type = OLED_128x64; _obd.iSpeed = 400000;}
+    ONE_BIT_DISPLAY() { _obd.iFG = OBD_BLACK; _obd.render = 1; _obd.type = OLED_128x64; _obd.iSpeed = 400000;}
     void SPIbegin(int iType = OLED_128x64, int32_t iSpeed = 2000000);
     void setSPIPins(int iCS, int iMOSI, int iSCLK, int iDC, int iReset=-1, int iLED=-1);
     void setI2CPins(int iSDA, int iSCL, int iReset=-1);
@@ -200,6 +194,8 @@ class ONE_BIT_DISPLAY
     void setContrast(uint8_t ucContrast);
     int display(bool bRefresh = true, bool bWait = true, bool bFast = false);
     void displayLines(int iStartLine, int iLineCount);
+    int dataTime();
+    int opTime();
     void setBitBang(bool bBitBang);
     void setRender(bool bRAMOnly);
     void createVirtualDisplay(int width, int height, uint8_t *buffer);
@@ -222,15 +218,17 @@ class ONE_BIT_DISPLAY
     void setTextColor(int iFG, int iBG = -1);
     void setCursor(int x, int y);
     void setPower(bool bOn);
-    int drawBMP(const uint8_t *pBMP, int x, int y, int iFG, int iBG);
-    int drawG5Image(const uint8_t *pG5, int x, int y, int iFG = OBD_BLACK, int iBG = OBD_WHITE, float fScale = 1.0f);
+    int loadBMP(const uint8_t *pBMP, int x, int y, int iFG, int iBG);
+    int loadG5Image(const uint8_t *pG5, int x, int y, int iFG = OBD_BLACK, int iBG = OBD_WHITE, float fScale = 1.0f);
     int16_t getCursorX(void);
     int16_t getCursorY(void);
+    void wake(void);
+    void sleep(int bDeep);
     void getStringBox(const char *string, BB_RECT *pRect);
-#ifdef ARDUINO
+    #ifdef ARDUINO
     void getStringBox(const String &str, BB_RECT *pRect);
-#endif
-    void setWordWrap(bool bWrap);
+    #endif
+    void setTextWrap(bool bWrap);
     void setFont(int iFont);
     void setFont(const void *pFont);
     int16_t height(void);
@@ -252,7 +250,7 @@ class ONE_BIT_DISPLAY
     void drawEllipse(int16_t x, int16_t y, int32_t rx, int32_t ry, uint16_t color);
     void fillEllipse(int16_t x, int16_t y, int32_t rx, int32_t ry, uint16_t color);
     int drawGFX(uint8_t *pSrc, int iSrcCol, int iSrcRow, int iDestCol, int iDestRow, int iWidth, int iHeight, int iSrcPitch);
-#ifdef _LINUX_
+#ifdef __LINUX__
     void print(const char *pString);
     void println(const char *pString);
     void print(int, int);
@@ -262,11 +260,11 @@ class ONE_BIT_DISPLAY
     size_t write(uint8_t ucChar);
     void delayMicroseconds(int iTime);
 #else
-#if !defined( __AVR__ ) && defined( ARDUINO )
+#ifndef __AVR__
     using Print::write;
     virtual size_t write(uint8_t);
 #endif // !__AVR__
-#endif // _LINUX_
+#endif // __LINUX__
 
   private:
     OBDISP _obd;
@@ -295,7 +293,7 @@ typedef struct smenu {
 } SIMPLEMENU;
 
 // Make the Linux library interface C instead of C++
-#if defined(_LINUX_) && defined(__cplusplus)
+#if defined(__LINUX__) && defined(__cplusplus)
 extern "C" {
 #endif
 
@@ -540,7 +538,7 @@ uint8_t * obdPlayAnimFrame(OBDISP *pOBD, uint8_t *pAnimation, uint8_t *pCurrent,
 void obdWriteCommand(OBDISP *pOBD, unsigned char c);
 void obdSetPosition(OBDISP *pOBD, int x, int y, int bRender);
 void obdWriteDataBlock(OBDISP *pOBD, unsigned char *ucBuf, int iLen, int bRender);
-void RawWriteData(OBDISP *pOBD, unsigned char *ucBuf, int iLen);
+//void RawWriteData(OBDISP *pOBD, unsigned char *ucBuf, int iLen);
 //
 // Scroll the internal buffer by 1 scanline (up/down)
 // width is in pixels, lines is group of 8 rows
@@ -616,9 +614,9 @@ int obdMenuDelta(SIMPLEMENU *sm, int iDelta);
 //
 int obdMenuRun(SIMPLEMENU *sm);
 
-#if defined(_LINUX_) && defined(__cplusplus)
+#if defined(__LINUX__) && defined(__cplusplus)
 }
-#endif // _LINUX_
+#endif // __LINUX__
 
 #endif // __ONEBITDISPLAY__
 

src/g5enc.inl

@@ -84,7 +84,7 @@ static void G5ENCFlushBits(G5_BUFFERED_BITS *bb)
 // Initialize the compressor
 // This must be called before adding data to the output
 //
-int g5_encode_init(G5ENCIMAGE *pImage, int iWidth, int iHeight, uint8_t *pOut, int iOutSize)
+static int g5_encode_init(G5ENCIMAGE *pImage, int iWidth, int iHeight, uint8_t *pOut, int iOutSize)
 {
     int iError = G5_SUCCESS;
 
@@ -197,7 +197,7 @@ doblack:
 // Returns G5ENC_SUCCESS for each line if all is well and G5ENC_IMAGE_COMPLETE
 // for the last line
 //
-int g5_encode_encodeLine(G5ENCIMAGE *pImage, uint8_t *pPixels)
+static int g5_encode_encodeLine(G5ENCIMAGE *pImage, uint8_t *pPixels)
 {
 int16_t a0, a0_c, b2, a1;
 int dx, run1, run2;
@@ -302,7 +302,7 @@ G5_BUFFERED_BITS bb;
 //
 // Returns the number of bytes of G5 created by the encoder
 //
-int g5_encode_getOutSize(G5ENCIMAGE *pImage)
+static int g5_encode_getOutSize(G5ENCIMAGE *pImage)
 {
     int iSize = 0;
     if (pImage != NULL)