diff --git a/.project b/.project index 25dab8c..a2abc54 100644 --- a/.project +++ b/.project @@ -45,7 +45,7 @@ core/variant 2 - ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/variants/nodemcu + ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/variants/generic libraries/Adafruit_NeoPixel diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index ded390a..4317bbd 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -4,7 +4,7 @@ - + diff --git a/.settings/org.eclipse.cdt.core.prefs b/.settings/org.eclipse.cdt.core.prefs index 79a2c9a..7ece69f 100644 --- a/.settings/org.eclipse.cdt.core.prefs +++ b/.settings/org.eclipse.cdt.core.prefs @@ -13,7 +13,7 @@ environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.ARCH/op environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.ARCH/value=ESP8266 environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.BOARD/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.BOARD/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.BOARD/value=ESP8266_NODEMCU +environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.BOARD/value=ESP8266_ESP01 environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.CORE.PATH/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.CORE.PATH/operation=replace environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.CORE.PATH/value=${A.RUNTIME.PLATFORM.PATH}/cores/${A.BUILD.CORE} @@ -76,10 +76,10 @@ environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.SYSTEM. environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.SYSTEM.PATH/value=${A.RUNTIME.PLATFORM.PATH}/system environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.VARIANT.PATH/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.VARIANT.PATH/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.VARIANT.PATH/value=${eclipse_home}/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/variants/nodemcu +environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.VARIANT.PATH/value=${eclipse_home}/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/variants/generic environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.VARIANT/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.VARIANT/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.VARIANT/value=nodemcu +environment/project/io.sloeber.core.toolChain.release.1583508753/A.BUILD.VARIANT/value=generic environment/project/io.sloeber.core.toolChain.release.1583508753/A.COMPILER.AR.CMD/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.COMPILER.AR.CMD/operation=replace environment/project/io.sloeber.core.toolChain.release.1583508753/A.COMPILER.AR.CMD/value=xtensa-lx106-elf-ar @@ -184,10 +184,10 @@ environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.DT environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.DTS/value=3600 environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.LOCAL/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.LOCAL/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.LOCAL/value=1555711355 +environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.LOCAL/value=1555718656 environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.UTC/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.UTC/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.UTC/value=1555704155 +environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.UTC/value=1555711456 environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.ZONE/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.ZONE/operation=replace environment/project/io.sloeber.core.toolChain.release.1583508753/A.EXTRA.TIME.ZONE/value=3600 @@ -202,7 +202,7 @@ environment/project/io.sloeber.core.toolChain.release.1583508753/A.JANTJE.VARIAN environment/project/io.sloeber.core.toolChain.release.1583508753/A.JANTJE.VARIANT.REFERENCED.PLATFORM/value=${JANTJE.SELECTED.PLATFORM} environment/project/io.sloeber.core.toolChain.release.1583508753/A.NAME/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.NAME/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/A.NAME/value=NodeMCU 1.0 (ESP-12E Module) +environment/project/io.sloeber.core.toolChain.release.1583508753/A.NAME/value=Generic ESP8266 Module environment/project/io.sloeber.core.toolChain.release.1583508753/A.PACKAGES/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.PACKAGES/operation=replace environment/project/io.sloeber.core.toolChain.release.1583508753/A.PACKAGES/value=${eclipse_home}/arduinoPlugin/packages @@ -226,7 +226,7 @@ environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.C.COMB environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.C.COMBINE.PATTERN/value="${A.COMPILER.PATH}${A.COMPILER.C.ELF.CMD}" ${A.COMPILER.C.ELF.FLAGS} ${A.COMPILER.C.ELF.EXTRA_FLAGS} -o "${A.BUILD.PATH}/${A.BUILD.PROJECT_NAME}.elf" -Wl,--start-group ${A.OBJECT_FILES} "${A.BUILD.PATH}/arduino.ar" ${A.COMPILER.C.ELF.LIBS} -Wl,--end-group "-L${A.BUILD.PATH}" environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.C.O.PATTERN.1/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.C.O.PATTERN.1/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.C.O.PATTERN.1/value="/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/tools/xtensa-lx106-elf-gcc/1.20.0-26-gb404fb9-2/bin/xtensa-lx106-elf-gcc" -D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/tools/sdk/include" "-I/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/tools/sdk/lwip/include" "-I/home/wn/workspace-sloeber/RgbLed/Release/core" -c -Wall -Wextra -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions\=4 -std\=gnu99 -ffunction-sections -fdata-sections -DF_CPU\=80000000L -DLWIP_OPEN_SRC -DARDUINO\=10802 -DARDUINO_ESP8266_NODEMCU -DARDUINO_ARCH_ESP8266 '-DARDUINO_BOARD\="ESP8266_NODEMCU"' -DESP8266 +environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.C.O.PATTERN.1/value="/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/tools/xtensa-lx106-elf-gcc/1.20.0-26-gb404fb9-2/bin/xtensa-lx106-elf-gcc" -D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/tools/sdk/include" "-I/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/tools/sdk/lwip/include" "-I/home/wn/workspace-sloeber/RgbLed/Release/core" -c -Wall -Wextra -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions\=4 -std\=gnu99 -ffunction-sections -fdata-sections -DF_CPU\=80000000L -DLWIP_OPEN_SRC -DARDUINO\=10802 -DARDUINO_ESP8266_ESP01 -DARDUINO_ARCH_ESP8266 '-DARDUINO_BOARD\="ESP8266_ESP01"' -DESP8266 environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.C.O.PATTERN.2/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.C.O.PATTERN.2/operation=replace environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.C.O.PATTERN.2/value=\ -o @@ -238,7 +238,7 @@ environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.C.O.PA environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.C.O.PATTERN/value="${A.COMPILER.PATH}${A.COMPILER.C.CMD}" ${A.COMPILER.CPREPROCESSOR.FLAGS} ${A.COMPILER.C.FLAGS} -DF_CPU\=${A.BUILD.F_CPU} ${A.BUILD.LWIP_FLAGS} ${A.BUILD.DEBUG_PORT} ${A.BUILD.DEBUG_LEVEL} -DARDUINO\=${A.RUNTIME.IDE.VERSION} -DARDUINO_${A.BUILD.BOARD} -DARDUINO_ARCH_${A.BUILD.ARCH} '-DARDUINO_BOARD\="${A.BUILD.BOARD}"' ${A.COMPILER.C.EXTRA_FLAGS} ${A.BUILD.EXTRA_FLAGS} ${A.INCLUDES} "${A.SOURCE_FILE}" -o "${A.OBJECT_FILE}" environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.CPP.O.PATTERN.1/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.CPP.O.PATTERN.1/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.CPP.O.PATTERN.1/value="/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/tools/xtensa-lx106-elf-gcc/1.20.0-26-gb404fb9-2/bin/xtensa-lx106-elf-g++" -D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/tools/sdk/include" "-I/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/tools/sdk/lwip/include" "-I/home/wn/workspace-sloeber/RgbLed/Release/core" -c -Wall -Wextra -Os -g -mlongcalls -mtext-section-literals -fno-exceptions -fno-rtti -falign-functions\=4 -std\=c++11 -ffunction-sections -fdata-sections -DF_CPU\=80000000L -DLWIP_OPEN_SRC -DARDUINO\=10802 -DARDUINO_ESP8266_NODEMCU -DARDUINO_ARCH_ESP8266 '-DARDUINO_BOARD\="ESP8266_NODEMCU"' -DESP8266 +environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.CPP.O.PATTERN.1/value="/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/tools/xtensa-lx106-elf-gcc/1.20.0-26-gb404fb9-2/bin/xtensa-lx106-elf-g++" -D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/tools/sdk/include" "-I/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/tools/sdk/lwip/include" "-I/home/wn/workspace-sloeber/RgbLed/Release/core" -c -Wall -Wextra -Os -g -mlongcalls -mtext-section-literals -fno-exceptions -fno-rtti -falign-functions\=4 -std\=c++11 -ffunction-sections -fdata-sections -DF_CPU\=80000000L -DLWIP_OPEN_SRC -DARDUINO\=10802 -DARDUINO_ESP8266_ESP01 -DARDUINO_ARCH_ESP8266 '-DARDUINO_BOARD\="ESP8266_ESP01"' -DESP8266 environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.CPP.O.PATTERN.2/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.CPP.O.PATTERN.2/operation=replace environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.CPP.O.PATTERN.2/value=\ -o @@ -268,7 +268,7 @@ environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.OUTPUT environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.OUTPUT.TMP_FILE/value=${A.BUILD.PROJECT_NAME}.bin environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.S.O.PATTERN.1/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.S.O.PATTERN.1/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.S.O.PATTERN.1/value="/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/tools/xtensa-lx106-elf-gcc/1.20.0-26-gb404fb9-2/bin/xtensa-lx106-elf-gcc" -D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/tools/sdk/include" "-I/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/tools/sdk/lwip/include" "-I/home/wn/workspace-sloeber/RgbLed/Release/core" -c -g -x assembler-with-cpp -mlongcalls -DF_CPU\=80000000L -DLWIP_OPEN_SRC -DARDUINO\=10802 -DARDUINO_ESP8266_NODEMCU -DARDUINO_ARCH_ESP8266 '-DARDUINO_BOARD\="ESP8266_NODEMCU"' -DESP8266 +environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.S.O.PATTERN.1/value="/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/tools/xtensa-lx106-elf-gcc/1.20.0-26-gb404fb9-2/bin/xtensa-lx106-elf-gcc" -D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/tools/sdk/include" "-I/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/tools/sdk/lwip/include" "-I/home/wn/workspace-sloeber/RgbLed/Release/core" -c -g -x assembler-with-cpp -mlongcalls -DF_CPU\=80000000L -DLWIP_OPEN_SRC -DARDUINO\=10802 -DARDUINO_ESP8266_ESP01 -DARDUINO_ARCH_ESP8266 '-DARDUINO_BOARD\="ESP8266_ESP01"' -DESP8266 environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.S.O.PATTERN.2/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.S.O.PATTERN.2/operation=replace environment/project/io.sloeber.core.toolChain.release.1583508753/A.RECIPE.S.O.PATTERN.2/value=\ -o @@ -436,7 +436,7 @@ environment/project/io.sloeber.core.toolChain.release.1583508753/A.UPLOAD.PROTOC environment/project/io.sloeber.core.toolChain.release.1583508753/A.UPLOAD.PROTOCOL/value=stk500v1 environment/project/io.sloeber.core.toolChain.release.1583508753/A.UPLOAD.RESETMETHOD/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.UPLOAD.RESETMETHOD/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/A.UPLOAD.RESETMETHOD/value=nodemcu +environment/project/io.sloeber.core.toolChain.release.1583508753/A.UPLOAD.RESETMETHOD/value=ck environment/project/io.sloeber.core.toolChain.release.1583508753/A.UPLOAD.SPEED/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/A.UPLOAD.SPEED/operation=replace environment/project/io.sloeber.core.toolChain.release.1583508753/A.UPLOAD.SPEED/value=115200 @@ -460,16 +460,16 @@ environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.BOARDS_F environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.BOARDS_FILE/value=${eclipse_home}/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/boards.txt environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.BOARD_ID/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.BOARD_ID/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.BOARD_ID/value=nodemcuv2 +environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.BOARD_ID/value=generic environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.BOARD_NAME/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.BOARD_NAME/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.BOARD_NAME/value=NodeMCU 1.0 (ESP-12E Module) +environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.BOARD_NAME/value=Generic ESP8266 Module environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.COM_PORT/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.COM_PORT/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.COM_PORT/value=/dev/ttyUSB0 +environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.COM_PORT/value=/dev/ttyUSB3 environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.ECLIPSE_LOCATION/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.ECLIPSE_LOCATION/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.ECLIPSE_LOCATION/value=${eclipse_home}//////////////////// +environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.ECLIPSE_LOCATION/value=${eclipse_home}///////////////////////// environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.EXTRA.ALL/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.EXTRA.ALL/operation=replace environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.EXTRA.ALL/value= @@ -493,7 +493,7 @@ environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.EXTRA.LI environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.EXTRA.LINK/value= environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.MENU/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.MENU/operation=replace -environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.MENU/value=CpuFrequency\=80\nFlashSize\=4M1M\nUploadSpeed\=115200 +environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.MENU/value=CpuFrequency\=80\nDebug\=Disabled\nDebugLevel\=None____\nFlashFreq\=40\nFlashMode\=dio\nFlashSize\=4M1M\nResetMethod\=ck\nUploadSpeed\=115200.upload.speed environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.OBJCOPY/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.OBJCOPY/operation=replace environment/project/io.sloeber.core.toolChain.release.1583508753/JANTJE.OBJCOPY/value=${A.RECIPE.OBJCOPY.HEX.PATTERN} diff --git a/defines.h b/defines.h index 61d118c..692f613 100644 --- a/defines.h +++ b/defines.h @@ -15,19 +15,32 @@ // #define WS2811 #define PL9823 +// #define NODEMCU +#define ESP01 + #define EEPROM_ADDR 0 -#define CONFIG_SWITCH 4 // Arduino numbering +#ifdef ESP01 +#define CONFIG_SWITCH 0 // Arduino numbering +#endif +#ifdef NODEMCU +#define CONFIG_SWITCH D4 +#endif #ifdef WS2811 #define PIXEL_PIN 1 // NODEMCU numbering #endif #ifdef PL9823 +#ifdef ESP01 +#define PIXEL_PIN 2 +#endif +#ifdef NODEMCU #define PIXEL_PIN D1 #endif +#endif -#define NUM_OF_LEDs 64 +#define NUM_OF_LEDs 16 #endif /* DEFINES_H_ */ diff --git a/productionMode.cpp b/productionMode.cpp index 581cdd7..1dca6d9 100644 --- a/productionMode.cpp +++ b/productionMode.cpp @@ -364,7 +364,11 @@ void setupProduction() { #endif #ifdef PL9823 pixels.begin(); - pixels.clear(); + + for (uint8_t i = 0; i < NUM_OF_LEDs; i++) { + pixels.setPixelColor(i, pixels.Color(0,0,0)); + } + pixels.show(); #endif }