piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

EEPROM was readonly since my latest cosmetics (line removed by mistake)

Browse Source
This commit is contained in:
bsongis
2015-05-16 11:34:24 +02:00
parent 08a198ae66
commit ddf88e2721
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/taranis/hal.h
+1
View File
@@ -320,6 +320,7 @@
#define I2C_GPIO GPIOB
#define I2C_GPIO_PIN_SCL GPIO_Pin_6 // PB.06
#define I2C_GPIO_PIN_SDA GPIO_Pin_7 // PB.07
#define I2C_GPIO_PIN_WP GPIO_Pin_9 // PB.09
#define I2C_GPIO_AF GPIO_AF_I2C1
#define I2C_GPIO_PinSource_SCL GPIO_PinSource6
#define I2C_GPIO_PinSource_SDA GPIO_PinSource7
radio/src/targets/taranis/i2c_driver.cpp
+10 -7
View File
@@ -3,12 +3,12 @@
#define EE_CMD_WRITE (0)
#define EE_CMD_READ (1)
#define SCL_H do{I2C_GPIO->BSRRL = I2C_GPIO_PIN_SCL;}while(0)
#define SCL_L do{I2C_GPIO->BSRRH = I2C_GPIO_PIN_SCL;}while(0)
#define SDA_H do{I2C_GPIO->BSRRL = I2C_GPIO_PIN_SDA;}while(0)
#define SDA_L do{I2C_GPIO->BSRRH = I2C_GPIO_PIN_SDA;}while(0)
#define SCL_read (I2C_GPIO->IDR & I2C_GPIO_PIN_SCL)
#define SDA_read (I2C_GPIO->IDR & I2C_GPIO_PIN_SDA)
#define SCL_H do { I2C_GPIO->BSRRL = I2C_GPIO_PIN_SCL; } while(0)
#define SCL_L do { I2C_GPIO->BSRRH = I2C_GPIO_PIN_SCL; } while(0)
#define SDA_H do { I2C_GPIO->BSRRL = I2C_GPIO_PIN_SDA; } while(0)
#define SDA_L do { I2C_GPIO->BSRRH = I2C_GPIO_PIN_SDA; } while(0)
#define SCL_read (I2C_GPIO->IDR & I2C_GPIO_PIN_SCL)
#define SDA_read (I2C_GPIO->IDR & I2C_GPIO_PIN_SDA)
void I2C_EE_PageWrite(uint8_t* pBuffer, uint16_t WriteAddr, uint8_t NumByteToWrite);
void I2C_EE_WaitEepromStandbyState(void);
@@ -139,7 +139,7 @@ void eepromInit(void)
RCC_APB1PeriphClockCmd(I2C_RCC_APB1Periph_I2C, ENABLE);
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = I2C_GPIO_PIN_SCL | I2C_GPIO_PIN_SDA;
GPIO_InitStructure.GPIO_Pin = I2C_GPIO_PIN_SCL | I2C_GPIO_PIN_SDA | I2C_GPIO_PIN_WP;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
GPIO_InitStructure.GPIO_OType = GPIO_OType_OD;
@@ -159,6 +159,9 @@ void eepromInit(void)
I2C_Init(I2C, &I2C_InitStructure);
I2C_Cmd(I2C, ENABLE);
#endif
GPIO_ResetBits(I2C_GPIO, I2C_GPIO_PIN_WP);
// Set Idle levels
SDA_H;
SCL_H;