From 6682d0c6d3d306783f025324b8c47862565dde84 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Sun, 31 May 2015 16:08:17 +0200
Subject: [PATCH] 200kHz on non REVPLUS boards

---
 radio/src/targets/taranis/hal.h          |  5 ++++
 radio/src/targets/taranis/i2c_driver.cpp | 32 +++++++++++-------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h
index 789c418b6..126d78f41 100644
--- a/radio/src/targets/taranis/hal.h
+++ b/radio/src/targets/taranis/hal.h
@@ -324,6 +324,11 @@
 #define I2C_GPIO_AF                     GPIO_AF_I2C1
 #define I2C_GPIO_PinSource_SCL          GPIO_PinSource6
 #define I2C_GPIO_PinSource_SDA          GPIO_PinSource7
+#if defined(REVPLUS)
+  #define I2C_SPEED                     400000
+#else
+  #define I2C_SPEED                     200000
+#endif
 #define I2C_ADDRESS_EEPROM              0xA2
 #define I2C_ADDRESS_CAT5137             0x5C
 #define I2C_FLASH_PAGESIZE              64
diff --git a/radio/src/targets/taranis/i2c_driver.cpp b/radio/src/targets/taranis/i2c_driver.cpp
index 6565fe0fd..aa02afd73 100644
--- a/radio/src/targets/taranis/i2c_driver.cpp
+++ b/radio/src/targets/taranis/i2c_driver.cpp
@@ -17,29 +17,27 @@ void eepromInit(void)
   GPIO_InitStructure.GPIO_OType = GPIO_OType_OD;
   GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
   GPIO_Init(I2C_GPIO, &GPIO_InitStructure);
+  GPIO_ResetBits(I2C_GPIO, I2C_GPIO_PIN_WP);
+
+  I2C_InitTypeDef I2C_InitStructure;
+  I2C_InitStructure.I2C_ClockSpeed = I2C_SPEED;
+  I2C_InitStructure.I2C_DutyCycle = I2C_DutyCycle_2;
+  I2C_InitStructure.I2C_OwnAddress1 = 0x00;
+  I2C_InitStructure.I2C_Mode = I2C_Mode_I2C;
+  I2C_InitStructure.I2C_Ack = I2C_Ack_Enable;
+  I2C_InitStructure.I2C_AcknowledgedAddress = I2C_AcknowledgedAddress_7bit;
+  I2C_Init(I2C, &I2C_InitStructure);
+  I2C_Cmd(I2C, ENABLE);
+
+  GPIO_PinAFConfig(I2C_GPIO, I2C_GPIO_PinSource_SCL, I2C_GPIO_AF);
+  GPIO_PinAFConfig(I2C_GPIO, I2C_GPIO_PinSource_SDA, I2C_GPIO_AF);
 
   GPIO_InitStructure.GPIO_Pin = I2C_GPIO_PIN_SCL | I2C_GPIO_PIN_SDA;
   GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
   GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF;
   GPIO_InitStructure.GPIO_OType = GPIO_OType_OD;
-  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
+  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
   GPIO_Init(I2C_GPIO, &GPIO_InitStructure);
-
-  GPIO_PinAFConfig(I2C_GPIO, I2C_GPIO_PinSource_SCL, I2C_GPIO_AF);
-  GPIO_PinAFConfig(I2C_GPIO, I2C_GPIO_PinSource_SDA, I2C_GPIO_AF);
-
-  I2C_InitTypeDef I2C_InitStructure;
-  I2C_InitStructure.I2C_ClockSpeed = 240000;
-  I2C_InitStructure.I2C_DutyCycle = I2C_DutyCycle_2;
-  I2C_InitStructure.I2C_OwnAddress1 = 0x00;
-  I2C_InitStructure.I2C_Mode = I2C_Mode_I2C;
-  I2C_InitStructure.I2C_Ack = I2C_Ack_Enable; // TODO Disable
-  I2C_InitStructure.I2C_AcknowledgedAddress = I2C_AcknowledgedAddress_7bit;
-
-  I2C_Init(I2C, &I2C_InitStructure);
-  I2C_Cmd(I2C, ENABLE);
-
-  GPIO_ResetBits(I2C_GPIO, I2C_GPIO_PIN_WP);
 }
 
 #define I2C_TIMEOUT_MAX 1000