HG_REPOSITORIES/LPP/INSTRUMENTATION/libuc2 Commit - r56:bf21d93f0037

Corrected bug

jeandet -

r56:bf21d93f0037 dev_alexis

parent child

Context file:

r56:bf21d93f0037

Collapse all files

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

             void bsp_iic_init()
             {
-                i2copenandconfig(i2c2,0,400000,PF0,PF1);
+                i2copenandconfig(i2c2,0,10000,PF0,PF1);
             }
             void bsp_SD_init()

bsp/src/BEAGLESYNTH/bsp.pri +5 -2

             CPU=stm32f4xxxG
             DEFINES+=BSP=\\\"BEAGLESYNTH\\\"
             beagleCp.target = beagleCp
-            beagleCp.commands = scp $$DESTDIR/$(QMAKE_TARGET).bin root@192.168.7.2://opt/stm32flashAje/hello.bin
+            beagleCp.commands = cd bin && scp $(QMAKE_TARGET).bin root@192.168.7.2://opt/stm32flashAje/hello.bin
-            QMAKE_EXTRA_TARGETS += beagleCp
+            beagleCp131.target = beagleCp131
+            beagleCp131.commands = cd bin && scp $(QMAKE_TARGET).bin root@129.104.27.131://opt/stm32flashAje/hello.bin
+            QMAKE_EXTRA_TARGETS += beagleCp beagleCp131
             UCMODEL=stm32f4

bsp/src/STM32F4Eval/bsp.c +1 -1

             void bsp_iic_init()
             {
-                //i2copenandconfig(i2c2,0,400000,PF0,PF1);
+                i2copenandconfig(i2c1,0,100000,PB9,PB6);
             }
             void bsp_SD_init()

examples/BeagleSynthHelloSupMon/BeagleSynthHelloSupMon.pro +12 -3

             UCMODEL=stm32f4
-            DEFINES += CPUFREQ=160000000
+            DEFINES += CPUFREQ=40000000
-            #BSP = BEAGLESYNTH
+            BSP = BEAGLESYNTH
             #BSP = SOLAR_LFR_PSU
-            BSP = STM32F4Eval
+            #BSP = STM32F4Eval
             SOURCES += \
                 main.c
+            #beagleCp.target = beagleCp
+            #beagleCp.commands = cd bin && scp $(QMAKE_TARGET).bin root@192.168.7.2://opt/stm32flashAje/hello.bin
+            #beagleCp131.target = beagleCp131
+            #beagleCp131.commands = cd bin && scp $(QMAKE_TARGET).bin root@129.104.27.131://opt/stm32flashAje/hello.bin
+            #QMAKE_EXTRA_TARGETS += beagleCp beagleCp131

examples/BeagleSynthHelloSupMon/main.c +14 -4

             #include <fonts.h>
             #include <stdlib.h>
             #include <core.h>
+            #include <malloc.h>
             extern streamdevice* __opnfiles__[];
             #define PSU_DISABLE LED1
             #endif
+            void setUartAsStdout()
+            {
+                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;
+            }
             int main()
             {
                 delay_100us(20000);
                 INA226_t ina5VSens,ina33VSens,ina15VSens;
                 gpioset(PSU_DISABLE);//enable psu!
-                ili9328paintFilRect(&lcd0,0,0,240,320,LCD_COLOR_BLACK,1,LCD_COLOR_BLACK);
+                setUartAsStdout();
+                //ili9328paintFilRect(&lcd0,0,0,240,320,LCD_COLOR_BLACK,1,LCD_COLOR_BLACK);
                 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");
                     current5V = ina226getCurrent(&ina5VSens);
                     current33V = ina226getCurrent(&ina33VSens);
                     current15V = ina226getCurrent(&ina15VSens);
-                    printf("%dmA\n",current15V/1000);
+                    printf("%dmA\n\r",current15V/1000);
-                    printf("%dmA\n",current33V/1000);
+                    printf("%dmA\n\r",current33V/1000);
-                    printf("%dmA\n",current5V/1000);
+                    printf("%dmA\n\r",current5V/1000);
+                    delay_100us(10000);
                 }
                 printf("Exit\n\r");
                 return 0;

examples/lcdTerminal/lcdTerminal.pro +1 -1

             BSP = STM32F4Eval
-            DEFINES += CPUFREQ=160000000
+            DEFINES += CPUFREQ=40000000
             SOURCES += \
                 main.c

examples/lcdTerminal/main.c +10 0

             #define LCD_COLOR_CYAN           0x7FFF
             #define LCD_COLOR_YELLOW         0xFFE0
