HG_REPOSITORIES/LPP/INSTRUMENTATION/libuc2 Commit - r34:da27034d4b78

sync

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

r34:da27034d4b78 dev_alexis

parent child

Context file:

r34:da27034d4b78

Collapse all files

bsp/includes/BEAGLESYNTH/bsp.h +2 0

             /*------------------------------------------------------------------------------
             --  This file is a part of the libuc, microcontroler library
             --  Copyright (C) 2011, Alexis Jeandet
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------
             --                 Author : Alexis Jeandet
             --                   Mail : alexis.jeandet@gmail.com
             -------------------------------------------------------------------------------*/
             #ifndef BSP_H
             #define BSP_H
             #include <stm32f4xx.h>
             #include <stm32f4xx_gpio.h>
             #include <stm32f4xx_rcc.h>
             #include <gpio.h>
             #include <ili9328.h>
             #include <genericLCD_Controler.h>
             #define __MAX_OPENED_FILES__ 4
             #define __FS_ROOT_SIZE__ 4
             /*
             #ifndef PD8
               #define PD8
             #endif
             #ifndef PD9
               #define PD9
             #endif
             */
             #define LED1 PF6
             #define LED2 PF7
             #define LED3 PF8
             #define PSU_DISABLE PH2
             #define PSU_ALERT_5V PF2
             #define PSU_ALERT_1_5V PF3
             #define PSU_ALERT_3_3V PF4
+            #define LCD_RESET PE2
             extern float VREF0;
             extern uint32_t currentCpuFreq;
             extern LCD_t lcd0;
             extern int bsp_init();
             extern void bsp_GPIO_init();
             extern void bsp_uart_init();
             extern void bsp_iic_init();
             extern void bsp_spi_init();
             extern void bsp_SD_init();
             extern void bsp_FSMC_init();
             /*  VS1053  */
             extern void clearXCS();
             extern void setXCS();
             extern int vs10XXDREQ();
             /*   SD CARD */
             void bsppowersdcard(char onoff);
             char bspsdcardpresent();
             void bspsdcardselect(char YESNO);
             char bspsdcardwriteprotected();
             #endif

bsp/src/BEAGLESYNTH/bsp.c +7 -5

             /*------------------------------------------------------------------------------
             --  This file is a part of the libuc, microcontroler library
             --  Copyright (C) 2011, Alexis Jeandet
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------
             --                 Author : Alexis Jeandet
             --                   Mail : alexis.jeandet@gmail.com
             -------------------------------------------------------------------------------*/
             #include "bsp.h"
             #include <streamdevices.h>
             #include <malloc.h>
             #include <gpio.h>
             #include <uart.h>
             #include <stdio.h>
             #include <stm32f4xx_gpio.h>
             #include <stm32f4xx_fsmc.h>
             #include <i2c.h>
             uint32_t OSC0  =8000000;
             uint32_t INTOSC =16000000;
             uint32_t RTCOSC =32768;
             uint32_t currentCpuFreq=0;
             extern streamdevice* __opnfiles__[__MAX_OPENED_FILES__];
             LCD_t lcd0;
             LCD_IF_t lcdIF0;
             volatile int16_t* lcd0_CMD=(volatile int16_t*)  0x60000000;
