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

Fixed announcement of power level both in settings menu and channel summary

This commit is contained in:
Silvano Seva 2022-09-05 17:36:07 +02:00
parent 0452bd0f10
commit e5de5b96a3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openrtx/src/core/voicePromptUtils.c
View File

@ -28,6 +28,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <utils.h>
#include <ui.h> #include <ui.h>
#include "interfaces/cps_io.h" #include "interfaces/cps_io.h"
@ -253,7 +254,8 @@ void vp_announceChannelSummary(const channel_t* channel,
} }
addSilenceIfNeeded(localFlags); addSilenceIfNeeded(localFlags);
vp_anouncePower(channel->power, localFlags); float power = dBmToWatt(channel->power);
vp_anouncePower(power, localFlags);
addSilenceIfNeeded(localFlags); addSilenceIfNeeded(localFlags);
if (channelNumber > 0) // i.e. not called from VFO. if (channelNumber > 0) // i.e. not called from VFO.

4
openrtx/src/ui/ui.c
View File

@ -76,6 +76,7 @@
#include <string.h> #include <string.h>
#include <battery.h> #include <battery.h>
#include <input.h> #include <input.h>
#include <utils.h>
#include <hwconfig.h> #include <hwconfig.h>
#include <voicePromptUtils.h> #include <voicePromptUtils.h>
@ -918,7 +919,8 @@ static void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx)
else else
state.channel.power = 100; state.channel.power = 100;
*sync_rtx = true; *sync_rtx = true;
vp_anouncePower(state.channel.power, queueFlags); float power = dBmToWatt(state.channel.power);
vp_anouncePower(power, queueFlags);
break; break;
break; break;
case 7: case 7: