fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved conversion law in MD-3x0 and MD-UV3x0 platform_getVolumeLevel(). 

Rewritten the conversion law from ADC measurement in mV and normalized
0-255 output, adding a linearization if the pseudo-logarithmic output
curve of the potentiometer.

Signed-off-by: Silvano Seva <silseva@fastwebnet.it>
This commit is contained in:
Silvano Seva 2023-09-08 16:02:53 +02:00
parent d7578c4441
commit dd46a48cd1
2 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
platform/targets/MD-3x0/platform.c
View File

@ -100,15 +100,32 @@ uint8_t platform_getMicLevel()
uint8_t platform_getVolumeLevel() uint8_t platform_getVolumeLevel()
{ {
/* /*
* Knob position corresponds to an analog signal in the range 0 - 1600mV, * Volume level corresponds to an analog signal in the range 0 - 1650mV.
* converted to a value in range 0 - 255 using fixed point math: divide by * Potentiometer has pseudo-logarithmic law, well described with two straight
* 1600 and then multiply by 256. * lines with a breakpoint around 270mV.
* Output value has range 0 - 255 with breakpoint at 150.
*/ */
uint16_t value = adc1_getMeasurement(ADC_VOL_CH); uint16_t value = adc1_getMeasurement(ADC_VOL_CH);
if(value > 1599) value = 1599; uint32_t output;
uint32_t level = value << 16;
level /= 1600; if(value <= 270)
return ((uint8_t) (level >> 8)); {
// First line: offset zero, slope 0.556
output = value;
output = (output * 556) / 1000;
}
else
{
// Second line: offset 270, slope 0.076
output = value - 270;
output = (output * 76) / 1000;
output += 150;
}
if(output > 255)
output = 255;
return output;
} }
int8_t platform_getChSelector() int8_t platform_getChSelector()

34
platform/targets/MD-UV3x0/platform.c
View File

@ -104,15 +104,35 @@ uint8_t platform_getMicLevel()
uint8_t platform_getVolumeLevel() uint8_t platform_getVolumeLevel()
{ {
/* /*
* Knob position corresponds to an analog signal in the range 0 - 1600mV, * Volume level corresponds to an analog signal in the range 20 - 1650mV.
* converted to a value in range 0 - 255 using fixed point math: divide by * Potentiometer has pseudo-logarithmic law, well described with two straight
* 1600 and then multiply by 256. * lines with a breakpoint around 270mV.
* Output value has range 0 - 255 with breakpoint at 150.
*/ */
uint16_t value = adc1_getMeasurement(ADC_VOL_CH); uint16_t value = adc1_getMeasurement(ADC_VOL_CH);
if(value > 1599) value = 1599; uint32_t output;
uint32_t level = value << 16;
level /= 1600; if(value < 20)
return ((uint8_t) (level >> 8)); return 0;
if(value <= 270)
{
// First line: offset zero, slope 0.556
output = value;
output = (output * 556) / 1000;
}
else
{
// Second line: offset 270, slope 0.076
output = value - 270;
output = (output * 76) / 1000;
output += 150;
}
if(output > 255)
output = 255;
return output;
} }
bool platform_getPttStatus() bool platform_getPttStatus()