From 939a80a29f8b32dd1ff12ac430dd3d69802cd2cb Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Mon, 3 Jun 2019 23:56:21 +0200 Subject: [PATCH] . --- .travis.yml | 6 +- examples/knx-hdc1008/knx-hdc1008.ino | 13 +- knx-hdc1008/sketches/knx-hdc1008.ino | 24 ++++ visualstudio/knx-hdc1008.vgdbproj | 171 +++++++++++++++++++++++++++ visualstudio/knx.sln | 79 +++++++------ 5 files changed, 248 insertions(+), 45 deletions(-) create mode 100644 knx-hdc1008/sketches/knx-hdc1008.ino create mode 100644 visualstudio/knx-hdc1008.vgdbproj diff --git a/.travis.yml b/.travis.yml index 2cbe231..5aefc59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,12 +27,16 @@ before_install: - if [ "$MODE" = "LINUX" ]; then eval "${MATRIX_EVAL}"; fi - if [ "$MODE" = "ARDUINO" ]; then source <(curl -SLs "https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/install.sh"); fi - if [ "$MODE" = "ARDUINO" ]; then downloadArduinoLib FlashStorage "https://github.com/thelsing/FlashStorage/archive/master.zip"; fi - - if [ "$MODE" = "ARDUINO" ]; then downloadArduinoLib HDC100X "https://github.com/RFgermany/HDC100X_Arduino_Library/archive/master.zip"; fi + # the HDC100X lib is not properly set up in githup so move things around a bit + - if [ "$MODE" = "ARDUINO" ]; then wget -O HDC100X.zip "https://github.com/RFgermany/HDC100X_Arduino_Library/archive/master.zip"; fi + - if [ "$MODE" = "ARDUINO" ]; then unzip -d "$HOME/HDC100X" "HDC100X.zip" && f=("$HOME/HDC100X"/*) && mv "$HOME/HDC100X"/*/* "$HOME/HDC100X" && rmdir "${f[@]}" && mv "$HOME/HDC100X" $HOME/arduino_ide/libraries; fi - if [ "$MODE" = "ARDUINO" ]; then downloadArduinoLib BSEC "https://github.com/BoschSensortec/BSEC-Arduino-library/archive/master.zip"; fi - buildExampleSketch() { arduino --verify --board $BOARD $PWD/examples/$1/$1.ino; } + - if [ "$MODE" = "ARDUINO" ]; then ls -lR $HOME/arduino_ide/libraries; fi install: - if [ "$MODE" = "ARDUINO" ]; then arduino --install-library "WiFiManager"; fi + - if [ "$MODE" = "ARDUINO" ]; then ls -lR $HOME/arduino_ide/libraries; fi script: - if [ "$MODE" = "LINUX" ]; then cd knx-linux; fi - if [ "$MODE" = "LINUX" ]; then mkdir -p build; fi diff --git a/examples/knx-hdc1008/knx-hdc1008.ino b/examples/knx-hdc1008/knx-hdc1008.ino index 817e2c4..c5abe7d 100644 --- a/examples/knx-hdc1008/knx-hdc1008.ino +++ b/examples/knx-hdc1008/knx-hdc1008.ino @@ -1,8 +1,8 @@ #include #include +#ifdef ARDUINO_ARCH_ESP8266 #include - -#define SerialDBG SerialUSB +#endif HDC100X HDC1(0x43); @@ -24,9 +24,11 @@ void setup(void) SerialDBG.begin(115200); delay(5000); SerialDBG.println("start"); - + +#ifdef ARDUINO_ARCH_ESP8266 WiFiManager wifiManager; wifiManager.autoConnect("knx-hdc1008"); +#endif // Programming LED on digital pin D5 knx.ledPin(5); @@ -40,6 +42,7 @@ void setup(void) if (knx.configured()) { + cyclSend = knx.paramInt(0); SerialDBG.print("Zykl. send:"); SerialDBG.println(cyclSend); @@ -80,8 +83,8 @@ void loop(void) { sendCounter = 0; - goTemperature.objectWrite(temp); - goHumidity.objectWrite(humi); + goTemperature.value(temp); + goHumidity.value(humi); } } diff --git a/knx-hdc1008/sketches/knx-hdc1008.ino b/knx-hdc1008/sketches/knx-hdc1008.ino new file mode 100644 index 0000000..ffb77b7 --- /dev/null +++ b/knx-hdc1008/sketches/knx-hdc1008.ino @@ -0,0 +1,24 @@ +#include + +//Comment out the definition below if you don't want to use the ESP8266 gdb stub. +#define ESP8266_USE_GDB_STUB + +void setup() +{ + pinMode(LED_BUILTIN, OUTPUT); + +#ifdef ESP8266_USE_GDB_STUB +#if !defined(GDBSTUB_BREAK_ON_INIT) || !GDBSTUB_BREAK_ON_INIT + printf("WARNING! The ESP8266 GDB stub will not wait for gdb during startup. Please add GDBSTUB_BREAK_ON_INIT=1 to Extra Preprocessor Macros.\n"); +#endif + gdbstub_init(); +#endif +} + +void loop() +{ + digitalWrite(LED_BUILTIN, HIGH); + delay(1000); + digitalWrite(LED_BUILTIN, LOW); + delay(1000); +} diff --git a/visualstudio/knx-hdc1008.vgdbproj b/visualstudio/knx-hdc1008.vgdbproj new file mode 100644 index 0000000..b4b9b60 --- /dev/null +++ b/visualstudio/knx-hdc1008.vgdbproj @@ -0,0 +1,171 @@ + + + + + + Unknown + + + 3f71ae50-5d11-46d0-918f-1c97717824b0 + true + true + ..\examples\knx-hdc1008 + knx-hdc1008.ino + + + + knx-hdc1008.ino + + + + + + + + ..\.. + + false + Output\$(PlatformName.defuse)\$(ConfigurationName.defuse) + false + + + GDBSTUB_BREAK_ON_INIT=1 + + + + + + + + + + + + + + + Default + + + + true + + + + Unknown + + true + true + true + + + + false + + + + + NodeMCU_1 0_(ESP-12E_Module) + + + + + false + false + false + false + false + false + false + false + false + + false + false + false + false + false + false + true + false + None + false + false + main + true + false + false + false + 0 + + + gdbsim + + + + + true + Auto + 0 + false + false + true + false + false + + _estack + 0 + false + true + + + esp8266:esp8266:nodemcuv2 + + + + xtal + 80 + + + vt + flash + + + exception + disabled + + + ssl + all + + + eesz + 4M + + + ip + lm2f + + + dbg + Disabled + + + lvl + None____ + + + wipe + none + + + baud + 115200 + + + + Sketch + + + + \ No newline at end of file diff --git a/visualstudio/knx.sln b/visualstudio/knx.sln index fcb91da..034e25f 100644 --- a/visualstudio/knx.sln +++ b/visualstudio/knx.sln @@ -6,14 +6,14 @@ Project("{803FD0C6-D64E-4E16-9DC3-1DAEC859A3D2}") = "knx-bme680", "knx-bme680.vg EndProject Project("{803FD0C6-D64E-4E16-9DC3-1DAEC859A3D2}") = "knx-demo", "knx-demo.vgdbproj", "{6165CD6A-91A4-49FA-977A-48F22086CA8E}" EndProject -Project("{803FD0C6-D64E-4E16-9DC3-1DAEC859A3D2}") = "knx-vito", "knx-vito.vgdbproj", "{527A0D25-BC8E-47B8-AA56-BD991BE6CC67}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "knxPython", "..\knxPython\knxPython.vcxproj", "{68FCB2F7-7A74-43A0-8CBE-36CB25020584}" EndProject Project("{803FD0C6-D64E-4E16-9DC3-1DAEC859A3D2}") = "knx-sonoffS20", "knx-sonoffS20.vgdbproj", "{3DB3061B-09A3-4C8B-A197-CBEEB3336437}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "knx-linux", "..\knx-linux\knx-linux.vcxproj", "{456D87B3-1DFE-4724-BDEF-17E0FDB55A61}" EndProject +Project("{803FD0C6-D64E-4E16-9DC3-1DAEC859A3D2}") = "knx-hdc1008", "knx-hdc1008.vgdbproj", "{3F71AE50-5D11-46D0-918F-1C97717824B0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Arduino Genuino Zero (Native USB Port) = Debug|Arduino Genuino Zero (Native USB Port) @@ -121,43 +121,6 @@ Global {6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|x64.Build.0 = Release|Arduino Genuino Zero (Native USB Port) {6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|x86.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) {6165CD6A-91A4-49FA-977A-48F22086CA8E}.RelWithDebInfo|x86.Build.0 = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Debug|Arduino Genuino Zero (Native USB Port).ActiveCfg = Debug|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Debug|Mixed.ActiveCfg = Debug|NodeMCU 1 0 (ESP-12E Module) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Debug|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Debug|NodeMCU 1 0 (ESP-12E Module) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Debug|VisualGDB.ActiveCfg = Debug|NodeMCU 1 0 (ESP-12E Module) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Debug|x64.ActiveCfg = Debug|NodeMCU 1 0 (ESP-12E Module) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Debug|x86.ActiveCfg = Debug|NodeMCU 1 0 (ESP-12E Module) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|Arduino Genuino Zero (Native USB Port).ActiveCfg = Debug|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|Arduino Genuino Zero (Native USB Port).Build.0 = Debug|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|Mixed.ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|Mixed.Build.0 = Release|NodeMCU 1 0 (ESP-12E Module) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|VisualGDB.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|VisualGDB.Build.0 = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|x64.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|x64.Build.0 = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|x86.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.MinSizeRel|x86.Build.0 = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Release|Arduino Genuino Zero (Native USB Port).ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Release|Arduino Genuino Zero (Native USB Port).Build.0 = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Release|Mixed.ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Release|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Release|VisualGDB.ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Release|x64.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.Release|x86.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|Arduino Genuino Zero (Native USB Port).ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|Arduino Genuino Zero (Native USB Port).Build.0 = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|Mixed.ActiveCfg = Release|NodeMCU 1 0 (ESP-12E Module) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|Mixed.Build.0 = Release|NodeMCU 1 0 (ESP-12E Module) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|VisualGDB.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|VisualGDB.Build.0 = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|x64.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|x64.Build.0 = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|x86.ActiveCfg = Release|Arduino Genuino Zero (Native USB Port) - {527A0D25-BC8E-47B8-AA56-BD991BE6CC67}.RelWithDebInfo|x86.Build.0 = Release|Arduino Genuino Zero (Native USB Port) {68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Debug|Arduino Genuino Zero (Native USB Port).ActiveCfg = Debug|Win32 {68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Debug|Mixed.ActiveCfg = Debug|Win32 {68FCB2F7-7A74-43A0-8CBE-36CB25020584}.Debug|Mixed.Build.0 = Debug|Win32 @@ -273,6 +236,44 @@ Global {456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.RelWithDebInfo|x64.Build.0 = Release|Win32 {456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 {456D87B3-1DFE-4724-BDEF-17E0FDB55A61}.RelWithDebInfo|x86.Build.0 = Release|Win32 + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|Arduino Genuino Zero (Native USB Port).ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|Mixed.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Debug|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|VisualGDB.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|x64.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Debug|x86.ActiveCfg = Debug|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|Arduino Genuino Zero (Native USB Port).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|Arduino Genuino Zero (Native USB Port).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|Mixed.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|VisualGDB.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|x64.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|x86.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.MinSizeRel|x86.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|Arduino Genuino Zero (Native USB Port).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.Release|x86.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|Arduino Genuino Zero (Native USB Port).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|Arduino Genuino Zero (Native USB Port).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|Mixed.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|Mixed.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|NodeMCU_1 0_(ESP-12E_Module).Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|VisualGDB.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|VisualGDB.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|x64.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|x64.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|x86.ActiveCfg = Release|NodeMCU_1 0_(ESP-12E_Module) + {3F71AE50-5D11-46D0-918F-1C97717824B0}.RelWithDebInfo|x86.Build.0 = Release|NodeMCU_1 0_(ESP-12E_Module) EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE