Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2024-12-18 19:08:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

correct flag handling for group objects

Browse Source
This commit is contained in:
Thomas Kunze 2019-05-27 22:06:32 +02:00
parent 0628d88921
commit 5b31b24337
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/knx/bau_systemB.cpp
View File

@ -48,16 +48,16 @@ void BauSystemB::sendNextGroupTelegram()
if (flag != ReadRequest && flag != WriteRequest) if (flag != ReadRequest && flag != WriteRequest)
continue; continue;
if(!go.communicationEnable() || ! go.transmitEnable()) if (!go.communicationEnable())
continue; continue;
if (flag == WriteRequest) if (flag == WriteRequest && go.transmitEnable())
{ {
uint8_t* data = go.valueRef(); uint8_t* data = go.valueRef();
_appLayer.groupValueWriteRequest(AckRequested, asap, go.priority(), NetworkLayerParameter, data, _appLayer.groupValueWriteRequest(AckRequested, asap, go.priority(), NetworkLayerParameter, data,
go.sizeInTelegram()); go.sizeInTelegram());
} }
else else if (flag == ReadRequest)
{ {
_appLayer.groupValueReadRequest(AckRequested, asap, go.priority(), NetworkLayerParameter); _appLayer.groupValueReadRequest(AckRequested, asap, go.priority(), NetworkLayerParameter);
} }
@ -265,6 +265,10 @@ void BauSystemB::groupValueReadLocalConfirm(AckType ack, uint16_t asap, Priority
void BauSystemB::groupValueReadIndication(uint16_t asap, Priority priority, HopCountType hopType) void BauSystemB::groupValueReadIndication(uint16_t asap, Priority priority, HopCountType hopType)
{ {
GroupObject& go = _groupObjTable.get(asap); GroupObject& go = _groupObjTable.get(asap);
if (!go.communicationEnable() || !go.readEnable())
return;
uint8_t* data = go.valueRef(); uint8_t* data = go.valueRef();
_appLayer.groupValueReadResponse(AckRequested, asap, priority, hopType, data, go.sizeInTelegram()); _appLayer.groupValueReadResponse(AckRequested, asap, priority, hopType, data, go.sizeInTelegram());
} }

2
src/knx/table_object.h
View File

@ -29,7 +29,7 @@ public:
virtual uint8_t* restore(uint8_t* buffer); virtual uint8_t* restore(uint8_t* buffer);
protected: protected:
/** /**
* This method is called before the interface object enters a new ::Loadstate. * This method is called before the interface object enters a new ::LoadState.
* If there is a error changing the state newState should be set to ::LS_ERROR and errorCode() * If there is a error changing the state newState should be set to ::LS_ERROR and errorCode()
* to a reason for the failure. * to a reason for the failure.
*/ */

8
src/knx_facade.h
View File

@ -31,10 +31,9 @@ public:
*/ */
uint32_t ledPinActiveOn(); uint32_t ledPinActiveOn();
/** /**
* To adapt the output to hardware. * Sets if the programming led is active on HIGH or LOW.
* *
* @param ledPinActiveOn = "0" or "low" --> GPIO--LED--RESISTOR--VDD (for example NODE MCU) * Set to HIGH for GPIO--RESISTOR--LED--GND or to LOW for GPIO--LED--RESISTOR--VDD
* @param ledPinActiveOn = "1" or "high" --> GPIO--RESISTOR--LED--GND (for example WeMos D1 R2)
*/ */
void ledPinActiveOn(uint32_t value); void ledPinActiveOn(uint32_t value);
uint32_t ledPin(); uint32_t ledPin();
@ -63,9 +62,6 @@ private:
uint32_t _ledPinActiveOn = LOW; uint32_t _ledPinActiveOn = LOW;
uint32_t _ledPin = LED_BUILTIN; uint32_t _ledPin = LED_BUILTIN;
uint32_t _buttonPin = 0; uint32_t _buttonPin = 0;
#ifdef USE_STATES
Ticker _ticker;
#endif
saveRestoreCallback _saveCallback = 0; saveRestoreCallback _saveCallback = 0;
saveRestoreCallback _restoreCallback = 0; saveRestoreCallback _restoreCallback = 0;