Skip to content

misc: fix static effects not working (thx @winxi01) #25

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

Merged
jsm174 merged 1 commit into from
Sep 11, 2025
Merged

misc: fix static effects not working (thx @winxi01) #25

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion include/DOF/DOF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#define LIBDOF_VERSION_MAJOR 0 // X Digits
#define LIBDOF_VERSION_MINOR 4 // Max 2 Digits
#define LIBDOF_VERSION_PATCH 2 // Max 2 Digits
#define LIBDOF_VERSION_PATCH 3 // Max 2 Digits

#define _LIBDOF_STR(x) #x
#define LIBDOF_STR(x) _LIBDOF_STR(x)
Expand Down
4 changes: 0 additions & 4 deletions src/cab/toys/layer/AnalogAlphaToy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,20 +89,16 @@ int AnalogAlphaToy::GetResultingValue()
for (int layerNumber : layerNumbers)
{
AnalogAlpha* layer = m_layers.GetLayer(layerNumber, 1);
Log::Debug(StringExtensions::Build("Layer {0}: layer={1}", std::to_string(layerNumber), StringExtensions::ToAddressString(layer)));
if (layer != nullptr)
{
const AnalogAlpha& layerValue = layer[0];
int alpha = layerValue.GetAlpha();
int val = layerValue.GetValue();
Log::Debug(StringExtensions::Build("Layer {0}: alpha={1}, value={2}", std::to_string(layerNumber), std::to_string(alpha), std::to_string(val)));
if (alpha != 0)
{
float oldValue = AlphaMappingTable::AlphaMapping[255 - alpha][static_cast<int>(value)];
float newValue = AlphaMappingTable::AlphaMapping[alpha][layerValue.GetValue()];
value = oldValue + newValue;
Log::Debug(StringExtensions::Build(
"Alpha blend: alpha={0}, oldVal={1}, newVal={2}, result={3}", std::to_string(alpha), std::to_string(oldValue), std::to_string(newValue), std::to_string(value)));
}
}
}
Expand Down
8 changes: 2 additions & 6 deletions src/ledcontrol/setup/Configurator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,12 +908,8 @@ void Configurator::SetupTable(
switch (tcs->GetOutputControl())
{
case OutputControlEnum::FixedOn:
{
std::vector<std::string> tableElementDescriptors;
tableElementDescriptors.push_back(StringExtensions::Build("{0}.{1}.{2}", std::to_string(ledWizNr), std::to_string(tcc->GetNumber()), std::to_string(settingNumber)));
AssignEffectToTableElements(table, tableElementDescriptors, finalEffect);
}
break;
table->GetAssignedStaticEffects()->Add(finalEffect->GetName());
break;
case OutputControlEnum::Controlled:
if (!StringExtensions::IsNullOrWhiteSpace(tcs->GetTableElement()))
{
Expand Down