HG_REPOSITORIES/LPP/INSTRUMENTATION/libuc2 Commit - r42:ee74c90426e9

Sync

jeandet@pc-de-jeandet3.LAB-LPP.LOCAL -

r42:ee74c90426e9 dev_alexis

parent child

Context file:

r42:ee74c90426e9

Collapse all files

bsp/src/M4Stick/bsp.c +4 -10

             void bsp_GPIO_init()
             {
-                gpio_t gpio1 = gpioopen(PD12);//gpioopen(LED1);  //PD9 D=> 0x0300 9 => 0x0009
+                gpio_t gpio1 = gpioopen(PC6);//gpioopen(LED1);  //PD9 D=> 0x0300 9 => 0x0009
-                gpio_t gpio2 = gpioopen(PD13);//gpioopen(LED2);
+                gpio_t gpio2 = gpioopen(PC7);//gpioopen(LED2);
-                gpio_t gpio3 = gpioopen(PD14);//gpioopen(LED2);
-                gpio_t gpio4 = gpioopen(PD15);//gpioopen(LED2);
                 gpiosetspeed(&gpio1,gpiohighspeed);
                 gpiosetspeed(&gpio2,gpiohighspeed);
-                gpiosetspeed(&gpio3,gpiohighspeed);
-                gpiosetspeed(&gpio4,gpiohighspeed);
                 gpiosetdir(&gpio1,gpiooutdir);
-                gpiosetdir(&gpio3,gpiooutdir);
                 gpiosetdir(&gpio2,gpiooutdir);
-                gpiosetdir(&gpio4,gpiooutdir);
             }
             void bsp_uart_init()
                 {
                     //uart_t* uart1 = (uart_t*)malloc(sizeof(uart_t));
                     streamdevice* fd1 = (streamdevice*)malloc(sizeof(streamdevice));
-                    uart_t uart = uartopenandconfig(uart3,uartparitynone | uart8bits | uartonestop,115200,PB10,PB11,-1,-1);
+                    uart_t uart = uartopenandconfig(uart3,uartparitynone | uart8bits | uartonestop,115200,LED2,LED1,-1,-1);
                     uartmkstreamdev(uart,fd1);
                     __opnfiles__[1] = fd1;
                 }
                 else
                 {
-                    uartopenandconfig(2,uartparitynone | uart8bits | uartonestop,115200,PB10,PB11,-1,-1);
+                    uartopenandconfig(uart3,uartparitynone | uart8bits | uartonestop,115200,LED2,LED1,-1,-1);
                 }
             }

examples/BeagleSynthHello/main.c +1 -1

                 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)randBoxesDemo();
+                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))
                 {
                     printf("Can't open 3.3V monitor\n\r");

examples/SOLAR_PSU_HELLO/hello.pro +2 -1

             CONFIG -= qt
             #BSP = BEAGLESYNTH
-            BSP = SOLAR_LFR_PSU
+            #BSP = SOLAR_LFR_PSU
+            BSP=M4Stick
             include($$(libuc2)/bsp/cfg/$$BSP/bsp.pri)
             #include($$(libuc2)/rules/stm32f4-arm-none-eabi-gcc/rules.pri)

examples/SOLAR_PSU_HELLO/main.c +2 -4

             #include <uart.h>
             #include <stm32f4xx.h>
             #include <bsp.h>
+            #include <core.h>
             extern streamdevice* __opnfiles__[];
             int main()
             {
-                //gpioset(PSU_DISABLE);
                while(1)
                 {
-                    for(volatile int i=0;i<1024*2048;i++);
                     gpioset(LED1);
                     gpioclr(LED2);
-                    for(volatile int i=0;i<1024*2048;i++);
                     gpioclr(LED1);
                     gpioset(LED2);
+                    printf("Hello\n\r");
                 }
                 printf("hello world\n\r");
                 return 0;

lib/src/stm32f4/CPU/stm32f4xxxG/cpuinit.c +1 -1

             void cpu_init()
             {
                 extern uint32_t currentCpuFreq;
-                currentCpuFreq = 180*1000*1000;
+                currentCpuFreq = 16*1000*1000;
                 enable_FPU();
                 RCC->CR |= (uint32_t)0x00000001;
                 FLASH->ACR = FLASH_ACR_ICEN |FLASH_ACR_DCEN |FLASH_ACR_LATENCY_5WS;

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