Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(radio): fix inverted source causing EM on PlayValue SF trigger #5968

Merged
merged 3 commits into from
Mar 9, 2025
Merged

fix(radio): fix inverted source causing EM on PlayValue SF trigger #5968

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea4c671
fix(radio): fix inverted source causing EM on PlayValue SF trigger
pfeerick Mar 5, 2025
10f02e7
chore: handle most if not all inverted special processing
pfeerick Mar 5, 2025
8437a35
chore: way less abs
pfeerick Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions radio/src/functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void testFunc()
}
#endif

PLAY_FUNCTION(playValue, source_t idx)
PLAY_FUNCTION(playValue, mixsrc_t idx)
{
if (IS_FAI_FORBIDDEN(idx))
return;
Expand All @@ -65,10 +65,16 @@ PLAY_FUNCTION(playValue, source_t idx)
return;

getvalue_t val = getValue(idx);
idx = abs(idx); // Don't need negative form any longer

if (idx >= MIXSRC_FIRST_TELEM) {
TelemetrySensor & telemetrySensor = g_model.telemetrySensors[(idx-MIXSRC_FIRST_TELEM) / 3];
uint8_t attr = 0;

// Preserve the sign
int sign = (val >= 0) ? 1 : -1;
val = abs(val);

if (telemetrySensor.prec > 0) {
if (telemetrySensor.prec == 2) {
if (val >= 5000) {
Expand All @@ -88,11 +94,14 @@ PLAY_FUNCTION(playValue, source_t idx)
}
}
}

val *= sign; // Reapply sign if needed

PLAY_NUMBER(val, telemetrySensor.unit == UNIT_CELLS ? UNIT_VOLTS : telemetrySensor.unit, attr);
}
else if (idx >= MIXSRC_FIRST_TIMER && idx <= MIXSRC_LAST_TIMER) {
int flag = 0;
if (val > LONG_TIMER_DURATION || -val > LONG_TIMER_DURATION) {
if (abs(val) > LONG_TIMER_DURATION) {
flag = PLAY_LONG_TIMER;
}
PLAY_DURATION(val, flag);
Expand Down Expand Up @@ -399,7 +408,7 @@ void evalFunctions(CustomFunctionData * functions, CustomFunctionsContext & func

getvalue_t raw = getValue(CFN_PARAM(cfn));
#if defined(COLORLCD)
requiredBacklightBright = BACKLIGHT_LEVEL_MAX - (g_eeGeneral.blOffBright +
requiredBacklightBright = BACKLIGHT_LEVEL_MAX - (g_eeGeneral.blOffBright +
((1024 + raw) * ((BACKLIGHT_LEVEL_MAX - g_eeGeneral.backlightBright) - g_eeGeneral.blOffBright) / 2048));
#elif defined(OLED_SCREEN)
requiredBacklightBright = (raw + 1024) * 254 / 2048;
Expand Down