Skip to content

fix: FN switch, cannot adjust volume when toggled value is "unchanged", hardware indicator mismatch #660

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

Open
mohammadsyuhada wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: FN switch, cannot adjust volume when toggled value is "unchanged", hardware indicator mismatch #660

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 21 additions & 1 deletion workspace/tg5040/libmsettings/msettings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,9 +500,13 @@ static inline void SaveSettings(void) {
///////// Getters exposed in public API

int GetBrightness(void) { // 0-10
if (settings->mute && GetMutedBrightness() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
return GetMutedBrightness();
return settings->brightness;
}
int GetColortemp(void) { // 0-10
if (settings->mute && GetMutedColortemp() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
return GetMutedColortemp();
return settings->colortemperature;
}
int GetVolume(void) { // 0-20
Expand Down Expand Up @@ -532,14 +536,20 @@ int GetMute(void) {
}
int GetContrast(void)
{
if (settings->mute && GetMutedContrast() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
return GetMutedContrast();
return settings->contrast;
}
int GetSaturation(void)
{
if (settings->mute && GetMutedSaturation() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
return GetMutedSaturation();
return settings->saturation;
}
int GetExposure(void)
{
if (settings->mute && GetMutedExposure() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
return GetMutedExposure();
return settings->exposure;
}
int GetMutedBrightness(void)
Expand Down Expand Up @@ -610,17 +620,21 @@ int GetMuteTurboR2(void)
///////// Setters exposed in public API

void SetBrightness(int value) {
if (settings->mute && GetMutedBrightness() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
return SetRawBrightness(scaleBrightness(GetMutedBrightness()));
SetRawBrightness(scaleBrightness(value));
settings->brightness = value;
SaveSettings();
}
void SetColortemp(int value) {
if (settings->mute && GetMutedColortemp() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
return SetRawColortemp(scaleColortemp(GetMutedColortemp()));
SetRawColortemp(scaleColortemp(value));
settings->colortemperature = value;
SaveSettings();
}
void SetVolume(int value) { // 0-20
if (settings->mute)
if (settings->mute && GetMutedVolume() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
return SetRawVolume(scaleVolume(GetMutedVolume()));

if (settings->jack || settings->audiosink != AUDIO_SINK_DEFAULT)
Expand Down Expand Up @@ -718,18 +732,24 @@ void SetMute(int value) {
}
void SetContrast(int value)
{
if (settings->mute && GetMutedContrast() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
return SetRawContrast(scaleContrast(GetMutedContrast()));
SetRawContrast(scaleContrast(value));
settings->contrast = value;
SaveSettings();
}
void SetSaturation(int value)
{
if (settings->mute && GetMutedSaturation() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
return SetRawSaturation(scaleSaturation(GetMutedSaturation()));
SetRawSaturation(scaleSaturation(value));
settings->saturation = value;
SaveSettings();
}
void SetExposure(int value)
{
if (settings->mute && GetMutedExposure() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
return SetRawExposure(scaleExposure(GetMutedExposure()));
SetRawExposure(scaleExposure(value));
settings->exposure = value;
SaveSettings();
Expand Down
Loading