lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant defines.

Browse Source
This commit is contained in:
Travis J Dean 2020-03-30 05:04:20 -04:00
parent 9134c3b4af
commit c54092c932
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wled00/wled.cpp
View File

@ -45,7 +45,6 @@ bool noWifiSleep = false; //disabling modem sleep modes will i
//LED CONFIG //LED CONFIG
uint16_t ledCount = 30; //overcurrent prevented by ABL uint16_t ledCount = 30; //overcurrent prevented by ABL
bool useRGBW = false; //SK6812 strips can contain an extra White channel bool useRGBW = false; //SK6812 strips can contain an extra White channel
#define ABL_MILLIAMPS_DEFAULT 850; //auto lower brightness to stay close to milliampere limit
bool turnOnAtBoot = true; //turn on LEDs at power-up bool turnOnAtBoot = true; //turn on LEDs at power-up
byte bootPreset = 0; //save preset to load after power-up byte bootPreset = 0; //save preset to load after power-up
@ -95,7 +94,6 @@ bool receiveDirect = true; //receive UDP realtime
bool arlsDisableGammaCorrection = true; //activate if gamma correction is handled by the source bool arlsDisableGammaCorrection = true; //activate if gamma correction is handled by the source
bool arlsForceMaxBri = false; //enable to force max brightness if source has very dark colors that would be black bool arlsForceMaxBri = false; //enable to force max brightness if source has very dark colors that would be black
#define E131_MAX_UNIVERSE_COUNT 9
uint16_t e131Universe = 1; //settings for E1.31 (sACN) protocol (only DMX_MODE_MULTIPLE_* can span over consequtive universes) uint16_t e131Universe = 1; //settings for E1.31 (sACN) protocol (only DMX_MODE_MULTIPLE_* can span over consequtive universes)
uint8_t DMXMode = DMX_MODE_MULTIPLE_RGB; //DMX mode (s.a.) uint8_t DMXMode = DMX_MODE_MULTIPLE_RGB; //DMX mode (s.a.)
uint16_t DMXAddress = 1; //DMX start address of fixture, a.k.a. first Channel [for E1.31 (sACN) protocol] uint16_t DMXAddress = 1; //DMX start address of fixture, a.k.a. first Channel [for E1.31 (sACN) protocol]
@ -315,14 +313,8 @@ unsigned long ntpLastSyncTime = 999000000L;
unsigned long ntpPacketSentTime = 999000000L; unsigned long ntpPacketSentTime = 999000000L;
IPAddress ntpServerIP; IPAddress ntpServerIP;
uint16_t ntpLocalPort = 2390; uint16_t ntpLocalPort = 2390;
#define NTP_PACKET_SIZE 48
//maximum number of LEDs - MAX_LEDS is coming from the JSON response getting too big, MAX_LEDS_DMA will become a timing issue // Temp buffer
#define MAX_LEDS 1500
#define MAX_LEDS_DMA 500
//string temp buffer (now stored in stack locally)
#define OMAX 2048
char *obuf; char *obuf;
uint16_t olen = 0; uint16_t olen = 0;
@ -353,9 +345,6 @@ bool e131NewData = false;
//led fx library object //led fx library object
WS2812FX strip = WS2812FX(); WS2812FX strip = WS2812FX();
#define WLED_CONNECTED (WiFi.status() == WL_CONNECTED)
#define WLED_WIFI_CONFIGURED (strlen(clientSSID) >= 1 && strcmp(clientSSID, DEFAULT_CLIENT_SSID) != 0)
//debug macro variable definitions //debug macro variable definitions
#ifdef WLED_DEBUG #ifdef WLED_DEBUG
unsigned long debugTime = 0; unsigned long debugTime = 0;

7
wled00/wled.h
View File

@ -137,7 +137,7 @@ extern IPAddress staticSubnet;
extern bool noWifiSleep; extern bool noWifiSleep;
extern uint16_t ledCount; extern uint16_t ledCount;
extern bool useRGBW; extern bool useRGBW;
#define ABL_MILLIAMPS_DEFAULT 850; #define ABL_MILLIAMPS_DEFAULT 850; //auto lower brightness to stay close to milliampere limit
extern bool turnOnAtBoot; extern bool turnOnAtBoot;
extern byte bootPreset; extern byte bootPreset;
extern byte col[]; extern byte col[];
@ -332,11 +332,16 @@ extern unsigned long ntpPacketSentTime;
extern IPAddress ntpServerIP; extern IPAddress ntpServerIP;
extern uint16_t ntpLocalPort; extern uint16_t ntpLocalPort;
#define NTP_PACKET_SIZE 48 #define NTP_PACKET_SIZE 48
//maximum number of LEDs - MAX_LEDS is coming from the JSON response getting too big, MAX_LEDS_DMA will become a timing issue
#define MAX_LEDS 1500 #define MAX_LEDS 1500
#define MAX_LEDS_DMA 500 #define MAX_LEDS_DMA 500
//string temp buffer (now stored in stack locally)
#define OMAX 2048 #define OMAX 2048
extern char *obuf; extern char *obuf;
extern uint16_t olen; extern uint16_t olen;
extern uint16_t savedPresets; extern uint16_t savedPresets;
extern int8_t currentPreset; extern int8_t currentPreset;
extern bool isPreset; extern bool isPreset;