HG_REPOSITORIES/LPP/INSTRUMENTATION/libuc2 Commit - r36:f47a2524d7d3

sync

jeandet@PC-DE-JEANDET.lab-lpp.local -

r36:f47a2524d7d3 dev_alexis

parent child

Context file:

r36:f47a2524d7d3

Collapse all files

bsp/includes/BEAGLESYNTH/bsp.h +7 -1

             extern void bsp_iic_init();
             extern void bsp_spi_init();
             extern void bsp_SD_init();
-            extern void bsp_FSMC_init();
+            extern int bsp_FSMC_init();
             /*  VS1053  */
             extern void clearXCS();
             void bspsdcardselect(char YESNO);
             char bspsdcardwriteprotected();
+            void bsp_lcd0_write_reg(uint32_t reg,uint32_t data);
+            uint32_t bsp_lcd0_read_reg(uint32_t reg);
+            void bsp_lcd0_writeGRAM(void *buffer, uint32_t count);
+            void bsp_lcd0_readGRAM(void *buffer, uint32_t count);
             #endif

bsp/src/BEAGLESYNTH/bsp.c +27 -18

             uint32_t RTCOSC =32768;
             uint32_t currentCpuFreq=0;
             extern streamdevice* __opnfiles__[__MAX_OPENED_FILES__];
-            LCD_t lcd0;
-            LCD_IF_t lcdIF0;
+            LCD_IF_t lcdIF0={
+                .init = &bsp_FSMC_init,
+                .writereg = &bsp_lcd0_write_reg,
+                .readreg = &bsp_lcd0_read_reg,
+                .writeGRAM = &bsp_lcd0_writeGRAM,
+                .readGRAM = &bsp_lcd0_readGRAM
+            };
+            LCD_t lcd0={
+                .interface = &lcdIF0,
+                .init = &ili9328init,
+                .paint = &ili9328paint,
+                .refreshenable = &ili9328refreshenable,
+                .width= 240,
+                .height = 320
+            };
             volatile int16_t* lcd0_CMD=(volatile int16_t*)  0x60000000;
             volatile int16_t* lcd0_DATA=(volatile int16_t*)(0x61FFFFF0);
                 }
             }
-            void bsp_lcd0_write_reg(uint32_t reg,uint32_t data);
-            uint32_t bsp_lcd0_read_reg(uint32_t reg);
-            void bsp_lcd0_writeGRAM(void *buffer, uint32_t count);
-            void bsp_lcd0_readGRAM(void *buffer, uint32_t count);
-            void bsp_FSMC_init()
+            int bsp_FSMC_init()
             {
                 #define GPIOGETPORT(gpio)   ((GPIO_TypeDef*)(((((uint32_t)gpio) & (uint32_t)0x0000FF00)*(uint32_t)4) + (uint32_t)GPIOA))
                 #define GPIOPORTNUM(gpio)   (((uint32_t)(gpio) & (uint32_t)0x0000FF00)>>(uint32_t)8)
               /*----------------------- SRAM Bank 3 ----------------------------------------*/
                 /* FSMC_Bank1_NORSRAM4 configuration */
                 //p.FSMC_AddressSetupTime = 5;
-                p.FSMC_AddressSetupTime = 1;
+                p.FSMC_AddressSetupTime = 2;
                 p.FSMC_AddressHoldTime = 0;
                 //p.FSMC_DataSetupTime = 9;
-                p.FSMC_DataSetupTime = 3;
+                p.FSMC_DataSetupTime = 4;
                 p.FSMC_BusTurnAroundDuration = 0;
                 p.FSMC_CLKDivision = 0;
                 p.FSMC_DataLatency = 0;
                 /* Enable FSMC NOR/SRAM Bank1 */
                 FSMC_NORSRAMCmd(FSMC_Bank1_NORSRAM1, ENABLE);
-                lcdIF0.writereg=&bsp_lcd0_write_reg;
-                lcdIF0.readGRAM=&bsp_lcd0_readGRAM;
-                lcdIF0.readreg=&bsp_lcd0_read_reg;
-                lcdIF0.writeGRAM=&bsp_lcd0_writeGRAM;
-                lcd0.interface=&lcdIF0;
-                lcd0.init=&ili9328init;
-                lcd0.paint=&ili9328paint;
                 gpioset(LCD_RESET);
                 lcd0.init(&lcd0);
+                return 1;
             }
             void bsp_spi_init()
             void bsp_lcd0_write_reg(uint32_t reg,uint32_t data)
             {
+                printf("Write %X @ %d\n\r",data,reg);
                 *lcd0_CMD=(uint16_t)reg;
                 *lcd0_DATA=(uint16_t)data;
             }
             void bsp_lcd0_writeGRAM(void* buffer,uint32_t count)
             {
+                printf("Write to GRAM %d pixels from 0x%X\t\n\r",count,(int)buffer);
                 *lcd0_CMD=(uint16_t)ILI9328_REGISTER_WRITEDATATOGRAM;
                 uint16_t* castedBuff=(uint16_t*)buffer;
-                for(uint32_t i=0;i<count;i++)
+                for(int i=0;i<(int)count;i++)
                 {
                      *lcd0_DATA=castedBuff[i];
                 }
+                printf("[Done]\n\r");
             }
             void bsp_lcd0_readGRAM(void* buffer,uint32_t count)
                 *lcd0_CMD=(uint16_t)ILI9328_REGISTER_WRITEDATATOGRAM;
                 uint16_t* castedBuff=(uint16_t*)buffer;
                 castedBuff[0]=*lcd0_DATA;
