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

Compilation failure on Taranis (not plus)

Browse Source
This commit is contained in:
bsongis
2014-05-11 16:00:51 +02:00
parent cd04dfaa5e
commit fb20b21151
1 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/taranis/haptic_driver.cpp
+31 -12
View File
@@ -36,16 +36,12 @@
#include "../../opentx.h"
#if defined(REVPLUS)
void hapticOff(void)
{
#if defined(REVPLUS)
TIM10->CCR1 = 0;
#else
GPIO_ResetBits(GPIO_HAPTIC, PIN_HAPTIC);
#endif
}
#if defined(REVPLUS)
void hapticOn(uint32_t pwmPercent)
{
if (pwmPercent > 100) {
@@ -53,13 +49,6 @@ void hapticOn(uint32_t pwmPercent)
}
TIM10->CCR1 = pwmPercent;
}
#else
void hapticOn()
{
// No PWM before REVPLUS
GPIO_SetBits(GPIO_HAPTIC, PIN_HAPTIC);
}
#endif
void hapticInit(void)
{
@@ -84,3 +73,33 @@ void hapticInit(void)
TIM10->EGR = 0 ;
TIM10->CR1 = TIM_CR1_CEN ; // Counter enable
}
#else
// No PWM before REVPLUS
void hapticInit(void)
{
GPIO_InitTypeDef GPIO_InitStructure;
RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOHAPTIC, ENABLE);
/* GPIO Configuration*/
GPIO_InitStructure.GPIO_Pin = PIN_HAPTIC;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_Init(GPIO_HAPTIC, &GPIO_InitStructure);
}
void hapticOff(void)
{
GPIO_ResetBits(GPIO_HAPTIC, PIN_HAPTIC);
}
void hapticOn()
{
GPIO_SetBits(GPIO_HAPTIC, PIN_HAPTIC);
}
#endif