Merge pull request #5513 from Rbb666/pico

Add lvgl_8.1.0 support for raspberry_pi pico

bsp/raspberry-pico/Kconfig

@@ -17,6 +17,7 @@ config PKGS_DIR
  
 source "$RTT_DIR/Kconfig"
 source "$PKGS_DIR/Kconfig"
+source "libraries/Kconfig"
 
 config SOC_RP2040
     bool

bsp/raspberry-pico/SConstruct

@@ -27,5 +27,7 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT)
 
+objs.extend(SConscript(os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')))
+
 # make a building
 DoBuilding(TARGET, objs)

bsp/raspberry-pico/applications/SConscript

@@ -1,11 +1,17 @@
-Import('RTT_ROOT')
-Import('rtconfig')
 from building import *
+import os
 
-cwd     = os.path.join(str(Dir('#')), 'applications')
-src	= Glob('*.c')
-CPPPATH = [cwd, str(Dir('#'))]
+cwd = GetCurrentDir()
+
+src = ['main.c']
+
+CPPPATH = [cwd]
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
+list = os.listdir(cwd)
+for item in list:
+    if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
+        group = group + SConscript(os.path.join(item, 'SConscript'))
+
 Return('group')

bsp/raspberry-pico/applications/lvgl/SConscript

@@ -0,0 +1,17 @@
+from building import *
+import os
+
+cwd = GetCurrentDir()
+group = []
+src = Glob('*.c')
+CPPPATH = [cwd]
+
+group = DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH)
+
+list = os.listdir(cwd)
+for d in list:
+    path = os.path.join(cwd, d)
+    if os.path.isfile(os.path.join(path, 'SConscript')):
+        group = group + SConscript(os.path.join(d, 'SConscript'))
+        
+Return('group')

bsp/raspberry-pico/applications/lvgl/lv_conf.h

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author        Notes
+ * 2021-10-18     Meco Man      First version
+ */
+
+#ifndef LV_CONF_H
+#define LV_CONF_H
+
+#define LV_USE_PERF_MONITOR     1
+#define LV_COLOR_DEPTH          16
+#define LV_COLOR_16_SWAP        1
+
+/* music player demo */
+#define LV_HOR_RES_MAX              240
+#define LV_VER_RES_MAX              240
+#define LV_USE_DEMO_RTT_MUSIC       1
+#define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1
+#define LV_FONT_MONTSERRAT_12       1
+#define LV_FONT_MONTSERRAT_16       1
+
+#endif

bsp/raspberry-pico/applications/lvgl/lv_demo.c

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author        Notes
+ * 2021-10-17     Meco Man      First version
+ */
+#include <rtthread.h>
+#include <lvgl.h>
+#include <lv_port_indev.h>
+#define DBG_TAG    "LVGL.demo"
+#define DBG_LVL    DBG_INFO
+#include <rtdbg.h>
+
+#ifndef LV_THREAD_STACK_SIZE
+#define LV_THREAD_STACK_SIZE 4096
+#endif
+
+#ifndef LV_THREAD_PRIO
+#define LV_THREAD_PRIO (RT_THREAD_PRIORITY_MAX * 2 / 3)
+#endif
+
+static void lvgl_thread(void *parameter)
+{
+    extern void lv_demo_music(void);
+    lv_demo_music();
+    while (1)
+    {
+        lv_task_handler();
+        rt_thread_mdelay(5);
+    }
+}
+
+static int lvgl_demo_init(void)
+{
+    rt_thread_t tid;
+
+    tid = rt_thread_create("LVGL", lvgl_thread, RT_NULL, LV_THREAD_STACK_SIZE, LV_THREAD_PRIO, 0);
+    if (tid == RT_NULL)
+    {
+        LOG_E("Fail to create 'LVGL' thread");
+    }
+    rt_thread_startup(tid);
+
+    return 0;
+}
+INIT_APP_EXPORT(lvgl_demo_init);

bsp/raspberry-pico/applications/lvgl/lv_port_disp.c

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2021-10-18     Meco Man     The first version
+ * 2021-12-24     	Rb         Refresh using dma2d
+ */
+#include <lvgl.h>
+#include "drv_lcd.h"
+
+/*A static or global variable to store the buffers*/
+static lv_disp_draw_buf_t disp_buf;
+static lv_disp_drv_t disp_drv; /*Descriptor of a display driver*/
+
+#define DISP_BUF_SIZE        (LV_HOR_RES_MAX * LV_VER_RES_MAX)
+
+static const lv_color_t * buf_to_flush;
+
+static lv_disp_drv_t g_disp_drv;
+static lv_color_t lv_disp_buf1[DISP_BUF_SIZE];
+
+static void lcd_fb_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p)
+{
+    LCD_DisplayWindows(area->x1, area->y1, area->x2, area->y2, (uint16_t*) color_p);
+    lv_disp_flush_ready(disp_drv);
+}
+
+void lv_port_disp_init(void)
+{
+    rt_err_t result;
+
+    SPI_Init();
+    LCD_Init(HORIZONTAL);
+
+    /*Initialize `disp_buf` with the buffer(s).*/
+    lv_disp_draw_buf_init(&disp_buf, lv_disp_buf1, RT_NULL, DISP_BUF_SIZE);
+
+    lv_disp_drv_init(&disp_drv); /*Basic initialization*/
+
+    /*Set the resolution of the display*/
+    disp_drv.hor_res = LV_VER_RES_MAX;
+    disp_drv.ver_res = LV_HOR_RES_MAX;
+
+    /*Set a display buffer*/
+    disp_drv.draw_buf = &disp_buf;
+
+    /*Used to copy the buffer's content to the display*/
+    disp_drv.flush_cb = lcd_fb_flush;
+
+    /*Finally register the driver*/
+    lv_disp_drv_register(&disp_drv);
+
+    g_disp_drv = disp_drv;
+}

