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

config mode enable in thermometer

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2018-05-19 15:07:30 +02:00
parent 0581366f3c
commit f0672d3d72
Signed by: wn
GPG Key ID: B586EAFCDF2F65F4
10 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.project
View File

@ -45,7 +45,7 @@
<link> <link>
<name>core/variant</name> <name>core/variant</name>
<type>2</type> <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>
<link> <link>
<name>libraries/EEPROM</name> <name>libraries/EEPROM</name>

2
.settings/language.settings.xml
View File

@ -4,7 +4,7 @@
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider"> <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider class="io.sloeber.core.toolchain.ArduinoLanguageProvider" console="false" env-hash="-92744725978751571" 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="-93122585082844115" 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.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

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

@ -13,7 +13,7 @@ environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.ARCH/op
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.ARCH/value=ESP8266 environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.ARCH/value=ESP8266
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.BOARD/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.BOARD/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.BOARD/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.BOARD/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.BOARD/value=ESP8266_NODEMCU environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.BOARD/value=ESP8266_ESP01
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.CORE.PATH/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.CORE.PATH/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.CORE.PATH/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.CORE.PATH/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.CORE.PATH/value=${A.RUNTIME.PLATFORM.PATH}/cores/${A.BUILD.CORE} environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.CORE.PATH/value=${A.RUNTIME.PLATFORM.PATH}/cores/${A.BUILD.CORE}
@ -76,10 +76,10 @@ environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.SYSTEM.
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.SYSTEM.PATH/value=${A.RUNTIME.PLATFORM.PATH}/system environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.SYSTEM.PATH/value=${A.RUNTIME.PLATFORM.PATH}/system
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.VARIANT.PATH/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.VARIANT.PATH/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.VARIANT.PATH/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.VARIANT.PATH/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.VARIANT.PATH/value=${eclipse_home}/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/variants/nodemcu environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.VARIANT.PATH/value=${eclipse_home}/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/variants/generic
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.VARIANT/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.VARIANT/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.VARIANT/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.VARIANT/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.VARIANT/value=nodemcu environment/project/io.sloeber.core.toolChain.release.1352205473/A.BUILD.VARIANT/value=generic
environment/project/io.sloeber.core.toolChain.release.1352205473/A.COMPILER.AR.CMD/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.COMPILER.AR.CMD/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.COMPILER.AR.CMD/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.COMPILER.AR.CMD/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.COMPILER.AR.CMD/value=xtensa-lx106-elf-ar environment/project/io.sloeber.core.toolChain.release.1352205473/A.COMPILER.AR.CMD/value=xtensa-lx106-elf-ar
@ -181,13 +181,13 @@ environment/project/io.sloeber.core.toolChain.release.1352205473/A.ESP8266.NETWO
environment/project/io.sloeber.core.toolChain.release.1352205473/A.ESP8266.NETWORK.UPLOAD.TOOL/value=esp8266OTA environment/project/io.sloeber.core.toolChain.release.1352205473/A.ESP8266.NETWORK.UPLOAD.TOOL/value=esp8266OTA
environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.DTS/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.DTS/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.DTS/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.DTS/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.DTS/value=0 environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.DTS/value=3600
environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.LOCAL/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.LOCAL/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.LOCAL/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.LOCAL/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.LOCAL/value=1511882449 environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.LOCAL/value=1526741327
environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.UTC/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.UTC/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.UTC/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.UTC/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.UTC/value=1511878849 environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.UTC/value=1526734127
environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.ZONE/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.ZONE/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.ZONE/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.ZONE/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.ZONE/value=3600 environment/project/io.sloeber.core.toolChain.release.1352205473/A.EXTRA.TIME.ZONE/value=3600
@ -202,7 +202,7 @@ environment/project/io.sloeber.core.toolChain.release.1352205473/A.JANTJE.VARIAN
environment/project/io.sloeber.core.toolChain.release.1352205473/A.JANTJE.VARIANT.REFERENCED.PLATFORM/value=${JANTJE.SELECTED.PLATFORM} environment/project/io.sloeber.core.toolChain.release.1352205473/A.JANTJE.VARIANT.REFERENCED.PLATFORM/value=${JANTJE.SELECTED.PLATFORM}
environment/project/io.sloeber.core.toolChain.release.1352205473/A.NAME/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.NAME/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.NAME/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.NAME/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.NAME/value=NodeMCU 1.0 (ESP-12E Module) environment/project/io.sloeber.core.toolChain.release.1352205473/A.NAME/value=Generic ESP8266 Module
environment/project/io.sloeber.core.toolChain.release.1352205473/A.PACKAGES/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.PACKAGES/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.PACKAGES/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.PACKAGES/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.PACKAGES/value=${eclipse_home}/arduinoPlugin/packages environment/project/io.sloeber.core.toolChain.release.1352205473/A.PACKAGES/value=${eclipse_home}/arduinoPlugin/packages
@ -226,7 +226,7 @@ environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.C.COMB
environment/project/io.sloeber.core.toolChain.release.1352205473/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.1352205473/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.1352205473/A.RECIPE.C.O.PATTERN.1/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.C.O.PATTERN.1/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.C.O.PATTERN.1/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.C.O.PATTERN.1/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/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/EspThermometer2/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.1352205473/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/EspThermometer2/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.1352205473/A.RECIPE.C.O.PATTERN.2/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.C.O.PATTERN.2/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.C.O.PATTERN.2/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.C.O.PATTERN.2/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.C.O.PATTERN.2/value=\ -o environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.C.O.PATTERN.2/value=\ -o
@ -238,7 +238,7 @@ environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.C.O.PA
environment/project/io.sloeber.core.toolChain.release.1352205473/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.1352205473/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.1352205473/A.RECIPE.CPP.O.PATTERN.1/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.CPP.O.PATTERN.1/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.CPP.O.PATTERN.1/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.CPP.O.PATTERN.1/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/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/EspThermometer2/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.1352205473/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/EspThermometer2/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.1352205473/A.RECIPE.CPP.O.PATTERN.2/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.CPP.O.PATTERN.2/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.CPP.O.PATTERN.2/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.CPP.O.PATTERN.2/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.CPP.O.PATTERN.2/value=\ -o environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.CPP.O.PATTERN.2/value=\ -o
@ -268,7 +268,7 @@ environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.OUTPUT
environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.OUTPUT.TMP_FILE/value=${A.BUILD.PROJECT_NAME}.bin environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.OUTPUT.TMP_FILE/value=${A.BUILD.PROJECT_NAME}.bin
environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.S.O.PATTERN.1/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.S.O.PATTERN.1/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.S.O.PATTERN.1/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.S.O.PATTERN.1/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/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/EspThermometer2/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.1352205473/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/EspThermometer2/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.1352205473/A.RECIPE.S.O.PATTERN.2/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.S.O.PATTERN.2/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.S.O.PATTERN.2/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.S.O.PATTERN.2/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.S.O.PATTERN.2/value=\ -o environment/project/io.sloeber.core.toolChain.release.1352205473/A.RECIPE.S.O.PATTERN.2/value=\ -o
@ -436,7 +436,7 @@ environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.PROTOC
environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.PROTOCOL/value=stk500v1 environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.PROTOCOL/value=stk500v1
environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.RESETMETHOD/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.RESETMETHOD/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.RESETMETHOD/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.RESETMETHOD/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.RESETMETHOD/value=nodemcu environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.RESETMETHOD/value=ck
environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.SPEED/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.SPEED/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.SPEED/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.SPEED/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.SPEED/value=115200 environment/project/io.sloeber.core.toolChain.release.1352205473/A.UPLOAD.SPEED/value=115200
@ -460,16 +460,16 @@ environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARDS_F
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARDS_FILE/value=${eclipse_home}/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/boards.txt environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARDS_FILE/value=${eclipse_home}/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/boards.txt
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARD_ID/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARD_ID/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARD_ID/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARD_ID/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARD_ID/value=nodemcuv2 environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARD_ID/value=generic
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARD_NAME/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARD_NAME/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARD_NAME/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARD_NAME/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARD_NAME/value=NodeMCU 1.0 (ESP-12E Module) environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.BOARD_NAME/value=Generic ESP8266 Module
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.COM_PORT/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.COM_PORT/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.COM_PORT/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.COM_PORT/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.COM_PORT/value=/dev/ttyUSB4 environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.COM_PORT/value=/dev/ttyUSB4
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.ECLIPSE_LOCATION/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.ECLIPSE_LOCATION/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.ECLIPSE_LOCATION/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.ECLIPSE_LOCATION/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.ECLIPSE_LOCATION/value=${eclipse_home}////////// environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.ECLIPSE_LOCATION/value=${eclipse_home}///////////////////////////////////////////////////
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.EXTRA.ALL/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.EXTRA.ALL/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.EXTRA.ALL/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.EXTRA.ALL/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.EXTRA.ALL/value= environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.EXTRA.ALL/value=
@ -493,7 +493,7 @@ environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.EXTRA.LI
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.EXTRA.LINK/value= environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.EXTRA.LINK/value=
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.MENU/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.MENU/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.MENU/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.MENU/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.MENU/value=CpuFrequency\=80\nFlashSize\=4M1M\nUploadSpeed\=115200 environment/project/io.sloeber.core.toolChain.release.1352205473/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.1352205473/JANTJE.OBJCOPY/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.OBJCOPY/delimiter=\:
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.OBJCOPY/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.OBJCOPY/operation=replace
environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.OBJCOPY/value=${A.RECIPE.OBJCOPY.HEX.PATTERN} environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.OBJCOPY/value=${A.RECIPE.OBJCOPY.HEX.PATTERN}

