HG_REPOSITORIES/LPP/INSTRUMENTATION/libuc2 Commit - r24:5d5838023b3d

sync

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

r24:5d5838023b3d default

parent child

Context file:

r24:5d5838023b3d

Collapse all files

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

             void bsp_iic_init()
             {
-                if(0==i2copenandconfig(i2c1,0,100000,PB9,PB6))printf("I2C1 opened\n\r");
+                if(0==i2copenandconfig(i2c1,0,400000,PB9,PB6))printf("I2C1 opened\n\r");
                 i2cenable(i2c1);
             }

examples/BeagleSynthHello/main.c +5 -1

             int main()
             {
                 //gpioset(PSU_DISABLE);
+                gpio_t dacRst=gpioopen(PD4);
+                gpiosetspeed(&dacRst,gpiohighspeed);
+                gpiosetdir(&dacRst,gpiooutdir);
+                gpioset(dacRst);
                 printf("i2C Control register 1 (I2C_CR1) = %x\n\r",I2C1->CR1);
                 printf("i2C Control register 2 (I2C_CR2) = %x\n\r",I2C1->CR2);
                 printf("i2C Status register 1 (I2C_SR1) = %x\n\r",I2C1->SR1);
                     for(volatile int i=0;i<1024*2048;i++);
                     gpioclr(LED1);
                     gpioset(LED2);
-                    i2cwrite(i2c1,0x4a,"test",4);
+                    i2cwrite(i2c1,0x4a,"test",1);
                 }
                 printf("hello world\n\r");
                 return 0;

lib/includes/i2c.h +2 -1

             //extern int i2csetdatabits(i2c_t* dev,uartbits_t databits);
             extern int i2cwrite(i2c_t dev,char address,char* data,int count);
             extern int i2cread(i2c_t dev,char address,char* data,int count);
+            extern int i2cbusy(i2c_t dev);
+            extern int i2cStatusCheck(i2c_t dev,int32_t flagMask);
             #ifdef __cplusplus
              }
             #endif

lib/src/stm32f4/I2C/i2c.c +48 -20

                 i2c_t dev = i2copen(count);
                 if(dev!=-1)
                 {
-                     i2cenable(count);
+                    i2cclose(dev);
-                     I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
-                    _dev_->CR1 = (1<<15);
-                    _dev_->CR1 &=~(1<<15);
-                    i2cdisable(count);
                     i2csetpins(dev,SDA,SCL);
+                    i2copen(count);
+                    i2cenable(count);
+                    //I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
                     i2csetspeed(dev,speed);
                     i2cenable(count);
-                    _dev_->CR1|=1<<15;
-                    _dev_->CR1&=~(1<<15);
                 }
                 return dev;
             }
                     int32_t APB1Freq=getAPB1Freq()/1000000;
                     if((APB1Freq>1)&&(APB1Freq<43))
                     {
-                        i2cdisable(dev);
                         uint16_t tmpreg=_dev_->CR2;
                         tmpreg &= ~(0x1f);
                         tmpreg |= APB1Freq;
                         _dev_->CR2=tmpreg;
-                        tmpreg=_dev_->TRISE;
+                        i2cdisable(dev);
-                        tmpreg &= ~(0x3f);
-                        tmpreg |= APB1Freq+1;
-                        _dev_->TRISE = tmpreg;
                         tmpreg=_dev_->CCR;
                         APB1Freq=getAPB1Freq();
                         if(speed>100000) //100kHz= standard mode, 400kHz= fast mode
                                 tmpreg |= 0xfff & (APB1Freq/(2*speed));
                         }
                         _dev_->CCR=tmpreg;
+                        tmpreg=_dev_->TRISE;
+                        tmpreg &= ~(0x3f);
+                        tmpreg |= (APB1Freq/1000000)+1;
+                        _dev_->TRISE = tmpreg;
+                        i2cenable(dev);
                         return 0;
                     }
                 }
                 return -1;
             }
+            int i2cbusy(i2c_t dev)
+            {
+                if((dev<3)&&(dev>=0))
+                {
+                    I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
+                    if((_dev_->SR2 & 2) ==2) return 1;  /* Dev is busy */
+                    return 0;                           /* Dev isn't busy */
+                }
+                return -1;                              /* Error, dev is out of range */
+            }
             int i2cwrite(i2c_t dev,char address,char* data,int count)
             {
                 if((dev<3)&&(dev>=0))
                 {
                     I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
+                    while(i2cbusy(dev));
                     _dev_->CR1 |= 1<<8;
-                    while((_dev_->SR1&1)==0);
+                    while(!i2cStatusCheck(dev,((uint32_t)0x00030001)));
                     _dev_->DR= address<<1;
-                    while((_dev_->SR1 & (1<<3))==0);
+                    while(!i2cStatusCheck(dev, ((uint32_t)0x00070082)));
                     address=_dev_->SR2;
                     for(int i=0;i<count;i++)
                     {
-                        while((_dev_->SR1 & (1<<7))==0);
+                        while(!i2cStatusCheck(dev,((uint32_t)0x00070080)));
                         _dev_->DR= data[i];
                     }
-                    while((_dev_->SR1 & (1<<7))==0);
+                    while(!i2cStatusCheck(dev,1<<7));
-                    while((_dev_->SR1 & (1<<2))==0);
+                    while(!i2cStatusCheck(dev,1<<2));
                     _dev_->CR1 |= 1<<9;
                     return count;
                 }
             {
                 if((dev<3)&&(dev>=0))
                 {
+                    while(i2cbusy(dev));
                     I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
                     _dev_->CR1 |= (1<<8) | (1<<10);
                     if(count==1)
                     {
                         _dev_->CR1 &= ~(1<<10);
                     }
-                    while((_dev_->SR1&1)==0);
+                    while(!i2cStatusCheck(dev,0x00030001));
                     _dev_->DR= (address<<1) + 1;
-                    while((_dev_->SR1 & (1<<3))==0);
+                    while(!i2cStatusCheck(dev, ((uint32_t)0x00070082)));
                     address=_dev_->SR2;
                     for(int i=0;i<count-1;i++)
                     {
             }
+            int i2cStatusCheck(i2c_t dev,int32_t flagMask)
+            {
+                int32_t flag;
+                __asm__("nop");
+                __asm__("nop");
+                __asm__("nop");
+                __asm__("nop");
+                if((dev<3)&&(dev>=0))
+                {
+                    I2C_TypeDef* _dev_ = _i2c_dev_table[(int)dev];
+                    flag= _dev_->SR1 + (_dev_->SR2<<16);
+                    if(flagMask==(flag & flagMask))
+                        return 1;
+                    return 0;
+                }
+                return -1;
+            }

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