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

Preprocessor fix.

Browse Source
This commit is contained in:
Blaz Kristan 2021-02-26 16:05:05 +01:00
parent 2c0c22dbf3
commit c6f575d8d3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wled00/bus_manager.h
View File

@ -10,6 +10,10 @@
#include "bus_wrapper.h" #include "bus_wrapper.h"
#include <Arduino.h> #include <Arduino.h>
#define GET_BIT(var,bit) ((var>>bit)&0x01)
#define SET_BIT(var,bit) (var|=(uint16_t)(0x0001<<bit))
#define UNSET_BIT(var,bit) (var&=(~(uint16_t)(0x0001<<bit)))
//temporary struct for passing bus configuration to bus //temporary struct for passing bus configuration to bus
struct BusConfig { struct BusConfig {
uint8_t type = TYPE_WS2812_RGB; uint8_t type = TYPE_WS2812_RGB;
@ -21,7 +25,7 @@ struct BusConfig {
bool rgbwOverride = false; bool rgbwOverride = false;
uint8_t pins[5] = {LEDPIN, 255, 255, 255, 255}; uint8_t pins[5] = {LEDPIN, 255, 255, 255, 255};
BusConfig(uint8_t busType, uint8_t* ppins, uint16_t pstart, uint16_t len = 1, uint8_t pcolorOrder = COL_ORDER_GRB, bool rev = false, bool skip = false) { BusConfig(uint8_t busType, uint8_t* ppins, uint16_t pstart, uint16_t len = 1, uint8_t pcolorOrder = COL_ORDER_GRB, bool rev = false, bool skip = false) {
rgbwOverride = GET_BIT(busType,7); rgbwOverride = (bool) GET_BIT(busType,7);
type = busType & 0x7F; // bit 7 is hacked to include RGBW info (1=RGBW, 0=RGB) type = busType & 0x7F; // bit 7 is hacked to include RGBW info (1=RGBW, 0=RGB)
count = len; start = pstart; colorOrder = pcolorOrder; reversed = rev; skipFirst = skip; count = len; start = pstart; colorOrder = pcolorOrder; reversed = rev; skipFirst = skip;
uint8_t nPins = 1; uint8_t nPins = 1;

4
wled00/wled.h
View File

@ -605,10 +605,6 @@ WLED_GLOBAL UsermodManager usermods _INIT(UsermodManager());
#define WLED_WIFI_CONFIGURED (strlen(clientSSID) >= 1 && strcmp(clientSSID, DEFAULT_CLIENT_SSID) != 0) #define WLED_WIFI_CONFIGURED (strlen(clientSSID) >= 1 && strcmp(clientSSID, DEFAULT_CLIENT_SSID) != 0)
#define WLED_MQTT_CONNECTED (mqtt != nullptr && mqtt->connected()) #define WLED_MQTT_CONNECTED (mqtt != nullptr && mqtt->connected())
#define GET_BIT(var,bit) ((var>>bit)&0x01)
#define SET_BIT(var,bit) (var|=(uint16_t)(0x0001<<bit))
#define UNSET_BIT(var,bit) (var&=(~(uint16_t)(0x0001<<bit)))
// append new c string to temp buffer efficiently // append new c string to temp buffer efficiently
bool oappend(const char* txt); bool oappend(const char* txt);
// append new number to temp buffer efficiently // append new number to temp buffer efficiently