# HG changeset patch
# User jeandet@pc-de-jeandet3.LAB-LPP.LOCAL
# Date 2012-12-07 18:41:48
# Node ID e203e69902ca4d06aab6bdeeba03a2a0aa76883e
# Parent  be52970f57977558122fb01b3bdbbc2ba0bc8c31

sync

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
@@ -85,7 +85,7 @@ void bsp_uart_init()
     }
     else
     {
-        uartopenandconfig(2,uartparitynone | uart8bits | uartonestop,115200,PB10,PB11,-1,-1);
+        uartopenandconfig(uart3,uartparitynone | uart8bits | uartonestop,115200,PB10,PB11,-1,-1);
     }
 }
 
diff --git a/examples/examples.pro b/examples/examples.pro
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -4,7 +4,8 @@ SUBDIRS += 	QtTest/test.pro \
                 SOLAR_PSU_HELLO/hello.pro \
     SDCARD \
     STM32F4IT \
-    BeagleSynthHello
+    BeagleSynthHello \
+    ../../../home/jeandet/hello
 
 
 
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
@@ -31,6 +31,18 @@
 
 #define _delay_(del) for(volatile int _d_e_l_=0;_d_e_l_<(del);_d_e_l_++);
 
+#define ilipaintLine(LCD,X,Y,W,buffer,buffsize) \
+    for(int l=0;l<1;l++)\
+    {\
+        ili9328setFrame(LCD,X,Y,W,1);\
+        int rem=(W)%buffsize;\
+        if(rem)LCD->interface->writeGRAM(buffer,rem);\
+        for(int i=rem;i<(W);i+=buffsize)\
+        {\
+            LCD->interface->writeGRAM(buffer,buffsize);\
+        }\
+    }
+
 void ili9328setGRAMaddress(LCD_t* LCD,uint16_t Haddress,uint16_t Vaddress)
 {
     LCD->interface->writereg(ILI9328_REGISTER_HORIZONTALGRAMADDRESSSET,Haddress);
@@ -71,12 +83,30 @@ 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)
 {
+    //Based on the mid point circle algorithm from Wikipedia
+    //http://en.wikipedia.org/wiki/Midpoint_circle_algorithm
+
     if(contSz<r)
     {
-        for(int i=0;i<(r/2);i++)
-        {
+        int f = 1 - r;
+        int ddF_x = 1;
+        int ddF_y = -2 * r;
+        int x = 0;
+        int y = r;
+        uint16_t tmp1[16];
+        uint16_t tmp2[16];
+        for(int i=0;i<16;i++)tmp1[i]=fillColor;
+        for(int i=0;i<16;i++)tmp2[i]=contColor;
+        ilipaintLine(LCD,Xpos-r,Ypos,2*r,tmp1,16);
+        ilipaintLine(LCD,Xpos-r,Ypos+1,2*r,tmp1,16);
+        ilipaintLine(LCD,Xpos-1,Ypos+r,2,tmp1,16);
+        ilipaintLine(LCD,Xpos,Ypos-r,2,tmp1,16);
+        setPixel(x0, y0 + radius);
+        setPixel(x0, y0 - radius);
+        setPixel(x0 + radius, y0);
+        setPixel(x0 - radius, y0);
 
-        }
+
     }
 
 }
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
@@ -38,17 +38,34 @@ void SysTick_Handler(void)
     tickCounter+=1;
 }
 
+void delay_us(uint32_t value)
+{
+    extern uint32_t currentCpuFreq;
+    if(value)
+    {
+        uint32_t tickperus=currentCpuFreq/(1000*10);
+        uint32_t SysTickSnap = SysTick->VAL+((value%100)*tickperus);
+        uint32_t targetVal=tickCounterSnap +(value/100);
+        if(targetVal < tickCounterSnap)
+        {
+            while(tickCounter > targetVal);
+        }
+        while((tickCounter < targetVal) | (SysTick->VAL<SysTickSnap));
+    }
+}
+
 void delay_100us(uint32_t value)
 {
     if(value)
     {
         uint32_t tickCounterSnap = tickCounter;
+        uint32_t SysTickSnap = SysTick->VAL;
         uint32_t targetVal=tickCounterSnap +(value);
         if(targetVal < tickCounterSnap)
         {
             while(tickCounter > targetVal);
         }
-        while(tickCounter < targetVal);
+        while((tickCounter < targetVal) | (SysTick->VAL<SysTickSnap));
     }
 }