ETM-Schurig
/
nymea-zigbee
mirror of https://github.com/nymea/nymea-zigbee
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix clang build flags and APDU bit parsing

fix-qt-6.10-building
Simon Stürz 2026-03-13 14:19:31 +01:00
parent 6b394096f0
commit cb7213a09c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.pri
View File

@ -3,17 +3,16 @@ QT += gui serialport sql
greaterThan(QT_MAJOR_VERSION, 5) { greaterThan(QT_MAJOR_VERSION, 5) {
message("Building using Qt6 support") message("Building using Qt6 support")
CONFIG *= c++17 CONFIG *= c++17
QMAKE_LFLAGS *= -std=c++17
QMAKE_CXXFLAGS *= -std=c++17 QMAKE_CXXFLAGS *= -std=c++17
} else { } else {
message("Building using Qt5 support") message("Building using Qt5 support")
CONFIG *= c++11 CONFIG *= c++11
QMAKE_LFLAGS *= -std=c++11
QMAKE_CXXFLAGS *= -std=c++11 QMAKE_CXXFLAGS *= -std=c++11
DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x050F00 DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x050F00
} }
QMAKE_CXXFLAGS += -Werror -z defs QMAKE_CXXFLAGS += -Werror
QMAKE_LFLAGS += -Wl,-z,defs
sourceDir = $$PWD sourceDir = $$PWD
buildDir = $$shadowed($$PWD) buildDir = $$shadowed($$PWD)

12
libnymea-zigbee/zigbeeadpu.cpp
View File

@ -65,11 +65,11 @@ quint8 ZigbeeAdpu::buildFrameControlByte(FrameControl frameControl)
ZigbeeAdpu::FrameControl ZigbeeAdpu::readFrameControlByte(quint8 frameControlByte) ZigbeeAdpu::FrameControl ZigbeeAdpu::readFrameControlByte(quint8 frameControlByte)
{ {
FrameControl frameControl; FrameControl frameControl;
frameControl.frameType = static_cast<FrameType>(frameControlByte | 0x03); frameControl.frameType = static_cast<FrameType>(frameControlByte & 0x03);
frameControl.deliveryMode = static_cast<DeliveryMode>(frameControlByte | 0x0C); frameControl.deliveryMode = static_cast<DeliveryMode>(frameControlByte & 0x0C);
frameControl.apsAckFormat = frameControlByte | 0x10; frameControl.apsAckFormat = (frameControlByte & 0x10) != 0;
frameControl.security = frameControlByte | 0x20; frameControl.security = (frameControlByte & 0x20) != 0;
frameControl.acknowledgementRequest = frameControlByte | 0x40; frameControl.acknowledgementRequest = (frameControlByte & 0x40) != 0;
frameControl.extendedHeader = frameControlByte | 0x80; frameControl.extendedHeader = (frameControlByte & 0x80) != 0;
return frameControl; return frameControl;
} }