2
ConfigGenerator/configGen.py
View File

@ -13,7 +13,7 @@ configItems = [
{"label":"MQTT Username", "key":"mqttUser", "type":"C", "length":32, "default":"esp1"}, {"label":"MQTT Username", "key":"mqttUser", "type":"C", "length":32, "default":"esp1"},
{"label":"MQTT Password", "key":"mqttPass", "type":"C", "length":32, "default":"geheim"}, {"label":"MQTT Password", "key":"mqttPass", "type":"C", "length":32, "default":"geheim"},
{"label":"MQTT ClientId", "key":"mqttClientId", "type":"C", "length":32, "default":"changeThis"}, {"label":"MQTT ClientId", "key":"mqttClientId", "type":"C", "length":32, "default":"changeThis"},
{"label":"MQTT Topic", "key":"mqttTopic", "type":"C", "length":64, "default":"IoT/espThermometer2/location/measurement"}, {"label":"MQTT Topic", "key":"mqttTopic", "type":"C", "length":64, "default":"IoT/espThermometer2/measurement"},
{"label":"MQTT Port", "key":"mqttPort", "type":"I", "default":8883}, {"label":"MQTT Port", "key":"mqttPort", "type":"I", "default":8883},
{"label":"Measure Period", "key":"measurePeriod", "type":"I", "default":300} {"label":"Measure Period", "key":"measurePeriod", "type":"I", "default":300}
] ]

