wn/TouchSwitch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2018-02-02 19:20:17 +01:00
parent 2e34cfe5b5
commit 1c83e1b7d6
8 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.project
View File

@ -45,7 +45,7 @@
<link>
<name>core/variant</name>
<type>2</type>
<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/variants/nodemcu</locationURI>
<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/variants/generic</locationURI>
</link>
<link>
<name>libraries/EEPROM</name>

2
.settings/language.settings.xml
View File

@ -4,7 +4,7 @@
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider class="io.sloeber.core.toolchain.ArduinoLanguageProvider" console="false" env-hash="-72844783099938269" id="io.sloeber.languageSettingsProvider" keep-relative-paths="false" name="Arduino Compiler Settings" parameter="${COMMAND} -E -P -v -dD -D__IN_ECLIPSE__ &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="io.sloeber.core.toolchain.ArduinoLanguageProvider" console="false" env-hash="-12514882420628291" id="io.sloeber.languageSettingsProvider" keep-relative-paths="false" name="Arduino Compiler Settings" parameter="${COMMAND} -E -P -v -dD -D__IN_ECLIPSE__ &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

34
.settings/org.eclipse.cdt.core.prefs
View File

@ -13,7 +13,7 @@ environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.ARCH/ope
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.ARCH/value=ESP8266
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.BOARD/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.BOARD/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.BOARD/value=ESP8266_NODEMCU
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.BOARD/value=ESP8266_ESP01
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.CORE.PATH/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.CORE.PATH/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.CORE.PATH/value=${A.RUNTIME.PLATFORM.PATH}/cores/${A.BUILD.CORE}
@ -25,13 +25,13 @@ environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.DEBUG_LE
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.DEBUG_LEVEL/value=
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.DEBUG_PORT/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.DEBUG_PORT/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.DEBUG_PORT/value=
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.DEBUG_PORT/value=-DDEBUG_ESP_PORT\=Serial
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.EXTRA_FLAGS/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.EXTRA_FLAGS/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.EXTRA_FLAGS/value=-DESP8266
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.FLASH_FREQ/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.FLASH_FREQ/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.FLASH_FREQ/value=40
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.FLASH_FREQ/value=80
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.FLASH_LD/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.FLASH_LD/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.FLASH_LD/value=eagle.flash.4m1m.ld
@ -76,10 +76,10 @@ environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.SYSTEM.P
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.SYSTEM.PATH/value=${A.RUNTIME.PLATFORM.PATH}/system
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.VARIANT.PATH/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.VARIANT.PATH/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.VARIANT.PATH/value=${eclipse_home}/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/variants/nodemcu
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.VARIANT.PATH/value=${eclipse_home}/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/variants/generic
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.VARIANT/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.VARIANT/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.VARIANT/value=nodemcu
environment/project/io.sloeber.core.toolChain.release.547546691/A.BUILD.VARIANT/value=generic
environment/project/io.sloeber.core.toolChain.release.547546691/A.COMPILER.AR.CMD/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.COMPILER.AR.CMD/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.COMPILER.AR.CMD/value=xtensa-lx106-elf-ar
@ -184,10 +184,10 @@ environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.DTS
environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.DTS/value=0
environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.LOCAL/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.LOCAL/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.LOCAL/value=1517504909
environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.LOCAL/value=1517597611
environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.UTC/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.UTC/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.UTC/value=1517501309
environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.UTC/value=1517594011
environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.ZONE/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.ZONE/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.EXTRA.TIME.ZONE/value=3600
@ -202,7 +202,7 @@ environment/project/io.sloeber.core.toolChain.release.547546691/A.JANTJE.VARIANT
environment/project/io.sloeber.core.toolChain.release.547546691/A.JANTJE.VARIANT.REFERENCED.PLATFORM/value=${JANTJE.SELECTED.PLATFORM}
environment/project/io.sloeber.core.toolChain.release.547546691/A.NAME/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.NAME/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.NAME/value=NodeMCU 1.0 (ESP-12E Module)
environment/project/io.sloeber.core.toolChain.release.547546691/A.NAME/value=Generic ESP8266 Module
environment/project/io.sloeber.core.toolChain.release.547546691/A.PACKAGES/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.PACKAGES/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.PACKAGES/value=${eclipse_home}/arduinoPlugin/packages
@ -226,7 +226,7 @@ environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.C.COMBI
environment/project/io.sloeber.core.toolChain.release.547546691/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.547546691/A.RECIPE.C.O.PATTERN.1/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.C.O.PATTERN.1/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/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/TouchSwitch/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.547546691/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/TouchSwitch/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 -DDEBUG_ESP_PORT\=Serial -DARDUINO\=10802 -DARDUINO_ESP8266_ESP01 -DARDUINO_ARCH_ESP8266 '-DARDUINO_BOARD\="ESP8266_ESP01"' -DESP8266
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.C.O.PATTERN.2/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.C.O.PATTERN.2/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.C.O.PATTERN.2/value=\ -o
@ -238,7 +238,7 @@ environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.C.O.PAT
environment/project/io.sloeber.core.toolChain.release.547546691/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.547546691/A.RECIPE.CPP.O.PATTERN.1/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.CPP.O.PATTERN.1/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/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/TouchSwitch/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.547546691/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/TouchSwitch/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 -DDEBUG_ESP_PORT\=Serial -DARDUINO\=10802 -DARDUINO_ESP8266_ESP01 -DARDUINO_ARCH_ESP8266 '-DARDUINO_BOARD\="ESP8266_ESP01"' -DESP8266
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.CPP.O.PATTERN.2/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.CPP.O.PATTERN.2/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.CPP.O.PATTERN.2/value=\ -o
@ -256,7 +256,7 @@ environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.OBJCOPY
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.OBJCOPY.EEP.PATTERN/value=
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.OBJCOPY.HEX.PATTERN.1/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.OBJCOPY.HEX.PATTERN.1/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.OBJCOPY.HEX.PATTERN.1/value="/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/tools/esptool/0.4.9/esptool" -eo "/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/bootloaders/eboot/eboot.elf" -bo "/home/wn/workspace-sloeber/TouchSwitch/Release/TouchSwitch.bin" -bm dio -bf 40 -bz 4M -bs .text -bp 4096 -ec -eo "/home/wn/workspace-sloeber/TouchSwitch/Release/TouchSwitch.elf" -bs .irom0.text -bs .text -bs .data -bs .rodata -bc -ec
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.OBJCOPY.HEX.PATTERN.1/value="/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/tools/esptool/0.4.9/esptool" -eo "/opt/eclipse/sloeber//arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/bootloaders/eboot/eboot.elf" -bo "/home/wn/workspace-sloeber/TouchSwitch/Release/TouchSwitch.bin" -bm dio -bf 80 -bz 4M -bs .text -bp 4096 -ec -eo "/home/wn/workspace-sloeber/TouchSwitch/Release/TouchSwitch.elf" -bs .irom0.text -bs .text -bs .data -bs .rodata -bc -ec
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.OBJCOPY.HEX.PATTERN/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.OBJCOPY.HEX.PATTERN/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.OBJCOPY.HEX.PATTERN/value="${A.RUNTIME.TOOLS.ESPTOOL.PATH}/${A.COMPILER.ESPTOOL.CMD}" -eo "${A.RUNTIME.PLATFORM.PATH}/bootloaders/eboot/eboot.elf" -bo "${A.BUILD.PATH}/${A.BUILD.PROJECT_NAME}.bin" -bm ${A.BUILD.FLASH_MODE} -bf ${A.BUILD.FLASH_FREQ} -bz ${A.BUILD.FLASH_SIZE} -bs .text -bp 4096 -ec -eo "${A.BUILD.PATH}/${A.BUILD.PROJECT_NAME}.elf" -bs .irom0.text -bs .text -bs .data -bs .rodata -bc -ec
@ -268,7 +268,7 @@ environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.OUTPUT.
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.OUTPUT.TMP_FILE/value=${A.BUILD.PROJECT_NAME}.bin
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.S.O.PATTERN.1/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.S.O.PATTERN.1/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/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/TouchSwitch/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.547546691/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/TouchSwitch/Release/core" -c -g -x assembler-with-cpp -mlongcalls -DF_CPU\=80000000L -DLWIP_OPEN_SRC -DDEBUG_ESP_PORT\=Serial -DARDUINO\=10802 -DARDUINO_ESP8266_ESP01 -DARDUINO_ARCH_ESP8266 '-DARDUINO_BOARD\="ESP8266_ESP01"' -DESP8266
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.S.O.PATTERN.2/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.S.O.PATTERN.2/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.RECIPE.S.O.PATTERN.2/value=\ -o
@ -436,7 +436,7 @@ environment/project/io.sloeber.core.toolChain.release.547546691/A.UPLOAD.PROTOCO
environment/project/io.sloeber.core.toolChain.release.547546691/A.UPLOAD.PROTOCOL/value=stk500v1
environment/project/io.sloeber.core.toolChain.release.547546691/A.UPLOAD.RESETMETHOD/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.UPLOAD.RESETMETHOD/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.UPLOAD.RESETMETHOD/value=nodemcu
environment/project/io.sloeber.core.toolChain.release.547546691/A.UPLOAD.RESETMETHOD/value=ck
environment/project/io.sloeber.core.toolChain.release.547546691/A.UPLOAD.SPEED/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/A.UPLOAD.SPEED/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/A.UPLOAD.SPEED/value=115200
@ -460,16 +460,16 @@ environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.BOARDS_FI
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.BOARDS_FILE/value=${eclipse_home}/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/boards.txt
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.BOARD_ID/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.BOARD_ID/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.BOARD_ID/value=nodemcuv2
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.BOARD_ID/value=generic
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.BOARD_NAME/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.BOARD_NAME/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.BOARD_NAME/value=NodeMCU 1.0 (ESP-12E Module)
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.BOARD_NAME/value=Generic ESP8266 Module
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.COM_PORT/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.COM_PORT/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.COM_PORT/value=/dev/ttyUSB0
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.ECLIPSE_LOCATION/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.ECLIPSE_LOCATION/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.ECLIPSE_LOCATION/value=${eclipse_home}///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.ECLIPSE_LOCATION/value=${eclipse_home}////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.EXTRA.ALL/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.EXTRA.ALL/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.EXTRA.ALL/value=
@ -493,7 +493,7 @@ environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.EXTRA.LIN
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.EXTRA.LINK/value=
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.MENU/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.MENU/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.MENU/value=CpuFrequency\=80\nFlashSize\=4M1M\nUploadSpeed\=115200
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.MENU/value=CpuFrequency\=80\nDebug\=Serial\nDebugLevel\=None____\nFlashFreq\=80\nFlashMode\=dio\nFlashSize\=4M1M\nResetMethod\=ck\nUploadSpeed\=115200.upload.speed
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.OBJCOPY/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.OBJCOPY/operation=replace
environment/project/io.sloeber.core.toolChain.release.547546691/JANTJE.OBJCOPY/value=${A.RECIPE.OBJCOPY.HEX.PATTERN}

8
ConfigGenerator/configGen.py
View File

@ -7,11 +7,11 @@ from Cheetah.Template import Template
configItems = [
{"label":"_", "key":"magic", "type":"I", "default": ""},
{"label":"Config Username", "key":"confUser", "type":"C", "length":32, "default":"admin"},
{"label":"Config Password", "key":"confPasswd", "type":"C", "length":32, "default":"geheim123"},
{"label":"Config Username", "key":"confUser", "type":"C", "length":16, "default":"admin"},
{"label":"Config Password", "key":"confPasswd", "type":"C", "length":16, "default":"geheim123"},
{"label":"Wifi SSID", "key":"wifiSsid", "type":"C", "length":32, "default":"test"},
{"label":"Wifi Key", "key":"wifiKey", "type":"C", "length":64, "default":"geheim"},
{"label":"MQTT Broker", "key":"mqttBroker", "type":"C", "length":64, "default":"broker.hottis.de"},
{"label":"MQTT Broker", "key":"mqttBroker", "type":"C", "length":32, "default":"broker.hottis.de"},
{"label":"MQTT Username", "key":"mqttUser", "type":"C", "length":32, "default":"TouchSwitch"},
{"label":"MQTT Password", "key":"mqttPass", "type":"C", "length":32, "default":"geheim123"},
{"label":"MQTT ClientId", "key":"mqttClientId", "type":"C", "length":32, "default":"TouchSwitch"},
@ -26,7 +26,7 @@ configItems = [
]
magic = 0xC0DE0002
magic = 0xC0DE0003
appName = "ESP8266 based TouchSwitch"
confWifiSsid = "espconfig"

15
ConfigGenerator/configuration_c.tmpl
View File

@ -19,18 +19,16 @@ bool configSaved = false;
static bool checkAuthentication() {
Serial.print("User: "); Serial.println(configBlock.confUser);
Serial.print("Pass: "); Serial.println(configBlock.confPasswd);
return webServer.authenticate(configBlock.confUser, configBlock.confPasswd);
}
void configServeIndex() {
if (! checkAuthentication()) {
return webServer.requestAuthentication();
}
bool configValid = (configBlock.magic == MAGIC);
if (! configValid) {
configBlock.magic = MAGIC;
#for $configItem in $configItems
#if $configItem.label != "_"
#if $configItem.type == "C"
@ -41,7 +39,12 @@ void configServeIndex() {
#end if
#end for
}
if (! checkAuthentication()) {
return webServer.requestAuthentication();
}
String buffer =
"<!doctype html"
"<html lang=\"en\">"

23
configuration.cpp
View File

@ -9,7 +9,7 @@
tConfigBlock configBlock;
const uint32_t MAGIC = 3235774466;
const uint32_t MAGIC = 3235774467;
const char* CONFIG_SSID = "espconfig";
extern ESP8266WebServer webServer;
@ -17,18 +17,16 @@ bool configSaved = false;
static bool checkAuthentication() {
Serial.print("User: "); Serial.println(configBlock.confUser);
Serial.print("Pass: "); Serial.println(configBlock.confPasswd);
return webServer.authenticate(configBlock.confUser, configBlock.confPasswd);
}
void configServeIndex() {
if (! checkAuthentication()) {
return webServer.requestAuthentication();
}
bool configValid = (configBlock.magic == MAGIC);
if (! configValid) {
configBlock.magic = MAGIC;
strcpy(configBlock.confUser, "admin");
strcpy(configBlock.confPasswd, "geheim123");
strcpy(configBlock.wifiSsid, "test");
@ -46,7 +44,12 @@ void configServeIndex() {
configBlock.calibrationTimeout = 20000;
configBlock.threshold = 10;
}
if (! checkAuthentication()) {
return webServer.requestAuthentication();
}
String buffer =
"<!doctype html"
"<html lang=\"en\">"
@ -70,7 +73,7 @@ void configServeIndex() {
" </td><td>"
" <input type=\"text\" name=\"confUser\" id=\"confUser\" ";
buffer += " size=\"32\" ";
buffer += " size=\"16\" ";
buffer += " value=\"";
buffer += configBlock.confUser;
buffer += "\"";
@ -85,7 +88,7 @@ void configServeIndex() {
" </td><td>"
" <input type=\"text\" name=\"confPasswd\" id=\"confPasswd\" ";
buffer += " size=\"32\" ";
buffer += " size=\"16\" ";
buffer += " value=\"";
buffer += configBlock.confPasswd;
buffer += "\"";
@ -130,7 +133,7 @@ void configServeIndex() {
" </td><td>"
" <input type=\"text\" name=\"mqttBroker\" id=\"mqttBroker\" ";
buffer += " size=\"64\" ";
buffer += " size=\"32\" ";
buffer += " value=\"";
buffer += configBlock.mqttBroker;
buffer += "\"";

6
configuration.h
View File

@ -1,10 +1,10 @@
typedef struct {
uint32_t magic;
char confUser[32];
char confPasswd[32];
char confUser[16];
char confPasswd[16];
char wifiSsid[32];
char wifiKey[64];
char mqttBroker[64];
char mqttBroker[32];
char mqttUser[32];
char mqttPass[32];
char mqttClientId[32];

2
defines.h
View File

@ -8,7 +8,7 @@
#ifndef DEFINES_H_
#define DEFINES_H_
// #define DEBUG
#define DEBUG
#define EEPROM_ADDR 0