ctdo
/
esp-videoswitcher
16
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge korrigiert

This commit is contained in:
starcalc 2018-02-11 18:49:39 +01:00
parent bba6d4cf8a
commit 52ccd0c31d
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NeoPatterns.h
View File

@ -36,13 +36,10 @@ class NeoPatterns : public Adafruit_NeoPixel
void PlasmaUpdate(); void PlasmaUpdate();
void Radar(float radarspeed = 0.5,float radarthickness = 1, uint8_t interval = 50); void Radar(float radarspeed = 0.5,float radarthickness = 1, uint8_t interval = 50);
void RadarUpdate(); void RadarUpdate();
<<<<<<< HEAD
void ShowInput(); void ShowInput();
void ShowInputUpdate(); void ShowInputUpdate();
=======
void Equalizer(uint8_t eqvalues[]); void Equalizer(uint8_t eqvalues[]);
void setEqBar(uint8_t barid,uint8_t pvalue); void setEqBar(uint8_t barid,uint8_t pvalue);
>>>>>>> cff73c87e375c2766ab0a7beebffd403d37b21d8
void SetColor1(uint32_t color); void SetColor1(uint32_t color);
void SetColor2(uint32_t color); void SetColor2(uint32_t color);