Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-10-08 11:14:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Bernator 2019-10-10 11:12:58 +02:00 committed by GitHub
parent daddf6fb2e
commit 6977e38540
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 59 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/knx_facade.h
View File

@ -110,6 +110,24 @@ template <class P, class B> class KnxFacade : private SaveRestore
_ledPin = value;
}
/**
* returns RISING if interrupt is created in a rising signal, FALLING otherwise
*/
uint32_t buttonPinInterruptOn()
{
return _buttonPinInterruptOn;
}
/**
* Sets if the programming button creates a RISING or a FALLING signal.
*
* Set to RISING for GPIO--BUTTON--VDD or to FALLING for GPIO--BUTTON--GND
*/
void buttonPinInterruptOn(uint32_t value)
{
_buttonPinInterruptOn = value;
}
uint32_t buttonPin()
{
return _buttonPin;
@ -192,7 +210,7 @@ template <class P, class B> class KnxFacade : private SaveRestore
pinMode(_buttonPin, INPUT_PULLUP);
attachInterrupt(_buttonPin, buttonUp, RISING);
attachInterrupt(_buttonPin, buttonUp, _buttonPinInterruptOn);
enabled(true);
}
@ -252,8 +270,9 @@ template <class P, class B> class KnxFacade : private SaveRestore
P* _platformPtr = 0;
B* _bauPtr = 0;
B& _bau;
uint32_t _ledPinActiveOn = LOW;
uint32_t _ledPinActiveOn = LOW;
uint32_t _ledPin = LED_BUILTIN;
uint32_t _buttonPinInterruptOn = RISING;
uint32_t _buttonPin = 0;
saveRestoreCallback _saveCallback = 0;
saveRestoreCallback _restoreCallback = 0;
@ -261,12 +280,14 @@ template <class P, class B> class KnxFacade : private SaveRestore
bool _toogleProgMode = false;
bool _progLedState = false;
uint32_t size(){
uint32_t size()
{
if (_sizeCallback != 0)
return _sizeCallback();
return 0;
}
uint8_t* save(uint8_t* buffer)
{
if (_saveCallback != 0)
@ -275,7 +296,10 @@ template <class P, class B> class KnxFacade : private SaveRestore
return buffer;
}
uint8_t* save(){};
uint8_t* save()
{
};
uint8_t* restore(uint8_t* buffer)
{
if (_restoreCallback != 0)