feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forgot merge thingy

Browse Source
This commit is contained in:
CommanderRedYT
2021-10-10 00:30:06 +02:00
parent 2c77b55275
commit 8dc5665d5d
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/settings.h
View File

@@ -166,12 +166,9 @@ struct Settings
bool enableStVO; bool enableStVO;
int16_t stvoFrontOffset; int16_t stvoFrontOffset;
int16_t stvoFrontLength; int16_t stvoFrontLength;
<<<<<<< HEAD
=======
bool stvoFrontEnable; bool stvoFrontEnable;
int16_t animationMultiplier; int16_t animationMultiplier;
uint8_t brightness; uint8_t brightness;
>>>>>>> 3dff172 (Added led brightness and animation speed)
} ledstrip; } ledstrip;
#endif #endif