From 8f072e5ddf7bc24285f579edfb6f3f24b1da9ac6 Mon Sep 17 00:00:00 2001 From: Nathael Pajani Date: Mon, 27 Feb 2023 14:24:49 +0100 Subject: [PATCH] Move ws2812fx library to extlib/ws2812fx directory Update header. --- {extdrv => extlib/ws2812fx}/ws2812fx.c | 75 ++++++++++--------- .../{extdrv => extlib/ws2812fx}/ws2812fx.h | 73 +++++++++--------- 2 files changed, 77 insertions(+), 71 deletions(-) rename {extdrv => extlib/ws2812fx}/ws2812fx.c (95%) rename include/{extdrv => extlib/ws2812fx}/ws2812fx.h (59%) diff --git a/extdrv/ws2812fx.c b/extlib/ws2812fx/ws2812fx.c similarity index 95% rename from extdrv/ws2812fx.c rename to extlib/ws2812fx/ws2812fx.c index f66c023..bc1f3a5 100644 --- a/extdrv/ws2812fx.c +++ b/extlib/ws2812fx/ws2812fx.c @@ -1,43 +1,46 @@ -/* - WS2812FX.cpp - Library for WS2812 LED effects. - Harm Aldick - 2016 - www.aldick.org - FEATURES - * A lot of blinken modes and counting - * WS2812FX can be used as drop-in replacement for Adafruit Neopixel Library - NOTES - * Uses the Adafruit Neopixel library. Get it here: - https://github.com/adafruit/Adafruit_NeoPixel - LICENSE - The MIT License (MIT) - Copyright (c) 2016 Harm Aldick - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - CHANGELOG - 2016-05-28 Initial beta release - 2016-06-03 Code cleanup, minor improvements, new modes - 2016-06-04 2 new fx, fixed setColor (now also resets _mode_color) - 2017-02-02 added external trigger functionality (e.g. for sound-to-light) - 2017-02-02 removed "blackout" on mode, speed or color-change -*/ +/**************************************************************************** + * + * extlib/ws2812fx/ws2812fx.c - Library for WS2812 LED effects. + * + * Fork from Harm Aldick's work - 2016 - www.aldick.org + * https://github.com/kitesurfer1404/WS2812FX.git + * + * FEATURES + * - A lot of blinken modes and counting + * - WS2812FX can be used as drop-in replacement for Adafruit Neopixel Library + * + * LICENSE + * The MIT License (MIT) + * Copyright (c) 2016 Harm Aldick + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * CHANGELOG + * 2016-05-28 Initial beta release + * 2016-06-03 Code cleanup, minor improvements, new modes + * 2016-06-04 2 new fx, fixed setColor (now also resets _mode_color) + * 2017-02-02 added external trigger functionality (e.g. for sound-to-light) + * 2017-02-02 removed "blackout" on mode, speed or color-change + * + *************************************************************************** */ #include "core/systick.h" #include "lib/utils.h" #include "extdrv/ws2812.h" -#include "extdrv/ws2812fx.h" +#include "extlib/ws2812fx/ws2812fx.h" static uint32_t random(uint32_t max) { diff --git a/include/extdrv/ws2812fx.h b/include/extlib/ws2812fx/ws2812fx.h similarity index 59% rename from include/extdrv/ws2812fx.h rename to include/extlib/ws2812fx/ws2812fx.h index df00f2e..51b1cc7 100644 --- a/include/extdrv/ws2812fx.h +++ b/include/extlib/ws2812fx/ws2812fx.h @@ -1,38 +1,41 @@ -/* - WS2812FX.h - Library for WS2812 LED effects. - - Harm Aldick - 2016 - www.aldick.org - FEATURES -/ * A lot of blinken modes and countin2 - * WS2812FX can be used as drop-in replacement for Adafruit Neopixel Library - NOTES - * Uses the Adafruit Neopixel library. Get it here: - https://github.com/adafruit/Adafruit_NeoPixel - LICENSE - The MIT License (MIT) - Copyright (c) 2016 Harm Aldick - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - CHANGELOG - 2016-05-28 Initial beta release - 2016-06-03 Code cleanup, minor improvements, new modes - 2016-06-04 2 new fx, fixed setColor (now also resets _mode_color) - 2017-02-02 added external trigger functionality (e.g. for sound-to-light) -*/ +/**************************************************************************** + * + * include/extlib/ws2812fx/ws2812fx.h - Library for WS2812 LED effects. + * + * Fork from Harm Aldick's work - 2016 - www.aldick.org + * https://github.com/kitesurfer1404/WS2812FX.git + * + * FEATURES + * - A lot of blinken modes and counting + * - WS2812FX can be used as drop-in replacement for Adafruit Neopixel Library + * + * LICENSE + * The MIT License (MIT) + * Copyright (c) 2016 Harm Aldick + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * CHANGELOG + * 2016-05-28 Initial beta release + * 2016-06-03 Code cleanup, minor improvements, new modes + * 2016-06-04 2 new fx, fixed setColor (now also resets _mode_color) + * 2017-02-02 added external trigger functionality (e.g. for sound-to-light) + * 2017-02-02 removed "blackout" on mode, speed or color-change + * + *************************************************************************** */ #ifndef WS2812FX_h #define WS2812FX_h -- 2.43.0