diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..2edd9412 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.pio +.pioenvs +.piolibdeps +.vscode +!.vscode/extensions.json diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..c4408c4c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,35 @@ +# Continuous Integration (CI) is the practice, in software +# engineering, of merging all developer working copies with a shared mainline +# several times a day < https://docs.platformio.org/page/ci/index.html > +# +# Documentation: +# +# * Travis CI Embedded Builds with PlatformIO +# < https://docs.travis-ci.com/user/integration/platformio/ > +# +# * PlatformIO integration with Travis CI +# < https://docs.platformio.org/page/ci/travis.html > +# +# * User Guide for `platformio ci` command +# < https://docs.platformio.org/page/userguide/cmd_ci.html > +# +# +# Please choose one of the following templates (proposed below) and uncomment +# it (remove "# " before each line) or use own configuration according to the +# Travis CI documentation (see above). +# + +language: python +python: + - "2.7" +sudo: false +cache: + directories: + - "~/.platformio" +env: + - PLATFORMIO_CI_SRC=wled00 +install: + - pip install -U platformio + - platformio update +script: + - platformio ci --project-conf=./platformio.ini -v diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 00000000..8281e64c --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ] +} \ No newline at end of file diff --git a/include/README b/include/README new file mode 100644 index 00000000..194dcd43 --- /dev/null +++ b/include/README @@ -0,0 +1,39 @@ + +This directory is intended for project header files. + +A header file is a file containing C declarations and macro definitions +to be shared between several project source files. You request the use of a +header file in your project source file (C, C++, etc) located in `src` folder +by including it, with the C preprocessing directive `#include'. + +```src/main.c + +#include "header.h" + +int main (void) +{ + ... +} +``` + +Including a header file produces the same results as copying the header file +into each source file that needs it. Such copying would be time-consuming +and error-prone. With a header file, the related declarations appear +in only one place. If they need to be changed, they can be changed in one +place, and programs that include the header file will automatically use the +new version when next recompiled. The header file eliminates the labor of +finding and changing all the copies as well as the risk that a failure to +find one copy will result in inconsistencies within a program. + +In C, the usual convention is to give header files names that end with `.h'. +It is most portable to use only letters, digits, dashes, and underscores in +header file names, and at most one dot. + +Read more about using header files in official GCC documentation: + +* Include Syntax +* Include Operation +* Once-Only Headers +* Computed Includes + +https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/lib/README b/lib/README new file mode 100644 index 00000000..6debab1e --- /dev/null +++ b/lib/README @@ -0,0 +1,46 @@ + +This directory is intended for project specific (private) libraries. +PlatformIO will compile them to static libraries and link into executable file. + +The source code of each library should be placed in a an own separate directory +("lib/your_library_name/[here are source files]"). + +For example, see a structure of the following two libraries `Foo` and `Bar`: + +|--lib +| | +| |--Bar +| | |--docs +| | |--examples +| | |--src +| | |- Bar.c +| | |- Bar.h +| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html +| | +| |--Foo +| | |- Foo.c +| | |- Foo.h +| | +| |- README --> THIS FILE +| +|- platformio.ini +|--src + |- main.c + +and a contents of `src/main.c`: +``` +#include +#include + +int main (void) +{ + ... +} + +``` + +PlatformIO Library Dependency Finder will find automatically dependent +libraries scanning project source files. + +More information about PlatformIO Library Dependency Finder +- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/platformio.ini b/platformio.ini new file mode 100644 index 00000000..4f44fb61 --- /dev/null +++ b/platformio.ini @@ -0,0 +1,121 @@ +; PlatformIO Project Configuration File +; Please visit documentation: https://docs.platformio.org/page/projectconf.html + +[platformio] +src_dir = ./wled00 +data_dir = ./wled00/data +lib_extra_dirs = ./wled00/src +; env_default = nodemcuv2 +env_default = esp01 +; env_default = esp01_1m +; env_default = d1_mini +; env_default = esp32dev + + +[common] +framework = arduino +monitor_speed = 115200 +board_build.flash_mode = dout +upload_speed = 921600 +build_flags = + ; -D VERSION=0.9.0-dev + ; -D DEBUG +# TODO replace libs in /lib with managed libs in here if possible. +# If they are not changed it's just a metter of setting the correfct version and change the import statement +lib_deps_external = + #Blynk@0.5.4 + #E131@1.0.0 + #webserver + FastLED@3.2.1 + NeoPixelBus@2.3.4 + #PubSubClient@2.7 + #Time@1.5 + #Timezone@1.2.1 + #WS2812FX@1.1.2 + +[common:esp8266] +platform = espressif8266@1.8.0 +build_flags = + -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH + +[common:esp8266_512k] +platform = espressif8266@1.7.0 +build_flags = + -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH + -D WLED_DISABLE_MOBILE_UI + -D WLED_DISABLE_OTA + -D WLED_DISABLE_ALEXA + ; -D WLED_DISABLE_BLYNK + ; -D WLED_DISABLE_CRONIXIE + ; -D WLED_DISABLE_HUESYNC + +[common:esp32] +platform = espressif32@1.5.0 +build_flags = + -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH + -D ARDUINO_ARCH_ESP32 + -D WORKAROUND_ESP32_BITBANG + + +# see: http://docs.platformio.org/en/latest/platforms/espressif8266.html +[env:nodemcuv2] +board = nodemcuv2 +platform = ${common:esp8266.platform} +monitor_speed = ${common.monitor_speed} +upload_speed = ${common.upload_speed} +framework = ${common.framework} +build_flags = + ${common.build_flags} + ${common:esp8266.build_flags} +lib_deps = + ${common.lib_deps_external} + +[env:d1_mini] +board = d1_mini +platform = ${common:esp8266.platform} +monitor_speed = ${common.monitor_speed} +upload_speed = ${common.upload_speed} +framework = ${common.framework} +build_flags = + ${common.build_flags} + ${common:esp8266.build_flags} +lib_deps = + ${common.lib_deps_external} + +[env:esp01_1m] +board = esp01_1m +platform = ${common:esp8266.platform} +monitor_speed = ${common.monitor_speed} +upload_speed = ${common.upload_speed} +framework = ${common.framework} +build_flags = + ${common.build_flags} + ${common:esp8266.build_flags} +lib_deps = + ${common.lib_deps_external} + +[env:esp01] +board = esp01 +platform = ${common:esp8266_512k.platform} +monitor_speed = ${common.monitor_speed} +upload_speed = ${common.upload_speed} +framework = ${common.framework} +build_flags = + ${common.build_flags} + ${common:esp8266_512k.build_flags} +lib_deps = + ${common.lib_deps_external} + +# see: http://docs.platformio.org/en/latest/platforms/espressif32.html +[env:esp32dev] +board = esp32dev +platform = ${common:esp32.platform} +monitor_speed = ${common.monitor_speed} +upload_speed = ${common.upload_speed} +framework = ${common.framework} +build_flags = + ${common.build_flags} + ${common:esp32.build_flags} +lib_deps = + ${common.lib_deps_external} + \ No newline at end of file diff --git a/test/README b/test/README new file mode 100644 index 00000000..df5066e6 --- /dev/null +++ b/test/README @@ -0,0 +1,11 @@ + +This directory is intended for PIO Unit Testing and project tests. + +Unit Testing is a software testing method by which individual units of +source code, sets of one or more MCU program modules together with associated +control data, usage procedures, and operating procedures, are tested to +determine whether they are fit for use. Unit testing finds problems early +in the development cycle. + +More information about PIO Unit Testing: +- https://docs.platformio.org/page/plus/unit-testing.html diff --git a/wled00/WS2812FX.h b/wled00/WS2812FX.h index 33e274eb..4ab1e837 100644 --- a/wled00/WS2812FX.h +++ b/wled00/WS2812FX.h @@ -173,7 +173,7 @@ class WS2812FX { typedef struct Segment { // 21 bytes uint16_t start; uint16_t stop; - uint8_t speed; + uint16_t speed; uint8_t intensity; uint8_t palette; uint8_t mode; @@ -481,8 +481,8 @@ class WS2812FX { uint8_t _segment_index_palette_last = 99; uint8_t _num_segments = 1; segment _segments[MAX_NUM_SEGMENTS] = { // SRAM footprint: 20 bytes per element - // start, stop, speed, intensity, mode, options, color[] - { 0, 7, DEFAULT_SPEED, 128, FX_MODE_STATIC, NO_OPTIONS, {DEFAULT_COLOR}} + // start, stop, speed, intensity, palette, mode, options, color[] + {0, 7, DEFAULT_SPEED, 128, 0, FX_MODE_STATIC, NO_OPTIONS, {DEFAULT_COLOR}} }; segment_runtime _segment_runtimes[MAX_NUM_SEGMENTS]; // SRAM footprint: 17 bytes per element };