# HG changeset patch # User jeandet # Date 2012-11-30 19:45:17 # Node ID be52970f57977558122fb01b3bdbbc2ba0bc8c31 # Parent ee74c90426e95a760fdb7d9ffeb0a825e5ff0bb0 Sync diff --git a/examples/BeagleSynthHello/main.c b/examples/BeagleSynthHello/main.c --- a/examples/BeagleSynthHello/main.c +++ b/examples/BeagleSynthHello/main.c @@ -72,9 +72,9 @@ int main() printf("Sys Tick=%d\n\r",SysTick->VAL); printf("Sys Tick=%d\n\r",SysTick->VAL); printf("Sys Tick=%d\n\r",SysTick->VAL); - ili9328paintFilRect(&lcd0,1,1,3,3,LCD_COLOR_BLACK,1,LCD_COLOR_WHITE); - while(1)monkDemo(); //randBoxesDemo(); - 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)) + ili9328paintFilRect(&lcd0,0,0,240,320,LCD_COLOR_BLACK,1,LCD_COLOR_WHITE); + //while(1)monkDemo(); //randBoxesDemo(); + if(-1==ina226open(&ina33VSens,i2c2,INA226_MODE_SHUNT_VOLTAGE_CONTINUOUS|INA226_AVERAGES_16|INA226_BUS_CONV_8244us|INA226_SHUNT_CONV_8244us,0,0,15,1000000)) { printf("Can't open 3.3V monitor\n\r"); } 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 @@ -3,8 +3,8 @@ CONFIG += console CONFIG -= qt #BSP = BEAGLESYNTH -#BSP = SOLAR_LFR_PSU -BSP=M4Stick +BSP = SOLAR_LFR_PSU +#BSP=M4Stick include($$(libuc2)/bsp/cfg/$$BSP/bsp.pri) #include($$(libuc2)/rules/stm32f4-arm-none-eabi-gcc/rules.pri) 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 @@ -69,6 +69,18 @@ void ili9328paint(LCD_t* LCD,void* buffe } } +void ili9328paintFilCircMidPoint(LCD_t* LCD,uint16_t Xpos,uint16_t Ypos,uint16_t r,uint32_t contColor,uint16_t contSz,uint32_t fillColor) +{ + if(contSz