Skip to content

Commit

Permalink
fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
mha1 authored and pfeerick committed Oct 12, 2023
1 parent ad911bb commit b1d0962
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions radio/src/mixer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1071,9 +1071,8 @@ void evalMixes(uint8_t tick10ms)
// must be done after mixing because some functions use the inputs/channels values
// must be done before limits because of the applyLimit function: it checks for safety switches which would be not initialized otherwise
if (tick10ms) {
if(!luaSpeakerVolumeOn)
requiredSpeakerVolume = g_eeGeneral.speakerVolume + VOLUME_LEVEL_DEF;

requiredSpeakerVolume = g_eeGeneral.speakerVolume + VOLUME_LEVEL_DEF;

requiredBacklightBright = g_eeGeneral.getBrightness();

if (radioGFEnabled()) {
Expand Down

0 comments on commit b1d0962

Please sign in to comment.