diff --git a/.project b/.project index f85ff19..3f7635d 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/EEPROM diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 7edf274..b5fc975 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 5cdcc63..2caa826 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.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.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/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/operation=replace 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.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/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/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/operation=replace 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.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/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/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/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/operation=replace 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.NAME/delimiter=\: 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/operation=replace 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.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/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/operation=replace 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.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/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/operation=replace 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.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/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/operation=replace 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.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/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/operation=replace 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.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/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/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/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.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/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/operation=replace 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.MENU/delimiter=\: 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/operation=replace environment/project/io.sloeber.core.toolChain.release.1352205473/JANTJE.OBJCOPY/value=${A.RECIPE.OBJCOPY.HEX.PATTERN} diff --git a/ConfigGenerator/configGen.py b/ConfigGenerator/configGen.py index 91527d5..1bfa536 100644 --- a/ConfigGenerator/configGen.py +++ b/ConfigGenerator/configGen.py @@ -13,7 +13,7 @@ configItems = [ {"label":"MQTT Username", "key":"mqttUser", "type":"C", "length":32, "default":"esp1"}, {"label":"MQTT Password", "key":"mqttPass", "type":"C", "length":32, "default":"geheim"}, {"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":"Measure Period", "key":"measurePeriod", "type":"I", "default":300} ] diff --git a/EspThermometer2.cpp b/EspThermometer2.cpp index 61bc323..5a359db 100644 --- a/EspThermometer2.cpp +++ b/EspThermometer2.cpp @@ -47,7 +47,8 @@ void setup() { Serial.println("Configuration mode"); #endif digitalWrite(LED_PIN, LOW); - setupConfiguration(); + setupConfigurationNetwork(); + setupConfigurationServer(); } else { #ifdef DEBUG Serial.println("Production mode"); @@ -58,6 +59,7 @@ void setup() { digitalWrite(LED_PIN, HIGH); setupProduction(); + setupConfigurationServer(); } #ifdef DEBUG diff --git a/configuration.cpp b/configuration.cpp index 4415687..b6474b5 100644 --- a/configuration.cpp +++ b/configuration.cpp @@ -9,7 +9,7 @@ tConfigBlock configBlock; -const uint32_t MAGIC = 0xC0DE0002; +const uint32_t MAGIC = 0xC0DE0006; extern ESP8266WebServer webServer; bool configSaved = false; @@ -18,14 +18,14 @@ void configServeIndex() { bool configValid = (configBlock.magic == MAGIC); if (! configValid) { - strcpy(configBlock.wifiSsid, "Test"); - strcpy(configBlock.wifiKey, "geheim"); - strcpy(configBlock.mqttBroker, "192.168.0.1"); - strcpy(configBlock.mqttUser, "esp1"); + strcpy(configBlock.wifiSsid, "TV_WLAN"); + strcpy(configBlock.wifiKey, "ioweishauhodohtheexairiedaihohbiethiihahchietoovieziajuboneecai"); + strcpy(configBlock.mqttBroker, "172.16.2.15"); + strcpy(configBlock.mqttUser, "esp2"); strcpy(configBlock.mqttPass, "geheim"); - strcpy(configBlock.mqttClientId, "changeThis"); - strcpy(configBlock.mqttTopic, "IoT/espThermometer2/locationChangeThis/measurement"); - configBlock.mqttPort = 1883; + strcpy(configBlock.mqttClientId, "Kitchen"); + strcpy(configBlock.mqttTopic, "IoT/espThermometer2/measurement"); + configBlock.mqttPort = 8883; configBlock.measurePeriod = 300; } diff --git a/configurationMode.cpp b/configurationMode.cpp index 0f5cc54..9b2c863 100644 --- a/configurationMode.cpp +++ b/configurationMode.cpp @@ -33,13 +33,15 @@ void configServeNotFound() { -void setupConfiguration() { +void setupConfigurationNetwork() { WiFi.mode(WIFI_AP); WiFi.softAP(CONFIG_SSID); #ifdef DEBUG Serial.println("AP started"); #endif +} +void setupConfigurationServer() { webServer.on("/", configServeIndex); webServer.on("/config", configServeGetConfiguration); webServer.onNotFound(configServeNotFound); diff --git a/configurationMode.h b/configurationMode.h index 898422d..59f5e19 100644 --- a/configurationMode.h +++ b/configurationMode.h @@ -10,7 +10,8 @@ -void setupConfiguration(); +void setupConfigurationNetwork(); +void setupConfigurationServer(); void loopConfiguration(); diff --git a/defines.h b/defines.h index bcb9683..784c02e 100644 --- a/defines.h +++ b/defines.h @@ -8,7 +8,7 @@ #ifndef DEFINES_H_ #define DEFINES_H_ -// #define DEBUG +//#define DEBUG #define SLEEP #define EEPROM_ADDR 0 diff --git a/productionMode.cpp b/productionMode.cpp index 40f6b28..6b71cb9 100644 --- a/productionMode.cpp +++ b/productionMode.cpp @@ -135,7 +135,7 @@ void read_thermometer() { //char topic[128]; //snprintf(topic, 127, "IoT/espThermometer2/%s/measurement", WiFi.macAddress().c_str()); 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 Serial.println(payload); #endif