mirror of
https://github.com/thelsing/knx.git
synced 2026-02-23 13:50:35 +01:00
added alternative GroupObject with less mangagement footprint (#125)
* corrected float with DPT9 * Switch Programming-LED also via Bus/ETS * Again: Prog-LED switchable from bus/ETS * DPT16 (to bus) implemented * - added SMALL_GROUPOBJECT * - added knx-demo-small-go example - added config.h option (commented) - changed platformio-ci.ini with -DSMALL_GROUPOBJECT - changed plantformio.ini with tested -DSMALL_GROUPOBJECT * - removed duplicate files Co-authored-by: Waldemar Porscha <waldemar@porscha.eu> Co-authored-by: Waldemar Porscha <waldemar.porscha@sap.com>
This commit is contained in:
mumpf
GitHub
129
examples/knx-demo-smal-go/knx-demo.ino
Normal file
129
examples/knx-demo-smal-go/knx-demo.ino
Normal file
@@ -0,0 +1,129 @@
|
||||
#include <knx.h>
|
||||
|
||||
#ifdef ARDUINO_ARCH_ESP8266
|
||||
#include <WiFiManager.h>
|
||||
#endif
|
||||
|
||||
/*****************************************
|
||||
* changes necessary for SMALL_GROUPOBJECT
|
||||
* are commented with //**
|
||||
* This project can be used with any
|
||||
* of the knxprod files of the original
|
||||
* knx-demo project.
|
||||
*****************************************/
|
||||
|
||||
// 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)
|
||||
|
||||
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, DPT_Value_Temp); //** each value access needs to done with according DPT parameter
|
||||
|
||||
if (currentValue > maxValue)
|
||||
{
|
||||
maxValue = currentValue;
|
||||
goMax.value(maxValue, DPT_Value_Temp); //** each value access needs to done with according DPT parameter
|
||||
}
|
||||
|
||||
if (currentValue < minValue)
|
||||
{
|
||||
minValue = currentValue;
|
||||
goMin.value(minValue, DPT_Value_Temp); //** each value access needs to done with according DPT parameter
|
||||
}
|
||||
}
|
||||
|
||||
// callback from reset-GO
|
||||
void resetCallback(GroupObject& go)
|
||||
{
|
||||
//** callbacks are now handled in the class, not per instance,
|
||||
//** this means, we have to check, which GroupObject is calling back
|
||||
if (go.asap() == goReset.asap())
|
||||
{
|
||||
if (go.value(DPT_Trigger)) //** each value access needs to done with according DPT parameter
|
||||
{
|
||||
maxValue = 0;
|
||||
minValue = 10000;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void setup()
|
||||
{
|
||||
Serial.begin(115200);
|
||||
ArduinoPlatform::SerialDebug = &Serial;
|
||||
|
||||
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
|
||||
GroupObject::classCallback(resetCallback); //** callbacks are now handled per class, not per instance
|
||||
//** there is no global assignment of DPT for GroupObjects
|
||||
// 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);
|
||||
// Is the interrup created in RISING or FALLING signal? Default is RISING
|
||||
// knx.buttonPinInterruptOn(FALLING);
|
||||
|
||||
// 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();
|
||||
}
|
||||
120
examples/knx-demo-smal-go/platformio.ini
Normal file
120
examples/knx-demo-smal-go/platformio.ini
Normal file
@@ -0,0 +1,120 @@
|
||||
;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 = .
|
||||
|
||||
;--- SAMD --------------------------------------------------
|
||||
; SMALL_GROUPOBJECT just tested with TP on SAMD, but should work also in other environments
|
||||
[env:zeroUSB]
|
||||
platform = atmelsam
|
||||
board = zeroUSB
|
||||
framework = arduino
|
||||
; We consider that the this projects is opened within its project directory
|
||||
; while working with VS Code.
|
||||
lib_extra_dirs = ../../../
|
||||
|
||||
lib_deps =
|
||||
SPI
|
||||
https://github.com/thelsing/FlashStorage.git
|
||||
knx
|
||||
|
||||
build_flags =
|
||||
-DMASK_VERSION=0x07B0
|
||||
-DSMALL_GROUPOBJECT
|
||||
-Wno-unknown-pragmas
|
||||
|
||||
; [env:adafruit_feather_m0_rf]
|
||||
; platform = atmelsam
|
||||
; board = adafruit_feather_m0
|
||||
; framework = arduino
|
||||
; ; We consider that the this projects is opened within its project directory
|
||||
; ; while working with VS Code.
|
||||
; lib_extra_dirs = ../../../
|
||||
|
||||
; lib_deps =
|
||||
; SPI
|
||||
; https://github.com/thelsing/FlashStorage.git
|
||||
; knx
|
||||
|
||||
; build_flags =
|
||||
; -DMASK_VERSION=0x27B0
|
||||
; -Wno-unknown-pragmas
|
||||
;-----------------------------------------------------------
|
||||
|
||||
|
||||
;--- ESP8266 -----------------------------------------------
|
||||
#[env:nodemcuv2_ip]
|
||||
#platform = espressif8266
|
||||
#board = nodemcuv2
|
||||
#framework = arduino
|
||||
; We consider that the this projects is opened within its project directory
|
||||
; while working with VS Code.
|
||||
#lib_extra_dirs = ../../../
|
||||
|
||||
#lib_deps =
|
||||
# WifiManager
|
||||
# knx
|
||||
|
||||
#build_flags =
|
||||
# -DMASK_VERSION=0x57B0
|
||||
# -Wno-unknown-pragmas
|
||||
|
||||
; [env:nodemcuv2_tp]
|
||||
; platform = espressif8266
|
||||
; board = nodemcuv2
|
||||
; framework = arduino
|
||||
; ; We consider that the this projects is opened within its project directory
|
||||
; ; while working with VS Code.
|
||||
; lib_extra_dirs = ../../../
|
||||
|
||||
; lib_deps =
|
||||
; WifiManager
|
||||
; knx
|
||||
|
||||
; build_flags =
|
||||
; -DMASK_VERSION=0x07B0
|
||||
; -Wno-unknown-pragmas
|
||||
|
||||
;---------------------------------------------------------
|
||||
|
||||
|
||||
;--- ESP32 -----------------------------------------------
|
||||
; [env:esp32dev_ip]
|
||||
; 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=0x57B0
|
||||
; -Wno-unknown-pragmas
|
||||
|
||||
; [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
|
||||
Reference in New Issue
Block a user