update

Author: mjs513

src/GigaDisplay.cpp

@@ -32,12 +32,12 @@
 
 /* Private function prototypes -----------------------------------------------*/
 #if __has_include ("lvgl.h")
-#if defined(__MBED__)
+#if __MBED__
 #include "mbed.h"
 #endif
 #if (LVGL_VERSION_MAJOR == 9)
 void lvgl_displayFlushing(lv_display_t * display, const lv_area_t * area, unsigned char * px_map);
-#if defined(__MBED__)
+#if __MBED__
 static void inc_thd() {
     while (1) {
       lv_tick_inc(16);
@@ -49,7 +49,7 @@ static rtos::Thread lvgl_inc_thd;
 #else
 void lvgl_displayFlushing(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * color_p);
 #endif
-
+#endif
 
 #ifdef HAS_ARDUINOGRAPHICS
 Display::Display(int width, int height) : ArduinoGraphics(width, height), gdev(NULL)
@@ -212,9 +212,9 @@ bool Display::begin(DisplayPixelFormat pixformat) {
     }
     lv_display_set_buffers(display, buf1, NULL, width() * height() / 10, LV_DISPLAY_RENDER_MODE_PARTIAL);  /*Initialize the display buffer.*/
     lv_display_set_flush_cb(display, lvgl_displayFlushing);
-
+   #if __MBED__
     lvgl_inc_thd.start(inc_thd);
-    
+   #endif
     printk("LVGL Initialized\n");
 
   #else //LVGL_VERSION_MAJOR
@@ -414,13 +414,14 @@ void lvgl_displayFlushing(lv_display_t * disp, const lv_area_t * area, unsigned
     uint32_t offsetPos  = (area_in_use->x1 + (dsi_getDisplayXSize() * area_in_use->y1)) * sizeof(uint16_t);
     dsi_lcdDrawImage((void *) px_map, (void *)(dsi_getActiveFrameBuffer() + offsetPos), w, h, DMA2D_INPUT_RGB565);
 #else
-    uint32_t offsetPos  = (area_in_use->x1 + (getDisplayXSize() * area_in_use->y1)) * sizeof(uint16_t);
+    uint32_t offsetPos  = (area_in_use->x1 + (lcd_x_size * area_in_use->y1)) * sizeof(uint16_t);
     //dsi_lcdDrawImage((void *) px_map, (void *)(dsi_getActiveFrameBuffer() + offsetPos), w, h, DMA2D_INPUT_RGB565);
-    memcpy(px_map, buffer + offest, w * h);
-    write8(0, 0, buffer);
+    //--- cant do this memcpy(px_map, buffer + offsetPos, w * h);
+    Display::write8(0, 0, buffer);
 #endif
     lv_display_flush_ready(disp);         /* Indicate you are ready with the flushing*/
 }
+
 #else
 void lvgl_displayFlushing(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * color_p) {
     uint32_t width      = lv_area_get_width(area);
@@ -429,8 +430,9 @@ void lvgl_displayFlushing(lv_disp_drv_t * disp, const lv_area_t * area, lv_color
 #if defined(__MBED__)
     dsi_lcdDrawImage((void *) color_p, (void *)(dsi_getActiveFrameBuffer() + offsetPos), width, height, DMA2D_INPUT_RGB565);
 #else
-    memcpy(color_p, buffer + offest, w * h);
-    write8(0, 0, buffer);
+    //--- cant do this memcpy(px_map, buffer + offsetPos, w * h);
+    Display::write8(0, 0, buffer);
+
 #endif
     lv_disp_flush_ready(disp);         /* Indicate you are ready with the flushing*/
 }

src/GigaDisplay.h

@@ -26,11 +26,10 @@
 #include "SDRAM.h"
 #include "ArduinoGraphics.h"
 #define HAS_ARDUINOGRAPHICS
+#endif
 
 static uint32_t lcd_x_size = 480;
 static uint32_t lcd_y_size = 800;
-#endif
-
 
 /** 
  * @enum DisplayPixelFormat
@@ -77,46 +76,54 @@ class Display
 #endif
 {
 public:
-    /**
-    * @brief Construct a new Camera object.
-    */
-    Display(int width = 800, int height = 480);
-
-    /**
-    * @brief Initialize the display
-    */
-    bool begin(DisplayPixelFormat pixformat = DISPLAY_RGB565);
-    
-    /**
-    * @brief a frame.
-    * 
-    * @param fb Reference to a FrameBuffer object to store the frame data.
-    * @param timeout Time in milliseconds to wait for a frame (default: 5000).
-    * @return true if the frame is successfully captured, otherwise false.
-    */
-    //bool grabFrame(FrameBuffer &fb, uint32_t timeout = 5000);
-    
-    
-    /**
-    *
-    *
-    *
-    *
-    */
-    int write8(const uint16_t x,
-        const uint16_t y,
-        const void *buf);
-        
-    void setFrameDesc(uint16_t w, uint16_t h, uint16_t pitch, uint32_t buf_size);
-    void startFrameBuffering();
-    void endFrameBuffering();
-
-    int setBlanking(bool on);
+  /**
+  * @brief Construct a new Camera object.
+  */
+  Display(int width = 800, int height = 480);
 
-    void* getFrameBuffer();
+  /**
+  * @brief Initialize the display
+  */
+  bool begin(DisplayPixelFormat pixformat = DISPLAY_RGB565);
+  
+  /**
+  * @brief a frame.
+  * 
+  * @param fb Reference to a FrameBuffer object to store the frame data.
+  * @param timeout Time in milliseconds to wait for a frame (default: 5000).
+  * @return true if the frame is successfully captured, otherwise false.
+  */
+  //bool grabFrame(FrameBuffer &fb, uint32_t timeout = 5000);
+  
+  
+  /**
+  *
+  *
+  *
+  *
+  */
+  int write8(const uint16_t x,
+      const uint16_t y,
+      const void *buf);
+      
+  void setFrameDesc(uint16_t w, uint16_t h, uint16_t pitch, uint32_t buf_size);
+  void startFrameBuffering();
+  void endFrameBuffering();
+
+  int setBlanking(bool on);
+
+  void* getFrameBuffer();
+
+  int16_t width(void)  { return _width; }
+  int16_t height(void) { return _height; }
+    
+  uint32_t getDisplayXSize(){
+    return lcd_x_size;
+  }
 
-    int16_t width(void)  { return _width; }
-    int16_t height(void) { return _height; }
+  uint32_t getDisplayYSize(){
+    return lcd_y_size;
+  }
 
 
 #ifdef HAS_ARDUINOGRAPHICS
@@ -146,14 +153,6 @@ class Display
    */
   virtual void set(int x, int y, uint8_t r, uint8_t g, uint8_t b);
 
-  uint32_t getDisplayXSize(){
-    return lcd_x_size;
-  }
-
-  uint32_t getDisplayYSize(){
-    return lcd_y_size;
-  }
-  
   void lcdClear(uint16_t Color);
 
 #endif
@@ -162,16 +161,13 @@ class Display
 private:
     const struct device *gdev;
     struct display_buffer_descriptor *buf_desc;
-#if defined(HAS_ARDUINOGRAPHICS)  || __has_include ("lvgl.h") 
     uint16_t *buffer = nullptr;
     uint32_t sizeof_framebuffer;
-#endif
  protected:
     int16_t _height, _width;
     bool    _rotated = false;
 
 };
 
+#endif // __ZEPHYR__
 #endif // __GIGA_DISPLAY_H__
-
-#endif // __ZEPHYR__