Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-10-26 10:26:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

no more warnings

Browse Source
This commit is contained in:
Thomas Kunze 2024-08-09 21:30:35 +02:00
parent 7c85635183
commit 5293dd8894
12 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -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)

2
examples/knx-linux-coupler/CMakeLists.txt
View File

@ -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

2
examples/knx-linux-coupler/fdsk.cpp
View File

@ -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;

2
examples/knx-linux/CMakeLists.txt
View File

@ -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

2
examples/knx-linux/fdsk.cpp
View File

@ -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;

2
examples/knxPython/CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.16)
project(knx VERSION 1.4)
project(knx VERSION 1.5)
add_subdirectory(pybind11)

2
library.json
View File

@ -1,6 +1,6 @@
{
"name": "knx",
"version": "1.2.0",
"version": "1.5.0",
"dependencies": {
},
"description": "knx stack",

2
library.properties
View File

@ -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

5
src/knx/bau07B0.cpp
View File

@ -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

8
src/knx/bau091A.cpp
View File

@ -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

2
src/knx/ip_data_link_layer.cpp
View File

@ -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;

2
src/knx/tpuart_data_link_layer.cpp
View File

@ -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
}
}