mirror of
https://github.com/thelsing/knx.git
synced 2025-02-04 00:16:20 +01:00
Fix last CodeFactor Style issues (#202)
* fix malformed whitespace * fix trailing spaces fix trailing spaces
This commit is contained in:
parent
d43703f7bd
commit
eb963583ee
8
.github/workflows/cmake-arm.yml
vendored
8
.github/workflows/cmake-arm.yml
vendored
@ -22,7 +22,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Install bare metal ARM toolchain
|
- name: Install bare metal ARM toolchain
|
||||||
run: sudo apt-get install binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib
|
run: sudo apt-get install binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib
|
||||||
|
|
||||||
- name: Show toolchain version
|
- name: Show toolchain version
|
||||||
run: arm-none-eabi-gcc --version
|
run: arm-none-eabi-gcc --version
|
||||||
|
|
||||||
@ -36,8 +36,8 @@ jobs:
|
|||||||
# access regardless of the host operating system
|
# access regardless of the host operating system
|
||||||
shell: bash
|
shell: bash
|
||||||
working-directory: ${{runner.workspace}}/build
|
working-directory: ${{runner.workspace}}/build
|
||||||
# Note the current convention is to use the -S and -B options here to specify source
|
# Note the current convention is to use the -S and -B options here to specify source
|
||||||
# and build directories, but this is only available with CMake 3.13 and higher.
|
# and build directories, but this is only available with CMake 3.13 and higher.
|
||||||
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
|
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
|
||||||
run: cmake $GITHUB_WORKSPACE/examples/knx-cc1310 -DCMAKE_BUILD_TYPE=$BUILD_TYPE
|
run: cmake $GITHUB_WORKSPACE/examples/knx-cc1310 -DCMAKE_BUILD_TYPE=$BUILD_TYPE
|
||||||
|
|
||||||
@ -50,6 +50,6 @@ jobs:
|
|||||||
# - name: Test
|
# - name: Test
|
||||||
# working-directory: ${{runner.workspace}}/build
|
# working-directory: ${{runner.workspace}}/build
|
||||||
# shell: bash
|
# shell: bash
|
||||||
# Execute tests defined by the CMake configuration.
|
# Execute tests defined by the CMake configuration.
|
||||||
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
|
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
|
||||||
# run: ctest -C $BUILD_TYPE
|
# run: ctest -C $BUILD_TYPE
|
||||||
|
6
.github/workflows/cmake-native.yml
vendored
6
.github/workflows/cmake-native.yml
vendored
@ -27,8 +27,8 @@ jobs:
|
|||||||
# access regardless of the host operating system
|
# access regardless of the host operating system
|
||||||
shell: bash
|
shell: bash
|
||||||
working-directory: ${{runner.workspace}}/build
|
working-directory: ${{runner.workspace}}/build
|
||||||
# Note the current convention is to use the -S and -B options here to specify source
|
# Note the current convention is to use the -S and -B options here to specify source
|
||||||
# and build directories, but this is only available with CMake 3.13 and higher.
|
# and build directories, but this is only available with CMake 3.13 and higher.
|
||||||
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
|
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
|
||||||
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
|
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
|
||||||
|
|
||||||
@ -41,6 +41,6 @@ jobs:
|
|||||||
# - name: Test
|
# - name: Test
|
||||||
# working-directory: ${{runner.workspace}}/build
|
# working-directory: ${{runner.workspace}}/build
|
||||||
# shell: bash
|
# shell: bash
|
||||||
# Execute tests defined by the CMake configuration.
|
# Execute tests defined by the CMake configuration.
|
||||||
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
|
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
|
||||||
# run: ctest -C $BUILD_TYPE
|
# run: ctest -C $BUILD_TYPE
|
||||||
|
2
.github/workflows/codeql-analysis.yml
vendored
2
.github/workflows/codeql-analysis.yml
vendored
@ -47,7 +47,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
languages: ${{ matrix.language }}
|
languages: ${{ matrix.language }}
|
||||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||||
# By default, queries listed here will override any specified in a config file.
|
# By default, queries listed here will override any specified in a config file.
|
||||||
# Prefix the list here with "+" to use these queries and those in the config file.
|
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||||
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
||||||
|
|
||||||
|
@ -347,7 +347,7 @@ void ApplicationLayer::dataConnectedConfirm(uint16_t tsap)
|
|||||||
|
|
||||||
void ApplicationLayer::dataConnectedConfirm(uint16_t tsap, const SecurityControl& secCtrl)
|
void ApplicationLayer::dataConnectedConfirm(uint16_t tsap, const SecurityControl& secCtrl)
|
||||||
{
|
{
|
||||||
|
//FIXME: implement dataConnectedConfirm DataSecurity
|
||||||
}
|
}
|
||||||
#pragma endregion
|
#pragma endregion
|
||||||
void ApplicationLayer::groupValueReadRequest(AckType ack, uint16_t asap, Priority priority, HopCountType hopType, const SecurityControl& secCtrl)
|
void ApplicationLayer::groupValueReadRequest(AckType ack, uint16_t asap, Priority priority, HopCountType hopType, const SecurityControl& secCtrl)
|
||||||
|
@ -157,7 +157,6 @@ class ApplicationLayer
|
|||||||
#pragma endregion
|
#pragma endregion
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
#pragma region hooks
|
#pragma region hooks
|
||||||
void dataGroupIndication(HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu, const SecurityControl &secCtrl);
|
void dataGroupIndication(HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu, const SecurityControl &secCtrl);
|
||||||
void dataGroupConfirm(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap,
|
void dataGroupConfirm(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap,
|
||||||
|
@ -21,7 +21,6 @@ BauSystemBCoupler::BauSystemBCoupler(Platform& platform) :
|
|||||||
#ifdef USE_DATASECURE
|
#ifdef USE_DATASECURE
|
||||||
_memory.addSaveRestore(&_secIfObj);
|
_memory.addSaveRestore(&_secIfObj);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ApplicationLayer& BauSystemBCoupler::applicationLayer()
|
ApplicationLayer& BauSystemBCoupler::applicationLayer()
|
||||||
|
@ -91,7 +91,6 @@ DeviceObject::DeviceObject()
|
|||||||
#ifdef USE_RF
|
#ifdef USE_RF
|
||||||
new DataProperty(PID_RF_DOMAIN_ADDRESS_CEMI_SERVER, true, PDT_GENERIC_06, 1, ReadLv3 | WriteLv3),
|
new DataProperty(PID_RF_DOMAIN_ADDRESS_CEMI_SERVER, true, PDT_GENERIC_06, 1, ReadLv3 | WriteLv3),
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
};
|
};
|
||||||
initializeProperties(sizeof(properties), properties);
|
initializeProperties(sizeof(properties), properties);
|
||||||
}
|
}
|
||||||
|
@ -135,7 +135,6 @@ int KNX_Decode_Value(uint8_t* payload, size_t payload_length, const Dpt& datatyp
|
|||||||
|
|
||||||
int KNX_Encode_Value(const KNXValue& value, uint8_t* payload, size_t payload_length, const Dpt& datatype)
|
int KNX_Encode_Value(const KNXValue& value, uint8_t* payload, size_t payload_length, const Dpt& datatype)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (datatype.mainGroup == 1 && datatype.subGroup >= 1 && datatype.subGroup <= 23 && datatype.subGroup != 20 && !datatype.index)
|
if (datatype.mainGroup == 1 && datatype.subGroup >= 1 && datatype.subGroup <= 23 && datatype.subGroup != 20 && !datatype.index)
|
||||||
return valueToBusValueBinary(value, payload, payload_length, datatype);
|
return valueToBusValueBinary(value, payload, payload_length, datatype);
|
||||||
// DPT 2.* - Binary Control
|
// DPT 2.* - Binary Control
|
||||||
@ -1553,7 +1552,6 @@ int valueToBusValueRGBW(const KNXValue& value, uint8_t* payload, size_t payload_
|
|||||||
case 1: // Mask bits
|
case 1: // Mask bits
|
||||||
unsigned8ToPayload(payload, payload_length, 5, (uint8_t)value, 0x0f);
|
unsigned8ToPayload(payload, payload_length, 5, (uint8_t)value, 0x0f);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -188,7 +188,6 @@ class InterfaceObject : public SaveRestore
|
|||||||
uint16_t saveSize() override;
|
uint16_t saveSize() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Intializes the Property-array the the supplied values.
|
* Intializes the Property-array the the supplied values.
|
||||||
*/
|
*/
|
||||||
|
@ -29,9 +29,6 @@ enum KnxIpServiceType
|
|||||||
TunnelingAck = 0x421,
|
TunnelingAck = 0x421,
|
||||||
RoutingIndication = 0x530,
|
RoutingIndication = 0x530,
|
||||||
RoutingLostMessage = 0x531,
|
RoutingLostMessage = 0x531,
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class KnxIpFrame
|
class KnxIpFrame
|
||||||
|
@ -49,7 +49,6 @@ class KNXValue
|
|||||||
KNXValue& operator=(const float value);
|
KNXValue& operator=(const float value);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
bool boolValue() const;
|
bool boolValue() const;
|
||||||
uint8_t ucharValue() const;
|
uint8_t ucharValue() const;
|
||||||
uint16_t ushortValue() const;
|
uint16_t ushortValue() const;
|
||||||
|
@ -162,7 +162,6 @@ void Memory::writeMemory()
|
|||||||
//save to size of the memoryblock for tableobject too, so that we can rebuild the usedList and freeList
|
//save to size of the memoryblock for tableobject too, so that we can rebuild the usedList and freeList
|
||||||
if (_tableObjects[i]->_data != nullptr)
|
if (_tableObjects[i]->_data != nullptr)
|
||||||
{
|
{
|
||||||
|
|
||||||
MemoryBlock* block = findBlockInList(_usedList, _tableObjects[i]->_data);
|
MemoryBlock* block = findBlockInList(_usedList, _tableObjects[i]->_data);
|
||||||
if (block == nullptr)
|
if (block == nullptr)
|
||||||
{
|
{
|
||||||
|
@ -679,7 +679,6 @@ void RfPhysicalLayerCC1101::loop()
|
|||||||
bytesLeft -= (32 - 1);
|
bytesLeft -= (32 - 1);
|
||||||
pByteIndex += (32 - 1);
|
pByteIndex += (32 - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -719,7 +718,6 @@ void RfPhysicalLayerCC1101::loop()
|
|||||||
packetStartTime = millis();
|
packetStartTime = millis();
|
||||||
syncStart = true;
|
syncStart = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -21,7 +21,6 @@ class BusAccessUnit;
|
|||||||
*/
|
*/
|
||||||
class SecureApplicationLayer : public ApplicationLayer
|
class SecureApplicationLayer : public ApplicationLayer
|
||||||
{
|
{
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* The constructor.
|
* The constructor.
|
||||||
@ -56,8 +55,6 @@ class SecureApplicationLayer : public ApplicationLayer
|
|||||||
void dataConnectedRequest(uint16_t tsap, Priority priority, APDU& apdu, const SecurityControl& secCtrl) override; // apdu must be valid until it was confirmed
|
void dataConnectedRequest(uint16_t tsap, Priority priority, APDU& apdu, const SecurityControl& secCtrl) override; // apdu must be valid until it was confirmed
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
|
||||||
enum class AddrType : uint8_t
|
enum class AddrType : uint8_t
|
||||||
{
|
{
|
||||||
group,
|
group,
|
||||||
|
@ -490,7 +490,6 @@ uint16_t SecurityInterfaceObject::getNumberOfElements(PropertyID propId)
|
|||||||
|
|
||||||
uint64_t SecurityInterfaceObject::getLastValidSequenceNumber(uint16_t deviceAddr)
|
uint64_t SecurityInterfaceObject::getLastValidSequenceNumber(uint16_t deviceAddr)
|
||||||
{
|
{
|
||||||
|
|
||||||
// Get number of entries for this property
|
// Get number of entries for this property
|
||||||
uint16_t numElements = getNumberOfElements(PID_SECURITY_INDIVIDUAL_ADDRESS_TABLE);
|
uint16_t numElements = getNumberOfElements(PID_SECURITY_INDIVIDUAL_ADDRESS_TABLE);
|
||||||
|
|
||||||
|
@ -616,7 +616,6 @@ bool TpUartDataLinkLayer::sendSingleFrameByte()
|
|||||||
|
|
||||||
void TpUartDataLinkLayer::addFrameTxQueue(CemiFrame& frame)
|
void TpUartDataLinkLayer::addFrameTxQueue(CemiFrame& frame)
|
||||||
{
|
{
|
||||||
|
|
||||||
_tx_queue_frame_t* tx_frame = new _tx_queue_frame_t;
|
_tx_queue_frame_t* tx_frame = new _tx_queue_frame_t;
|
||||||
tx_frame->length = frame.telegramLengthtTP();
|
tx_frame->length = frame.telegramLengthtTP();
|
||||||
tx_frame->data = new uint8_t[tx_frame->length];
|
tx_frame->data = new uint8_t[tx_frame->length];
|
||||||
|
@ -343,7 +343,6 @@ void TransportLayer::dataIndividualConfirm(AckType ack, uint16_t destination, Ho
|
|||||||
A5(destination);
|
A5(destination);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case Disconnect:
|
case Disconnect:
|
||||||
|
@ -63,7 +63,6 @@ void UsbTunnelInterface::loop()
|
|||||||
handleHidReportRxQueue();
|
handleHidReportRxQueue();
|
||||||
rxHaveCompletePacket = false;
|
rxHaveCompletePacket = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* USB TX */
|
/* USB TX */
|
||||||
@ -136,7 +135,6 @@ void UsbTunnelInterface::loadNextTxFrame(uint8_t** sendBuffer, uint16_t* sendBuf
|
|||||||
}
|
}
|
||||||
println("");
|
println("");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void UsbTunnelInterface::sendKnxHidReport(ProtocolIdType protId, ServiceIdType servId, uint8_t* data, uint16_t length)
|
void UsbTunnelInterface::sendKnxHidReport(ProtocolIdType protId, ServiceIdType servId, uint8_t* data, uint16_t length)
|
||||||
|
Loading…
Reference in New Issue
Block a user