interfisch
/
hoverboard-firmware-hack-foc-serial-esc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #57 from benjaf/master 

PWM Steering fixed
This commit is contained in:
EmanuelFeru 2020-06-02 14:46:07 +02:00 committed by GitHub
parent 34c6e4d610 22411e1851
commit 558759b2c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Inc/config.h
View File

@ -298,7 +298,7 @@
#define PWM_CH2_MIN -1000 // (-1000 - 0) #define PWM_CH2_MIN -1000 // (-1000 - 0)
#define FILTER 6553 // 0.1f [-] fixdt(0,16,16) lower value == softer filter [0, 65535] = [0.0 - 1.0]. #define FILTER 6553 // 0.1f [-] fixdt(0,16,16) lower value == softer filter [0, 65535] = [0.0 - 1.0].
#define SPEED_COEFFICIENT 16384 // 1.0f [-] fixdt(1,16,14) higher value == stronger. [0, 65535] = [-2.0 - 2.0]. In this case 16384 = 1.0 * 2^14 #define SPEED_COEFFICIENT 16384 // 1.0f [-] fixdt(1,16,14) higher value == stronger. [0, 65535] = [-2.0 - 2.0]. In this case 16384 = 1.0 * 2^14
#define STEER_COEFFICIENT 0 // 0.0f [-] fixdt(1,16,14) higher value == stronger. [0, 65535] = [-2.0 - 2.0]. In this case 0 = 0.0 * 2^14. If you do not want any steering, set it to 0. #define STEER_COEFFICIENT 16384 // 1.0f [-] fixdt(1,16,14) higher value == stronger. [0, 65535] = [-2.0 - 2.0]. In this case 16384 = 1.0 * 2^14. If you do not want any steering, set it to 0.
// #define SUPPORT_BUTTONS // use right sensor board cable for button inputs. Disable DEBUG_SERIAL_USART3! // #define SUPPORT_BUTTONS // use right sensor board cable for button inputs. Disable DEBUG_SERIAL_USART3!
// #define INVERT_R_DIRECTION // #define INVERT_R_DIRECTION
// #define INVERT_L_DIRECTION // #define INVERT_L_DIRECTION

70
Src/control.c
View File

