From 98edabf84d46ebd83ae5d97a936ed4f6a660b955 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Fri, 26 Apr 2019 12:15:29 +0200 Subject: [PATCH] mention magic and appName in configuration --- .cproject | 1 + .settings/org.eclipse.cdt.core.prefs | 8 ++++---- ConfigDataStructure.py | 3 +++ configuration.cpp | 4 ++-- esp8266boilerplate | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.cproject b/.cproject index ceaa099..3f15115 100644 --- a/.cproject +++ b/.cproject @@ -84,4 +84,5 @@ + diff --git a/.settings/org.eclipse.cdt.core.prefs b/.settings/org.eclipse.cdt.core.prefs index 3b11a20..b61e94c 100644 --- a/.settings/org.eclipse.cdt.core.prefs +++ b/.settings/org.eclipse.cdt.core.prefs @@ -184,10 +184,10 @@ environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.DT environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.DTS/value=3600 environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.LOCAL/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.LOCAL/operation=replace -environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.LOCAL/value=1556210238 +environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.LOCAL/value=1556278652 environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.UTC/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.UTC/operation=replace -environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.UTC/value=1556203038 +environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.UTC/value=1556271452 environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.ZONE/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.ZONE/operation=replace environment/project/io.sloeber.core.toolChain.release.1704841599/A.EXTRA.TIME.ZONE/value=3600 @@ -466,10 +466,10 @@ environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.BOARD_NA environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.BOARD_NAME/value=NodeMCU 1.0 (ESP-12E Module) environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.COM_PORT/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.COM_PORT/operation=replace -environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.COM_PORT/value=/dev/ttyUSB5 +environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.COM_PORT/value=/dev/ttyUSB0 environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.ECLIPSE_LOCATION/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.ECLIPSE_LOCATION/operation=replace -environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.ECLIPSE_LOCATION/value=${eclipse_home} +environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.ECLIPSE_LOCATION/value=${eclipse_home}///// environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.EXTRA.ALL/delimiter=\: environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.EXTRA.ALL/operation=replace environment/project/io.sloeber.core.toolChain.release.1704841599/JANTJE.EXTRA.ALL/value= diff --git a/ConfigDataStructure.py b/ConfigDataStructure.py index b13e782..8821e60 100644 --- a/ConfigDataStructure.py +++ b/ConfigDataStructure.py @@ -15,3 +15,6 @@ configItems = [ {"label":"MQTT DebugTopic", "key":"mqttDebugTopic", "type":"C", "length":64, "default":"IoT/RgbLed1/Debug"}, {"label":"DebugMode", "key":"debugMode", "type":"I", "default":0} ] + +magic = 0xC0DE0005 +appName = "ESP8266 based TwoLedSignal" diff --git a/configuration.cpp b/configuration.cpp index 7537b1c..219adb4 100644 --- a/configuration.cpp +++ b/configuration.cpp @@ -9,7 +9,7 @@ tConfigBlock configBlock; -const uint32_t MAGIC = 3235774469; +const uint32_t MAGIC = 3235774470; const char* CONFIG_SSID = "espconfig"; extern ESP8266WebServer webServer; @@ -386,4 +386,4 @@ void showConfiguration() { Serial.println("---"); -} \ No newline at end of file +} diff --git a/esp8266boilerplate b/esp8266boilerplate index 7a6268a..c9073c1 160000 --- a/esp8266boilerplate +++ b/esp8266boilerplate @@ -1 +1 @@ -Subproject commit 7a6268a074a9396571a328649e7c2ba2d252af96 +Subproject commit c9073c1b7df6e906aae067aacd5c6c0800832a74