-            volatile int16_t* lcd0_DATA=(volatile int16_t*)(0x60000000+(1<<20));
+            volatile int16_t* lcd0_DATA=(volatile int16_t*)(0x61FFFFF0);
             float VREF0 =(float)3.3;
             int bsp_init()
             {
                 int i=0;
                 for(i=0;i<32;i++)
                 {
                     __opnfiles__[i] = NULL;
                 }
                 bsp_GPIO_init();
                 bsp_uart_init();
                 bsp_iic_init();
                 bsp_FSMC_init();
                 printf("\r================================================================\n\r");
                 printf("================================================================\n\r");
                 printf(BSP);
                 printf(" initialised\n\r");
                 printf("================================================================\n\r");
                 return 1;
             }
             void bsp_GPIO_init()
             {
                 gpio_t gpio1 = gpioopen(LED1);
                 gpio_t gpio2 = gpioopen(LED2);
                 gpio_t gpio3 = gpioopen(LED3);
                 gpio_t gpio4 = gpioopen(PSU_DISABLE);
                 gpio_t gpio5 = gpioopen(PSU_ALERT_5V);
                 gpio_t gpio6 = gpioopen(PSU_ALERT_1_5V);
                 gpio_t gpio7 = gpioopen(PSU_ALERT_3_3V);
                 gpiosetspeed(&gpio1,gpiohighspeed);
                 gpiosetspeed(&gpio2,gpiohighspeed);
                 gpiosetspeed(&gpio3,gpiohighspeed);
                 gpiosetspeed(&gpio4,gpiohighspeed);
                 gpiosetspeed(&gpio5,gpiohighspeed);
                 gpiosetspeed(&gpio6,gpiohighspeed);
                 gpiosetspeed(&gpio7,gpiohighspeed);
                 gpioclr(PSU_DISABLE);
                 gpiosetdir(&gpio1,gpiooutdir);
                 gpiosetdir(&gpio3,gpiooutdir);
                 gpiosetdir(&gpio2,gpiooutdir);
                 gpiosetdir(&gpio4,gpiooutdir);
                 gpiosetdir(&gpio5,gpioindir);
                 gpiosetdir(&gpio6,gpioindir);
                 gpiosetdir(&gpio7,gpioindir);
                 gpioclr(PSU_DISABLE);
             }
             void bsp_uart_init()
             {
                 if(__opnfiles__[1]==NULL)
                 {
                     //uart_t* uart1 = (uart_t*)malloc(sizeof(uart_t));
                     streamdevice* fd1 = (streamdevice*)malloc(sizeof(streamdevice));
                     uart_t uart = uartopenandconfig(uart1,uartparitynone | uart8bits | uartonestop,115200,PA9,PA10,-1,-1);
                     uartmkstreamdev(uart,fd1);
                     __opnfiles__[1] = fd1;
                 }
                 else
                 {
                     uartopenandconfig(0,uartparitynone | uart8bits | uartonestop,115200,PA9,PA10,-1,-1);
                 }
             }
             void bsp_lcd0_write_reg(uint32_t reg,uint32_t data);
             void 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)