bsp/raspberry-pico/applications/lvgl/lv_port_disp.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2021-10-18     Meco Man     The first version
+ */
+#ifndef LV_PORT_DISP_H
+#define LV_PORT_DISP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void lv_port_disp_init(void);
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif

bsp/raspberry-pico/applications/lvgl/lv_port_indev.c

@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2021-10-18     Meco Man     The first version
+ */
+#include <lvgl.h>
+#include <stdbool.h>
+#include <rtdevice.h>
+
+#define UP_KEY      2
+#define DOWN_KEY    18
+#define LEFT_KEY    16
+#define RIGHT_KEY   20
+#define CRTL_KEY    3
+
+#define BUTTON0_PIN        2
+#define BUTTON1_PIN        18
+#define BUTTON2_PIN        16
+#define BUTTON_WKUP_PIN    20
+
+/*Test if `id` button is pressed or not*/
+static bool button_is_pressed(uint8_t id)
+{
+    switch(id)
+    {
+    case 0:
+        if(rt_pin_read(BUTTON0_PIN) == PIN_LOW)
+            return true;
+        break;
+    case 1:
+        if(rt_pin_read(BUTTON1_PIN) == PIN_LOW)
+            return true;
+        break;
+    case 2:
+        if(rt_pin_read(BUTTON2_PIN) == PIN_LOW)
+            return true;
+        break;
+    case 3:
+        if(rt_pin_read(BUTTON_WKUP_PIN) == PIN_LOW)
+            return true;
+        break;
+    }
+
+    return false;
+}
+
+static int8_t button_get_pressed_id(void)
+{
+    uint8_t i;
+
+    /*Check to buttons see which is being pressed*/
+    for(i = 0; i < 4; i++)
+    {
+        /*Return the pressed button's ID*/
+        if(button_is_pressed(i))
+        {
+            return i;
+        }
+    }
+
+    /*No button pressed*/
+    return -1;
+}
+
+void button_read(lv_indev_drv_t * drv, lv_indev_data_t*data)
+{
+    static uint32_t last_btn = 0;   /*Store the last pressed button*/
+    int btn_pr = button_get_pressed_id(); /*Get the ID (0,1,2...) of the pressed button*/
+    if(btn_pr >= 0)
+    {               /*Is there a button press? (E.g. -1 indicated no button was pressed)*/
+       last_btn = btn_pr;           /*Save the ID of the pressed button*/
+       data->state = LV_INDEV_STATE_PRESSED;  /*Set the pressed state*/
+    }
+    else
+    {
+       data->state = LV_INDEV_STATE_RELEASED; /*Set the released state*/
+    }
+
+    data->btn_id = last_btn;            /*Save the last button*/
+}
+
+
+lv_indev_t * button_indev;
+
+void lv_port_indev_init(void)
+{
+    static lv_indev_drv_t indev_drv;
+
+    /* Initialize the on-board buttons */
+    rt_pin_mode(BUTTON0_PIN, PIN_MODE_INPUT);
+    rt_pin_mode(BUTTON1_PIN, PIN_MODE_INPUT);
+    rt_pin_mode(BUTTON2_PIN, PIN_MODE_INPUT);
+    rt_pin_mode(BUTTON_WKUP_PIN, PIN_MODE_INPUT);
+
+    lv_indev_drv_init(&indev_drv);      /*Basic initialization*/
+    indev_drv.type = LV_INDEV_TYPE_BUTTON;
+    indev_drv.read_cb = button_read;
+
+    /*Register the driver in LVGL and save the created input device object*/
+    button_indev = lv_indev_drv_register(&indev_drv);
+}

