From c54092c932ee84ca3a385f38ceb28bbc40b83967 Mon Sep 17 00:00:00 2001 From: Travis J Dean Date: Mon, 30 Mar 2020 05:04:20 -0400 Subject: [PATCH] Remove redundant defines. --- wled00/wled.cpp | 13 +------------ wled00/wled.h | 7 ++++++- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/wled00/wled.cpp b/wled00/wled.cpp index fe3d7bd99..670868e61 100644 --- a/wled00/wled.cpp +++ b/wled00/wled.cpp @@ -45,7 +45,6 @@ bool noWifiSleep = false; //disabling modem sleep modes will i //LED CONFIG uint16_t ledCount = 30; //overcurrent prevented by ABL 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 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 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) 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] @@ -315,14 +313,8 @@ unsigned long ntpLastSyncTime = 999000000L; unsigned long ntpPacketSentTime = 999000000L; IPAddress ntpServerIP; 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 -#define MAX_LEDS 1500 -#define MAX_LEDS_DMA 500 - -//string temp buffer (now stored in stack locally) -#define OMAX 2048 +// Temp buffer char *obuf; uint16_t olen = 0; @@ -353,9 +345,6 @@ bool e131NewData = false; //led fx library object 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 #ifdef WLED_DEBUG unsigned long debugTime = 0; diff --git a/wled00/wled.h b/wled00/wled.h index 4eebead2f..3e6c11be1 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -137,7 +137,7 @@ extern IPAddress staticSubnet; extern bool noWifiSleep; extern uint16_t ledCount; 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 byte bootPreset; extern byte col[]; @@ -332,11 +332,16 @@ extern unsigned long ntpPacketSentTime; extern IPAddress ntpServerIP; extern uint16_t ntpLocalPort; #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_DMA 500 + +//string temp buffer (now stored in stack locally) #define OMAX 2048 extern char *obuf; extern uint16_t olen; + extern uint16_t savedPresets; extern int8_t currentPreset; extern bool isPreset;