Changeset 364 for asp3_tinet_ecnl_arm/trunk/asp3_dcre/gdic

Timestamp:

Feb 1, 2019, 9:57:09 PM (5 years ago)

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

Location:

asp3_tinet_ecnl_arm/trunk/asp3_dcre/gdic

Files:

• adafruit_ssd1306 (added)
• adafruit_ssd1306/Makefile.config (added)
• adafruit_ssd1306/adafruit_ssd1306.c (added)
• adafruit_ssd1306/adafruit_ssd1306.h (added)
• adafruit_st7735/adafruit_st7735.c (modified) (2 diffs)
• adafruit_st7735/adafruit_st7735.h (modified) (5 diffs)

asp3_tinet_ecnl_arm/trunk/asp3_dcre/gdic/adafruit_st7735/adafruit_st7735.c

@@ -354 +354 @@
 
 /*
+ *  LCDへのRGBデータ送信関数
+ */
+ER
+lcd_writedata4(LCD_Handler_t *hlcd, uint8_t *pbmp, uint16_t width, uint16_t height)
+{
+        ER  ercd = E_OK;
+        int index, i;
+
+        if(width == 0 || height == 0)
+                return ercd;
+        if(hlcd->spi_lock != 0){
+                if((ercd = wai_sem(hlcd->spi_lock)) != E_OK)
+                        return ercd;
+        }
+        rs_set(PORT_HIGH);
+        cs_set(PORT_LOW);
+        //dly_tsk(100/*us*/);
+        for(index=0; index < height; index++){
+                uint8_t *p = pbmp;
+                for (i = 0; i < width; i++){
+                        spi_master_write(&hlcd->hspi, *p++);
+                        spi_master_write(&hlcd->hspi, *p++);
+                }
+                pbmp -= width*2;
+        }
+        //dly_tsk(100/*us*/);
+        cs_set(PORT_HIGH);
+        if(hlcd->spi_lock != 0)
+                sig_sem(hlcd->spi_lock);
+        return ercd;
+}
+
+/*
  *  ST7735へのコマンドリスト送信
  */
@@ -590 +623 @@
         lcd_setAddrWindow(hlcd, x0, y0, x0+width-1, y0+height-1);
         lcd_writedata3(hlcd, pbmp, width, height);
+}
+
+void
+lcd_drawImage(LCD_Handler_t *hlcd, uint16_t x0, uint16_t y0, int16_t w, int16_t h, uint8_t *pbmp)
+{
+        lcd_setAddrWindow(hlcd, x0, y0, x0+w-1, y0+h-1);
+        pbmp += w * (h - 1) * 3;  
+        lcd_writedata3(hlcd, pbmp, w, h);
 }
 

asp3_tinet_ecnl_arm/trunk/asp3_dcre/gdic/adafruit_st7735/adafruit_st7735.h

@@ -59 +59 @@
 #endif
 
+#include <stdbool.h>
 #include "device.h"
 #include "pinmap.h"
@@ -145 +146 @@
 #ifndef TOPPERS_MACRO_ONLY
 
+typedef struct GFXfont GFXfont;
+
 /*
  *  LCDハンドラ構造体定義
@@ -153 +156 @@
         uint16_t                _width;         /* 幅ピクセル数 */
         uint16_t                                _height;        /* 高さピクセル数 */
+        int16_t cursor_x, cursor_y;
+        uint16_t textcolor, textbgcolor;
+        uint8_t textsize, rotation;
+        bool wrap;
+        GFXfont *gfxFont;
         uint8_t                 colstart;
         uint8_t                 rowstart;
@@ -188 +196 @@
 extern ER lcd_writedata2(LCD_Handler_t *hlcd, uint16_t c, int cnt);
 extern ER lcd_writedata3(LCD_Handler_t *hlcd, uint8_t *pbmp, uint16_t width, uint16_t height);
+extern ER lcd_writedata4(LCD_Handler_t *hlcd, uint8_t *pbmp, uint16_t width, uint16_t height);
 
 extern void lcd_initB(LCD_Handler_t *hlcd);
@@ -198 +207 @@
 extern void lcd_drawFastHLine(LCD_Handler_t *hlcd, int16_t x, int16_t y, int16_t w, uint16_t color);
 extern void lcd_drawBitmap(LCD_Handler_t *hlcd, uint16_t x0, uint16_t y0, uint8_t *pbmp);
+extern void lcd_drawImage(LCD_Handler_t *hlcd, uint16_t x0, uint16_t y0, int16_t w, int16_t h, uint8_t *pbmp);
 extern void lcd_invertDisplay(LCD_Handler_t *hlcd, bool_t i);