diff --git a/CMakeLists.txt b/CMakeLists.txt index 841e743..af5b0ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_policy(SET CMP0048 NEW) -project(knx VERSION 1.4) cmake_minimum_required(VERSION 3.16) +project(knx VERSION 1.5) + add_subdirectory(examples/knx-linux) add_subdirectory(examples/knx-linux-coupler) diff --git a/examples/knx-linux-coupler/CMakeLists.txt b/examples/knx-linux-coupler/CMakeLists.txt index 1809326..6b839c6 100644 --- a/examples/knx-linux-coupler/CMakeLists.txt +++ b/examples/knx-linux-coupler/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(knx-linux-coupler VERSION 1.4) +project(knx-linux-coupler VERSION 1.5) set(LIBRARIES_FROM_REFERENCES "") set(SOURCES diff --git a/examples/knx-linux-coupler/fdsk.cpp b/examples/knx-linux-coupler/fdsk.cpp index bb62d57..c8ca285 100644 --- a/examples/knx-linux-coupler/fdsk.cpp +++ b/examples/knx-linux-coupler/fdsk.cpp @@ -62,8 +62,6 @@ int FdskCalculator::toBase32(uint8_t* in, long length, uint8_t*& out, bool usePa char standardPaddingChar = '='; int result = 0; - int count = 0; - int bufSize = 8; int index = 0; int size = 0; // size of temporary array uint8_t* temp = nullptr; diff --git a/examples/knx-linux/CMakeLists.txt b/examples/knx-linux/CMakeLists.txt index ba740df..837b230 100644 --- a/examples/knx-linux/CMakeLists.txt +++ b/examples/knx-linux/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(knx-linux VERSION 1.4) +project(knx-linux VERSION 1.5) set(LIBRARIES_FROM_REFERENCES "") set(SOURCES diff --git a/examples/knx-linux/fdsk.cpp b/examples/knx-linux/fdsk.cpp index bb62d57..c8ca285 100644 --- a/examples/knx-linux/fdsk.cpp +++ b/examples/knx-linux/fdsk.cpp @@ -62,8 +62,6 @@ int FdskCalculator::toBase32(uint8_t* in, long length, uint8_t*& out, bool usePa char standardPaddingChar = '='; int result = 0; - int count = 0; - int bufSize = 8; int index = 0; int size = 0; // size of temporary array uint8_t* temp = nullptr; diff --git a/examples/knxPython/CMakeLists.txt b/examples/knxPython/CMakeLists.txt index 7f795e0..9b3d1e5 100644 --- a/examples/knxPython/CMakeLists.txt +++ b/examples/knxPython/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(knx VERSION 1.4) +project(knx VERSION 1.5) add_subdirectory(pybind11) diff --git a/library.json b/library.json index 8f76877..29ff45d 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "knx", - "version": "1.2.0", + "version": "1.5.0", "dependencies": { }, "description": "knx stack", diff --git a/library.properties b/library.properties index 3e79e42..62a4296 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=knx -version=1.2.0 +version=1.5.0 author=Thomas Kunze, et. al. maintainer=Thomas Kunze sentence=knx stack diff --git a/src/knx/bau07B0.cpp b/src/knx/bau07B0.cpp index cfbc1bb..099987a 100644 --- a/src/knx/bau07B0.cpp +++ b/src/knx/bau07B0.cpp @@ -9,9 +9,8 @@ using namespace std; Bau07B0::Bau07B0(Platform& platform) - : BauSystemBDevice(platform), - _dlLayer(_deviceObj, _netLayer.getInterface(), _platform, *this, (ITpUartCallBacks&) *this, (DataLinkLayerCallbacks*) this), - DataLinkLayerCallbacks() + : BauSystemBDevice(platform), DataLinkLayerCallbacks(), + _dlLayer(_deviceObj, _netLayer.getInterface(), _platform, *this, (ITpUartCallBacks&) *this, (DataLinkLayerCallbacks*) this) #ifdef USE_CEMI_SERVER , _cemiServer(*this) #endif diff --git a/src/knx/bau091A.cpp b/src/knx/bau091A.cpp index 430f2e6..0fa0e7d 100644 --- a/src/knx/bau091A.cpp +++ b/src/knx/bau091A.cpp @@ -14,15 +14,13 @@ implement PID_COUPLER_SERVICES_CONTROL 03_05_01 4.4.7 */ Bau091A::Bau091A(Platform& platform) - : BauSystemBCoupler(platform), + : BauSystemBCoupler(platform), DataLinkLayerCallbacks(), _routerObj(memory(), 0x200, 0x2000), // the Filtertable of 0x091A IP Routers is fixed at 0x200 and 0x2000 long _ipParameters(_deviceObj, platform), _dlLayerPrimary(_deviceObj, _ipParameters, _netLayer.getPrimaryInterface(), _platform, *this, (DataLinkLayerCallbacks*) this), - _dlLayerSecondary(_deviceObj, _netLayer.getSecondaryInterface(), platform, *this, (ITpUartCallBacks&) *this, (DataLinkLayerCallbacks*) this), - DataLinkLayerCallbacks() + _dlLayerSecondary(_deviceObj, _netLayer.getSecondaryInterface(), platform, *this, (ITpUartCallBacks&) *this, (DataLinkLayerCallbacks*) this) #ifdef USE_CEMI_SERVER - , - _cemiServer(*this) + , _cemiServer(*this) #endif { // Before accessing anything of the router object they have to be initialized according to the used medium diff --git a/src/knx/ip_data_link_layer.cpp b/src/knx/ip_data_link_layer.cpp index 3fe45b9..ec19e8d 100644 --- a/src/knx/ip_data_link_layer.cpp +++ b/src/knx/ip_data_link_layer.cpp @@ -1069,7 +1069,7 @@ bool IpDataLinkLayer::isSendLimitReached() uint32_t timeBaseDiff = _frameCountTimeBase - curTime; if(timeBaseDiff > 10) timeBaseDiff = 10; - for(int i = 0; i < timeBaseDiff ; i++) + for(uint32_t i = 0; i < timeBaseDiff ; i++) { _frameCountBase++; _frameCountBase = _frameCountBase % 10; diff --git a/src/knx/tpuart_data_link_layer.cpp b/src/knx/tpuart_data_link_layer.cpp index e70b58c..57f03ef 100644 --- a/src/knx/tpuart_data_link_layer.cpp +++ b/src/knx/tpuart_data_link_layer.cpp @@ -659,7 +659,7 @@ void TpUartDataLinkLayer::requestConfig() _platform.writeUart(0x0); // dummy, see NCN5120 datasheet #else _platform.writeUart(U_MXRSTCNT); - _platform.writeUart(((_repetitions & 0xF0) << 1) || (_repetitions & 0x0F)); + _platform.writeUart(((_repetitions & 0xF0) << 1) | (_repetitions & 0x0F)); #endif } }