Revision 23:233a0d635d9d, committed 2020-08-05

Comitter:

kenjiArai

Date:

Wed Aug 05 05:08:59 2020 +0000

Parent:

22:7d03976a0cb3

Commit message:

added #include "Stream.h" line for running on mbed-os6.2.0

Changed in this revision

--- a/ST7565_SPI_LCD.cpp	Sat Dec 13 05:29:11 2014 +0000
+++ b/ST7565_SPI_LCD.cpp	Wed Aug 05 05:08:59 2020 +0000
@@ -1,16 +1,17 @@
 /*
     EXTEND for SPI interface LCD which is using ST7565 controller
-        Modified by Kenji Arai / JH1PJL  
-        http://www.page.sannet.ne.jp/kenjia/index.html
-        http://mbed.org/users/kenjiArai/
+        Modified by Kenji Arai / JH1PJL
+         http://www7b.biglobe.ne.jp/~kenjia/
+         https://os.mbed.com/users/kenjiArai/
             Started: September 20th, 2014
             Revised: December  13th, 2014
+            Revised: August     5th, 2020
 
     original file: C12832.cpp
     original Library name: C12832
 */
 
-//---------- ORIGINAL Header ----------------------------------------------------
+//---------- ORIGINAL Header ---------------------------------------------------
 /* mbed library for the mbed Lab Board  128*32 pixel LCD
  * use C12832 controller
  * Copyright (c) 2012 Peter Drescher - DC2PD
@@ -40,38 +41,50 @@
 //#define DEBUG
 // Com
 #ifdef  DEBUG
-#define BAUD(x)             pcx.baud(x)
-#define GETC(x)             pcx.getc(x)
-#define PUTC(x)             pcx.putc(x)
-#define PRINTF(...)         pcx.printf(__VA_ARGS__)
-#define READABLE(x)         pcx.readable(x)
+#define PRINTF(...)         printf(__VA_ARGS__)
 #else
-#define BAUD(x)             {;}
-#define GETC(x)             {;}
-#define PUTC(x)             {;}
 #define PRINTF(...)         {;}
-#define READABLE(x)         {;}
-#endif
-#ifdef  DEBUG
-// com  !!!Please specify the pin!!!!
-Serial      pcx(?,?);         // Communication with Host
 #endif
 
-ST7565::ST7565(PinName mosi, PinName sck,
-      PinName reset, PinName a0, PinName ncs, LCDType type, const char* name)
-    : GraphicsDisplay(name),_spi(mosi,NC,sck),_reset(reset),_A0(a0),_CS(ncs)
+ST7565::ST7565
+(
+    PinName mosi, PinName sck,
+    PinName reset,
+    PinName a0,
+    PinName ncs,
+    LCDType type,
+    const char* name
+):
+    GraphicsDisplay(name),
+    _spi_p(new SPI(mosi,NC,sck)), _spi(*_spi_p),
+    _reset(reset),
+    _A0(a0),
+    _CS(ncs)
 {
     initialize(type);
 }
 
-ST7565::ST7565(SPI& p_spi, PinName reset, PinName a0, PinName ncs, LCDType type, const char* name)
-    : GraphicsDisplay(name),_spi(p_spi),_reset(reset),_A0(a0),_CS(ncs)
+ST7565::ST7565
+(
+    SPI& p_spi,
+    PinName reset,
+    PinName a0,
+    PinName ncs,
+    LCDType type,
+    const char* name
+):
+    GraphicsDisplay(name),
+    _spi(p_spi),
+    _reset(reset),
+    _A0(a0),
+    _CS(ncs)
 {
     initialize(type);
 }
 
-void ST7565::initialize(LCDType type){
-    switch (type){
+void ST7565::initialize(LCDType type)
+{
+    switch (type) {
         case LCD128x32:
             lcd_width  = 128;
             lcd_height = 32;
@@ -80,7 +93,7 @@
             lcd_width  = 128;
             lcd_height = 48;
             break;
-        case LCD128x64:  
+        case LCD128x64:
             lcd_width  = 128;
             lcd_height = 64;
             break;
@@ -93,37 +106,43 @@
     lcd_reset();
 }
 
-int ST7565::width(){
+int ST7565::width()
+{
 //    PRINTF("W:%d",lcd_width);
     return(lcd_width);
 }
 
-int ST7565::height(){
+int ST7565::height()
+{
 //    PRINTF("H:%d",lcd_height);
     return(lcd_height);
 }
 
-void ST7565::invert(unsigned int o){
-    if(o == 0){
+void ST7565::invert(unsigned int o)
+{
+    if(o == 0) {
         wr_cmd(0xA6);
     } else {
         wr_cmd(0xA7);
     }
 }
 
-void ST7565::set_contrast(unsigned int o){
+void ST7565::set_contrast(unsigned int o)
+{
     contrast = o;
     wr_cmd(0x23);      //  Vo voltage reg.
     wr_cmd(0x81);      //  set volume
     wr_cmd(o & 0x3F);
 }
 
-unsigned int ST7565::get_contrast(void){
+unsigned int ST7565::get_contrast(void)
+{
     return(contrast);
 }
 
 // write command to lcd controller
-void ST7565::wr_cmd(unsigned char cmd){
+void ST7565::wr_cmd(unsigned char cmd)
+{
     _A0 = 0;
     _CS = 0;
     _spi.write(cmd);
@@ -131,7 +150,8 @@
 }
 
 // write data to lcd controller
-void ST7565::wr_dat(unsigned char dat){
+void ST7565::wr_dat(unsigned char dat)
+{
     _A0 = 1;
     _CS = 0;
     _spi.write(dat);
@@ -139,7 +159,8 @@
 }
 
 // reset and init the lcd controller
-void ST7565::lcd_reset(){
+void ST7565::lcd_reset()
+{
     _spi.format(8,0);
     _spi.frequency(10000000);   // 10 MHz SPI clock
     _A0 = 0;
@@ -147,7 +168,7 @@
     _reset = 0;                 // display reset
     wait_us(50);
     _reset = 1;                 // end reset
-    wait_ms(5);
+    ThisThread::sleep_for(5ms);
     // initialize sequence
     wr_cmd(0xaf);     // display on
     wr_cmd(0x2f);     // power control set
@@ -174,7 +195,8 @@
 }
 
 // set one pixel in buffer
-void ST7565::pixel(int x, int y, int color){
+void ST7565::pixel(int x, int y, int color)
+{
     // first check parameter
     if(x > lcd_width || y > lcd_height || x < 0 || y < 0) return;
     if(draw_mode == NORMAL) {
@@ -189,9 +211,10 @@
 }
 
 // update lcd
-void ST7565::copy_to_lcd(void){
-int i=0;
-    
+void ST7565::copy_to_lcd(void)
+{
+    int i=0;
+
     // page 0
     wr_cmd(0x00);      // set column low nibble 0
     wr_cmd(0x10);      // set column hi  nibble 0
@@ -224,7 +247,7 @@
     for(i=384; i<512; i++) {
         wr_dat(buffer[i]);
     }
-    if ((lcd_height == 48) || (lcd_height == 64)){
+    if ((lcd_height == 48) || (lcd_height == 64)) {
         // page 4
         wr_cmd(0x00);      // set column low nibble 0
         wr_cmd(0x10);      // set column hi  nibble 0
@@ -241,8 +264,8 @@
         for(i=640; i<768; i++) {
             wr_dat(buffer[i]);
         }
-    }   
-    if (lcd_height == 64){
+    }
+    if (lcd_height == 64) {
         // page 6
         wr_cmd(0x00);      // set column low nibble 0
         wr_cmd(0x10);      // set column hi  nibble 0
@@ -263,16 +286,18 @@
     _CS = 0;
 }
 
-void ST7565::cls(void){
+void ST7565::cls(void)
+{
     memset(buffer,0x00,1024);  // clear display buffer
     copy_to_lcd();
 }
 
-void ST7565::line(int x0, int y0, int x1, int y1, int color){
-int   dx = 0, dy = 0;
-int   dx_sym = 0, dy_sym = 0;
-int   dx_x2 = 0, dy_x2 = 0;
-int   di = 0;
+void ST7565::line(int x0, int y0, int x1, int y1, int color)
+{
+    int   dx = 0, dy = 0;
+    int   dx_sym = 0, dy_sym = 0;
+    int   dx_x2 = 0, dy_x2 = 0;
+    int   di = 0;
 
     dx = x1-x0;
     dy = y1-y0;
@@ -327,23 +352,41 @@
         }
         pixel(x0, y0, color);
     }
-    if(auto_up){ copy_to_lcd();}
+    if(auto_up) {
+        copy_to_lcd();
+    }
 }
 
-void ST7565::rect(int x0, int y0, int x1, int y1, int color){
-    if (x1 > x0){ line(x0,y0,x1,y0,color);
-    } else {  line(x1,y0,x0,y0,color);}
-    if (y1 > y0){ line(x0,y0,x0,y1,color);
-    } else { line(x0,y1,x0,y0,color);}
-    if (x1 > x0){ line(x0,y1,x1,y1,color);
-    } else {  line(x1,y1,x0,y1,color);}
-    if (y1 > y0){ line(x1,y0,x1,y1,color);
-    } else { line(x1,y1,x1,y0,color);}
-    if(auto_up){ copy_to_lcd();}
+void ST7565::rect(int x0, int y0, int x1, int y1, int color)
+{
+    if (x1 > x0) {
+        line(x0,y0,x1,y0,color);
+    } else {
+        line(x1,y0,x0,y0,color);
+    }
+    if (y1 > y0) {
+        line(x0,y0,x0,y1,color);
+    } else {
+        line(x0,y1,x0,y0,color);
+    }
+    if (x1 > x0) {
+        line(x0,y1,x1,y1,color);
+    } else {
+        line(x1,y1,x0,y1,color);
+    }
+    if (y1 > y0) {
+        line(x1,y0,x1,y1,color);
+    } else {
+        line(x1,y1,x1,y0,color);
+    }
+    if(auto_up) {
+        copy_to_lcd();
+    }
 }
 
-void ST7565::fillrect(int x0, int y0, int x1, int y1, int color){
-int l,c,i;
+void ST7565::fillrect(int x0, int y0, int x1, int y1, int color)
+{
+    int l,c,i;
 
     if(x0 > x1) {
         i = x0;
@@ -360,20 +403,23 @@
             pixel(l,c,color);
         }
     }
-    if(auto_up){ copy_to_lcd();}
+    if(auto_up) {
+        copy_to_lcd();
+    }
 }
 
-void ST7565::circle(int x0, int y0, int r, int color){
-int draw_x0, draw_y0;
-int draw_x1, draw_y1;
-int draw_x2, draw_y2;
-int draw_x3, draw_y3;
-int draw_x4, draw_y4;
-int draw_x5, draw_y5;
-int draw_x6, draw_y6;
-int draw_x7, draw_y7;
-int xx, yy;
-int di;
+void ST7565::circle(int x0, int y0, int r, int color)
+{
+    int draw_x0, draw_y0;
+    int draw_x1, draw_y1;
+    int draw_x2, draw_y2;
+    int draw_x3, draw_y3;
+    int draw_x4, draw_y4;
+    int draw_x5, draw_y5;
+    int draw_x6, draw_y6;
+    int draw_x7, draw_y7;
+    int xx, yy;
+    int di;
 
     //WindowMax();
     if (r == 0) {       /* no radius */
