From 6169c458bfb327a2a700481be52e6b71584df0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Kristan?= Date: Thu, 12 Sep 2024 08:48:31 +0200 Subject: [PATCH] Remove void --- wled00/bus_manager.cpp | 36 +++++----- wled00/bus_manager.h | 158 ++++++++++++++++++++--------------------- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp index c6c54885c..723297178 100644 --- a/wled00/bus_manager.cpp +++ b/wled00/bus_manager.cpp @@ -173,7 +173,7 @@ BusDigital::BusDigital(BusConfig &bc, uint8_t nr, const ColorOrderMap &com) //I am NOT to be held liable for burned down garages or houses! // To disable brightness limiter we either set output max current to 0 or single LED current to 0 -uint8_t BusDigital::estimateCurrentAndLimitBri(void) { +uint8_t BusDigital::estimateCurrentAndLimitBri() { bool useWackyWS2815PowerModel = false; byte actualMilliampsPerLed = _milliAmpsPerLed; @@ -225,7 +225,7 @@ uint8_t BusDigital::estimateCurrentAndLimitBri(void) { return newBri; } -void BusDigital::show(void) { +void BusDigital::show() { _milliAmpsTotal = 0; if (!_valid) return; @@ -286,7 +286,7 @@ void BusDigital::show(void) { if (newBri < _bri) PolyBus::setBrightness(_busPtr, _iType, _bri); } -bool BusDigital::canShow(void) const { +bool BusDigital::canShow() const { if (!_valid) return true; return PolyBus::canShow(_busPtr, _iType); } @@ -410,12 +410,12 @@ std::vector BusDigital::getLEDTypes() { }; } -void BusDigital::reinit(void) { +void BusDigital::reinit() { if (!_valid) return; PolyBus::begin(_busPtr, _iType, _pins); } -void BusDigital::cleanup(void) { +void BusDigital::cleanup() { DEBUG_PRINTLN(F("Digital Cleanup.")); PolyBus::cleanup(_busPtr, _iType); _iType = I_NONE; @@ -637,7 +637,7 @@ std::vector BusPwm::getLEDTypes() { }; } -void BusPwm::deallocatePins(void) { +void BusPwm::deallocatePins() { unsigned numPins = getPins(); for (unsigned i = 0; i < numPins; i++) { pinManager.deallocatePin(_pins[i], PinOwner::BusPwm); @@ -689,7 +689,7 @@ uint32_t BusOnOff::getPixelColor(uint16_t pix) const { return RGBW32(_data[0], _data[0], _data[0], _data[0]); } -void BusOnOff::show(void) { +void BusOnOff::show() { if (!_valid) return; digitalWrite(_pin, _reversed ? !(bool)_data[0] : (bool)_data[0]); } @@ -751,7 +751,7 @@ uint32_t BusNetwork::getPixelColor(uint16_t pix) const { return RGBW32(_data[offset], _data[offset+1], _data[offset+2], (hasWhite() ? _data[offset+3] : 0)); } -void BusNetwork::show(void) { +void BusNetwork::show() { if (!_valid || !canShow()) return; _broadcastLock = true; realtimeBroadcast(_UDPtype, _client, _len, _data, _bri, hasWhite()); @@ -778,7 +778,7 @@ std::vector BusNetwork::getLEDTypes() { }; } -void BusNetwork::cleanup(void) { +void BusNetwork::cleanup() { _type = I_NONE; _valid = false; freeData(); @@ -839,7 +839,7 @@ static String LEDTypesToJson(const std::vector& types) { } // credit @willmmiles & @netmindz https://github.com/Aircoookie/WLED/pull/4056 -String BusManager::getLEDTypesJSONString(void) { +String BusManager::getLEDTypesJSONString() { String json = "["; json += LEDTypesToJson(BusDigital::getLEDTypes()); json += LEDTypesToJson(BusOnOff::getLEDTypes()); @@ -850,13 +850,13 @@ String BusManager::getLEDTypesJSONString(void) { return json; } -void BusManager::useParallelOutput(void) { +void BusManager::useParallelOutput() { _parallelOutputs = 8; // hardcoded since we use NPB I2S x8 methods PolyBus::setParallelI2S1Output(); } //do not call this method from system context (network callback) -void BusManager::removeAll(void) { +void BusManager::removeAll() { DEBUG_PRINTLN(F("Removing all.")); //prevents crashes due to deleting busses while in use. while (!canAllShow()) yield(); @@ -870,7 +870,7 @@ void BusManager::removeAll(void) { // #2478 // If enabled, RMT idle level is set to HIGH when off // to prevent leakage current when using an N-channel MOSFET to toggle LED power -void BusManager::esp32RMTInvertIdle(void) { +void BusManager::esp32RMTInvertIdle() { bool idle_out; unsigned rmt = 0; for (unsigned u = 0; u < numBusses(); u++) { @@ -901,7 +901,7 @@ void BusManager::esp32RMTInvertIdle(void) { } #endif -void BusManager::on(void) { +void BusManager::on() { #ifdef ESP8266 //Fix for turning off onboard LED breaking bus if (pinManager.getPinOwner(LED_BUILTIN) == PinOwner::BusDigital) { @@ -922,7 +922,7 @@ void BusManager::on(void) { #endif } -void BusManager::off(void) { +void BusManager::off() { #ifdef ESP8266 // turn off built-in LED if strip is turned off // this will break digital bus so will need to be re-initialised on On @@ -937,7 +937,7 @@ void BusManager::off(void) { #endif } -void BusManager::show(void) { +void BusManager::show() { _milliAmpsUsed = 0; for (unsigned i = 0; i < numBusses; i++) { busses[i]->show(); @@ -984,7 +984,7 @@ uint32_t BusManager::getPixelColor(uint16_t pix) { return 0; } -bool BusManager::canAllShow(void) { +bool BusManager::canAllShow() { for (unsigned i = 0; i < numBusses; i++) { if (!busses[i]->canShow()) return false; } @@ -997,7 +997,7 @@ Bus* BusManager::getBus(uint8_t busNr) { } //semi-duplicate of strip.getLengthTotal() (though that just returns strip._length, calculated in finalizeInit()) -uint16_t BusManager::getTotalLength(void) { +uint16_t BusManager::getTotalLength() { unsigned len = 0; for (unsigned i=0; igetLength(); return len; diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h index c3ebcad61..8205bd66c 100644 --- a/wled00/bus_manager.h +++ b/wled00/bus_manager.h @@ -79,46 +79,46 @@ class Bus { virtual ~Bus() {} //throw the bus under the bus - virtual void show(void) = 0; - virtual bool canShow(void) const { return true; } - virtual void setStatusPixel(uint32_t c) {} + virtual void show() = 0; + virtual bool canShow() const { return true; } + virtual void setStatusPixel(uint32_t c) {} virtual void setPixelColor(uint16_t pix, uint32_t c) = 0; - virtual void setBrightness(uint8_t b) { _bri = b; }; - virtual void setColorOrder(uint8_t co) {} - virtual uint32_t getPixelColor(uint16_t pix) const { return 0; } - virtual uint8_t getPins(uint8_t* pinArray = nullptr) const { return 0; } - virtual uint16_t getLength(void) const { return isOk() ? _len : 0; } - virtual uint8_t getColorOrder(void) const { return COL_ORDER_RGB; } - virtual uint8_t skippedLeds(void) const { return 0; } - virtual uint16_t getFrequency(void) const { return 0U; } - virtual uint16_t getLEDCurrent(void) const { return 0; } - virtual uint16_t getUsedCurrent(void) const { return 0; } - virtual uint16_t getMaxCurrent(void) const { return 0; } + virtual void setBrightness(uint8_t b) { _bri = b; }; + virtual void setColorOrder(uint8_t co) {} + virtual uint32_t getPixelColor(uint16_t pix) const { return 0; } + virtual uint8_t getPins(uint8_t* pinArray = nullptr) const { return 0; } + virtual uint16_t getLength() const { return isOk() ? _len : 0; } + virtual uint8_t getColorOrder() const { return COL_ORDER_RGB; } + virtual uint8_t skippedLeds() const { return 0; } + virtual uint16_t getFrequency() const { return 0U; } + virtual uint16_t getLEDCurrent() const { return 0; } + virtual uint16_t getUsedCurrent() const { return 0; } + virtual uint16_t getMaxCurrent() const { return 0; } - inline bool hasRGB(void) const { return _hasRgb; } - inline bool hasWhite(void) const { return _hasWhite; } - inline bool hasCCT(void) const { return _hasCCT; } - inline bool isDigital(void) const { return isDigital(_type); } - inline bool is2Pin(void) const { return is2Pin(_type); } - inline bool isOnOff(void) const { return isOnOff(_type); } - inline bool isPWM(void) const { return isPWM(_type); } - inline bool isVirtual(void) const { return isVirtual(_type); } - inline bool is16bit(void) const { return is16bit(_type); } - inline void setReversed(bool reversed) { _reversed = reversed; } - inline void setStart(uint16_t start) { _start = start; } - inline void setAutoWhiteMode(uint8_t m) { if (m < 5) _autoWhiteMode = m; } - inline uint8_t getAutoWhiteMode(void) const { return _autoWhiteMode; } - inline uint8_t getNumberOfChannels(void) const { return hasWhite() + 3*hasRGB() + hasCCT(); } - inline uint16_t getStart(void) const { return _start; } - inline uint8_t getType(void) const { return _type; } - inline bool isOk(void) const { return _valid; } - inline bool isReversed(void) const { return _reversed; } - inline bool isOffRefreshRequired(void) const { return _needsRefresh; } - inline bool containsPixel(uint16_t pix) const { return pix >= _start && pix < _start + _len; } + inline bool hasRGB() const { return _hasRgb; } + inline bool hasWhite() const { return _hasWhite; } + inline bool hasCCT() const { return _hasCCT; } + inline bool isDigital() const { return isDigital(_type); } + inline bool is2Pin() const { return is2Pin(_type); } + inline bool isOnOff() const { return isOnOff(_type); } + inline bool isPWM() const { return isPWM(_type); } + inline bool isVirtual() const { return isVirtual(_type); } + inline bool is16bit() const { return is16bit(_type); } + inline void setReversed(bool reversed) { _reversed = reversed; } + inline void setStart(uint16_t start) { _start = start; } + inline void setAutoWhiteMode(uint8_t m) { if (m < 5) _autoWhiteMode = m; } + inline uint8_t getAutoWhiteMode() const { return _autoWhiteMode; } + inline uint8_t getNumberOfChannels() const { return hasWhite() + 3*hasRGB() + hasCCT(); } + inline uint16_t getStart() const { return _start; } + inline uint8_t getType() const { return _type; } + inline bool isOk() const { return _valid; } + inline bool isReversed() const { return _reversed; } + inline bool isOffRefreshRequired() const { return _needsRefresh; } + inline bool containsPixel(uint16_t pix) const { return pix >= _start && pix < _start + _len; } - static inline std::vector getLEDTypes(void) { return {{TYPE_NONE, "", PSTR("None")}}; } // not used. just for reference for derived classes - static constexpr uint8_t getNumberOfPins(uint8_t type) { return isVirtual(type) ? 4 : isPWM(type) ? numPWMPins(type) : is2Pin(type) + 1; } // credit @PaoloTK - static constexpr uint8_t getNumberOfChannels(uint8_t type) { return hasWhite(type) + 3*hasRGB(type) + hasCCT(type); } + static inline std::vector getLEDTypes() { return {{TYPE_NONE, "", PSTR("None")}}; } // not used. just for reference for derived classes + static constexpr uint8_t getNumberOfPins(uint8_t type) { return isVirtual(type) ? 4 : isPWM(type) ? numPWMPins(type) : is2Pin(type) + 1; } // credit @PaoloTK + static constexpr uint8_t getNumberOfChannels(uint8_t type) { return hasWhite(type) + 3*hasRGB(type) + hasCCT(type); } static constexpr bool hasRGB(uint8_t type) { return !((type >= TYPE_WS2812_1CH && type <= TYPE_WS2812_WWA) || type == TYPE_ANALOG_1CH || type == TYPE_ANALOG_2CH || type == TYPE_ONOFF); } @@ -144,11 +144,11 @@ class Bus { static constexpr bool is16bit(uint8_t type) { return type == TYPE_UCS8903 || type == TYPE_UCS8904 || type == TYPE_SM16825; } static constexpr int numPWMPins(uint8_t type) { return (type - 40); } - static inline int16_t getCCT(void) { return _cct; } + static inline int16_t getCCT() { return _cct; } static inline void setGlobalAWMode(uint8_t m) { if (m < 5) _gAWM = m; else _gAWM = AW_GLOBAL_DISABLED; } - static inline uint8_t getGlobalAWMode(void) { return _gAWM; } + static inline uint8_t getGlobalAWMode() { return _gAWM; } static inline void setCCT(int16_t cct) { _cct = cct; } - static inline uint8_t getCCTBlend(void) { return _cctBlend; } + static inline uint8_t getCCTBlend() { return _cctBlend; } static inline void setCCTBlend(uint8_t b) { _cctBlend = (std::min((int)b,100) * 127) / 100; //compile-time limiter for hardware that can't power both white channels at max @@ -197,24 +197,24 @@ class BusDigital : public Bus { BusDigital(BusConfig &bc, uint8_t nr, const ColorOrderMap &com); ~BusDigital() { cleanup(); } - void show(void) override; - bool canShow(void) const override; + void show() override; + bool canShow() const override; void setBrightness(uint8_t b) override; void setStatusPixel(uint32_t c) override; void setPixelColor(uint16_t pix, uint32_t c) override; void setColorOrder(uint8_t colorOrder) override; uint32_t getPixelColor(uint16_t pix) const override; - uint8_t getColorOrder(void) const override { return _colorOrder; } + uint8_t getColorOrder() const override { return _colorOrder; } uint8_t getPins(uint8_t* pinArray = nullptr) const override; - uint8_t skippedLeds(void) const override { return _skip; } - uint16_t getFrequency(void) const override { return _frequencykHz; } - uint16_t getLEDCurrent(void) const override { return _milliAmpsPerLed; } - uint16_t getUsedCurrent(void) const override { return _milliAmpsTotal; } - uint16_t getMaxCurrent(void) const override { return _milliAmpsMax; } - void reinit(void); - void cleanup(void); + uint8_t skippedLeds() const override { return _skip; } + uint16_t getFrequency() const override { return _frequencykHz; } + uint16_t getLEDCurrent() const override { return _milliAmpsPerLed; } + uint16_t getUsedCurrent() const override { return _milliAmpsTotal; } + uint16_t getMaxCurrent() const override { return _milliAmpsMax; } + void reinit(); + void cleanup(); - static std::vector getLEDTypes(void); + static std::vector getLEDTypes(); private: uint8_t _skip; @@ -240,7 +240,7 @@ class BusDigital : public Bus { return c; } - uint8_t estimateCurrentAndLimitBri(void); + uint8_t estimateCurrentAndLimitBri(); }; @@ -252,11 +252,11 @@ class BusPwm : public Bus { void setPixelColor(uint16_t pix, uint32_t c) override; uint32_t getPixelColor(uint16_t pix) const override; //does no index check uint8_t getPins(uint8_t* pinArray = nullptr) const override; - uint16_t getFrequency(void) const override { return _frequency; } - void show(void) override; - void cleanup(void) { deallocatePins(); } + uint16_t getFrequency() const override { return _frequency; } + void show() override; + void cleanup() { deallocatePins(); } - static std::vector getLEDTypes(void); + static std::vector getLEDTypes(); private: uint8_t _pins[5]; @@ -267,7 +267,7 @@ class BusPwm : public Bus { uint8_t _depth; uint16_t _frequency; - void deallocatePins(void); + void deallocatePins(); }; @@ -279,10 +279,10 @@ class BusOnOff : public Bus { void setPixelColor(uint16_t pix, uint32_t c) override; uint32_t getPixelColor(uint16_t pix) const override; uint8_t getPins(uint8_t* pinArray) const override; - void show(void) override; - void cleanup(void) { pinManager.deallocatePin(_pin, PinOwner::BusOnOff); } + void show() override; + void cleanup() { pinManager.deallocatePin(_pin, PinOwner::BusOnOff); } - static std::vector getLEDTypes(void); + static std::vector getLEDTypes(); private: uint8_t _pin; @@ -295,14 +295,14 @@ class BusNetwork : public Bus { BusNetwork(BusConfig &bc); ~BusNetwork() { cleanup(); } - bool canShow(void) const override { return !_broadcastLock; } // this should be a return value from UDP routine if it is still sending data out + bool canShow() const override { return !_broadcastLock; } // this should be a return value from UDP routine if it is still sending data out void setPixelColor(uint16_t pix, uint32_t c) override; uint32_t getPixelColor(uint16_t pix) const override; uint8_t getPins(uint8_t* pinArray = nullptr) const override; - void show(void) override; - void cleanup(void); + void show() override; + void cleanup(); - static std::vector getLEDTypes(void); + static std::vector getLEDTypes(); private: IPAddress _client; @@ -367,20 +367,20 @@ class BusManager { //utility to get the approx. memory usage of a given BusConfig static uint32_t memUsage(BusConfig &bc); static uint32_t memUsage(unsigned channels, unsigned count, unsigned buses = 1); - static uint16_t currentMilliamps(void) { return _milliAmpsUsed; } - static uint16_t ablMilliampsMax(void) { return _milliAmpsMax; } + static uint16_t currentMilliamps() { return _milliAmpsUsed; } + static uint16_t ablMilliampsMax() { return _milliAmpsMax; } static int add(BusConfig &bc); - static void useParallelOutput(void); // workaround for inaccessible PolyBus + static void useParallelOutput(); // workaround for inaccessible PolyBus //do not call this method from system context (network callback) - static void removeAll(void); + static void removeAll(); - static void on(void); - static void off(void); + static void on(); + static void off(); - static void show(void); - static bool canAllShow(void); + static void show(); + static bool canAllShow(); static void setStatusPixel(uint32_t c); static void setPixelColor(uint16_t pix, uint32_t c); static void setBrightness(uint8_t b); @@ -389,16 +389,16 @@ class BusManager { static void setSegmentCCT(int16_t cct, bool allowWBCorrection = false); static inline void setMilliampsMax(uint16_t max) { _milliAmpsMax = max;} static uint32_t getPixelColor(uint16_t pix); - static inline int16_t getSegmentCCT(void) { return Bus::getCCT(); } + static inline int16_t getSegmentCCT() { return Bus::getCCT(); } static Bus* getBus(uint8_t busNr); //semi-duplicate of strip.getLengthTotal() (though that just returns strip._length, calculated in finalizeInit()) - static uint16_t getTotalLength(void); - static inline uint8_t getNumBusses(void) { return numBusses; } - static String getLEDTypesJSONString(void); + static uint16_t getTotalLength(); + static inline uint8_t getNumBusses() { return numBusses; } + static String getLEDTypesJSONString(); - static inline ColorOrderMap& getColorOrderMap(void) { return colorOrderMap; } + static inline ColorOrderMap& getColorOrderMap() { return colorOrderMap; } private: static uint8_t numBusses; @@ -409,9 +409,9 @@ class BusManager { static uint8_t _parallelOutputs; #ifdef ESP32_DATA_IDLE_HIGH - static void esp32RMTInvertIdle(void) ; + static void esp32RMTInvertIdle() ; #endif - static uint8_t getNumVirtualBusses(void) { + static uint8_t getNumVirtualBusses() { int j = 0; for (int i=0; iisVirtual()) j++; return j;