mirror of
https://github.com/thelsing/knx.git
synced 2024-12-18 19:08:18 +01:00
* Fix #191 by initializing the platform pointer in all KnxFacade constructors
* Revert "Fix #191 by initializing the platform pointer in all KnxFacade constructors"
This reverts commit adc05cfaf7
.
* Alternative fix for #191 by initializing the platform pointer in KnxFacade(&bau) from the platform stored in bau
This commit is contained in:
parent
01979174e3
commit
29702f69c3
@ -31,6 +31,11 @@ void BauSystemB::writeMemory()
|
|||||||
_memory.writeMemory();
|
_memory.writeMemory();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Platform& BauSystemB::platform()
|
||||||
|
{
|
||||||
|
return _platform;
|
||||||
|
}
|
||||||
|
|
||||||
ApplicationProgramObject& BauSystemB::parameters()
|
ApplicationProgramObject& BauSystemB::parameters()
|
||||||
{
|
{
|
||||||
return _appProgram;
|
return _appProgram;
|
||||||
|
@ -21,6 +21,7 @@ class BauSystemB : protected BusAccessUnit
|
|||||||
virtual bool enabled() = 0;
|
virtual bool enabled() = 0;
|
||||||
virtual void enabled(bool value) = 0;
|
virtual void enabled(bool value) = 0;
|
||||||
|
|
||||||
|
Platform& platform();
|
||||||
ApplicationProgramObject& parameters();
|
ApplicationProgramObject& parameters();
|
||||||
DeviceObject& deviceObject();
|
DeviceObject& deviceObject();
|
||||||
|
|
||||||
|
@ -73,6 +73,7 @@ template <class P, class B> class KnxFacade : private SaveRestore
|
|||||||
|
|
||||||
KnxFacade(B& bau) : _bau(bau)
|
KnxFacade(B& bau) : _bau(bau)
|
||||||
{
|
{
|
||||||
|
_platformPtr = static_cast<P*>(&bau.platform());
|
||||||
manufacturerId(0xfa);
|
manufacturerId(0xfa);
|
||||||
bauNumber(platform().uniqueSerialNumber());
|
bauNumber(platform().uniqueSerialNumber());
|
||||||
_bau.addSaveRestore(this);
|
_bau.addSaveRestore(this);
|
||||||
|
Loading…
Reference in New Issue
Block a user