@ -88,22 +88,20 @@ void PPM_Init(void) {
#ifdef CONTROL_PWM #ifdef CONTROL_PWM
uint16_t pwm_captured_ch1_value = 500; uint16_t pwm_captured_ch1_value = 500;
uint16_t pwm_captured_ch2_value = 500; uint16_t pwm_captured_ch2_value = 500;
uint32_t pwm_timeout_ch1 = 0; uint32_t pwm_timeout = 0;
uint32_t pwm_timeout_ch2 = 0;
void PWM_ISR_CH1_Callback(void) { void PWM_ISR_CH1_Callback(void) {
// Dummy loop with 16 bit count wrap around // Dummy loop with 16 bit count wrap around
uint16_t rc_signal = TIM3->CNT; uint16_t rc_signal = TIM2->CNT;
TIM3->CNT = 0; TIM2->CNT = 0;
if (IN_RANGE(rc_signal, 900, 2100)){ if (IN_RANGE(rc_signal, 900, 2100)){
timeout = 0; timeout = 0;
pwm_timeout_ch1 = 0; pwm_timeout = 0;
pwm_captured_ch1_value = CLAMP(rc_signal, 1000, 2000) - 1000; pwm_captured_ch1_value = CLAMP(rc_signal, 1000, 2000) - 1000;
} }
} }
void PWM_ISR_CH2_Callback(void) { void PWM_ISR_CH2_Callback(void) {
// Dummy loop with 16 bit count wrap around // Dummy loop with 16 bit count wrap around
uint16_t rc_signal = TIM2->CNT; uint16_t rc_signal = TIM2->CNT;
@ -111,27 +109,33 @@ void PWM_ISR_CH2_Callback(void) {
if (IN_RANGE(rc_signal, 900, 2100)){ if (IN_RANGE(rc_signal, 900, 2100)){
timeout = 0; timeout = 0;
pwm_timeout_ch2 = 0; pwm_timeout = 0;
pwm_captured_ch2_value = CLAMP(rc_signal, 1000, 2000) - 1000; pwm_captured_ch2_value = CLAMP(rc_signal, 1000, 2000) - 1000;
} }
} }
// SysTick executes once each ms // SysTick executes once each ms
void PWM_SysTick_Callback(void) { void PWM_SysTick_Callback(void) {
pwm_timeout_ch1++; pwm_timeout++;
pwm_timeout_ch2++; // Stop after 500 ms without PPM signal
// Stop after 500 ms without PWM signal if(pwm_timeout > 500) {
if(pwm_timeout_ch1 > 500) {
pwm_captured_ch1_value = 500; pwm_captured_ch1_value = 500;
pwm_timeout_ch1 = 500; // limit the timeout to max timeout value of 500 ms
}
if(pwm_timeout_ch2 > 500) {
pwm_captured_ch2_value = 500; pwm_captured_ch2_value = 500;
pwm_timeout_ch2 = 500; // limit the timeout to max timeout value of 500 ms pwm_timeout = 0;
} }
} }
void PWM_Init(void) { void PWM_Init(void) {
// PWM Timer (TIM2)
__HAL_RCC_TIM2_CLK_ENABLE();
TimHandle.Instance = TIM2;
TimHandle.Init.Period = UINT16_MAX;
TimHandle.Init.Prescaler = (SystemCoreClock/DELAY_TIM_FREQUENCY_US)-1;;
TimHandle.Init.ClockDivision = 0;
TimHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
HAL_TIM_Base_Init(&TimHandle);
// Channel 1 (steering) // Channel 1 (steering)
GPIO_InitTypeDef GPIO_InitStruct2; GPIO_InitTypeDef GPIO_InitStruct2;
// Configure GPIO pin : PA2 // Configure GPIO pin : PA2
@ -141,18 +145,10 @@ void PWM_Init(void) {
GPIO_InitStruct2.Pull = GPIO_PULLDOWN; GPIO_InitStruct2.Pull = GPIO_PULLDOWN;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct2); HAL_GPIO_Init(GPIOA, &GPIO_InitStruct2);
__HAL_RCC_TIM3_CLK_ENABLE();
TimHandle2.Instance = TIM3;
TimHandle2.Init.Period = UINT16_MAX;
TimHandle2.Init.Prescaler = (SystemCoreClock/DELAY_TIM_FREQUENCY_US)-1;;
TimHandle2.Init.ClockDivision = 0;
TimHandle2.Init.CounterMode = TIM_COUNTERMODE_UP;
HAL_TIM_Base_Init(&TimHandle2);
// EXTI interrupt init // EXTI interrupt init
HAL_NVIC_SetPriority(EXTI2_IRQn, 0, 0); HAL_NVIC_SetPriority(EXTI2_IRQn, 0, 0);
HAL_NVIC_EnableIRQ(EXTI2_IRQn); HAL_NVIC_EnableIRQ(EXTI2_IRQn);
HAL_TIM_Base_Start(&TimHandle2);
// Channel 2 (speed) // Channel 2 (speed)
GPIO_InitTypeDef GPIO_InitStruct; GPIO_InitTypeDef GPIO_InitStruct;
@ -163,34 +159,12 @@ void PWM_Init(void) {
GPIO_InitStruct.Pull = GPIO_PULLDOWN; GPIO_InitStruct.Pull = GPIO_PULLDOWN;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
__HAL_RCC_TIM2_CLK_ENABLE();
TimHandle.Instance = TIM2;
TimHandle.Init.Period = UINT16_MAX;
TimHandle.Init.Prescaler = (SystemCoreClock/DELAY_TIM_FREQUENCY_US)-1;;
TimHandle.Init.ClockDivision = 0;
TimHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
HAL_TIM_Base_Init(&TimHandle);
/* EXTI interrupt init*/ /* EXTI interrupt init*/
HAL_NVIC_SetPriority(EXTI3_IRQn, 0, 0); HAL_NVIC_SetPriority(EXTI3_IRQn, 0, 0);
HAL_NVIC_EnableIRQ(EXTI3_IRQn); HAL_NVIC_EnableIRQ(EXTI3_IRQn);
// Start timer
HAL_TIM_Base_Start(&TimHandle); HAL_TIM_Base_Start(&TimHandle);
#ifdef SUPPORT_BUTTONS
/*Configure GPIO pin : PB10 */
GPIO_InitStruct.Pin = BUTTON1_RIGHT_PIN;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_MEDIUM;
GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(BUTTON1_RIGHT_PORT, &GPIO_InitStruct);
/*Configure GPIO pin : PB11 */
GPIO_InitStruct2.Pin = BUTTON2_RIGHT_PIN;
GPIO_InitStruct2.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct2.Speed = GPIO_SPEED_FREQ_MEDIUM;
GPIO_InitStruct2.Pull = GPIO_PULLUP;
HAL_GPIO_Init(BUTTON2_RIGHT_PORT, &GPIO_InitStruct2);
#endif
} }
#endif #endif