@@ -429,65 +475,75 @@
         draw_y5++;
         draw_y6--;
         draw_y7--;
-        if ((draw_x0 <= width()) && (draw_y0>=0)){
+        if ((draw_x0 <= width()) && (draw_y0>=0)) {
             pixel(draw_x0, draw_y0, color);
         }
-        if ((draw_x1 >= 0) && (draw_y1 >= 0)){
+        if ((draw_x1 >= 0) && (draw_y1 >= 0)) {
             pixel(draw_x1, draw_y1, color);
         }
-        if ((draw_x2 <= width()) && (draw_y2 <= height())){
+        if ((draw_x2 <= width()) && (draw_y2 <= height())) {
             pixel(draw_x2, draw_y2, color);
         }
-        if ((draw_x3 >=0 ) && (draw_y3 <= height())){
+        if ((draw_x3 >=0 ) && (draw_y3 <= height())) {
             pixel(draw_x3, draw_y3, color);
         }
-        if ((draw_x4 <= width()) && (draw_y4 >= 0)){
+        if ((draw_x4 <= width()) && (draw_y4 >= 0)) {
             pixel(draw_x4, draw_y4, color);
         }
-        if ((draw_x5 >= 0) && (draw_y5 >= 0)){
+        if ((draw_x5 >= 0) && (draw_y5 >= 0)) {
             pixel(draw_x5, draw_y5, color);
         }
-        if ((draw_x6 <=width()) && (draw_y6 <= height())){
+        if ((draw_x6 <=width()) && (draw_y6 <= height())) {
             pixel(draw_x6, draw_y6, color);
         }
-        if ((draw_x7 >= 0) && (draw_y7 <= height())){
+        if ((draw_x7 >= 0) && (draw_y7 <= height())) {
             pixel(draw_x7, draw_y7, color);
         }
     }
-    if(auto_up){ copy_to_lcd();}
+    if(auto_up) {
+        copy_to_lcd();
+    }
 }
 
-void ST7565::fillcircle(int x, int y, int r, int color){
-int i,up;
+void ST7565::fillcircle(int x, int y, int r, int color)
+{
+    int i,up;
 
     up = auto_up;
     auto_up = 0;   // off
-    for (i = 0; i <= r; i++){
+    for (i = 0; i <= r; i++) {
         circle(x,y,i,color);
     }
     auto_up = up;
-    if(auto_up){ copy_to_lcd();}
+    if(auto_up) {
+        copy_to_lcd();
+    }
 }
 
-void ST7565::setmode(int mode){
+void ST7565::setmode(int mode)
+{
     draw_mode = mode;
 }
 
-void ST7565::locate(int x, int y){
+void ST7565::locate(int x, int y)
+{
     char_x = x;
     char_y = y;
 }
 
-int ST7565::columns(){
+int ST7565::columns()
+{
     return width() / font[1];
 }
 
-int ST7565::rows(){
+int ST7565::rows()
+{
     return height() / font[2];
 }
 
-void ST7565::line_clear(int y){
-unsigned int vert,j,i,x;
+void ST7565::line_clear(int y)
+{
+    unsigned int vert,j,i,x;
 
     // read font parameter from start of array
     vert = font[2];                      // get vert size of font
@@ -496,39 +552,45 @@
         for (i=0; i<width(); i++) {  //  horz line
             pixel(x+i,y+j,0);
         }
-    }    
+    }
 }
 
-int ST7565::_putc(int value){
+int ST7565::_putc(int value)
+{
     if (value == 0x0d) {    // new line
         char_x = 0;
         char_y = char_y + font[2];
-        if (char_y >= height() - font[2]){
+        if (char_y >= height() - font[2]) {
             char_y = 0;
         }
         line_clear(char_y);
     } else {
         character(char_x, char_y, value);
-        if(auto_up){ copy_to_lcd();}
+        if(auto_up) {
+            copy_to_lcd();
+        }
     }
     return value;
 }
 
-void ST7565::character(int x, int y, int c){
-unsigned int hor,vert,offset,bpl,j,i,b;
-unsigned char* zeichen;
-unsigned char z,w;
+void ST7565::character(int x, int y, int c)
+{
+    unsigned int hor,vert,offset,bpl,j,i,b;
+    unsigned char* zeichen;
+    unsigned char z,w;
 
-    if ((c < 31) || (c > 127)){ return;}   // test char range
+    if ((c < 31) || (c > 127)) {
+        return;   // test char range
+    }
     // read font parameter from start of array
     offset = font[0];                    // bytes / char
     hor = font[1];                       // get hor size of font
     vert = font[2];                      // get vert size of font
     bpl = font[3];                       // bytes per line
-    if (char_x + hor > width()){
+    if (char_x + hor > width()) {
         char_x = 0;
         char_y = char_y + vert;
-        if (char_y >= height() - font[2]){
+        if (char_y >= height() - font[2]) {
             char_y = 0;
         }
     }
@@ -550,7 +612,7 @@
     if(char_x >= (width() - hor)) {
         char_x = 0;
         char_y = char_y + vert;
-        if (char_y >= height() - font[2]){
+        if (char_y >= height() - font[2]) {
             char_y = 0;
         }
         line_clear(char_y);
@@ -558,30 +620,38 @@
     //PRINTF("C:%d %d %d %d %d %d\r\n",offset,hor,vert,bpl,char_x,char_y);
 }
 
-void ST7565::set_font(unsigned char* f){
+void ST7565::set_font(unsigned char* f)
+{
     font = f;
 }
 
-void ST7565::set_auto_up(unsigned int up){
-    if(up){
+void ST7565::set_auto_up(unsigned int up)
+{
+    if(up) {
         auto_up = 1;
     } else {
         auto_up = 0;
     }
 }
 
-unsigned int ST7565::get_auto_up(void){
+unsigned int ST7565::get_auto_up(void)
+{
     return (auto_up);
 }
 
-void ST7565::print_bm(Bitmap bm, int x, int y){
-int h,v,b;
-char d;
+void ST7565::print_bm(Bitmap bm, int x, int y)
+{
+    int h,v,b;
+    char d;
 
     for(v=0; v < bm.ySize; v++) {   // lines
         for(h=0; h < bm.xSize; h++) { // pixel
-            if(h + x > 127){ break; }
-            if(v + y > 31){  break; }
+            if(h + x > 127) {
+                break;
+            }
+            if(v + y > 31) {
+                break;
+            }
             d = bm.data[bm.Byte_in_Line * v + ((h & 0xF8) >> 3)];
             b = 0x80 >> (h & 0x07);
             if((d & b) == 0) {

--- a/ST7565_SPI_LCD.h	Sat Dec 13 05:29:11 2014 +0000
+++ b/ST7565_SPI_LCD.h	Wed Aug 05 05:08:59 2020 +0000
@@ -1,16 +1,17 @@
 /*
     EXTEND for SPI interface LCD which is using ST7565 controller
-        Modified by Kenji Arai / JH1PJL  
-        http://www.page.sannet.ne.jp/kenjia/index.html
-        http://mbed.org/users/kenjiArai/
+        Modified by Kenji Arai / JH1PJL
+         http://www7b.biglobe.ne.jp/~kenjia/
+         https://os.mbed.com/users/kenjiArai/
             Started: September 20th, 2014
             Revised: November  29th, 2014
+            Revised: August     5th, 2020
 
     original file: C12832.h
     original Library name: C12832
 */
 
-//---------- ORIGINAL Header ----------------------------------------------------
+//---------- ORIGINAL Header ---------------------------------------------------
 /* mbed library for the mbed Lab Board  128*32 pixel LCD
  * use C12832 controller
  * Copyright (c) 2012 Peter Drescher - DC2PD
@@ -33,12 +34,12 @@
 
 /** Bitmap
  */
-struct Bitmap{
+struct Bitmap {
     int xSize;
     int ySize;
     int Byte_in_Line;
     char* data;
-    };
+};
 
 /** SPI LCD control library for ST7565 Controller
  *      http://www.ladyada.net/learn/lcd/st7565.html
@@ -48,12 +49,14 @@
  *
  * @code
  * #include "mbed.h"
- * 
- * #if 1  
- * ST7565   lcd(dp2, dp6, dp10, dp4, dp9, ST7565::AD12864SPI); // mosi, sck, reset, a0, ncs
+ *
+ * #if 1
+ * //           mosi, sck, reset, a0, ncs
+ * ST7565   lcd(dp2, dp6, dp10, dp4, dp9, ST7565::AD12864SPI);
  * #else
  * SPI      spi_lcd(dp2, dp1, dp6); // mosi, miso, sck
- * ST7565   lcd(spi_lcd, dp10, dp4, dp9, ST7565::AD12864SPI);  // spi, reset, a0, ncs
+ * //           spi, reset, a0, ncs
+ * ST7565   lcd(spi_lcd, dp10, dp4, dp9, ST7565::AD12864SPI);
  * #endif
  *
  * int main() {
@@ -69,26 +72,37 @@
  * @endcode
  */
 
-class ST7565 : public GraphicsDisplay{
+class ST7565 : public GraphicsDisplay
+{
 public:
 
     /** LCD panel format */
     enum LCDType {
-        LCD128x32,    
+        LCD128x32,
         LCD128x48,
         LCD128x64,
         AQM1248A   = LCD128x48,
         AD12864SPI = LCD128x64,
-        ST7565LCD  = LCD128x64                        
+        ST7565LCD  = LCD128x64
     };
-    
+
     /**
      * Create a ST7565 object connected to SPI1
      */
     ST7565(PinName mosi, PinName sck,
-           PinName reset, PinName a0, PinName ncs, LCDType type, const char* name = "LCD");
+           PinName reset,
+           PinName a0,
+           PinName ncs,
+           LCDType type,
+           const char* name = "LCD"
+          );
     ST7565(SPI& _spi,
-           PinName reset, PinName a0, PinName ncs, LCDType type, const char* name = "LCD");
+           PinName reset,
+           PinName a0,
+           PinName ncs,
+           LCDType type,
+           const char* name = "LCD"
+          );
 
     /**
      * Get the width of the screen in pixel
@@ -224,13 +238,13 @@
      * @param y y-position
      */
     virtual void locate(int x, int y);
-    
+
     /**
-     * Setup auto update of screen 
+     * Setup auto update of screen
      *
      * @param up 1 = on , 0 = off
      *
-     * if switched off the program has to call copy_to_lcd() 
+     * if switched off the program has to call copy_to_lcd()
      * to update screen from framebuffer
      */
     void set_auto_up(unsigned int up);
@@ -247,8 +261,8 @@
      *
      * @param f pointer to font array
      *
-     *   font array can created with GLCD Font Creator from http://www.mikroe.com
-     *   you have to add 4 parameter at the beginning of the font array to use:
+     * font array can created with GLCD Font Creator from http://www.mikroe.com
+     * you have to add 4 parameter at the beginning of the font array to use:
      *   - the number of byte / char
      *   - the vertial size in pixel
      *   - the horizontal size in pixel
@@ -256,7 +270,7 @@
      *   you also have to change the array to char[]
      */
     void set_font(unsigned char* f);
-    
+
     /**
      * Print bitmap to buffer
      *
@@ -290,15 +304,16 @@
     /** Draw color
       */
     enum {WHITE = 0,BLACK};
-    
+
     /** Draw mode
       * NORMAl
       * XOR set pixel by xor the screen
       */
     enum {NORMAL,XOR};
-    
+
     /** Vars     */
-    SPI _spi;
+    SPI *_spi_p;
+    SPI &_spi;
     DigitalOut _reset;
     DigitalOut _A0;
     DigitalOut _CS;
@@ -314,7 +329,7 @@
     void initialize(LCDType type);
 
     virtual int _putc(int value);
-        
+
     unsigned int lcd_width;
     unsigned int lcd_height;
     unsigned int char_x;

--- a/TextDisplay.h	Sat Dec 13 05:29:11 2014 +0000
+++ b/TextDisplay.h	Wed Aug 05 05:08:59 2020 +0000
@@ -17,6 +17,7 @@
 #define MBED_TEXTDISPLAY_H
 
 #include "mbed.h"
+#include "Stream.h"     // need on mbed-os-6.2.0, Aug. 5th, 2020 by JH1PJL
 
 /**
  * TextDisplay interface