From 57c4e462f3b192d56d24b1df978aa980335eb14f Mon Sep 17 00:00:00 2001
From: Sami Korhonen <samik.korhonen@gmail.com>
Date: Tue, 2 May 2017 19:13:29 +0300
Subject: [PATCH] Fix more HAL init issues

---
 src/main/drivers/bus_i2c_hal.c          |  1 -
 src/main/drivers/pwm_output_stm32f7xx.c | 29 ++++++++++---------------
 src/main/drivers/timer_hal.c            |  5 +++--
 src/main/target/ANYFCF7/target.h        |  1 +
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/main/drivers/bus_i2c_hal.c b/src/main/drivers/bus_i2c_hal.c
index 8b52e6bed..1eb51855c 100644
--- a/src/main/drivers/bus_i2c_hal.c
+++ b/src/main/drivers/bus_i2c_hal.c
@@ -234,7 +234,6 @@ void i2cInit(I2CDevice device)
         IOConfigGPIO(sda, IOCFG_AF_OD);
     #endif
     // Init I2C peripheral
-    HAL_I2C_DeInit(&i2cHandle[device].Handle);
 
     i2cHandle[device].Handle.Instance             = i2cHardwareMap[device].dev;
     /// TODO: HAL check if I2C timing is correct
diff --git a/src/main/drivers/pwm_output_stm32f7xx.c b/src/main/drivers/pwm_output_stm32f7xx.c
index e952fcebc..206323ca7 100644
--- a/src/main/drivers/pwm_output_stm32f7xx.c
+++ b/src/main/drivers/pwm_output_stm32f7xx.c
@@ -138,32 +138,25 @@ void pwmDigitalMotorHardwareConfig(const timerHardware_t *timerHardware, uint8_t
     const IO_t motorIO = IOGetByTag(timerHardware->tag);
 
     const uint8_t timerIndex = getTimerIndex(timer);
-    const bool configureTimer = (timerIndex == dmaMotorTimerCount-1);
 
     IOInit(motorIO, OWNER_MOTOR, RESOURCE_INDEX(motorIndex));
     IOConfigGPIOAF(motorIO, IO_CONFIG(GPIO_MODE_AF_PP, GPIO_SPEED_FREQ_VERY_HIGH, GPIO_PULLUP), timerHardware->alternateFunction);
 
     __DMA1_CLK_ENABLE();
 
-    if (configureTimer) {
-        RCC_ClockCmd(timerRCC(timer), ENABLE);
+    RCC_ClockCmd(timerRCC(timer), ENABLE);
 
-        motor->TimHandle.Instance = timerHardware->tim;
-        motor->TimHandle.Init.Prescaler = (SystemCoreClock / timerClockDivisor(timer) / getDshotHz(pwmProtocolType)) - 1;;
-        motor->TimHandle.Init.Period = MOTOR_BITLENGTH;
-        motor->TimHandle.Init.RepetitionCounter = 0;
-        motor->TimHandle.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
-        motor->TimHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
-        if(HAL_TIM_PWM_Init(&motor->TimHandle) != HAL_OK)
-        {
-            /* Initialization Error */
-            return;
-        }
-
-    }
-    else
+    motor->TimHandle.Instance = timerHardware->tim;
+    motor->TimHandle.Init.Prescaler = (SystemCoreClock / timerClockDivisor(timer) / getDshotHz(pwmProtocolType)) - 1;;
+    motor->TimHandle.Init.Period = MOTOR_BITLENGTH;
+    motor->TimHandle.Init.RepetitionCounter = 0;
+    motor->TimHandle.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
+    motor->TimHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
+    motor->TimHandle.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+    if(HAL_TIM_PWM_Init(&motor->TimHandle) != HAL_OK)
     {
-        motor->TimHandle = dmaMotors[timerIndex].TimHandle;
+        /* Initialization Error */
+        return;
     }
 
     motor->timerDmaSource = timerDmaSource(timerHardware->channel);
diff --git a/src/main/drivers/timer_hal.c b/src/main/drivers/timer_hal.c
index 6ac788e4e..bcc199ab7 100644
--- a/src/main/drivers/timer_hal.c
+++ b/src/main/drivers/timer_hal.c
@@ -267,6 +267,7 @@ void configTimeBase(TIM_TypeDef *tim, uint16_t period, uint8_t mhz)
     if(tim == TIM1 || tim == TIM2 || tim == TIM3 || tim == TIM4 || tim == TIM5 || tim == TIM8 || tim == TIM9)
     {
         TIM_ClockConfigTypeDef sClockSourceConfig;
+        memset(&sClockSourceConfig, 0, sizeof(sClockSourceConfig));
         sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
         if (HAL_TIM_ConfigClockSource(&timerHandle[timerIndex].Handle, &sClockSourceConfig) != HAL_OK)
         {
@@ -276,7 +277,7 @@ void configTimeBase(TIM_TypeDef *tim, uint16_t period, uint8_t mhz)
     if(tim == TIM1 || tim == TIM2 || tim == TIM3 || tim == TIM4 || tim == TIM5 || tim == TIM8 )
     {
         TIM_MasterConfigTypeDef sMasterConfig;
-        sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+        memset(&sMasterConfig, 0, sizeof(sMasterConfig));
         sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
         if (HAL_TIMEx_MasterConfigSynchronization(&timerHandle[timerIndex].Handle, &sMasterConfig) != HAL_OK)
         {
@@ -908,4 +909,4 @@ uint16_t timerGetPrescalerByDesiredMhz(TIM_TypeDef *tim, uint16_t mhz)
 uint16_t timerGetPeriodByPrescaler(TIM_TypeDef *tim, uint16_t prescaler, uint32_t hertz)
 {
     return ((uint16_t)((SystemCoreClock / timerClockDivisor(tim) / (prescaler + 1)) / hertz));
-}
\ No newline at end of file
+}
diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h
index bbf000f32..8542815a1 100644
--- a/src/main/target/ANYFCF7/target.h
+++ b/src/main/target/ANYFCF7/target.h
@@ -111,6 +111,7 @@
 #define SPI4_MOSI_PIN           PE14
 
 #define USE_SDCARD
+#define SDCARD_DETECT_INVERTED
 #define SDCARD_DETECT_PIN                   PD3
 #define SDCARD_DETECT_EXTI_LINE             EXTI_Line3
 #define SDCARD_DETECT_EXTI_PIN_SOURCE       EXTI_PinSource3