ps
/
Lumenarium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Peter Slattery 2021-04-26 20:47:41 -04:00
parent 53dcc868d3 965ca7c891
commit 4978c8522d
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/app/ss_blumen_lumen/blumen_lumen.cpp
View File

@ -566,16 +566,6 @@ BlumenLumen_CustomUpdate(gs_data UserData, app_state* State, context* Context)
{ {
temp_packet Temp = Packet.TempPacket; temp_packet Temp = Packet.TempPacket;
BLState->LastTemperatureReceived = Temp.Temperature; BLState->LastTemperatureReceived = Temp.Temperature;
if (Blumen_TempShouldDimLeds(BLState))
{
BLState->BrightnessPercent = HighTemperatureBrightnessPercent;
}
else
{
BLState->BrightnessPercent = FullBrightnessPercent;
}
DEBUG_ReceivedTemperature(Temp, Context->ThreadContext); DEBUG_ReceivedTemperature(Temp, Context->ThreadContext);
BLState->ShouldUpdateLog = true; BLState->ShouldUpdateLog = true;
}break; }break;
@ -751,15 +741,16 @@ BlumenLumen_CustomUpdate(gs_data UserData, app_state* State, context* Context)
LedOnTimesCount, LedOnTimesCount,
&RangeIn)) &RangeIn))
{ {
// If we're in one of the specified time ranges,
// play animations and set brightness if (Blumen_TempShouldDimLeds(BLState))
// {
// The values of BrightnessPercent and TimelineShouldAdvance OverrideBrightness = HighTemperatureBrightnessPercent;
// are set according to less strict rules above in this update }
// function. All we are doing is saying "If we are in a valid else
// time range, keep those values". {
OverrideBrightness = BLState->BrightnessPercent; OverrideBrightness = FullBrightnessPercent;
TimelineShouldAdvance = State->AnimationSystem.TimelineShouldAdvance; }
TimelineShouldAdvance = true;
} }
State->AnimationSystem.TimelineShouldAdvance = TimelineShouldAdvance; State->AnimationSystem.TimelineShouldAdvance = TimelineShouldAdvance;

2
src/app/ss_blumen_lumen/blumen_lumen.h
View File

@ -151,7 +151,7 @@ SystemTimeIsAfterTime(system_time SysTime, s32 Hour, s32 Minute)
{ {
bool Result = false; bool Result = false;
if (SysTime.Hour == Hour) { if (SysTime.Hour == Hour) {
Result = SysTime.Minute > Minute; Result = SysTime.Minute >= Minute;
} else { } else {
Result = SysTime.Hour > Hour; Result = SysTime.Hour > Hour;
} }