bsp/raspberry-pico/applications/lvgl/lv_port_indev.h

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2021-10-18     Meco Man     The first version
+ */
+#ifndef LV_PORT_INDEV_H
+#define LV_PORT_INDEV_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <lv_hal_indev.h>
+
+extern lv_indev_t * button_indev;
+
+void lv_port_indev_init(void);
+void lv_port_indev_input(rt_int16_t x, rt_int16_t y, lv_indev_state_t state);
+
+#ifdef __cplusplus
+} /*extern "C"*/
+#endif
+
+#endif

bsp/raspberry-pico/board/SConscript

@@ -0,0 +1,20 @@
+import os
+import rtconfig
+from building import *
+
+cwd = GetCurrentDir()
+
+# add general drivers
+src = Split('''
+board.c
+''')
+
+path =  [cwd]
+path += [cwd + '/ports/lcd']
+
+if GetDepend(['BSP_USING_LVGL']):
+    path += [cwd + '/ports/lcd']
+
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path)
+
+Return('group')

bsp/raspberry-pico/board/board.c

@@ -16,6 +16,8 @@
 #include "board.h"
 #include "hardware/structs/systick.h"
 
+#define PLL_SYS_KHZ (133 * 1000)
+
 void isr_systick(void)
 {
     /* enter interrupt */
@@ -43,6 +45,8 @@ uint32_t systick_config(uint32_t ticks)
 
 void rt_hw_board_init()
 {
+    set_sys_clock_khz(PLL_SYS_KHZ, true);
+
     rt_system_heap_init(HEAP_BEGIN, HEAP_END);
 
     alarm_pool_init_default();
@@ -65,7 +69,7 @@ void rt_hw_board_init()
     stdio_init_all();
     rt_hw_uart_init();
 
-#if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE)
+#ifdef RT_USING_CONSOLE
    rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
 #endif
 }

bsp/raspberry-pico/board/ports/SConscript

@@ -0,0 +1,12 @@
+import os
+from building import *
+
+objs = []
+cwd  = GetCurrentDir()
+
+list = os.listdir(cwd)
+for item in list:
+    if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
+        objs = objs + SConscript(os.path.join(item, 'SConscript'))
+
+Return('objs')

bsp/raspberry-pico/board/ports/lcd/SConscript

@@ -0,0 +1,10 @@
+from building import *
+import os
+
+cwd = GetCurrentDir()
+src = ['drv_lcd.c']
+CPPPATH = [cwd]
+    
+group = DefineGroup('Drivers', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH)
+
+Return('group')

bsp/raspberry-pico/board/ports/lcd/drv_lcd.h

@@ -0,0 +1,75 @@
+#ifndef __DRV_LCD_H
+#define __DRV_LCD_H
+
+#include <stdint.h>
+#include <rtdevice.h>
+
+#include "pico/stdlib.h"
+#include "hardware/spi.h"
+#include "hardware/i2c.h"
+#include "hardware/pwm.h"
+#include "hardware/dma.h"
+
+#define LCD_HEIGHT 240
+#define LCD_WIDTH 240
+
+#define HORIZONTAL 0
+#define VERTICAL   1
+
+/**
+ * data
+ **/
+#define UBYTE uint8_t
+#define UWORD uint16_t
+#define UDOUBLE uint32_t
+
+/**
+ * GPIOI config
+ **/
+#define LCD_RST_PIN 12
+#define LCD_DC_PIN 8
+#define LCD_BL_PIN 13
+
+#define LCD_CS_PIN 9
+#define LCD_CLK_PIN 10
+#define LCD_MOSI_PIN 11
+
+typedef struct
+{
+    UWORD WIDTH;UWORD HEIGHT;UBYTE SCAN_DIR;
+} LCD_ATTRIBUTES;
+extern LCD_ATTRIBUTES LCD;
+
+/*------------------------------------------------------------------------------------------------------*/
+void DEV_Digital_Write(UWORD Pin, UBYTE Value);
+UBYTE DEV_Digital_Read(UWORD Pin);
+
+void DEV_GPIO_Mode(UWORD Pin, UWORD Mode);
+void DEV_KEY_Config(UWORD Pin);
+void DEV_Digital_Write(UWORD Pin, UBYTE Value);
+UBYTE DEV_Digital_Read(UWORD Pin);
+
+void DEV_SPI_WriteByte(UBYTE Value);
+void DEV_SPI_Write_nByte(UBYTE *pData, UDOUBLE Len);
+
+void DEV_SET_PWM(UBYTE Value);
+
+UBYTE SPI_Init(void);
+UBYTE DEV_Module_Init(void);
+void DEV_Module_Exit(void);
+
+/********************************************************************************
+ function:
+ Macro definition variable name
+ ********************************************************************************/
+bool initDMA(bool ctrl_cs);
+void LCD_Init(UBYTE Scan_dir);
+void LCD_Clear(UWORD Color);
+void LCD_Display(UWORD *Image);
+void LCD_SetWindows(UWORD Xstart, UWORD Ystart, UWORD Xend, UWORD Yend);
+void LCD_DisplayWindows(UWORD Xstart, UWORD Ystart, UWORD Xend, UWORD Yend, UWORD *Image);
+void pushPixelsDMA(UWORD* image, UDOUBLE len);
+void LCD_DisplayPoint(UWORD X, UWORD Y, UWORD Color);
+void Handler_LCD(int signo);
+
+#endif

bsp/raspberry-pico/libraries/Kconfig

@@ -0,0 +1,23 @@
+menu "Hardware Drivers Config"
+
+config SOC_RP2040
+    bool
+    select SOC_SERIES_RP2040_PICO
+    select RT_USING_COMPONENTS_INIT
+    default y
+    
+menu "Onboard Peripheral Drivers"
+
+    config BSP_USING_LVGL
+        bool "Enable LVGL for LCD"
+        select PKG_USING_LVGL
+        select BSP_USING_SPI_LCD
+        select PKG_USING_LV_MUSIC_DEMO
+        default n
+    
+endmenu         
+
+endmenu   
+
+
+

bsp/raspberry-pico/libraries/SConscript

@@ -13,6 +13,9 @@ pico-sdk/src/rp2_common/hardware_claim/claim.c
 pico-sdk/src/rp2_common/hardware_sync/sync.c
 pico-sdk/src/rp2_common/pico_platform/platform.c
 pico-sdk/src/rp2_common/hardware_uart/uart.c
+pico-sdk/src/rp2_common/hardware_spi/spi.c
+pico-sdk/src/rp2_common/hardware_dma/dma.c
+pico-sdk/src/rp2_common/hardware_i2c/i2c.c
 pico-sdk/src/common/pico_time/time.c
 pico-sdk/src/common/pico_time/timeout_helper.c
 pico-sdk/src/rp2_common/hardware_timer/timer.c
@@ -67,6 +70,10 @@ path = [
     cwd + '/pico-sdk/src/rp2_common/hardware_claim/include',
     cwd + '/pico-sdk/src/rp2_common/hardware_sync/include',
     cwd + '/pico-sdk/src/rp2_common/hardware_uart/include',
+    cwd + '/pico-sdk/src/rp2_common/hardware_dma/include',
+    cwd + '/pico-sdk/src/rp2_common/hardware_spi/include',
+    cwd + '/pico-sdk/src/rp2_common/hardware_i2c/include',
+    cwd + '/pico-sdk/src/rp2_common/hardware_pwm/include',    
     cwd + '/pico-sdk/src/rp2_common/hardware_divider/include',
     cwd + '/pico-sdk/src/common/pico_time/include',
     cwd + '/pico-sdk/src/rp2_common/hardware_timer/include',