+            void testAudioDAC()
+            {
+                CS43L22_t dac;
+                cs43l22open(&dac,i2c1,0);
+                uint8_t ID= cs43l22getID(&dac);
+                printf("dac ID = %d\n\r",ID);
+            }
             int main()
             {
+                delay_100us(10000);
                 uint16_t innerbuffer[16];
                 uint16_t outterbuffer[16];
                 for(int i=0;i<16;i++)innerbuffer[i]=LCD_COLOR_BLUE;
                 printf("Line cnt :\n \t%d\n",terminal0.lineCount);
                 printf("Column cnt :\n \t%d\n",terminal0.columnCount);
                 printf("CPU Freq :\n \t%dMHz\n",getCpuFreq()/1000000);
+                //testAudioDAC();
+                i2cwrite(i2c1,0x4a," ",1);
                 while(1)
                 {
                     i%=1000;

lib/src/common/POWER/ina226/ina226.c +1 -1

                 if(dev != NULL)
                 {
                     dev->i2cdev=i2cdev;
-                    dev->devAddress = INA226_I2C_ADDRESS | (A0 & 1) | ((A1<<1) & 2);
+                    dev->devAddress = INA226_I2C_ADDRESS | (A0 & 1) | ((A1<<2) & 5);
                     printf("dev->devAddress = %x\n\r",dev->devAddress);
                     dev->shuntmOhm = shuntmOhm;
                     dev->CurrentRangeuAmp = CurrentRangeuAmp;

lib/src/stm32f4/I2C/i2c.c +73 -26

             #define _INIT_DEV(_RCC_) \
                 RCC_APB1PeriphClockCmd(_RCC_, ENABLE); \
                 RCC_APB1PeriphResetCmd(_RCC_, ENABLE); \
-                RCC_APB1PeriphResetCmd(_RCC_, DISABLE); \
+                RCC_APB1PeriphResetCmd(_RCC_, DISABLE);
-                RCC_APB1PeriphClockCmd(_RCC_, ENABLE);
                 switch(count)
                 {
                     i2cclose(dev);
                     i2csetpins(dev,SDA,SCL);
                     i2copen(count);
-                    i2cenable(count);
+                    //i2cenable(count);
                     //I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
                     i2csetspeed(dev,speed);
                     i2cenable(count);
             int i2csetpins(i2c_t dev, uint32_t SDA, uint32_t SCL)
             {
-                if((dev<3)&&(dev>=0))
+                if((dev<i2c4)&&(dev>=i2c1))
                 {
                     gpio_t SDApin,SCLpin;
                     SDApin = gpioopen(SDA);
             int i2cenable(i2c_t dev)
             {
-                if((dev<3)&&(dev>=0))
+                if((dev<i2c4)&&(dev>=i2c1))
                 {
                     I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
                     _dev_->CR1 |=1 ;
             int i2cdisable(i2c_t dev)
             {
-                if((dev<3)&&(dev>=0))
+                if((dev<i2c4)&&(dev>=i2c1))
                 {
                     I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
                     _dev_->CR1 &= ~1;
             int i2csetspeed(i2c_t dev,uint32_t speed)
             {
-                if((dev<3)&&(dev>=0))
+                if((dev<i2c4)&&(dev>=i2c1))
                 {
                     I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
                     int32_t APB1Freq=getAPB1Freq()/1000000;
                         }
                         else
                         {
-                                tmpreg &= ~(1<<15);
+                            tmpreg &= ~(1<<15);
-                                tmpreg &= ~(0xfff);
+                            tmpreg &= ~(0xfff);
-                                tmpreg |= 0xfff & (APB1Freq/(2*speed));
+                            tmpreg |= 0xfff & (APB1Freq/(2*speed));
                         }
                         _dev_->CCR=tmpreg;
                         tmpreg=_dev_->TRISE;
             int i2cbusy(i2c_t dev)
             {
-                if((dev<3)&&(dev>=0))
+                if((dev<i2c4)&&(dev>=i2c1))
                 {
                     I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
                     if((_dev_->SR2 & 2) ==2) return 1;  /* Dev is busy */
             int i2cwrite(i2c_t dev,char address,char* data,int count)
             {
-                if((dev<3)&&(dev>=0))
+                if((dev<i2c4)&&(dev>=i2c1))
                 {
                     int timeout=i2ctimeout;
                     I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
                     while(i2cbusy(dev))
                     {
-                        if(0==(timeout--))return -1;
+                        if(0==(timeout--))
+                        {
+                            printf("Exited on timeout @ line %d\n\r",__LINE__);
+                            return -1;
+                        }
                     }
                     _dev_->CR1 |= 1<<8;
                     timeout=i2ctimeout;
                     while(!i2cStatusCheck(dev,((uint32_t)0x00030001)))
                     {
-                        if(0==(timeout--))return -1;
+                        if(0==(timeout--))
+                        {
+                            printf("Exited on timeout @ line %d\n\r",__LINE__);
+                            return -1;
+                        }
                     }
                     _dev_->DR= address<<1;
                     timeout=i2ctimeout;
                     while(!i2cStatusCheck(dev, ((uint32_t)0x00070082)))
                     {
-                        if(0==(timeout--))return -1;
+                        if(0==(timeout--))
+                        {
+                            printf("Exited on timeout @ line %d\n\r",__LINE__);
+                            return -1;
+                        }
                     }
                     address=_dev_->SR2;
                     for(int i=0;i<count;i++)
                         timeout=i2ctimeout;
                         while(!i2cStatusCheck(dev,((uint32_t)0x00070080)))
                         {
-                            if(0==(timeout--))return -1;
+                            if(0==(timeout--))
+                            {
+                                printf("Exited on timeout @ line %d\n\r",__LINE__);
+                                return -1;
+                            }
                         }
                         _dev_->DR= data[i];
                     }
                     timeout=i2ctimeout;
                     while(!i2cStatusCheck(dev,1<<7))
                     {
-                        if(0==(timeout--))return -1;
+                        if(0==(timeout--))
+                        {
+                            printf("Exited on timeout @ line %d\n\r",__LINE__);
+                            return -1;
+                        }
                     }
                     timeout=i2ctimeout;
                     while(!i2cStatusCheck(dev,1<<2))
                     {
-                        if(0==(timeout--))return -1;
+                        if(0==(timeout--))
+                        {
+                            printf("Exited on timeout @ line %d\n\r",__LINE__);
+                            return -1;
+                        }
                     }
                     _dev_->CR1 |= 1<<9;
                     return count;
             int i2cread(i2c_t dev,char address,char* data,int count)
             {
-                if((dev<3)&&(dev>=0))
+                if((dev<i2c4)&&(dev>=i2c1))
                 {
                     int i=0;
                     int timeout=i2ctimeout;
                     while(i2cbusy(dev))
                     {
-                        if(0==(timeout--))return -1;
+                        if(0==(timeout--))
+                        {
+                            printf("Exited on timeout @ line %d\n\r",__LINE__);
+                            return -1;
+                        }
                     }
                     I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
                     _dev_->CR1 |= (1<<8) + (1<<10);
                     timeout=i2ctimeout;
                     while(!i2cStatusCheck(dev,0x00030001))
                     {
-                        if(0==(timeout--))return -1;
+                        if(0==(timeout--))
+                        {
+                            printf("Exited on timeout @ line %d\n\r",__LINE__);
+                            return -1;
+                        }
                     }
                     _dev_->DR= (address<<1) + 1;
                     while(!i2cStatusCheck(dev,0x000002))
                     {
-                        if(0==(timeout--))return -1;
+                        if(0==(timeout--))
+                        {
+                            printf("Exited on timeout @ line %d\n\r",__LINE__);
+                            return -1;
+                        }
                     }
                     if(count==1)
                     {
                         timeout=i2ctimeout;
                         while(!i2cStatusCheck(dev,0x0000040))
                         {
-                            if(0==(timeout--))return -1;
+                            if(0==(timeout--))
+                            {
+                                printf("Exited on timeout @ line %d\n\r",__LINE__);
+                                return -1;
+                            }
                         }
                         data[i]=_dev_->DR;
                     }
                     timeout=i2ctimeout;
                     while(!i2cStatusCheck(dev,0x0000040))
                     {
-                        if(0==(timeout--))return -1;
+                        if(0==(timeout--))
+                        {
+                            printf("Exited on timeout @ line %d\n\r",__LINE__);
+                            return -1;
+                        }
                     }
                     data[i]=_dev_->DR;
                     timeout=i2ctimeout;
                     while(_dev_->CR1 & ((uint16_t)0x0200))
                     {
-                        if(0==(timeout--))return -1;
+                        if(0==(timeout--))
+                        {
+                            printf("Exited on timeout @ line %d\n\r",__LINE__);
+                            return -1;
+                        }
                     }
                     _dev_->CR1 |= 1<<10;
                     return count;
             int i2cStatusCheck(i2c_t dev,int32_t flagMask)
             {
                 int32_t flag;
-                if((dev<3)&&(dev>=0))
+                if((dev<i2c4)&&(dev>=i2c1))
                 {
                     I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
                     flag= _dev_->SR1 + (_dev_->SR2<<16);

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