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

Updated PWM Variant 

- PWM Variant should now support that the PWM for the 2 channels (steering, throttle) can happen:
• in the same time (ussually the case if Servo library from Arduino is used)
•or offseted (ussually if commercial RC PWM received is used)
- made the PWM timeout for the 2 channels independent to be able to use only one channel if desired.
This commit is contained in:
EmanuelFeru 2020-06-13 00:08:34 +02:00
parent 558759b2c5
commit 8ddfc82882
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Src/control.c
View File

@ -88,40 +88,49 @@ 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 = 0; uint32_t pwm_timeout_ch1 = 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 = TIM2->CNT; if(HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_2)) { // Rising Edge interrupt -> reset timer
TIM2->CNT = 0; TIM2->CNT = 0;
} else { // Falling Edge interrupt -> measure pulse duration
if (IN_RANGE(rc_signal, 900, 2100)){ uint16_t rc_signal = TIM2->CNT;
timeout = 0; if (IN_RANGE(rc_signal, 900, 2100)){
pwm_timeout = 0; timeout = 0;
pwm_captured_ch1_value = CLAMP(rc_signal, 1000, 2000) - 1000; pwm_timeout_ch1 = 0;
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; if(HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_3)) { // Rising Edge interrupt -> reset timer
TIM2->CNT = 0; TIM2->CNT = 0;
} else { // Falling Edge interrupt -> measure pulse duration
if (IN_RANGE(rc_signal, 900, 2100)){ uint16_t rc_signal = TIM2->CNT;
timeout = 0; if (IN_RANGE(rc_signal, 900, 2100)){
pwm_timeout = 0; timeout = 0;
pwm_captured_ch2_value = CLAMP(rc_signal, 1000, 2000) - 1000; pwm_timeout_ch2 = 0;
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++; pwm_timeout_ch1++;
pwm_timeout_ch2++;
// Stop after 500 ms without PPM signal // Stop after 500 ms without PPM signal
if(pwm_timeout > 500) { if(pwm_timeout_ch1 > 500) {
pwm_captured_ch1_value = 500; pwm_captured_ch1_value = 500;
pwm_timeout_ch1 = 0;
}
if(pwm_timeout_ch2 > 500) {
pwm_captured_ch2_value = 500; pwm_captured_ch2_value = 500;
pwm_timeout = 0; pwm_timeout_ch2 = 0;
} }
} }