Skip to content

Commit 66e962a

Browse files
Pass XBeeAddress64 objects as const references where possible
Previously, they were passed as normal references. Adding const does not change the code in any way, but allows passing temporary objects as well, so you can do: req.setAddress64(XBeeAddress64(0, 0xffff)); Or even just: req.setAddress64(0x0013A20012345678);
1 parent dc4cc7b commit 66e962a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

XBee.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,14 +1059,14 @@ ZBTxRequest::ZBTxRequest() : PayloadRequest(ZB_TX_REQUEST, DEFAULT_FRAME_ID, NUL
10591059
_option = ZB_TX_UNICAST;
10601060
}
10611061

1062-
ZBTxRequest::ZBTxRequest(XBeeAddress64 &addr64, uint16_t addr16, uint8_t broadcastRadius, uint8_t option, uint8_t *data, uint8_t dataLength, uint8_t frameId): PayloadRequest(ZB_TX_REQUEST, frameId, data, dataLength) {
1062+
ZBTxRequest::ZBTxRequest(const XBeeAddress64 &addr64, uint16_t addr16, uint8_t broadcastRadius, uint8_t option, uint8_t *data, uint8_t dataLength, uint8_t frameId): PayloadRequest(ZB_TX_REQUEST, frameId, data, dataLength) {
10631063
_addr64 = addr64;
10641064
_addr16 = addr16;
10651065
_broadcastRadius = broadcastRadius;
10661066
_option = option;
10671067
}
10681068

1069-
ZBTxRequest::ZBTxRequest(XBeeAddress64 &addr64, uint8_t *data, uint8_t dataLength): PayloadRequest(ZB_TX_REQUEST, DEFAULT_FRAME_ID, data, dataLength) {
1069+
ZBTxRequest::ZBTxRequest(const XBeeAddress64 &addr64, uint8_t *data, uint8_t dataLength): PayloadRequest(ZB_TX_REQUEST, DEFAULT_FRAME_ID, data, dataLength) {
10701070
_addr64 = addr64;
10711071
_addr16 = ZB_BROADCAST_ADDRESS;
10721072
_broadcastRadius = ZB_BROADCAST_RADIUS_MAX_HOPS;
@@ -1123,7 +1123,7 @@ uint8_t ZBTxRequest::getOption() {
11231123
return _option;
11241124
}
11251125

1126-
void ZBTxRequest::setAddress64(XBeeAddress64& addr64) {
1126+
void ZBTxRequest::setAddress64(const XBeeAddress64& addr64) {
11271127
_addr64 = addr64;
11281128
}
11291129

XBee.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,8 +1188,8 @@ class ZBTxRequest : public PayloadRequest {
11881188
/**
11891189
* Creates a unicast ZBTxRequest with the ACK option and DEFAULT_FRAME_ID
11901190
*/
1191-
ZBTxRequest(XBeeAddress64 &addr64, uint8_t *payload, uint8_t payloadLength);
1192-
ZBTxRequest(XBeeAddress64 &addr64, uint16_t addr16, uint8_t broadcastRadius, uint8_t option, uint8_t *payload, uint8_t payloadLength, uint8_t frameId);
1191+
ZBTxRequest(const XBeeAddress64 &addr64, uint8_t *payload, uint8_t payloadLength);
1192+
ZBTxRequest(const XBeeAddress64 &addr64, uint16_t addr16, uint8_t broadcastRadius, uint8_t option, uint8_t *payload, uint8_t payloadLength, uint8_t frameId);
11931193
/**
11941194
* Creates a default instance of this class. At a minimum you must specify
11951195
* a payload, payload length and a 64-bit destination address before sending
@@ -1200,7 +1200,7 @@ class ZBTxRequest : public PayloadRequest {
12001200
uint16_t getAddress16();
12011201
uint8_t getBroadcastRadius();
12021202
uint8_t getOption();
1203-
void setAddress64(XBeeAddress64& addr64);
1203+
void setAddress64(const XBeeAddress64& addr64);
12041204
void setAddress16(uint16_t addr16);
12051205
void setBroadcastRadius(uint8_t broadcastRadius);
12061206
void setOption(uint8_t option);

0 commit comments

Comments
 (0)