mirror of https://github.com/thelsing/knx
opt-out global KNX, ability to DIY construct knx object, minor cleanups (#121)
* Refactored the knx_facade a bit to make the auto-building of the global knx object and the buttonUp() ISR function opt-in. Also added the ability to quite easily attach another serial (in this case tested with Serial2 of an ESP32). * Added visual studio code temp files to .gitignore * Fix for missing build flag for WifiManager in ESP32_ip demo * Added example in which we DIY build the KNX object and use ESP32's second UART to connect so that you can debug with the first one that's connected to USB. * Minor platform cleanups to remove compilation warnings. * ESP32 can't handle the defaulted 8192 byte EPROM. Next to that I needed to begin() the eprom lib in my setup() to get it to work and that requires knowing how much memory KNX will use. This fix makes the default more conservative and moves it's definition to the .h file so that other files can always use it as well. * After comments from thelsing, inverted the logic. The default global knx object is now opt-out by defining KNX_NO_AUTOMATIC_GLOBAL_INSTANCE. See the knx-demo-diy project for an example. Minor syntactic cleanups. * Removed hardwareserial from facade (detail which was not needed) Placed facade constructors together Minor syntactic cleanup * Fixed knx-cc1310 where own button routine was calling now private internal knx facade variable. Renamed files in knx-demo-diy Minor syntactic stuff * Added gitattributes for binary knxprod filespull/123/head
Dennis Fleurbaaij
3 years ago
committed by
GitHub
parent
58d3721571
commit
f169e20f2f
19 changed files with 527 additions and 157 deletions
@ -0,0 +1 @@ |
||||
*.knxprod binary |
||||
@ -0,0 +1,5 @@ |
||||
.pio |
||||
.vscode/.browse.c_cpp.db* |
||||
.vscode/c_cpp_properties.json |
||||
.vscode/launch.json |
||||
.vscode/ipch |
||||
Binary file not shown.
@ -0,0 +1,138 @@ |
||||
#include <knx.h> |
||||
#include <knx/bau07B0.h> |
||||
|
||||
#ifdef ARDUINO_ARCH_ESP8266 |
||||
#include <WiFiManager.h> |
||||
#endif |
||||
|
||||
// create named references for easy access to group objects
|
||||
#define goCurrent knx.getGroupObject(1) |
||||
#define goMax knx.getGroupObject(2) |
||||
#define goMin knx.getGroupObject(3) |
||||
#define goReset knx.getGroupObject(4) |
||||
|
||||
// If you don't want a global knx object, for example because you want
|
||||
// to more finely control it's construction, this is an example
|
||||
// of how to do so. Define KNX_NO_AUTOMATIC_GLOBAL_INSTANCE
|
||||
// and then you can DIY a knx object as shown below. In this case we use
|
||||
// the ESP32's secondary UART and late-bind the ISR function in setup().
|
||||
Esp32Platform knxPlatform(&Serial2); |
||||
Bau07B0 knxBau(knxPlatform); |
||||
KnxFacade<Esp32Platform, Bau07B0> knx(knxBau); |
||||
|
||||
ICACHE_RAM_ATTR void myButtonPressed() |
||||
{ |
||||
// Debounce
|
||||
static uint32_t lastpressed=0; |
||||
if (millis() - lastpressed > 200) |
||||
{ |
||||
knx.toggleProgMode(); |
||||
lastpressed = millis(); |
||||
} |
||||
} |
||||
|
||||
float currentValue = 0; |
||||
float maxValue = 0; |
||||
float minValue = RAND_MAX; |
||||
long lastsend = 0; |
||||
|
||||
void measureTemp() |
||||
{ |
||||
long now = millis(); |
||||
if ((now - lastsend) < 2000) |
||||
return; |
||||
|
||||
lastsend = now; |
||||
int r = rand(); |
||||
currentValue = (r * 1.0) / (RAND_MAX * 1.0); |
||||
currentValue *= 100 * 100; |
||||
|
||||
// write new value to groupobject
|
||||
goCurrent.value(currentValue); |
||||
|
||||
if (currentValue > maxValue) |
||||
{ |
||||
maxValue = currentValue; |
||||
goMax.value(maxValue); |
||||
} |
||||
|
||||
if (currentValue < minValue) |
||||
{ |
||||
minValue = currentValue; |
||||
goMin.value(minValue); |
||||
} |
||||
} |
||||
|
||||
// callback from reset-GO
|
||||
void resetCallback(GroupObject& go) |
||||
{ |
||||
if (go.value()) |
||||
{ |
||||
maxValue = 0; |
||||
minValue = 10000; |
||||
} |
||||
} |
||||
|
||||
void setup() |
||||
{ |
||||
knx.setButtonISRFunction(myButtonPressed); |
||||
|
||||
Serial.begin(115200); |
||||
ArduinoPlatform::SerialDebug = &Serial; |
||||
|
||||
Serial2.begin(19200); // KNX, pin 16,17 on EPS32
|
||||
|
||||
randomSeed(millis()); |
||||
|
||||
#ifdef ARDUINO_ARCH_ESP8266 |
||||
WiFiManager wifiManager; |
||||
wifiManager.autoConnect("knx-demo"); |
||||
#endif |
||||
|
||||
// read adress table, association table, groupobject table and parameters from eeprom
|
||||
knx.readMemory(); |
||||
|
||||
// print values of parameters if device is already configured
|
||||
if (knx.configured()) |
||||
{ |
||||
// register callback for reset GO
|
||||
goReset.callback(resetCallback); |
||||
goReset.dataPointType(DPT_Trigger); |
||||
goCurrent.dataPointType(DPT_Value_Temp); |
||||
goMin.dataPointType(DPT_Value_Temp); |
||||
goMax.dataPointType(DPT_Value_Temp); |
||||
|
||||
Serial.print("Timeout: "); |
||||
Serial.println(knx.paramByte(0)); |
||||
Serial.print("Zykl. senden: "); |
||||
Serial.println(knx.paramByte(1)); |
||||
Serial.print("Min/Max senden: "); |
||||
Serial.println(knx.paramByte(2)); |
||||
Serial.print("Aenderung senden: "); |
||||
Serial.println(knx.paramByte(3)); |
||||
Serial.print("Abgleich: "); |
||||
Serial.println(knx.paramByte(4)); |
||||
} |
||||
|
||||
// pin or GPIO the programming led is connected to. Default is LED_BUILTIN
|
||||
// knx.ledPin(LED_BUILTIN);
|
||||
// is the led active on HIGH or low? Default is LOW
|
||||
// knx.ledPinActiveOn(HIGH);
|
||||
// pin or GPIO programming button is connected to. Default is 0
|
||||
// knx.buttonPin(0);
|
||||
|
||||
// start the framework.
|
||||
knx.start(); |
||||
} |
||||
|
||||
void loop() |
||||
{ |
||||
// don't delay here to much. Otherwise you might lose packages or mess up the timing with ETS
|
||||
knx.loop(); |
||||
|
||||
// only run the application code if the device was configured with ETS
|
||||
if (!knx.configured()) |
||||
return; |
||||
|
||||
measureTemp(); |
||||
} |
||||
@ -0,0 +1,24 @@ |
||||
;PlatformIO Project Configuration File |
||||
; |
||||
; Build options: build flags, source filter |
||||
; Upload options: custom upload port, speed and extra flags |
||||
; Library options: dependencies, extra library storages |
||||
; Advanced options: extra scripting |
||||
; |
||||
; Please visit documentation for the other options and examples |
||||
; https://docs.platformio.org/page/projectconf.html |
||||
|
||||
; |
||||
;--- ESP32 ----------------------------------------------- |
||||
|
||||
[env:esp32dev_tp] |
||||
platform = espressif32 |
||||
board = esp32dev |
||||
framework = arduino |
||||
lib_deps = |
||||
knx |
||||
|
||||
build_flags = |
||||
-DMASK_VERSION=0x07B0 |
||||
-Wno-unknown-pragmas |
||||
-DKNX_NO_AUTOMATIC_GLOBAL_INSTANCE |
||||
@ -0,0 +1,33 @@ |
||||
;PlatformIO Project Configuration File |
||||
; |
||||
; Build options: build flags, source filter |
||||
; Upload options: custom upload port, speed and extra flags |
||||
; Library options: dependencies, extra library storages |
||||
; Advanced options: extra scripting |
||||
; |
||||
; Please visit documentation for the other options and examples |
||||
; https://docs.platformio.org/page/projectconf.html |
||||
[platformio] |
||||
; We have to keep libdeps dir out the project directory otherwise, |
||||
; library scanner seems to have issues so compilation fails |
||||
libdeps_dir = /tmp/libdeps |
||||
src_dir = . |
||||
|
||||
|
||||
;--- ESP32 ----------------------------------------------- |
||||
|
||||
[env:esp32dev_tp] |
||||
platform = espressif32 |
||||
board = esp32dev |
||||
framework = arduino |
||||
; We consider that the this projects is opened within its project directory |
||||
; while working with VS Code. |
||||
lib_extra_dirs = ../../../ |
||||
|
||||
lib_deps = |
||||
knx |
||||
|
||||
build_flags = |
||||
-DMASK_VERSION=0x07B0 |
||||
-Wno-unknown-pragmas |
||||
-DKNX_NO_AUTOMATIC_GLOBAL_INSTANCE |
||||
Loading…
Reference in new issue