+                gpio_t gpio1 = gpioopen(LCD_RESET);
+                gpiosetspeed(&gpio1,gpiohighspeed);
+                gpiosetdir(&gpio1,gpiooutdir);
+                gpioclr(LCD_RESET);
                 gpio_t LCD_DBxList[]={PD14,PD15,PD0,PD1,PE7,PE8,PE9,PE10,PE11,PE12,PE13,PE14,PE15\
                                       ,PD8,PD9,PD10,PD4,PD5,PD7,PE4};
                 for(int i=0;i<20;i++)
                 {
                     gpio_t LCD_DBx = gpioopen(LCD_DBxList[i]);
                     LCD_DBx |=  gpiohighspeed | gpioaf | gpiopushpulltype | gpionopulltype;
                     gpiosetconfig(&LCD_DBx);
                     GPIO_PinAFConfig(GPIOGETPORT(LCD_DBx), (uint8_t)(LCD_DBx & 0xF), GPIO_AF_FSMC);
                 }
                 FSMC_NORSRAMInitTypeDef  FSMC_NORSRAMInitStructure;
                 FSMC_NORSRAMTimingInitTypeDef  p;
                 /* Enable FSMC clock */
                 RCC_AHB3PeriphClockCmd(RCC_AHB3Periph_FSMC, ENABLE);
               /*-- FSMC Configuration ------------------------------------------------------*/
               /*----------------------- SRAM Bank 3 ----------------------------------------*/
                 /* FSMC_Bank1_NORSRAM4 configuration */
                 p.FSMC_AddressSetupTime = 5;
                 p.FSMC_AddressHoldTime = 0;
                 p.FSMC_DataSetupTime = 9;
                 p.FSMC_BusTurnAroundDuration = 0;
                 p.FSMC_CLKDivision = 0;
                 p.FSMC_DataLatency = 0;
                 p.FSMC_AccessMode = FSMC_AccessMode_A;
                 /* Color LCD configuration ------------------------------------
                    LCD configured as follow:
                       - Data/Address MUX = Disable
                       - Memory Type = SRAM
                       - Data Width = 16bit
                       - Write Operation = Enable
                       - Extended Mode = Enable
                       - Asynchronous Wait = Disable */
                 FSMC_NORSRAMInitStructure.FSMC_Bank = FSMC_Bank1_NORSRAM1;
                 FSMC_NORSRAMInitStructure.FSMC_DataAddressMux = FSMC_DataAddressMux_Disable;
                 FSMC_NORSRAMInitStructure.FSMC_MemoryType = FSMC_MemoryType_SRAM;
                 FSMC_NORSRAMInitStructure.FSMC_MemoryDataWidth = FSMC_MemoryDataWidth_16b;
                 FSMC_NORSRAMInitStructure.FSMC_BurstAccessMode = FSMC_BurstAccessMode_Disable;
                 FSMC_NORSRAMInitStructure.FSMC_AsynchronousWait = FSMC_AsynchronousWait_Disable;
                 FSMC_NORSRAMInitStructure.FSMC_WaitSignalPolarity = FSMC_WaitSignalPolarity_Low;
                 FSMC_NORSRAMInitStructure.FSMC_WrapMode = FSMC_WrapMode_Disable;
                 FSMC_NORSRAMInitStructure.FSMC_WaitSignalActive = FSMC_WaitSignalActive_BeforeWaitState;
                 FSMC_NORSRAMInitStructure.FSMC_WriteOperation = FSMC_WriteOperation_Enable;
                 FSMC_NORSRAMInitStructure.FSMC_WaitSignal = FSMC_WaitSignal_Disable;
                 FSMC_NORSRAMInitStructure.FSMC_ExtendedMode = FSMC_ExtendedMode_Disable;
                 FSMC_NORSRAMInitStructure.FSMC_WriteBurst = FSMC_WriteBurst_Disable;
                 FSMC_NORSRAMInitStructure.FSMC_ReadWriteTimingStruct = &p;
                 FSMC_NORSRAMInitStructure.FSMC_WriteTimingStruct = &p;
                 FSMC_NORSRAMInit(&FSMC_NORSRAMInitStructure);
                 /* Enable FSMC NOR/SRAM Bank1 */
                 FSMC_NORSRAMCmd(FSMC_Bank1_NORSRAM1, ENABLE);
                 lcdIF0.writereg=&bsp_lcd0_write_reg;
                 lcd0.interface=&lcdIF0;
                 lcd0.init=&ili9328init;
+                gpioset(LCD_RESET);
                 lcd0.init(&lcd0);
             }
             void bsp_spi_init()
             {
             }
             void bsp_iic_init()
             {
                 i2copenandconfig(i2c2,0,400000,PF0,PF1);
             }
             void bsp_SD_init()
             {
             }
             void vs10XXclearXCS(){}
             void vs10XXsetXCS(){}
             int vs10XXDREQ()
             {
                 return 1;
             }
             void bsppowersdcard(char onoff)   //always ON
             {
             }
             char bspsdcardpresent()
             {
                 return 0;
             }
             char bspsdcardwriteprotected()
             {
                 return 0;
             }
             void bspsdcardselect(char YESNO)
             {
             }
             void bsp_lcd0_write_reg(uint32_t reg,uint32_t data)
             {
                 *lcd0_CMD=(uint16_t)reg;
                 *lcd0_DATA=(uint16_t)data;
-                printf("Write to 0x%x   0x%x\n\r",reg,data);
-                *lcd0_CMD=(uint16_t)reg;
-                data = *lcd0_DATA;
-                printf("Readback to 0x%x   0x%x\n\r",reg,data);
             }

examples/BeagleSynthHello/main.c +8 -22

             #include <stdio.h>
             #include <fat32.h>
             #include <gpio.h>
             #include <uart.h>
             #include <stm32f4xx.h>
             #include <bsp.h>
             #include <i2c.h>
             #include <CS43L22.h>
             #include <ina226.h>
             extern streamdevice* __opnfiles__[];
             int main()
             {
                 INA226_t ina5VSens,ina33VSens,ina15VSens;
                 gpioset(PSU_DISABLE);
                 volatile int16_t* regtest=(volatile int16_t*)0x60000000;
-                volatile int16_t* regtest2=(volatile int16_t*)(0x60000000+(1<<20));
+                volatile int16_t* regtest2=(volatile int16_t*)(0x61FFFFF0);
                 //ina226open(&ina5VSens,i2c2,INA226_MODE_SHUNT_VOLTAGE_CONTINUOUS|INA226_AVERAGES_16|INA226_BUS_CONV_8244us|INA226_SHUNT_CONV_8244us,0,0,15,1000000);
                 //ina226open(&ina15VSens,i2c2,INA226_MODE_SHUNT_VOLTAGE_CONTINUOUS|INA226_AVERAGES_16|INA226_BUS_CONV_8244us|INA226_SHUNT_CONV_8244us,1,0,15,1000000);
                 *regtest=(int16_t)0;
                 printf("LCD ID=%x\n\r",0xFFFF&(*regtest2));
-                *regtest=(int16_t)ILI9328_REGISTER_ENTRYMODE;
+                //*regtest=(int16_t)ILI9328_REGISTER_ENTRYMODE;
-                *regtest2=(int16_t)0x1008;
+                //*regtest2=(int16_t)0x1008;
                 *regtest=(int16_t)0x20;
                 *regtest2=(int16_t)0x0;
                 *regtest=(int16_t)0x21;
                 *regtest2=(int16_t)0x0;
                 *regtest=(int16_t)0x22;
-                for(volatile int i=0;i<32;i++)
+                for(volatile int i=0;i<(320*240);i++)
                 {
-                    *regtest=(int16_t)0x20;
                     *regtest2=(int16_t)i;
-                    *regtest=(int16_t)0x21;
+                    for(volatile int l=0;l<(1024);l++);
-                    *regtest2=(int16_t)0x0;
-                    *regtest=(int16_t)0x22;
-                    *regtest2=(int16_t)-i;
                 }
-                *regtest=(int16_t)ILI9328_REGISTER_ENTRYMODE;
+                //*regtest=(int16_t)ILI9328_REGISTER_ENTRYMODE;
-                *regtest2=(int16_t)0x1018;
+                //*regtest2=(int16_t)0x1018;
-                for(volatile int i=0;i<32;i++)
-                    *regtest=(int16_t)0x20;
-                    *regtest2=(int16_t)i;
-                    *regtest=(int16_t)0x21;
-                    *regtest2=(int16_t)0x0;
-                    *regtest=(int16_t)0x22;
-                    int16_t test=*regtest2;
-                    printf("DATA@%d=%x\n\r",i,0xFFFF&(*regtest2));
                 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");
                 }
                 int current5V,current33V,current15V;
                 printf("\t5V\t3.3V\n\r");
                 while(1)
                 {
                     for(volatile int i=0;i<1024*1024;i++);
                     gpioset(LED1);
                     gpioclr(LED2);
                     for(volatile int i=0;i<1024*1024;i++);
                     gpioclr(LED1);
                     gpioset(LED2);
                     //current5V = ina226getCurrent(&ina5VSens);
                     current33V = ina226getCurrent(&ina33VSens);
                     //current15V = ina226getCurrent(&ina15VSens);
                     //current = ina226getReg(&Psens1,INA226_Current_Reg);
                     //printf("%duA  %dmA\t%duA  %dmA\n\r",current5V,current5V/1000,current33V,current33V/1000);
                     printf("%duA  %dmA\n\r",current33V,current33V/1000);
                 }
                 printf("hello world\n\r");
                 return 0;
             }

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