Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 09:45:37 +03:00
Code Issues Wiki Activity

Add RSSI PWM on CH2 input.

Browse source 
Also support FrSky 1khz RSSI.  See documentation also added in this
commit.

This commit also cleans up the PWM mapping code.  'mask' didn't need to
be a mask and it wasn't possible to add another 'type' since there were
only 4 possible values when it was a mask and they were already defined.  
Combined with switching to using 16 bits instead of 8 for the mapping
configurations, it's now possible to have 256 types instead of 4 at the
expense of a few bytes of flash.

Moved the RSSI calculation into rx_common.c, previously it was in the
main loop.
This commit is contained in:
Dominic Clifton 2014-05-23 23:57:32 +01:00
parent 1b80c76e30
commit 1925df26ca
14 changed files with 312 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

95
src/drivers/pwm_rssi.c Normal file
View file

@ -0,0 +1,95 @@
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include "platform.h"
#include "gpio_common.h"
#include "timer_common.h"
#include "pwm_mapping.h"
#include "pwm_rssi.h"
void pwmICConfig(TIM_TypeDef *tim, uint8_t channel, uint16_t polarity); // from pwm_output.c
typedef struct rssiInputPort_s {
uint8_t state;
captureCompare_t rise;
captureCompare_t fall;
captureCompare_t capture;
uint16_t raw;
const timerHardware_t *timerHardware;
} rssiInputPort_t;
static rssiInputPort_t rssiInputPort;
static void pwmRssiCallback(uint8_t reference, captureCompare_t capture)
{
const timerHardware_t *timerHardware = rssiInputPort.timerHardware;
if (rssiInputPort.state == 0) {
rssiInputPort.rise = capture;
rssiInputPort.state = 1;
pwmICConfig(timerHardware->tim, timerHardware->channel, TIM_ICPolarity_Falling);
} else {
rssiInputPort.fall = capture;
// compute and store capture
rssiInputPort.raw = rssiInputPort.fall - rssiInputPort.rise;
// switch state
rssiInputPort.state = 0;
pwmICConfig(timerHardware->tim, timerHardware->channel, TIM_ICPolarity_Rising);
}
}
static void pwmRSSIGPIOConfig(GPIO_TypeDef *gpio, uint32_t pin, GPIO_Mode mode)
{
gpio_config_t cfg;
cfg.pin = pin;
cfg.mode = mode;
cfg.speed = Speed_2MHz;
gpioInit(gpio, &cfg);
}
void pwmRSSIICConfig(TIM_TypeDef *tim, uint8_t channel, uint16_t polarity)
{
TIM_ICInitTypeDef TIM_ICInitStructure;
TIM_ICStructInit(&TIM_ICInitStructure);
TIM_ICInitStructure.TIM_Channel = channel;
TIM_ICInitStructure.TIM_ICPolarity = polarity;
TIM_ICInitStructure.TIM_ICSelection = TIM_ICSelection_DirectTI;
TIM_ICInitStructure.TIM_ICPrescaler = TIM_ICPSC_DIV1;
TIM_ICInitStructure.TIM_ICFilter = 0x00;
TIM_ICInit(tim, &TIM_ICInitStructure);
}
#define UNUSED_CALLBACK_REFERENCE 0
void pwmRSSIInConfig(uint8_t timerIndex)
{
const timerHardware_t *timerHardwarePtr = &(timerHardware[timerIndex]);
memset(&rssiInputPort, 0, sizeof(rssiInputPort));
rssiInputPort.timerHardware = timerHardwarePtr;
pwmRSSIGPIOConfig(timerHardwarePtr->gpio, timerHardwarePtr->pin, timerHardwarePtr->gpioInputMode);
pwmRSSIICConfig(timerHardwarePtr->tim, timerHardwarePtr->channel, TIM_ICPolarity_Rising);
timerConfigure(timerHardwarePtr, 0xFFFF, 1);
configureTimerCaptureCompareInterrupt(timerHardwarePtr, UNUSED_CALLBACK_REFERENCE, pwmRssiCallback);
}
uint16_t pwmRSSIRead(void)
{
return rssiInputPort.raw;
}