# HG changeset patch # User Jeandet Alexis # Date 2013-09-18 17:40:34 # Node ID b702edc5236605a8d28e33787ab9972b58dfeae5 # Parent 68dfbccdd813b3e73996a8b1ddc6503fa8406300 sync diff --git a/bsp/src/BEAGLESYNTH/bsp.c b/bsp/src/BEAGLESYNTH/bsp.c --- a/bsp/src/BEAGLESYNTH/bsp.c +++ b/bsp/src/BEAGLESYNTH/bsp.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include "bsp.h" #include diff --git a/bsp/src/BEAGLESYNTH/bsp.h b/bsp/src/BEAGLESYNTH/bsp.h --- a/bsp/src/BEAGLESYNTH/bsp.h +++ b/bsp/src/BEAGLESYNTH/bsp.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef BSP_H #define BSP_H diff --git a/bsp/src/M4Stick/bsp.c b/bsp/src/M4Stick/bsp.c --- a/bsp/src/M4Stick/bsp.c +++ b/bsp/src/M4Stick/bsp.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include "bsp.h" #include diff --git a/bsp/src/M4Stick/bsp.h b/bsp/src/M4Stick/bsp.h --- a/bsp/src/M4Stick/bsp.h +++ b/bsp/src/M4Stick/bsp.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef BSP_H #define BSP_H diff --git a/bsp/src/M4StickV2/bsp.c b/bsp/src/M4StickV2/bsp.c --- a/bsp/src/M4StickV2/bsp.c +++ b/bsp/src/M4StickV2/bsp.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include "bsp.h" #include diff --git a/bsp/src/M4StickV2/bsp.h b/bsp/src/M4StickV2/bsp.h --- a/bsp/src/M4StickV2/bsp.h +++ b/bsp/src/M4StickV2/bsp.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef BSP_H #define BSP_H diff --git a/bsp/src/OPLAYER/bsp.c b/bsp/src/OPLAYER/bsp.c --- a/bsp/src/OPLAYER/bsp.c +++ b/bsp/src/OPLAYER/bsp.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include "bsp.h" #include @@ -298,7 +298,7 @@ void bsp_SD_init() { printf("Can't open or read MBR\n"); } - + delay_100us(10000); if(mbropen(&sdcard2blkdev,&sdcard2Part2,2)==MBRnoErr) { if(FATnoErr!=fat32open(&sdcard2FAT32part2,&sdcard2Part2)) @@ -308,7 +308,7 @@ void bsp_SD_init() { printf("Can't open or read MBR\n"); } - + delay_100us(10000); if(mbropen(&sdcard2blkdev,&sdcard2Part3,3)==MBRnoErr) { if(FATnoErr!=fat32open(&sdcard2FAT32part3,&sdcard2Part3)) @@ -318,7 +318,7 @@ void bsp_SD_init() { printf("Can't open or read MBR\n"); } - + delay_100us(10000); if(mbropen(&sdcard2blkdev,&sdcard2Part4,4)==MBRnoErr) { if(FATnoErr!=fat32open(&sdcard2FAT32part4,&sdcard2Part4)) @@ -334,6 +334,7 @@ void bsp_SD_init() printf("Can't initialize SDCARD\n"); } } + delay_100us(20000); } void vs1052setXCS(char val) @@ -496,7 +497,7 @@ void bsp_GTerm_init() if(__opnfiles__[1]==NULL) { streamdevice* fd1 = (streamdevice*)malloc(sizeof(streamdevice)); - terminal_init(&terminal0 ,&lcd0,&ComicSansMS_18,fd1); + terminal_init(&terminal0 ,&lcd0,&ComicSansMS_8,fd1); __opnfiles__[1] = fd1; } else diff --git a/bsp/src/OPLAYER/bsp.h b/bsp/src/OPLAYER/bsp.h --- a/bsp/src/OPLAYER/bsp.h +++ b/bsp/src/OPLAYER/bsp.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef BSP_H #define BSP_H diff --git a/bsp/src/SIMULATOR/bsp.c b/bsp/src/SIMULATOR/bsp.c --- a/bsp/src/SIMULATOR/bsp.c +++ b/bsp/src/SIMULATOR/bsp.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include "bsp.h" #include @@ -36,8 +36,8 @@ LCD_IF_t lcdIF0={ .init = &SDLCD_init, .writereg = &SDLCD_writereg, .readreg = &SDLCD_readreg, - .writeGRAM = &SDLCD_writeGRAM, - .readGRAM = &SDLCD_readGRAM + .writeGRAM = &SDLCD_writeGRAM_16bpp, + .readGRAM = &SDLCD_readGRAM_16bpp }; LCD_t lcd0={ @@ -205,6 +205,7 @@ void bsp_GTerm_init() { streamdevice* fd1 = (streamdevice*)malloc(sizeof(streamdevice)); terminal_init(&terminal0 ,&lcd0,&ComicSansMS_18,fd1); + lcd0.paintFilRect(&lcd0,0,0,240,320,0,0,0x0f0f); __opnfiles__[1] = fd1; } else diff --git a/bsp/src/SIMULATOR/bsp.h b/bsp/src/SIMULATOR/bsp.h --- a/bsp/src/SIMULATOR/bsp.h +++ b/bsp/src/SIMULATOR/bsp.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef BSP_H #define BSP_H diff --git a/bsp/src/SOLAR_LFR_PSU/bsp.c b/bsp/src/SOLAR_LFR_PSU/bsp.c --- a/bsp/src/SOLAR_LFR_PSU/bsp.c +++ b/bsp/src/SOLAR_LFR_PSU/bsp.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include "bsp.h" #include diff --git a/bsp/src/SOLAR_LFR_PSU/bsp.h b/bsp/src/SOLAR_LFR_PSU/bsp.h --- a/bsp/src/SOLAR_LFR_PSU/bsp.h +++ b/bsp/src/SOLAR_LFR_PSU/bsp.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef BSP_H #define BSP_H diff --git a/bsp/src/STM32F4Discovery-EXT/bsp.c b/bsp/src/STM32F4Discovery-EXT/bsp.c --- a/bsp/src/STM32F4Discovery-EXT/bsp.c +++ b/bsp/src/STM32F4Discovery-EXT/bsp.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include "bsp.h" #include diff --git a/bsp/src/STM32F4Discovery-EXT/bsp.h b/bsp/src/STM32F4Discovery-EXT/bsp.h --- a/bsp/src/STM32F4Discovery-EXT/bsp.h +++ b/bsp/src/STM32F4Discovery-EXT/bsp.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef BSP_H #define BSP_H diff --git a/bsp/src/STM32F4Discovery/bsp.c b/bsp/src/STM32F4Discovery/bsp.c --- a/bsp/src/STM32F4Discovery/bsp.c +++ b/bsp/src/STM32F4Discovery/bsp.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include "bsp.h" #include diff --git a/bsp/src/STM32F4Discovery/bsp.h b/bsp/src/STM32F4Discovery/bsp.h --- a/bsp/src/STM32F4Discovery/bsp.h +++ b/bsp/src/STM32F4Discovery/bsp.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef BSP_H #define BSP_H diff --git a/bsp/src/STM32F4Eval/bsp.c b/bsp/src/STM32F4Eval/bsp.c --- a/bsp/src/STM32F4Eval/bsp.c +++ b/bsp/src/STM32F4Eval/bsp.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include "bsp.h" #include diff --git a/bsp/src/STM32F4Eval/bsp.h b/bsp/src/STM32F4Eval/bsp.h --- a/bsp/src/STM32F4Eval/bsp.h +++ b/bsp/src/STM32F4Eval/bsp.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef BSP_H #define BSP_H diff --git a/examples/SOLAR_PSU_HELLO/hello.pro b/examples/SOLAR_PSU_HELLO/hello.pro --- a/examples/SOLAR_PSU_HELLO/hello.pro +++ b/examples/SOLAR_PSU_HELLO/hello.pro @@ -5,7 +5,7 @@ CONFIG += cpu UCMODEL=stm32f4 BSP = OPLAYER -DEFINES += CPUFREQ=180000000 +DEFINES += CPUFREQ=10000000 SOURCES += \ diff --git a/examples/SOLAR_PSU_HELLO/main.c b/examples/SOLAR_PSU_HELLO/main.c --- a/examples/SOLAR_PSU_HELLO/main.c +++ b/examples/SOLAR_PSU_HELLO/main.c @@ -136,6 +136,7 @@ void playAllparts() int main() { + delay_100us(30000); int i=0; int color=0; for(i=0;i<240;i++) diff --git a/examples/TEST_SIMULATOR/main.c b/examples/TEST_SIMULATOR/main.c --- a/examples/TEST_SIMULATOR/main.c +++ b/examples/TEST_SIMULATOR/main.c @@ -42,10 +42,11 @@ int libuc2_main_task() char in[255]; lcd_print(); printf("hello world\n"); - streamdevicePrint(__opnfiles__[1],"test Hello %d %f \n ",1234567,8.96); + streamdevicePrint(__opnfiles__[1],"test Hello %d %f \n",1234567,8.96); + lcd0.paintText(&lcd0,"A",10,100,&ComicSansMS_18,0x0); // while (scanf("%c",in)) // { - sleep(3); + sleep(5); // } } diff --git a/lib/src/common/AUDIO/CS43L22/CS43L22.c b/lib/src/common/AUDIO/CS43L22/CS43L22.c --- a/lib/src/common/AUDIO/CS43L22/CS43L22.c +++ b/lib/src/common/AUDIO/CS43L22/CS43L22.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include #include diff --git a/lib/src/common/AUDIO/VS10XX/VS10XX.c b/lib/src/common/AUDIO/VS10XX/VS10XX.c --- a/lib/src/common/AUDIO/VS10XX/VS10XX.c +++ b/lib/src/common/AUDIO/VS10XX/VS10XX.c @@ -17,7 +17,7 @@ #-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #------------------------------------------------------------------------------- #-- Author : Alexis Jeandet -#-- Mail : alexis.jeandet@gmail.com +#-- Mail : alexis.jeandet@member.fsf.org #-------------------------------------------------------------------------------*/ #include #include diff --git a/lib/src/common/EEPROMS/24LCXX/24LC0X/24LC0X.c b/lib/src/common/EEPROMS/24LCXX/24LC0X/24LC0X.c --- a/lib/src/common/EEPROMS/24LCXX/24LC0X/24LC0X.c +++ b/lib/src/common/EEPROMS/24LCXX/24LC0X/24LC0X.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include <24LC0X.h> #include diff --git a/lib/src/common/EEPROMS/N25Q128/N25Q128.c b/lib/src/common/EEPROMS/N25Q128/N25Q128.c --- a/lib/src/common/EEPROMS/N25Q128/N25Q128.c +++ b/lib/src/common/EEPROMS/N25Q128/N25Q128.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include #include diff --git a/lib/src/common/FILE_SYSTEM/FAT32/fat32.c b/lib/src/common/FILE_SYSTEM/FAT32/fat32.c --- a/lib/src/common/FILE_SYSTEM/FAT32/fat32.c +++ b/lib/src/common/FILE_SYSTEM/FAT32/fat32.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #define FAT32_PRIVATE #include diff --git a/lib/src/common/FILE_SYSTEM/MBR/mbr.c b/lib/src/common/FILE_SYSTEM/MBR/mbr.c --- a/lib/src/common/FILE_SYSTEM/MBR/mbr.c +++ b/lib/src/common/FILE_SYSTEM/MBR/mbr.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include #include diff --git a/lib/src/common/FILE_SYSTEM/SDCARD/sdcard.c b/lib/src/common/FILE_SYSTEM/SDCARD/sdcard.c --- a/lib/src/common/FILE_SYSTEM/SDCARD/sdcard.c +++ b/lib/src/common/FILE_SYSTEM/SDCARD/sdcard.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include #include diff --git a/lib/src/common/GRAPHIC/CONTROLERS/ILI9328/ili9328.c b/lib/src/common/GRAPHIC/CONTROLERS/ILI9328/ili9328.c --- a/lib/src/common/GRAPHIC/CONTROLERS/ILI9328/ili9328.c +++ b/lib/src/common/GRAPHIC/CONTROLERS/ILI9328/ili9328.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include #include diff --git a/lib/src/common/GRAPHIC/CONTROLERS/SSD2119/ssd2119.c b/lib/src/common/GRAPHIC/CONTROLERS/SSD2119/ssd2119.c --- a/lib/src/common/GRAPHIC/CONTROLERS/SSD2119/ssd2119.c +++ b/lib/src/common/GRAPHIC/CONTROLERS/SSD2119/ssd2119.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include #include diff --git a/lib/src/common/GRAPHIC/GUI/FONTS/fonts8pts.c b/lib/src/common/GRAPHIC/GUI/FONTS/fonts8pts.c --- a/lib/src/common/GRAPHIC/GUI/FONTS/fonts8pts.c +++ b/lib/src/common/GRAPHIC/GUI/FONTS/fonts8pts.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include diff --git a/lib/src/common/GRAPHIC/GUI/Widgets/Terminal/Terminal.c b/lib/src/common/GRAPHIC/GUI/Widgets/Terminal/Terminal.c --- a/lib/src/common/GRAPHIC/GUI/Widgets/Terminal/Terminal.c +++ b/lib/src/common/GRAPHIC/GUI/Widgets/Terminal/Terminal.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include #include @@ -124,16 +124,16 @@ void terminal_movecursor(terminal_t* ter int y=CHARYPOS(terminal,charh)-charh; int w=charw*(terminal->columnCount-terminal->column); int h=charh; - terminal->LCD->paintFilRect(terminal->LCD,CHARXPOS(terminal, charw),CHARYPOS(terminal,charh)-charh,charw*(terminal->columnCount-terminal->column-1),charh,terminal->backgroundColor,0,terminal->backgroundColor); + //terminal->LCD->paintFilRect(terminal->LCD,CHARXPOS(terminal, charw),CHARYPOS(terminal,charh)-charh,charw*(terminal->columnCount-terminal->column-1),charh,terminal->backgroundColor,0,terminal->backgroundColor); } - terminal->LCD->paintFilRect(terminal->LCD,CHARXPOS(terminal,charw),CHARYPOS(terminal,charh)-charh,charw,charh,terminal->backgroundColor,0,terminal->backgroundColor); + //terminal->LCD->paintFilRect(terminal->LCD,CHARXPOS(terminal,charw),CHARYPOS(terminal,charh)-charh,charw,charh,terminal->backgroundColor,0,terminal->backgroundColor); } void terminal_clearCurentLine(terminal_t* terminal) { int charw=terminal->font->Width + terminal->horizontalSpace; int charh=terminal->font->Height + terminal->verticalSpace; - terminal->LCD->paintFilRect(terminal->LCD,terminal->Xpos,CHARYPOS(terminal, charh)-charh,terminal->width,charh,terminal->backgroundColor,0,terminal->backgroundColor); +// terminal->LCD->paintFilRect(terminal->LCD,terminal->Xpos,CHARYPOS(terminal, charh)-charh,terminal->width,charh,terminal->backgroundColor,0,terminal->backgroundColor); } int terminal_writenc(terminal_t* terminal,char* data, int n) @@ -161,7 +161,7 @@ int terminal_writenc(terminal_t* termina }else if(terminal->column==0)terminal_clearCurentLine(terminal); if(buffer[0]!='\r'){ - terminal->LCD->paintFilRect(terminal->LCD,CHARXPOS(terminal,charw),CHARYPOS(terminal, charh)-charh,charw,charh,terminal->backgroundColor,0,terminal->backgroundColor); + // terminal->LCD->paintFilRect(terminal->LCD,CHARXPOS(terminal,charw),CHARYPOS(terminal, charh)-charh,charw,charh,terminal->backgroundColor,0,terminal->backgroundColor); terminal->LCD->paintText(terminal->LCD,buffer,CHARXPOS(terminal,charw),CHARYPOS(terminal, charh),terminal->font,terminal->textColor); terminal_movecursor(terminal,1); } diff --git a/lib/src/common/GRAPHIC/TC_CONTROLERS/STMPE811/STMPE811.c b/lib/src/common/GRAPHIC/TC_CONTROLERS/STMPE811/STMPE811.c --- a/lib/src/common/GRAPHIC/TC_CONTROLERS/STMPE811/STMPE811.c +++ b/lib/src/common/GRAPHIC/TC_CONTROLERS/STMPE811/STMPE811.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include diff --git a/lib/src/common/POWER/ina226/ina226.c b/lib/src/common/POWER/ina226/ina226.c --- a/lib/src/common/POWER/ina226/ina226.c +++ b/lib/src/common/POWER/ina226/ina226.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include #include diff --git a/lib/src/common/Threading/thread.c b/lib/src/common/Threading/thread.c --- a/lib/src/common/Threading/thread.c +++ b/lib/src/common/Threading/thread.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include diff --git a/lib/src/includes/24LC0X.h b/lib/src/includes/24LC0X.h --- a/lib/src/includes/24LC0X.h +++ b/lib/src/includes/24LC0X.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef B24LC0X_H #define B24LC0X_H diff --git a/lib/src/includes/GRAPHIC/GUI/Widgets/terminal.h b/lib/src/includes/GRAPHIC/GUI/Widgets/terminal.h --- a/lib/src/includes/GRAPHIC/GUI/Widgets/terminal.h +++ b/lib/src/includes/GRAPHIC/GUI/Widgets/terminal.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef TERMINAL_H #define TERMINAL_H diff --git a/lib/src/includes/GRAPHIC/TC_CONTROLERS/STMPE811.h b/lib/src/includes/GRAPHIC/TC_CONTROLERS/STMPE811.h --- a/lib/src/includes/GRAPHIC/TC_CONTROLERS/STMPE811.h +++ b/lib/src/includes/GRAPHIC/TC_CONTROLERS/STMPE811.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef STMPE811_H #define STMPE811_H diff --git a/lib/src/includes/GRAPHIC/TC_CONTROLERS/genericTC_Controler.h b/lib/src/includes/GRAPHIC/TC_CONTROLERS/genericTC_Controler.h --- a/lib/src/includes/GRAPHIC/TC_CONTROLERS/genericTC_Controler.h +++ b/lib/src/includes/GRAPHIC/TC_CONTROLERS/genericTC_Controler.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef GENERICTC_CONTROLER_H #define GENERICTC_CONTROLER_H diff --git a/lib/src/includes/N25Q128.h b/lib/src/includes/N25Q128.h --- a/lib/src/includes/N25Q128.h +++ b/lib/src/includes/N25Q128.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef N25Q128_H #define N25Q128_H diff --git a/lib/src/includes/VS10XX.h b/lib/src/includes/VS10XX.h --- a/lib/src/includes/VS10XX.h +++ b/lib/src/includes/VS10XX.h @@ -17,7 +17,7 @@ #-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #------------------------------------------------------------------------------- #-- Author : Alexis Jeandet -#-- Mail : alexis.jeandet@gmail.com +#-- Mail : alexis.jeandet@member.fsf.org #-------------------------------------------------------------------------------*/ #ifndef VS10XX_H #define VS10XX_H diff --git a/lib/src/includes/fat32.h b/lib/src/includes/fat32.h --- a/lib/src/includes/fat32.h +++ b/lib/src/includes/fat32.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef FAT32_H #define FAT32_H diff --git a/lib/src/includes/mbr.h b/lib/src/includes/mbr.h --- a/lib/src/includes/mbr.h +++ b/lib/src/includes/mbr.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef MBR_H #define MBR_H diff --git a/lib/src/includes/sdcard.h b/lib/src/includes/sdcard.h --- a/lib/src/includes/sdcard.h +++ b/lib/src/includes/sdcard.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef SDCARD_H #define SDCARD_H diff --git a/lib/src/includes/spi.h b/lib/src/includes/spi.h --- a/lib/src/includes/spi.h +++ b/lib/src/includes/spi.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ /* TODO: diff --git a/lib/src/includes/thread.h b/lib/src/includes/thread.h --- a/lib/src/includes/thread.h +++ b/lib/src/includes/thread.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #ifndef THREAD_H #define THREAD_H diff --git a/lib/src/simulator/CORE/core.c b/lib/src/simulator/CORE/core.c --- a/lib/src/simulator/CORE/core.c +++ b/lib/src/simulator/CORE/core.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include #include diff --git a/lib/src/simulator/CORE/threads.c b/lib/src/simulator/CORE/threads.c --- a/lib/src/simulator/CORE/threads.c +++ b/lib/src/simulator/CORE/threads.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ diff --git a/lib/src/simulator/GPIO/gpio.c b/lib/src/simulator/GPIO/gpio.c --- a/lib/src/simulator/GPIO/gpio.c +++ b/lib/src/simulator/GPIO/gpio.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include diff --git a/lib/src/simulator/I2C/i2c.c b/lib/src/simulator/I2C/i2c.c --- a/lib/src/simulator/I2C/i2c.c +++ b/lib/src/simulator/I2C/i2c.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include diff --git a/lib/src/simulator/SDLCD/SDLCD.c b/lib/src/simulator/SDLCD/SDLCD.c --- a/lib/src/simulator/SDLCD/SDLCD.c +++ b/lib/src/simulator/SDLCD/SDLCD.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include @@ -136,6 +136,18 @@ void SDLCD_putpixel(SDL_Surface *surface } } +void SDLCD_putpixel_16bpp(SDL_Surface *surface, int x, int y, Uint32 pixel) +{ + Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * surface->format->BytesPerPixel; + *(Uint16 *)p = pixel; +} + +Uint32 SDLCD_getpixel_16bpp(SDL_Surface *surface, int x, int y) +{ + Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * surface->format->BytesPerPixel; + return *(Uint16 *)p; +} + Uint32 SDLCD_getpixel(SDL_Surface *surface, int x, int y) { int bpp = surface->format->BytesPerPixel; @@ -172,7 +184,7 @@ void SDLCD_writeGRAM(void* buffer,uint32 } for(i=0;i=SDLCD_XWinEnd) @@ -188,9 +200,64 @@ void SDLCD_writeGRAM(void* buffer,uint32 if ( SDL_MUSTLOCK(screen) ) { SDL_UnlockSurface(screen); } + // SDL_UpdateRect(screen, SDLCD_XWinStrt, SDLCD_YWinStrt, SDLCD_XWinEnd-SDLCD_XWinStrt, SDLCD_YWinEnd-SDLCD_YWinStrt); SDL_UpdateRect(screen, 0, 0, screen->w, screen->h); } +void SDLCD_writeGRAM_16bpp(void* buffer,uint32_t count) +{ + int i=0; + u_int16_t* inptr=(u_int16_t*)buffer; + if ( SDL_MUSTLOCK(screen) ) { + if ( SDL_LockSurface(screen) < 0 ) { + fprintf(stderr, "Can’t lock screen: %s\n", SDL_GetError()); + return; + } + } + for(i=0;ipixels + SDLCD_Ypos * screen->pitch / 2 + SDLCD_Xpos)=inptr[i]; + SDLCD_Xpos+=1; + if(SDLCD_Xpos>=SDLCD_XWinEnd) + { + SDLCD_Xpos=SDLCD_XWinStrt; + SDLCD_Ypos+=1; + } + if(SDLCD_Ypos>=SDLCD_YWinEnd) + { + SDLCD_Ypos=SDLCD_YWinStrt; + } + } + if ( SDL_MUSTLOCK(screen) ) { + SDL_UnlockSurface(screen); + } + // SDL_UpdateRect(screen, SDLCD_XWinStrt, SDLCD_YWinStrt, SDLCD_XWinEnd-SDLCD_XWinStrt, SDLCD_YWinEnd-SDLCD_YWinStrt); + SDL_UpdateRect(screen, 0, 0, screen->w, screen->h); +} + +void SDLCD_readGRAM_16bpp(void* buffer,uint32_t count) +{ + int i=0; + u_int16_t* ptr=(u_int16_t*)SDLCD_buffer; + u_int16_t* inptr=(u_int16_t*)buffer; + for(i=0;ipixels + SDLCD_Ypos * screen->pitch / 2 + SDLCD_Xpos); + SDLCD_Xpos+=1; + ptr[i]=inptr[i]; + if(SDLCD_Xpos>=SDLCD_XWinEnd) + { + SDLCD_Xpos=SDLCD_XWinStrt; + SDLCD_Ypos+=1; + } + if(SDLCD_Ypos>=SDLCD_YWinEnd) + { + SDLCD_Ypos=SDLCD_YWinStrt; + } + } + +} + void SDLCD_readGRAM(void* buffer,uint32_t count) { int i=0; @@ -198,7 +265,7 @@ void SDLCD_readGRAM(void* buffer,uint32_ u_int16_t* inptr=(u_int16_t*)buffer; for(i=0;i=SDLCD_XWinEnd) diff --git a/lib/src/simulator/SDLCD/SDLCD.h b/lib/src/simulator/SDLCD/SDLCD.h --- a/lib/src/simulator/SDLCD/SDLCD.h +++ b/lib/src/simulator/SDLCD/SDLCD.h @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include @@ -34,7 +34,9 @@ extern int SDLCD_init(); extern void SDLCD_writereg(uint32_t reg,uint32_t data); extern uint32_t SDLCD_readreg(uint32_t reg); extern void SDLCD_writeGRAM(void* buffer,uint32_t count); +extern void SDLCD_writeGRAM_16bpp(void* buffer,uint32_t count); extern void SDLCD_readGRAM(void* buffer,uint32_t count); +extern void SDLCD_readGRAM_16bpp(void* buffer,uint32_t count); diff --git a/lib/src/simulator/SPI/spi.c b/lib/src/simulator/SPI/spi.c --- a/lib/src/simulator/SPI/spi.c +++ b/lib/src/simulator/SPI/spi.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include diff --git a/lib/src/simulator/UART/uart.c b/lib/src/simulator/UART/uart.c --- a/lib/src/simulator/UART/uart.c +++ b/lib/src/simulator/UART/uart.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include diff --git a/lib/src/stm32f4/CORE/core.c b/lib/src/stm32f4/CORE/core.c --- a/lib/src/stm32f4/CORE/core.c +++ b/lib/src/stm32f4/CORE/core.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include #include diff --git a/lib/src/stm32f4/CORE/threads.c b/lib/src/stm32f4/CORE/threads.c --- a/lib/src/stm32f4/CORE/threads.c +++ b/lib/src/stm32f4/CORE/threads.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ diff --git a/lib/src/stm32f4/GPIO/gpio.c b/lib/src/stm32f4/GPIO/gpio.c --- a/lib/src/stm32f4/GPIO/gpio.c +++ b/lib/src/stm32f4/GPIO/gpio.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include #include diff --git a/lib/src/stm32f4/I2C/i2c.c b/lib/src/stm32f4/I2C/i2c.c --- a/lib/src/stm32f4/I2C/i2c.c +++ b/lib/src/stm32f4/I2C/i2c.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include diff --git a/lib/src/stm32f4/SDCARD-SDIO/sdcard-sdio.c b/lib/src/stm32f4/SDCARD-SDIO/sdcard-sdio.c --- a/lib/src/stm32f4/SDCARD-SDIO/sdcard-sdio.c +++ b/lib/src/stm32f4/SDCARD-SDIO/sdcard-sdio.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include diff --git a/lib/src/stm32f4/SPI/spi.c b/lib/src/stm32f4/SPI/spi.c --- a/lib/src/stm32f4/SPI/spi.c +++ b/lib/src/stm32f4/SPI/spi.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include diff --git a/lib/src/stm32f4/UART/uart.c b/lib/src/stm32f4/UART/uart.c --- a/lib/src/stm32f4/UART/uart.c +++ b/lib/src/stm32f4/UART/uart.c @@ -17,7 +17,7 @@ -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------- -- Author : Alexis Jeandet --- Mail : alexis.jeandet@gmail.com +-- Mail : alexis.jeandet@member.fsf.org -------------------------------------------------------------------------------*/ #include