From a0fd5366cea230b2b752e54c1313c90987f849b7 Mon Sep 17 00:00:00 2001 From: xuzhuoyi Date: Fri, 5 Oct 2018 13:29:50 +0800 Subject: [PATCH] [bsp][stm32f429-disco] Adjust the copyright information --- .../applications/application.c | 8 +-- bsp/stm32f429-disco/applications/startup.c | 8 +-- bsp/stm32f429-disco/drivers/board.c | 9 +-- bsp/stm32f429-disco/drivers/board.h | 8 +-- bsp/stm32f429-disco/drivers/drv_i2c.c | 8 +-- bsp/stm32f429-disco/drivers/drv_i2c.h | 20 +++--- bsp/stm32f429-disco/drivers/drv_lcd.c | 64 +++++++++---------- bsp/stm32f429-disco/drivers/drv_lcd.h | 10 +++ bsp/stm32f429-disco/drivers/drv_sdram.c | 18 +----- bsp/stm32f429-disco/drivers/drv_sdram.h | 8 +-- bsp/stm32f429-disco/drivers/drv_touch.c | 8 +-- bsp/stm32f429-disco/drivers/drv_touch.h | 8 +-- bsp/stm32f429-disco/drivers/usart.c | 8 +-- bsp/stm32f429-disco/drivers/usart.h | 8 +-- 14 files changed, 71 insertions(+), 122 deletions(-) diff --git a/bsp/stm32f429-disco/applications/application.c b/bsp/stm32f429-disco/applications/application.c index 1ac119fd13..23c14db25e 100644 --- a/bsp/stm32f429-disco/applications/application.c +++ b/bsp/stm32f429-disco/applications/application.c @@ -1,11 +1,7 @@ /* - * File : application.c - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006, RT-Thread Development Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes diff --git a/bsp/stm32f429-disco/applications/startup.c b/bsp/stm32f429-disco/applications/startup.c index f7cf47ae6b..c41f3dcb40 100644 --- a/bsp/stm32f429-disco/applications/startup.c +++ b/bsp/stm32f429-disco/applications/startup.c @@ -1,11 +1,7 @@ /* - * File : startup.c - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006, RT-Thread Develop Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://openlab.rt-thread.com/license/LICENSE + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes diff --git a/bsp/stm32f429-disco/drivers/board.c b/bsp/stm32f429-disco/drivers/board.c index 2592f7964b..d2d2b55da2 100644 --- a/bsp/stm32f429-disco/drivers/board.c +++ b/bsp/stm32f429-disco/drivers/board.c @@ -1,16 +1,13 @@ /* - * File : board.c - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2009 RT-Thread Develop Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes * 2009-01-05 Bernard first implementation */ + #include #include #include diff --git a/bsp/stm32f429-disco/drivers/board.h b/bsp/stm32f429-disco/drivers/board.h index 8a32a11d8a..089043b371 100644 --- a/bsp/stm32f429-disco/drivers/board.h +++ b/bsp/stm32f429-disco/drivers/board.h @@ -1,11 +1,7 @@ /* - * File : board.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2009, RT-Thread Development Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes diff --git a/bsp/stm32f429-disco/drivers/drv_i2c.c b/bsp/stm32f429-disco/drivers/drv_i2c.c index 7d8e7a27b2..a6afde74ce 100644 --- a/bsp/stm32f429-disco/drivers/drv_i2c.c +++ b/bsp/stm32f429-disco/drivers/drv_i2c.c @@ -1,11 +1,7 @@ /* - * File : drv_i2c.c - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2017 RT-Thread Develop Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes diff --git a/bsp/stm32f429-disco/drivers/drv_i2c.h b/bsp/stm32f429-disco/drivers/drv_i2c.h index 8e91be0e0e..cebcebc63b 100644 --- a/bsp/stm32f429-disco/drivers/drv_i2c.h +++ b/bsp/stm32f429-disco/drivers/drv_i2c.h @@ -1,16 +1,12 @@ /* -* File : drv_i2c.h -* This file is part of RT-Thread RTOS -* COPYRIGHT (C) 2017 RT-Thread Develop Team -* -* The license and distribution terms for this file may be -* found in the file LICENSE in this distribution or at -* http://www.rt-thread.org/license/LICENSE -* -* Change Logs: -* Date Author Notes -* 2017-06-05 tanek first implementation. -*/ + * Copyright (c) 2006-2018, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + + * Change Logs: + * Date Author Notes + * 2017-06-05 tanek first implementation. + */ #ifndef STM32F4XX_IIC_INCLUDED #define STM32F4XX_IIC_INCLUDED diff --git a/bsp/stm32f429-disco/drivers/drv_lcd.c b/bsp/stm32f429-disco/drivers/drv_lcd.c index 4f6c438a5d..bbb298b279 100644 --- a/bsp/stm32f429-disco/drivers/drv_lcd.c +++ b/bsp/stm32f429-disco/drivers/drv_lcd.c @@ -1,11 +1,7 @@ /* - * File : drv_lcd.c - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2009 RT-Thread Develop Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes @@ -25,13 +21,13 @@ typedef struct { - rt_uint16_t width; //LCD ¿í¶È - rt_uint16_t height; //LCD ¸ß¶È + rt_uint16_t width; //LCD ��� + rt_uint16_t height; //LCD �߶� rt_uint16_t id; //LCD ID - rt_uint8_t dir; //ºáÆÁ»¹ÊÇÊúÆÁ¿ØÖÆ£º0£¬ÊúÆÁ£»1£¬ºáÆÁ¡£ - rt_uint16_t wramcmd; //¿ªÊ¼Ð´gramÖ¸Áî - rt_uint16_t setxcmd; //ÉèÖÃx×ø±êÖ¸Áî - rt_uint16_t setycmd; //ÉèÖÃy×ø±êÖ¸Áî + rt_uint8_t dir; //���������������ƣ�0��������1�������� + rt_uint16_t wramcmd; //��ʼдgramָ�� + rt_uint16_t setxcmd; //����x����ָ�� + rt_uint16_t setycmd; //����y����ָ�� } lcd_info_t; typedef struct @@ -40,22 +36,22 @@ typedef struct volatile rt_uint16_t ram; } lcd_ili9341_t; -//ʹÓÃNOR/SRAMµÄ Bank1.sector1,µØַλHADDR[27,26]=00 A18×÷ΪÊý¾ÝÃüÁîÇø·ÖÏß -//×¢ÒâÉèÖÃʱSTM32ÄÚ²¿»áÓÒÒÆһλ¶ÔÆä! +//ʹ��NOR/SRAM�� Bank1.sector1,��ַλHADDR[27,26]=00 A18���������������� +//ע������ʱSTM32�ڲ�������һλ����! #define LCD_ILI9341_BASE ((rt_uint32_t)(0x60000000 | 0x0007FFFE)) #define ili9341 ((lcd_ili9341_t *) LCD_ILI9341_BASE) ////////////////////////////////////////////////////////////////////////////////// -//ɨÃè·½Ïò¶¨Òå -#define L2R_U2D 0 //´Ó×óµ½ÓÒ,´ÓÉϵ½Ï -#define L2R_D2U 1 //´Ó×óµ½ÓÒ,´Óϵ½ÉÏ -#define R2L_U2D 2 //´ÓÓÒµ½×ó,´ÓÉϵ½Ï -#define R2L_D2U 3 //´ÓÓÒµ½×ó,´Óϵ½ÉÏ -#define U2D_L2R 4 //´ÓÉϵ½ÏÂ,´Ó×óµ½ÓÒ -#define U2D_R2L 5 //´ÓÉϵ½ÏÂ,´ÓÓÒµ½×ó -#define D2U_L2R 6 //´Óϵ½ÉÏ,´Ó×óµ½ÓÒ -#define D2U_R2L 7 //´Óϵ½ÉÏ,´ÓÓÒµ½×ó -#define DFT_SCAN_DIR L2R_U2D //ĬÈϵÄɨÃè·½Ïò +//ɨ�跽���� +#define L2R_U2D 0 //������,���ϵ��� +#define L2R_D2U 1 //������,���µ��� +#define R2L_U2D 2 //���ҵ���,���ϵ��� +#define R2L_D2U 3 //���ҵ���,���µ��� +#define U2D_L2R 4 //���ϵ���,������ +#define U2D_R2L 5 //���ϵ���,���ҵ��� +#define D2U_L2R 6 //���µ���,������ +#define D2U_R2L 7 //���µ���,���ҵ��� +#define DFT_SCAN_DIR L2R_U2D //Ĭ�ϵ�ɨ�跽�� static lcd_info_t lcddev; LTDC_HandleTypeDef LtdcHandler; @@ -743,28 +739,28 @@ rt_uint16_t ili9341_bgr2rgb(rt_uint16_t value) // switch (dir) // { -// case L2R_U2D://´Ó×óµ½ÓÒ,´ÓÉϵ½Ï +// case L2R_U2D://������,���ϵ��� // regval |= (0 << 7) | (0 << 6) | (0 << 5); // break; -// case L2R_D2U://´Ó×óµ½ÓÒ,´Óϵ½ÉÏ +// case L2R_D2U://������,���µ��� // regval |= (1 << 7) | (0 << 6) | (0 << 5); // break; -// case R2L_U2D://´ÓÓÒµ½×ó,´ÓÉϵ½Ï +// case R2L_U2D://���ҵ���,���ϵ��� // regval |= (0 << 7) | (1 << 6) | (0 << 5); // break; -// case R2L_D2U://´ÓÓÒµ½×ó,´Óϵ½ÉÏ +// case R2L_D2U://���ҵ���,���µ��� // regval |= (1 << 7) | (1 << 6) | (0 << 5); // break; -// case U2D_L2R://´ÓÉϵ½ÏÂ,´Ó×óµ½ÓÒ +// case U2D_L2R://���ϵ���,������ // regval |= (0 << 7) | (0 << 6) | (1 << 5); // break; -// case U2D_R2L://´ÓÉϵ½ÏÂ,´ÓÓÒµ½×ó +// case U2D_R2L://���ϵ���,���ҵ��� // regval |= (0 << 7) | (1 << 6) | (1 << 5); // break; -// case D2U_L2R://´Óϵ½ÉÏ,´Ó×óµ½ÓÒ +// case D2U_L2R://���µ���,������ // regval |= (1 << 7) | (0 << 6) | (1 << 5); // break; -// case D2U_R2L://´Óϵ½ÉÏ,´ÓÓÒµ½×ó +// case D2U_R2L://���µ���,���ҵ��� // regval |= (1 << 7) | (1 << 6) | (1 << 5); // break; // } @@ -774,7 +770,7 @@ rt_uint16_t ili9341_bgr2rgb(rt_uint16_t value) // if (regval & 0X20) // { -// if (lcddev.width < lcddev.height)//½»»»X,Y +// if (lcddev.width < lcddev.height)//����X,Y // { // temp = lcddev.width; // lcddev.width = lcddev.height; @@ -783,7 +779,7 @@ rt_uint16_t ili9341_bgr2rgb(rt_uint16_t value) // } // else // { -// if (lcddev.width > lcddev.height)//½»»»X,Y +// if (lcddev.width > lcddev.height)//����X,Y // { // temp = lcddev.width; // lcddev.width = lcddev.height; diff --git a/bsp/stm32f429-disco/drivers/drv_lcd.h b/bsp/stm32f429-disco/drivers/drv_lcd.h index b537b13a67..4cde98eb55 100644 --- a/bsp/stm32f429-disco/drivers/drv_lcd.h +++ b/bsp/stm32f429-disco/drivers/drv_lcd.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2006-2018, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2018-09-13 xuzhuoyi first implementation + */ + #ifndef __DRV_LCD_H__ #define __DRV_LCD_H__ diff --git a/bsp/stm32f429-disco/drivers/drv_sdram.c b/bsp/stm32f429-disco/drivers/drv_sdram.c index 529cfb51b8..095f8dd0bc 100644 --- a/bsp/stm32f429-disco/drivers/drv_sdram.c +++ b/bsp/stm32f429-disco/drivers/drv_sdram.c @@ -1,21 +1,7 @@ /* - * File : drv_sdram.c - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2016, RT-Thread Development Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes diff --git a/bsp/stm32f429-disco/drivers/drv_sdram.h b/bsp/stm32f429-disco/drivers/drv_sdram.h index dce6764261..7f70783ef9 100644 --- a/bsp/stm32f429-disco/drivers/drv_sdram.h +++ b/bsp/stm32f429-disco/drivers/drv_sdram.h @@ -1,11 +1,7 @@ /* - * File : drv_sdram.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2016 RT-Thread Develop Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes diff --git a/bsp/stm32f429-disco/drivers/drv_touch.c b/bsp/stm32f429-disco/drivers/drv_touch.c index 8ba54e166b..224e20f351 100644 --- a/bsp/stm32f429-disco/drivers/drv_touch.c +++ b/bsp/stm32f429-disco/drivers/drv_touch.c @@ -1,11 +1,7 @@ /* - * File : drv_touch.c - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2018 RT-Thread Develop Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes diff --git a/bsp/stm32f429-disco/drivers/drv_touch.h b/bsp/stm32f429-disco/drivers/drv_touch.h index 565eca2a9e..68c8f92b7f 100644 --- a/bsp/stm32f429-disco/drivers/drv_touch.h +++ b/bsp/stm32f429-disco/drivers/drv_touch.h @@ -1,11 +1,7 @@ /* - * File : drv_touch.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2018 RT-Thread Develop Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes diff --git a/bsp/stm32f429-disco/drivers/usart.c b/bsp/stm32f429-disco/drivers/usart.c index 62a40df4ee..f7ba2ed277 100644 --- a/bsp/stm32f429-disco/drivers/usart.c +++ b/bsp/stm32f429-disco/drivers/usart.c @@ -1,11 +1,7 @@ /* - * File : usart.c - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2009, RT-Thread Development Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes diff --git a/bsp/stm32f429-disco/drivers/usart.h b/bsp/stm32f429-disco/drivers/usart.h index 3faf85fcde..12cfd253cf 100644 --- a/bsp/stm32f429-disco/drivers/usart.h +++ b/bsp/stm32f429-disco/drivers/usart.h @@ -1,11 +1,7 @@ /* - * File : usart.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2009, RT-Thread Development Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE + * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes