Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2026-02-23 13:50:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix examples. Only reserve memory on tableobject if size > 0

Browse Source
This commit is contained in:
Thomas Kunze
2019-05-13 22:31:45 +02:00
parent 174e29372c
commit bb77fa7000
17 changed files with 2743 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/knx/table_object.cpp
View File

@@ -102,7 +102,10 @@ uint8_t* TableObject::restore(uint8_t* buffer)
if (_data)
_platform.freeMemory(_data);
_data = _platform.allocMemory(_size);
if (_size > 0)
_data = _platform.allocMemory(_size);
else
_data = 0;
buffer = popByteArray(_data, _size, buffer);

18
src/knx_facade.cpp
View File

@@ -9,8 +9,8 @@ Bau57B0 bau(platform);
#endif
KnxFacade knx(bau);
void buttonUp()
{
void buttonUp()
{
if (knx.progMode())
{
digitalWrite(knx.ledPin(), LOW);
@@ -23,7 +23,7 @@ void buttonUp()
}
}
KnxFacade::KnxFacade(BauSystemB& bau) : _bau(bau)
KnxFacade::KnxFacade(BauSystemB& bau) : _bau(bau)
{
manufacturerId(0xfa);
_bau.addSaveRestore(this);
@@ -116,12 +116,12 @@ void KnxFacade::version(uint16_t value)
void KnxFacade::start()
{
pinMode(_ledPin, OUTPUT);
pinMode(_buttonPin, INPUT_PULLUP);
attachInterrupt(_buttonPin, buttonUp, RISING);
enabled(true);
pinMode(_ledPin, OUTPUT);
pinMode(_buttonPin, INPUT_PULLUP);
attachInterrupt(_buttonPin, buttonUp, RISING);
enabled(true);
}
uint8_t* KnxFacade::paramData(uint32_t addr)

1
src/linux_platform.h
View File

@@ -8,6 +8,7 @@
class LinuxPlatform: public Platform
{
using Platform::_memoryReference;
using Platform::memoryReference;
public:
LinuxPlatform();

9
src/main.cpp
View File

@@ -15,10 +15,10 @@ float maxValue = 0;
float minValue = RAND_MAX;
long lastsend = 0;
#define CURR bau.groupObjectTable().get(0)
#define MAX bau.groupObjectTable().get(1)
#define MIN bau.groupObjectTable().get(2)
#define RESET bau.groupObjectTable().get(3)
#define CURR bau.groupObjectTable().get(1)
#define MAX bau.groupObjectTable().get(2)
#define MIN bau.groupObjectTable().get(3)
#define RESET bau.groupObjectTable().get(4)
void measureTemp()
{
@@ -31,6 +31,7 @@ void measureTemp()
currentValue = (r * 1.0) / (RAND_MAX * 1.0);
currentValue *= 100 * 100;
CURR.objectWrite(currentValue);
if (currentValue > maxValue)