jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-26 12:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format changes.

Browse Source
This commit is contained in:
Travis J Dean 2020-03-30 06:42:21 -04:00
parent ffbedbc1e6
commit 8d75c06852
3 changed files with 287 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.clang-format
View File

@ -1,4 +1,12 @@
--- ---
BasedOnStyle: Webkit BasedOnStyle: Webkit
IndentWidth: 2 IndentWidth: 2
AlignTrailingComments: true
SpacesBeforeTrailingComments: 8
AllowShortIfStatementsOnASingleLine: Always
AllowShortLoopsOnASingleLine: true
AllowShortLambdasOnASingleLine: true
AllowShortCaseLabelsOnASingleLine: true
AllowShortFunctionsOnASingleLine: All
AllowShortBlocksOnASingleLine: true
IndentCaseLabels: true

10
wled00/wled.h
View File

@ -61,6 +61,7 @@ extern "C"
#include <SPIFFSEditor.h> #include <SPIFFSEditor.h>
#include "src/dependencies/time/TimeLib.h" #include "src/dependencies/time/TimeLib.h"
#include "src/dependencies/timezone/Timezone.h" #include "src/dependencies/timezone/Timezone.h"
#ifndef WLED_DISABLE_ALEXA #ifndef WLED_DISABLE_ALEXA
#define ESPALEXA_ASYNC #define ESPALEXA_ASYNC
#define ESPALEXA_NO_SUBPAGE #define ESPALEXA_NO_SUBPAGE
@ -71,10 +72,12 @@ extern "C"
#ifndef WLED_DISABLE_BLYNK #ifndef WLED_DISABLE_BLYNK
#include "src/dependencies/blynk/BlynkSimpleEsp.h" #include "src/dependencies/blynk/BlynkSimpleEsp.h"
#endif #endif
#include "src/dependencies/e131/ESPAsyncE131.h" #include "src/dependencies/e131/ESPAsyncE131.h"
#include "src/dependencies/async-mqtt-client/AsyncMqttClient.h" #include "src/dependencies/async-mqtt-client/AsyncMqttClient.h"
#include "src/dependencies/json/AsyncJson-v6.h" #include "src/dependencies/json/AsyncJson-v6.h"
#include "src/dependencies/json/ArduinoJson-v6.h" #include "src/dependencies/json/ArduinoJson-v6.h"
#include "html_ui.h" #include "html_ui.h"
#include "html_settings.h" #include "html_settings.h"
#include "html_other.h" #include "html_other.h"
@ -226,7 +229,6 @@ extern uint16_t userVar0, userVar1;
#ifdef WLED_ENABLE_DMX #ifdef WLED_ENABLE_DMX
extern byte DMXChannels; extern byte DMXChannels;
extern byte DMXFixtureMap[15]; extern byte DMXFixtureMap[15];
extern
extern uint16_t DMXGap; extern uint16_t DMXGap;
extern uint16_t DMXStart; extern uint16_t DMXStart;
#endif #endif
@ -324,6 +326,8 @@ extern String escapedMac;
extern Espalexa espalexa; extern Espalexa espalexa;
extern EspalexaDevice *espalexaDevice; extern EspalexaDevice *espalexaDevice;
#endif #endif
#define NTP_PACKET_SIZE 48
extern DNSServer dnsServer; extern DNSServer dnsServer;
extern bool ntpConnected; extern bool ntpConnected;
extern time_t local; extern time_t local;
@ -331,7 +335,6 @@ extern unsigned long ntpLastSyncTime;
extern unsigned long ntpPacketSentTime; extern unsigned long ntpPacketSentTime;
extern IPAddress ntpServerIP; extern IPAddress ntpServerIP;
extern uint16_t ntpLocalPort; 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 // 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
@ -382,8 +385,7 @@ bool oappend(const char *txt);
// append new number to temp buffer efficiently // append new number to temp buffer efficiently
bool oappendi(int i); bool oappendi(int i);
class WLED class WLED {
{
public: public:
WLED(); WLED();
static WLED& instance() static WLED& instance()