4
EspThermometer2.cpp
View File

@ -47,7 +47,8 @@ void setup() {
Serial.println("Configuration mode"); Serial.println("Configuration mode");
#endif #endif
digitalWrite(LED_PIN, LOW); digitalWrite(LED_PIN, LOW);
setupConfiguration(); setupConfigurationNetwork();
setupConfigurationServer();
} else { } else {
#ifdef DEBUG #ifdef DEBUG
Serial.println("Production mode"); Serial.println("Production mode");
@ -58,6 +59,7 @@ void setup() {
digitalWrite(LED_PIN, HIGH); digitalWrite(LED_PIN, HIGH);
setupProduction(); setupProduction();
setupConfigurationServer();
} }
#ifdef DEBUG #ifdef DEBUG

16
configuration.cpp
View File

@ -9,7 +9,7 @@
tConfigBlock configBlock; tConfigBlock configBlock;
const uint32_t MAGIC = 0xC0DE0002; const uint32_t MAGIC = 0xC0DE0006;
extern ESP8266WebServer webServer; extern ESP8266WebServer webServer;
bool configSaved = false; bool configSaved = false;
@ -18,14 +18,14 @@ void configServeIndex() {
bool configValid = (configBlock.magic == MAGIC); bool configValid = (configBlock.magic == MAGIC);
if (! configValid) { if (! configValid) {
strcpy(configBlock.wifiSsid, "Test"); strcpy(configBlock.wifiSsid, "TV_WLAN");
strcpy(configBlock.wifiKey, "geheim"); strcpy(configBlock.wifiKey, "ioweishauhodohtheexairiedaihohbiethiihahchietoovieziajuboneecai");
strcpy(configBlock.mqttBroker, "192.168.0.1"); strcpy(configBlock.mqttBroker, "172.16.2.15");
strcpy(configBlock.mqttUser, "esp1"); strcpy(configBlock.mqttUser, "esp2");
strcpy(configBlock.mqttPass, "geheim"); strcpy(configBlock.mqttPass, "geheim");
strcpy(configBlock.mqttClientId, "changeThis"); strcpy(configBlock.mqttClientId, "Kitchen");
strcpy(configBlock.mqttTopic, "IoT/espThermometer2/locationChangeThis/measurement"); strcpy(configBlock.mqttTopic, "IoT/espThermometer2/measurement");
configBlock.mqttPort = 1883; configBlock.mqttPort = 8883;
configBlock.measurePeriod = 300; configBlock.measurePeriod = 300;
} }

4
configurationMode.cpp
View File

@ -33,13 +33,15 @@ void configServeNotFound() {
void setupConfiguration() { void setupConfigurationNetwork() {
WiFi.mode(WIFI_AP); WiFi.mode(WIFI_AP);
WiFi.softAP(CONFIG_SSID); WiFi.softAP(CONFIG_SSID);
#ifdef DEBUG #ifdef DEBUG
Serial.println("AP started"); Serial.println("AP started");
#endif #endif
}
void setupConfigurationServer() {
webServer.on("/", configServeIndex); webServer.on("/", configServeIndex);
webServer.on("/config", configServeGetConfiguration); webServer.on("/config", configServeGetConfiguration);
webServer.onNotFound(configServeNotFound); webServer.onNotFound(configServeNotFound);

3
configurationMode.h
View File

@ -10,7 +10,8 @@
void setupConfiguration(); void setupConfigurationNetwork();
void setupConfigurationServer();
void loopConfiguration(); void loopConfiguration();

2
defines.h
View File

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

2
productionMode.cpp
View File

@ -135,7 +135,7 @@ void read_thermometer() {
//char topic[128]; //char topic[128];
//snprintf(topic, 127, "IoT/espThermometer2/%s/measurement", WiFi.macAddress().c_str()); //snprintf(topic, 127, "IoT/espThermometer2/%s/measurement", WiFi.macAddress().c_str());
char payload[128]; char payload[128];
snprintf(payload, 127, "%s %d.%d %d.%d %ld", configBlock.mqttClientId, t1, t2, v1, v2, duration); snprintf(payload, 127, "{\"location\":\"%s\", \"temperature\":%d.%d, \"battery\":%d.%d, \"duration\":%ld}", configBlock.mqttClientId, t1, t2, v1, v2, duration);
#ifdef DEBUG #ifdef DEBUG
Serial.println(payload); Serial.println(payload);
#endif #endif