-                for(uint32_t i=0;i<count;i++)
+                for(int i=0;i<(int)count;i++)
                 {
                      castedBuff[i]=*lcd0_DATA;
                 }

examples/BeagleSynthHello/main.c +19 -24

@@ -22,39 +22,34 int main()
22	//ina226open(&ina15VSens,i2c2,INA226_MODE_SHUNT_VOLTAGE_CONTINUOUS\|INA226_AVERAGES_16\|INA226_BUS_CONV_8244us\|INA226_SHUNT_CONV_8244us,1,0,15,1000000);	22	//ina226open(&ina15VSens,i2c2,INA226_MODE_SHUNT_VOLTAGE_CONTINUOUS\|INA226_AVERAGES_16\|INA226_BUS_CONV_8244us\|INA226_SHUNT_CONV_8244us,1,0,15,1000000);
23	*regtest=(int16_t)0;	23	*regtest=(int16_t)0;
24	printf("LCD ID=%x\n\r",0xFFFF&(*regtest2));	24	printf("LCD ID=%x\n\r",0xFFFF&(*regtest2));
25		25	//lcd0.refreshenable(&lcd0,1);
26	while(1)	26	while(1)
27	{	27	{
28	/* *regtest=(int16_t)ILI9328_REGISTER_ENTRYMODE;	28	//ili9328setFrame(&lcd0,0,0,240,320);
29	regtest2=(int16_t)0x1008;/	29	//ili9328setGRAMaddress(&lcd0,0,0);
30	ili9328setFrame(&lcd0,0,0,240,320);	30	*regtest=(int16_t)0x20;
		31	*regtest2=(int16_t)0x0;
		32	*regtest=(int16_t)0x21;
		33	*regtest2=(int16_t)0x0;
31	*regtest=(int16_t)0x22;	34	*regtest=(int16_t)0x22;
32	for(~~volatile~~ int i=0;i<(320*240);i++)	35	for(int i=0;i<(320*240);i++)
33	{	36	{
34	*regtest2=(int16_t)0x001F;	37	*regtest2=(int16_t)0x001F;
35	//for(volatile int l=0;l<(1024);l++);
36
37	}	38	}
38	/* *regtest=(int16_t)ILI9328_REGISTER_ENTRYMODE;
39	regtest2=(int16_t)0x1018;/
40	for(volatile int i=0;i<(320240100);i++);	39	for(volatile int i=0;i<(320240100);i++);
41	/* *regtest=(int16_t)ILI9328_REGISTER_ENTRYMODE;	40	//uint16_t test[100];
42	regtest2=(int16_t)0x1008;/	41	//ili9328setFrame(&lcd0,10,10,10,10);
43	//ili9328setGRAMaddress(&lcd0,60,80);	42	//*regtest=(int16_t)0x22;
44	uint16_t test[80*80];	43	//for(int i=0;i<(10*10);i++)
45	ili9328setFrame(&lcd0,10,10,100,100);	44	//{
46	*regtest=(int16_t)~~0x22~~;	45	// *regtest2=(int16_t)(0xF800);
47	for(volatile int i=0;i<(100*100);i++)	46	//test[i]=(int16_t)0xF800;
48	{	47	//for(volatile int l=0;l<(1024);l++);
49	*regtest2=(int16_t)(0xF800);
50	//test[i]=(int16_t)0xF800;
51	//for(volatile int l=0;l<(1024);l++);
52		48
53	}	49	//}
		50	//bsp_lcd0_writeGRAM(test,10*10);
54	//lcd0.paint(&lcd0,test,100,100,80,80);	51	//lcd0.paint(&lcd0,test,100,100,80,80);
55	/**regtest=(int16_t)ILI9328_REGISTER_ENTRYMODE;	52	//for(volatile int i=0;i<(320240100);i++);
56	regtest2=(int16_t)0x1018;/
57	for(volatile int i=0;i<(320240100);i++);
58	}	53	}
59		54
60	if(-1==ina226open(&ina33VSens,i2c2,INA226_MODE_SHUNT_VOLTAGE_CONTINUOUS\|INA226_AVERAGES_16\|INA226_BUS_CONV_8244us\|INA226_SHUNT_CONV_8244us,0,1,15,1000000))	55	if(-1==ina226open(&ina33VSens,i2c2,INA226_MODE_SHUNT_VOLTAGE_CONTINUOUS\|INA226_AVERAGES_16\|INA226_BUS_CONV_8244us\|INA226_SHUNT_CONV_8244us,0,1,15,1000000))

lib/includes/GRAPHIC/CONTROLERS/genericLCD_Controler.h +1 0

                 LCD_IF_t* interface;
                 int (*init)(struct LCD_t* LCD);
                 void (*paint)(struct LCD_t* LCD,void* buffer,uint16_t Xpos,uint16_t Ypos,uint16_t Width,uint16_t Height);
+                void (*refreshenable)(struct LCD_t* LCD,int enable);
                 uint16_t width;
                 uint16_t height;
             }LCD_t;

lib/includes/GRAPHIC/CONTROLERS/ili9328.h +2 -1

             #include <stdint.h>
             extern int ili9328init(struct LCD_t* LCD);
-            extern void ili9328setFrame(LCD_t* LCD,uint16_t HaddressStart,uint16_t VaddressStart,uint16_t HaddressStop,uint16_t VaddressStop);
+            extern void ili9328setFrame(LCD_t* LCD,uint16_t X,uint16_t Y,uint16_t W,uint16_t H);
             extern void ili9328setGRAMaddress(LCD_t* LCD,uint16_t Haddress,uint16_t Vaddress);
             extern void ili9328paint(LCD_t* LCD,void* buffer,uint16_t Xpos,uint16_t Ypos,uint16_t Width,uint16_t Height);
+            extern void ili9328refreshenable(struct LCD_t* LCD,int enable);
             #define	ILI9328_REGISTER_DRIVERCODEREAD	((uint32_t)	0x0000	)
             #define	ILI9328_REGISTER_DRIVEROUTPUTCONTROL1	((uint32_t)	0x0001	)

lib/src/common/GRAPHIC/CONTROLERS/ILI9328/ili9328.c +25 -8

                 LCD->interface->writereg(ILI9328_REGISTER_VERTICALGRAMADDRESSSET,Vaddress);
             }
-            void ili9328setFrame(LCD_t* LCD,uint16_t HaddressStart,uint16_t VaddressStart,uint16_t HaddressStop,uint16_t VaddressStop)
+            void ili9328refreshenable(struct LCD_t* LCD,int enable)
             {
-                LCD->interface->writereg(ILI9328_REGISTER_HORIZONTALADDRESSSTARTPOSITION,HaddressStart);
+                if(enable)
-                LCD->interface->writereg(ILI9328_REGISTER_VERTICALADDRESSSTARTPOSITION,VaddressStart);
-                LCD->interface->writereg(ILI9328_REGISTER_HORIZONTALADDRESSENDPOSITION,HaddressStop);
+                    //LCD->interface->writereg(ILI9328_REGISTER_ENTRYMODE,0x1018);
-                LCD->interface->writereg(ILI9328_REGISTER_VERTICALADDRESSENDPOSITION,VaddressStop);
+                else
+                {
+                    //LCD->interface->writereg(ILI9328_REGISTER_ENTRYMODE,0x1008);
+                }
+            }
+            void ili9328setFrame(LCD_t* LCD,uint16_t X,uint16_t Y,uint16_t W,uint16_t H)
+            {
+                printf("setFrame X=%d Y=%d W=%d H=%d\n\r",(int)X,(int)Y,(int)W,(int)H);
+                LCD->interface->writereg(ILI9328_REGISTER_HORIZONTALGRAMADDRESSSET,X);
+                LCD->interface->writereg(ILI9328_REGISTER_VERTICALGRAMADDRESSSET,Y);
+                LCD->interface->writereg(ILI9328_REGISTER_HORIZONTALADDRESSSTARTPOSITION,X);
+                LCD->interface->writereg(ILI9328_REGISTER_HORIZONTALADDRESSSTARTPOSITION,X);
+                LCD->interface->writereg(ILI9328_REGISTER_HORIZONTALADDRESSENDPOSITION,W+X);
+                LCD->interface->writereg(ILI9328_REGISTER_VERTICALADDRESSSTARTPOSITION,Y);
+                LCD->interface->writereg(ILI9328_REGISTER_VERTICALADDRESSENDPOSITION,Y+H);
             }
             void ili9328paint(LCD_t* LCD,void* buffer,uint16_t Xpos,uint16_t Ypos,uint16_t Width,uint16_t Height)
                 if((LCD!=NULL) && (LCD->interface!=NULL) && (LCD->interface->writeGRAM!=NULL) &&  (LCD->width<(Xpos+Width)) && (LCD->height<(Ypos+Height)))
                 {
                     printf("paint\n\r");
-                    ili9328setFrame(LCD,Xpos,Ypos,Xpos+Width,Ypos+Height);
+                    ili9328setFrame(LCD,Xpos,Ypos,Width,Height);
-                    ili9328setGRAMaddress(LCD,Xpos,Ypos);
+                    //ili9328setGRAMaddress(LCD,Xpos,Ypos);
                     LCD->interface->writeGRAM(buffer,Width*Height);
                 }
             }
                     // Display On
                     LCD->interface->writereg(ILI9328_REGISTER_DISPLAYCONTROL1, 0x0133);     // Display Control (R07h)
                     _delay_(500000);
-                    LCD->interface->writereg(ILI9328_REGISTER_ENTRYMODE, 0x1030);
+                    LCD->interface->writereg(ILI9328_REGISTER_ENTRYMODE, 0x1018);
                     LCD->interface->writereg(ILI9328_REGISTER_DRIVEROUTPUTCONTROL1, 0x0100);
                     //ili9328WriteCmd(ILI9328_REGISTER_WRITEDATATOGRAM);
                 }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages