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:
PS 2021-04-09 09:45:13 -10:00
parent 5d321d6f54 29b05d8057
commit 776b942013
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/ss_blumen_lumen/blumen_lumen_settings.h
View File

@ -50,7 +50,7 @@ global u32 LedOnTimesCount = CArrayLength(LedOnTimes); // do not edit
// How long it takes to fade from the default pattern to the // How long it takes to fade from the default pattern to the
// voice activated pattern // voice activated pattern
r32 VoiceCommandFadeDuration = 1.0f; // in seconds r32 VoiceCommandFadeDuration = 0.0f; // in seconds
// How long the voice activated pattern will remain active // How long the voice activated pattern will remain active
// without additional voice commands, before fading back to // without additional voice commands, before fading back to
@ -61,7 +61,7 @@ r32 VoiceCommandFadeDuration = 1.0f; // in seconds
// and then wait 30 seconds before fading back to the original // and then wait 30 seconds before fading back to the original
// pattern. If, in that 30 second window, another voice command // pattern. If, in that 30 second window, another voice command
// is issued, lumenarium will reset the 30 second counter. // is issued, lumenarium will reset the 30 second counter.
r64 VoiceCommandSustainDuration = 30.0; // in seconds r64 VoiceCommandSustainDuration = 120.0; // in seconds
// When we send a Motor Close command, we don't want the upper leds to // When we send a Motor Close command, we don't want the upper leds to
// immediately turn off. Instead, we want to wait until the flower is // immediately turn off. Instead, we want to wait until the flower is
@ -77,7 +77,7 @@ r64 VoiceCommandSustainDuration = 30.0; // in seconds
// NOTE: This is not a symmetric operation. When we send a 'motor open' // NOTE: This is not a symmetric operation. When we send a 'motor open'
// command, we want to immediately turn the upper leds on so they appear // command, we want to immediately turn the upper leds on so they appear
// to have been on the whole time. // to have been on the whole time.
r64 TurnUpperLedsOffAfterMotorCloseCommandDelay = 30.0; // in seconds r64 TurnUpperLedsOffAfterMotorCloseCommandDelay = 120.0; // in seconds
// NOTE: Temperature & Time of Day Based Led Brightness Settings // NOTE: Temperature & Time of Day Based Led Brightness Settings
@ -95,7 +95,7 @@ s8 MinHighTemperature = 0;
// This is multiplied by each pixels R, G, & B channels before being // This is multiplied by each pixels R, G, & B channels before being
// sent. So if it is set to .1f, then the maximum brightness value sent // sent. So if it is set to .1f, then the maximum brightness value sent
// to any channel of any pixel will be 25 (255 * .1 = 25). // to any channel of any pixel will be 25 (255 * .1 = 25).
r32 HighTemperatureBrightnessPercent = .25f; r32 HighTemperatureBrightnessPercent = 1.0f;
// The percent brightness we set leds to when no other conditions apply // The percent brightness we set leds to when no other conditions apply
// A value in the range 0:1 inclusive. // A value in the range 0:1 inclusive.
@ -111,14 +111,14 @@ r32 GlobalAnimSpeed = 1.0f;
// How long it takes to fade from one animation to the next. // How long it takes to fade from one animation to the next.
// This is used both for transitioning between animation files // This is used both for transitioning between animation files
// as well as transitioning from Standard pattern mode to voice // as well as transitioning from Standard pattern mode to voice
// activated mode // activated mode
r32 GlobalAnimTransitionSpeed = 5.0f; r32 GlobalAnimTransitionSpeed = 0.0f;
// how long it takes to fade from the old voice hue to the new one // how long it takes to fade from the old voice hue to the new one
r32 PhraseHueFadeInDuration = 2.0f; // seconds r32 PhraseHueFadeInDuration = 2.0f; // seconds
r64 PhrasePriorityMessageGroupingTime = 1.0f; r64 PhrasePriorityMessageGroupingTime = 0.0f;
// How often should Lumenarium send its status to the python server? // How often should Lumenarium send its status to the python server?
// //