Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2024-10-20 20:07:45 +02: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) cmake_policy(SET CMP0048 NEW)
project(knx VERSION 1.4)
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(knx VERSION 1.5)
add_subdirectory(examples/knx-linux) add_subdirectory(examples/knx-linux)
add_subdirectory(examples/knx-linux-coupler) 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) 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(LIBRARIES_FROM_REFERENCES "")
set(SOURCES 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 = '='; char standardPaddingChar = '=';
int result = 0; int result = 0;
int count = 0;
int bufSize = 8;
int index = 0; int index = 0;
int size = 0; // size of temporary array int size = 0; // size of temporary array
uint8_t* temp = nullptr; uint8_t* temp = nullptr;

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

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(knx-linux VERSION 1.4) project(knx-linux VERSION 1.5)
set(LIBRARIES_FROM_REFERENCES "") set(LIBRARIES_FROM_REFERENCES "")
set(SOURCES 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 = '='; char standardPaddingChar = '=';
int result = 0; int result = 0;
int count = 0;
int bufSize = 8;
int index = 0; int index = 0;
int size = 0; // size of temporary array int size = 0; // size of temporary array
uint8_t* temp = nullptr; uint8_t* temp = nullptr;

2
examples/knxPython/CMakeLists.txt
View File

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

2
library.json
View File

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

2
library.properties
View File

@ -1,5 +1,5 @@
name=knx name=knx
version=1.2.0 version=1.5.0
author=Thomas Kunze, et. al. author=Thomas Kunze, et. al.
maintainer=Thomas Kunze maintainer=Thomas Kunze
sentence=knx stack sentence=knx stack

5
src/knx/bau07B0.cpp
View File

@ -9,9 +9,8 @@
using namespace std; using namespace std;
Bau07B0::Bau07B0(Platform& platform) Bau07B0::Bau07B0(Platform& platform)
: BauSystemBDevice(platform), : BauSystemBDevice(platform), DataLinkLayerCallbacks(),
_dlLayer(_deviceObj, _netLayer.getInterface(), _platform, *this, (ITpUartCallBacks&) *this, (DataLinkLayerCallbacks*) this), _dlLayer(_deviceObj, _netLayer.getInterface(), _platform, *this, (ITpUartCallBacks&) *this, (DataLinkLayerCallbacks*) this)
DataLinkLayerCallbacks()
#ifdef USE_CEMI_SERVER #ifdef USE_CEMI_SERVER
, _cemiServer(*this) , _cemiServer(*this)
#endif #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) 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 _routerObj(memory(), 0x200, 0x2000), // the Filtertable of 0x091A IP Routers is fixed at 0x200 and 0x2000 long
_ipParameters(_deviceObj, platform), _ipParameters(_deviceObj, platform),
_dlLayerPrimary(_deviceObj, _ipParameters, _netLayer.getPrimaryInterface(), _platform, *this, (DataLinkLayerCallbacks*) this), _dlLayerPrimary(_deviceObj, _ipParameters, _netLayer.getPrimaryInterface(), _platform, *this, (DataLinkLayerCallbacks*) this),
_dlLayerSecondary(_deviceObj, _netLayer.getSecondaryInterface(), platform, *this, (ITpUartCallBacks&) *this, (DataLinkLayerCallbacks*) this), _dlLayerSecondary(_deviceObj, _netLayer.getSecondaryInterface(), platform, *this, (ITpUartCallBacks&) *this, (DataLinkLayerCallbacks*) this)
DataLinkLayerCallbacks()
#ifdef USE_CEMI_SERVER #ifdef USE_CEMI_SERVER
, , _cemiServer(*this)
_cemiServer(*this)
#endif #endif
{ {
// Before accessing anything of the router object they have to be initialized according to the used medium // 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; uint32_t timeBaseDiff = _frameCountTimeBase - curTime;
if(timeBaseDiff > 10) if(timeBaseDiff > 10)
timeBaseDiff = 10; timeBaseDiff = 10;
for(int i = 0; i < timeBaseDiff ; i++) for(uint32_t i = 0; i < timeBaseDiff ; i++)
{ {
_frameCountBase++; _frameCountBase++;
_frameCountBase = _frameCountBase % 10; _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 _platform.writeUart(0x0); // dummy, see NCN5120 datasheet
#else #else
_platform.writeUart(U_MXRSTCNT); _platform.writeUart(U_MXRSTCNT);
_platform.writeUart(((_repetitions & 0xF0) << 1) || (_repetitions & 0x0F)); _platform.writeUart(((_repetitions & 0xF0) << 1) | (_repetitions & 0x0F));
#endif #endif
} }
} }