Skip to content

Commit 6d3a70a

Browse files
cujomalaineycujomalainey
committed
Merge branch 'develop'
2 parents 07b8502 + 3a1d249 commit 6d3a70a

File tree

94 files changed

+267
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+267
-210
lines changed

‎src/BaseClasses/ANT_BaseAnt.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ void BaseAnt::getResponse(AntResponse &response) {
1515
response.setFrameData(_response.getFrameData());
1616
}
1717

18+
// cppcheck-suppress unusedFunction
1819
void BaseAnt::readPacketUntilAvailable() {
1920
while (!(getResponse().isAvailable() || getResponse().isError())) {
2021
// read some more

‎src/BaseClasses/ANT_BaseAntWithCallbacks.cpp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <BaseClasses/ANT_BaseAntWithCallbacks.h>
22

3+
// cppcheck-suppress unusedFunction
34
void BaseAntWithCallbacks::loop() {
45
if (loopTop())
56
loopBottom();
@@ -155,111 +156,111 @@ uint8_t BaseAntWithCallbacks::waitForInternal(uint8_t msgId, void *response, uin
155156
// must be unified as well).
156157
switch(msgId) {
157158
case AcknowledgedData::MSG_ID: {
158-
AcknowledgedData *r = (AcknowledgedData*)response;
159+
AcknowledgedData *r = static_cast<AcknowledgedData*>(response);
159160
bool(*f)(AcknowledgedData&,uintptr_t) = (bool(*)(AcknowledgedData&,uintptr_t))func;
160161
getResponse().getAcknowledgedDataMsg(*r);
161162
if(!f || f(*r, data))
162163
return 0;
163164
break;
164165
}
165166
case AdvancedBurstData::MSG_ID: {
166-
AdvancedBurstData *r = (AdvancedBurstData*)response;
167+
AdvancedBurstData *r = static_cast<AdvancedBurstData*>(response);
167168
bool(*f)(AdvancedBurstData&,uintptr_t) = (bool(*)(AdvancedBurstData&,uintptr_t))func;
168169
getResponse().getAdvancedBurstDataMsg(*r);
169170
if(!f || f(*r, data))
170171
return 0;
171172
break;
172173
}
173174
case BroadcastData::MSG_ID: {
174-
BroadcastData *r = (BroadcastData*)response;
175+
BroadcastData *r = static_cast<BroadcastData*>(response);
175176
bool(*f)(BroadcastData&,uintptr_t) = (bool(*)(BroadcastData&,uintptr_t))func;
176177
getResponse().getBroadcastDataMsg(*r);
177178
if(!f || f(*r, data))
178179
return 0;
179180
break;
180181
}
181182
case BurstTransferData::MSG_ID: {
182-
BurstTransferData *r = (BurstTransferData*)response;
183+
BurstTransferData *r = static_cast<BurstTransferData*>(response);
183184
bool(*f)(BurstTransferData&,uintptr_t) = (bool(*)(BurstTransferData&,uintptr_t))func;
184185
getResponse().getBurstTransferDataMsg(*r);
185186
if(!f || f(*r, data))
186187
return 0;
187188
break;
188189
}
189190
case AdvancedBurstCapabilitiesConfiguration::MSG_ID: {
190-
AdvancedBurstCapabilitiesConfiguration *r = (AdvancedBurstCapabilitiesConfiguration*)response;
191+
AdvancedBurstCapabilitiesConfiguration *r = static_cast<AdvancedBurstCapabilitiesConfiguration*>(response);
191192
bool(*f)(AdvancedBurstCapabilitiesConfiguration&,uintptr_t) = (bool(*)(AdvancedBurstCapabilitiesConfiguration&,uintptr_t))func;
192193
getResponse().getAdvancedBurstDataMsg(*r);
193194
if(!f || f(*r, data))
194195
return 0;
195196
break;
196197
}
197198
case AntVersion::MSG_ID: {
198-
AntVersion *r = (AntVersion*)response;
199+
AntVersion *r = static_cast<AntVersion*>(response);
199200
bool(*f)(AntVersion&,uintptr_t) = (bool(*)(AntVersion&,uintptr_t))func;
200201
getResponse().getAntVersionMsg(*r);
201202
if(!f || f(*r, data))
202203
return 0;
203204
break;
204205
}
205206
case Capabilities::MSG_ID: {
206-
Capabilities *r = (Capabilities*)response;
207+
Capabilities *r = static_cast<Capabilities*>(response);
207208
bool(*f)(Capabilities&,uintptr_t) = (bool(*)(Capabilities&,uintptr_t))func;
208209
getResponse().getCapabilitiesMsg(*r);
209210
if(!f || f(*r, data))
210211
return 0;
211212
break;
212213
}
213214
case ChannelEventResponse::MSG_ID: {
214-
ChannelEventResponse *r = (ChannelEventResponse*)response;
215+
ChannelEventResponse *r = static_cast<ChannelEventResponse*>(response);
215216
bool(*f)(ChannelEventResponse&,uintptr_t) = (bool(*)(ChannelEventResponse&,uintptr_t))func;
216217
getResponse().getChannelEventResponseMsg(*r);
217218
if(!f || f(*r, data))
218219
return 0;
219220
break;
220221
}
221222
case ChannelIdResponse::MSG_ID: {
222-
ChannelIdResponse *r = (ChannelIdResponse*)response;
223+
ChannelIdResponse *r = static_cast<ChannelIdResponse*>(response);
223224
bool(*f)(ChannelIdResponse&,uintptr_t) = (bool(*)(ChannelIdResponse&,uintptr_t))func;
224225
getResponse().getChannelIdResponseMsg(*r);
225226
if(!f || f(*r, data))
226227
return 0;
227228
break;
228229
}
229230
case ChannelStatus::MSG_ID: {
230-
ChannelStatus *r = (ChannelStatus*)response;
231+
ChannelStatus *r = static_cast<ChannelStatus*>(response);
231232
bool(*f)(ChannelStatus&,uintptr_t) = (bool(*)(ChannelStatus&,uintptr_t))func;
232233
getResponse().getChannelStatusMsg(*r);
233234
if(!f || f(*r, data))
234235
return 0;
235236
break;
236237
}
237238
case EncryptionModeParameters::MSG_ID: {
238-
EncryptionModeParameters *r = (EncryptionModeParameters*)response;
239+
EncryptionModeParameters *r = static_cast<EncryptionModeParameters*>(response);
239240
bool(*f)(EncryptionModeParameters&,uintptr_t) = (bool(*)(EncryptionModeParameters&,uintptr_t))func;
240241
getResponse().getEncryptionModeParametersMsg(*r);
241242
if(!f || f(*r, data))
242243
return 0;
243244
break;
244245
}
245246
case EventFilter::MSG_ID: {
246-
EventFilter *r = (EventFilter*)response;
247+
EventFilter *r = static_cast<EventFilter*>(response);
247248
bool(*f)(EventFilter&,uintptr_t) = (bool(*)(EventFilter&,uintptr_t))func;
248249
getResponse().getEventFilterMsg(*r);
249250
if(!f || f(*r, data))
250251
return 0;
251252
break;
252253
}
253254
case SelectiveDataUpdateMaskSetting::MSG_ID: {
254-
SelectiveDataUpdateMaskSetting *r = (SelectiveDataUpdateMaskSetting*)response;
255+
SelectiveDataUpdateMaskSetting *r = static_cast<SelectiveDataUpdateMaskSetting*>(response);
255256
bool(*f)(SelectiveDataUpdateMaskSetting&,uintptr_t) = (bool(*)(SelectiveDataUpdateMaskSetting&,uintptr_t))func;
256257
getResponse().getSelectiveDataUpdateMaskSettingMsg(*r);
257258
if(!f || f(*r, data))
258259
return 0;
259260
break;
260261
}
261262
case StartUpMessage::MSG_ID: {
262-
StartUpMessage *r = (StartUpMessage*)response;
263+
StartUpMessage *r = static_cast<StartUpMessage*>(response);
263264
bool(*f)(StartUpMessage&,uintptr_t) = (bool(*)(StartUpMessage&,uintptr_t))func;
264265
getResponse().getStartUpMsg(*r);
265266
if(!f || f(*r, data))

‎src/BaseClasses/ANT_BaseAntWithCallbacks.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -221,23 +221,23 @@ class BaseAntWithCallbacks : virtual public BaseAnt {
221221
*/
222222
void loopBottom();
223223

224-
AntCallback<uint8_t> _onPacketError;
225-
AntCallback<AntResponse&> _onResponse;
226-
AntCallback<AntResponse&> _onOtherResponse;
227-
AntCallback<AcknowledgedData&> _onAcknowledgedData;
228-
AntCallback<AdvancedBurstData&> _onAdvancedBurstData;
229-
AntCallback<BroadcastData&> _onBroadcastData;
230-
AntCallback<BurstTransferData&> _onBurstTransferData;
231-
AntCallback<AdvancedBurstCapabilitiesConfiguration&> _onAdvancedBurstCapabilitiesConfiguration;
232-
AntCallback<AntVersion&> _onAntVersion;
233-
AntCallback<Capabilities&> _onCapabilities;
234-
AntCallback<ChannelEventResponse&> _onChannelEventResponse;
235-
AntCallback<ChannelIdResponse&> _onChannelIdResponse;
236-
AntCallback<ChannelStatus&> _onChannelStatus;
237-
AntCallback<EncryptionModeParameters&> _onEncryptionModeParameters;
238-
AntCallback<EventFilter&> _onEventFilter;
239-
AntCallback<SelectiveDataUpdateMaskSetting&> _onSelectiveDataUpdateMaskSetting;
240-
AntCallback<StartUpMessage&> _onStartUpMessage;
224+
AntCallback<uint8_t> _onPacketError = { .func = NULL };
225+
AntCallback<AntResponse&> _onResponse = { .func = NULL };
226+
AntCallback<AntResponse&> _onOtherResponse = { .func = NULL };
227+
AntCallback<AcknowledgedData&> _onAcknowledgedData = { .func = NULL };
228+
AntCallback<AdvancedBurstData&> _onAdvancedBurstData = { .func = NULL };
229+
AntCallback<BroadcastData&> _onBroadcastData = { .func = NULL };
230+
AntCallback<BurstTransferData&> _onBurstTransferData = { .func = NULL };
231+
AntCallback<AdvancedBurstCapabilitiesConfiguration&> _onAdvancedBurstCapabilitiesConfiguration = { .func = NULL };
232+
AntCallback<AntVersion&> _onAntVersion = { .func = NULL };
233+
AntCallback<Capabilities&> _onCapabilities = { .func = NULL };
234+
AntCallback<ChannelEventResponse&> _onChannelEventResponse = { .func = NULL };
235+
AntCallback<ChannelIdResponse&> _onChannelIdResponse = { .func = NULL };
236+
AntCallback<ChannelStatus&> _onChannelStatus = { .func = NULL };
237+
AntCallback<EncryptionModeParameters&> _onEncryptionModeParameters = { .func = NULL };
238+
AntCallback<EventFilter&> _onEventFilter = { .func = NULL };
239+
AntCallback<SelectiveDataUpdateMaskSetting&> _onSelectiveDataUpdateMaskSetting = { .func = NULL };
240+
AntCallback<StartUpMessage&> _onStartUpMessage = { .func = NULL };
241241
};
242242

243243
#endif // ANT_BASEANTWITHCALLBACKS_h

‎src/BaseClasses/ANT_BaseSpiAnt.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
template<class S, class I, class O>
66
BaseSpiAnt<S, I, O>::BaseSpiAnt() : BaseAnt() {
7-
_pos = 0;
8-
_checksumTotal = 0;
97
getResponse().setFrameData(_responseFrameData);
108

119
}
@@ -147,6 +145,7 @@ void BaseSpiAnt<S, I, O>::send(AntRequest &request) {
147145
}
148146

149147
template<class S, class I, class O>
148+
// cppcheck-suppress unusedFunction
150149
void BaseSpiAnt<S, I, O>::resetRadio() {
151150
setHostMsgReady(1);
152151
setHostSRdy(1);

‎src/BaseClasses/ANT_BaseSpiAnt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ class BaseSpiAnt : virtual public BaseAnt {
6868
private:
6969
void resetResponse();
7070
// current packet position for response. just a state variable for packet parsing and has no relevance for the response otherwise
71-
uint8_t _pos;
71+
uint8_t _pos = 0;
7272
// last byte read
7373
uint8_t b;
74-
uint8_t _checksumTotal;
74+
uint8_t _checksumTotal = 0;
7575
// buffer for incoming RX packets. holds only the msg specific frame data, starting after the msg id byte and prior to checksum
7676
uint8_t _responseFrameData[ANT_MAX_MSG_DATA_SIZE];
7777
};

‎src/MainClasses/ANT_ArduinoSerialAnt.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ArduinoSerialAnt::ArduinoSerialAnt() : BaseSerialAnt<Stream>() {
1212
#endif
1313
}
1414

15+
ArduinoSerialAnt::ArduinoSerialAnt(Stream &serial) : BaseSerialAnt<Stream>(), _serial(&serial) {}
16+
1517
void ArduinoSerialAnt::setSerial(Stream &serial) {
1618
_serial = &serial;
1719
}

‎src/MainClasses/ANT_ArduinoSerialAnt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class ArduinoSerialAnt : virtual public BaseSerialAnt<Stream> {
99
public:
1010
ArduinoSerialAnt();
11-
ArduinoSerialAnt(Stream &serial);
11+
explicit ArduinoSerialAnt(Stream &serial);
1212
/**
1313
* Specify the serial port. Only relevant for Arduinos that support multiple serial ports (e.g. Mega)
1414
*/
@@ -18,7 +18,7 @@ class ArduinoSerialAnt : virtual public BaseSerialAnt<Stream> {
1818
uint8_t read() override;
1919
void write(uint8_t* data, uint8_t len) override;
2020
uint32_t getMs() override;
21-
Stream* _serial;
21+
Stream* _serial = NULL;
2222
};
2323

2424
#endif // defined(ARDUINO) || defined(UNIT_TEST)

‎src/RX/ANT_AntResponse.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ void AntResponse::setChecksum(uint8_t checksum) {
3232
_checksum = checksum;
3333
}
3434

35+
// cppcheck-suppress unusedFunction
3536
uint8_t AntResponse::getPacketLength() {
3637
return _length - ANT_MSG_OVERHEAD_LENGTH;
3738
}

‎src/RX/ANT_AntResponse.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifndef ANT_ANTRESPONSE_h
22
#define ANT_ANTRESPONSE_h
33
#include <inttypes.h>
4+
#include <stddef.h>
45
#include <ANT_defines.h>
56

67
/**
@@ -136,13 +137,13 @@ class AntResponse {
136137
void setErrorCode(uint8_t errorCode);
137138
protected:
138139
// pointer to frameData
139-
uint8_t* _frameDataPtr;
140+
uint8_t* _frameDataPtr = NULL;
140141
private:
141142
void setCommon(AntResponse &target);
142-
uint8_t _msgId;
143-
uint8_t _length;
144-
uint8_t _checksum;
145-
bool _complete;
146-
uint8_t _errorCode;
143+
uint8_t _msgId = 0;
144+
uint8_t _length = 0;
145+
uint8_t _checksum = 0;
146+
bool _complete = false;
147+
uint8_t _errorCode = 0;
147148
};
148149
#endif // ANT_ANTRESPONSE_h

‎src/RX/ANT_AntRxDataResponse.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ uint8_t* AntRxDataResponse::getData() {
1414
return getFrameData();
1515
}
1616

17+
// cppcheck-suppress unusedFunction
1718
uint8_t AntRxDataResponse::getDataOffset() {
1819
return ANT_MSG_FRONT_OVERHEAD;
1920
}
2021

22+
// cppcheck-suppress unusedFunction
2123
uint16_t AntRxDataResponse::getDeviceNumber() {
2224
if (getFlagByte() & LIB_CONFIG_CHANNEL_ID) {
2325
return AntRxDataResponse::getData(EXTENDEDDATA_DEVICENUMBER_LSB_BYTE) | (AntRxDataResponse::getData(EXTENDEDDATA_DEVICENUMBER_MSB_BYTE) << EXTENDEDDATA_DEVICENUMBER_MSB_SHIFT);
@@ -26,6 +28,7 @@ uint16_t AntRxDataResponse::getDeviceNumber() {
2628
}
2729
}
2830

31+
// cppcheck-suppress unusedFunction
2932
uint8_t AntRxDataResponse::getDeviceType() {
3033
if (getFlagByte() & LIB_CONFIG_CHANNEL_ID) {
3134
return AntRxDataResponse::getData(EXTENDEDDATA_DEVICETYPE_BYTE);
@@ -34,6 +37,7 @@ uint8_t AntRxDataResponse::getDeviceType() {
3437
}
3538
}
3639

40+
// cppcheck-suppress unusedFunction
3741
uint8_t AntRxDataResponse::getTransmissionType() {
3842
if (getFlagByte() & LIB_CONFIG_CHANNEL_ID) {
3943
return AntRxDataResponse::getData(EXTENDEDDATA_TRANSMISSIONTYPE_BYTE);
@@ -42,6 +46,7 @@ uint8_t AntRxDataResponse::getTransmissionType() {
4246
}
4347
}
4448

49+
// cppcheck-suppress unusedFunction
4550
uint8_t AntRxDataResponse::getMeasurementType() {
4651
if (getFlagByte() & LIB_CONFIG_RSSI) {
4752
uint8_t offset = 0;
@@ -54,6 +59,7 @@ uint8_t AntRxDataResponse::getMeasurementType() {
5459
}
5560
}
5661

62+
// cppcheck-suppress unusedFunction
5763
int8_t AntRxDataResponse::getRSSIValue() {
5864
if (getFlagByte() & LIB_CONFIG_RSSI) {
5965
uint8_t offset = 0;
@@ -66,6 +72,7 @@ int8_t AntRxDataResponse::getRSSIValue() {
6672
}
6773
}
6874

75+
// cppcheck-suppress unusedFunction
6976
int8_t AntRxDataResponse::getThresholdConfigurationValue() {
7077
if (getFlagByte() & LIB_CONFIG_RSSI) {
7178
uint8_t offset = 0;
@@ -78,6 +85,7 @@ int8_t AntRxDataResponse::getThresholdConfigurationValue() {
7885
}
7986
}
8087

88+
// cppcheck-suppress unusedFunction
8189
uint16_t AntRxDataResponse::getRxTimestamp() {
8290
if (getFlagByte() & LIB_CONFIG_RX_TIMESTAMP) {
8391
uint8_t offset = 0;

‎src/RX/Data/ANT_AcknowledgedData.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ AcknowledgedData::AcknowledgedData() : AntRxDataResponse() {
66

77
}
88

9+
// cppcheck-suppress unusedFunction
910
uint8_t AcknowledgedData::getChannelNumber() {
1011
return AntRxDataResponse::getData(0);
1112
}

‎src/RX/Data/ANT_AcknowledgedData.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ class AcknowledgedData : public AntRxDataResponse {
1818
/**
1919
* Returns sepcified byte of data from payload
2020
*/
21-
uint8_t getData(uint8_t index);
22-
uint8_t* getData();
23-
uint8_t getDataLength();
24-
uint8_t getFlagByte();
21+
uint8_t getData(uint8_t index) override;
22+
uint8_t* getData() override;
23+
uint8_t getDataLength() override;
24+
uint8_t getFlagByte() override;
2525

2626
static const uint8_t MSG_ID = ACKNOWLEDGED_DATA;
2727
};

‎src/RX/Data/ANT_AdvancedBurstData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ uint8_t AdvancedBurstData::getChannelNumber() {
1010
return AntRxDataResponse::getData(0) & ADVANCED_BURST_DATA_CHANNEL_MASK;
1111
}
1212

13+
// cppcheck-suppress unusedFunction
1314
uint8_t AdvancedBurstData::getSequenceNumber() {
1415
return (AntRxDataResponse::getData(0) & ~ADVANCED_BURST_DATA_CHANNEL_MASK) >> ADVANCED_BURST_DATA_SEQUENCENUMBER_SHIFT;
1516
}
1617

17-
1818
uint8_t AdvancedBurstData::getData(uint8_t index) {
1919
// skip channel byte
2020
return AntRxDataResponse::getData(index + 1);

‎src/RX/Data/ANT_AdvancedBurstData.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ class AdvancedBurstData : public AntRxDataResponse {
1919
/**
2020
* Returns sepcified byte of data from payload
2121
*/
22-
uint8_t getData(uint8_t index);
23-
uint8_t getDataLength();
22+
uint8_t getData(uint8_t index) override;
23+
uint8_t getDataLength() override;
2424
/**
2525
* AdvancedBurstData does not support extended data
2626
* therefore we lock it out with this method
2727
*/
28-
uint8_t getFlagByte();
28+
uint8_t getFlagByte() override;
2929

3030
static const uint8_t MSG_ID = ADVANCED_BURST_DATA;
3131
};

‎src/RX/Data/ANT_BroadcastData.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
#include <ANT_private_defines.h>
44

5-
BroadcastData::BroadcastData() : AntRxDataResponse() {
6-
7-
}
5+
BroadcastData::BroadcastData() : AntRxDataResponse() {}
86

97
uint8_t BroadcastData::getChannelNumber() {
108
return AntRxDataResponse::getData(0);

0 commit comments

Comments
 (0)