Skip to content

Commit 8515368

Browse files
tekka007tekka007
committed
- static definitions
2 parents c207dc1 + f79abe9 commit 8515368

File tree

3 files changed

+45
-43
lines changed

3 files changed

+45
-43
lines changed

‎libraries/MySensors/core/MyTransport.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ void transportPresentNode() {
461461
#else
462462
present(NODE_SENSOR_ID, S_ARDUINO_NODE);
463463
#endif
464-
else
464+
#else
465465
if (_nc.nodeId != AUTO) {
466466
// Send signing preferences for this node to the GW
467467
signerPresentation(_msg, GATEWAY_ADDRESS);

‎libraries/MySensors/drivers/RF24/RF24.cpp

+22-22
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222

2323
#include "RF24.h"
2424

25-
static uint8_t MY_RF24_BASE_ADDR[MY_RF24_ADDR_WIDTH] = { MY_RF24_BASE_RADIO_ID };
26-
static uint8_t MY_RF24_NODE_ADDRESS = AUTO;
25+
LOCAL uint8_t MY_RF24_BASE_ADDR[MY_RF24_ADDR_WIDTH] = { MY_RF24_BASE_RADIO_ID };
26+
LOCAL uint8_t MY_RF24_NODE_ADDRESS = AUTO;
2727

28-
void RF24_csn(bool level) {
28+
LOCAL void RF24_csn(bool level) {
2929
digitalWrite(MY_RF24_CS_PIN, level);
3030
}
3131

32-
void RF24_ce(bool level) {
32+
LOCAL void RF24_ce(bool level) {
3333
digitalWrite(MY_RF24_CE_PIN, level);
3434
}
3535

36-
uint8_t RF24_spiMultiByteTransfer(uint8_t cmd, uint8_t* buf, uint8_t len, bool aReadMode) {
36+
LOCAL uint8_t RF24_spiMultiByteTransfer(uint8_t cmd, uint8_t* buf, uint8_t len, bool aReadMode) {
3737
uint8_t* current = buf;
3838
#if !defined(MY_SOFTSPI)
3939
_SPI.beginTransaction(SPISettings(MY_RF24_SPI_MAX_SPEED, MY_RF24_SPI_DATA_ORDER, MY_RF24_SPI_DATA_MODE));
@@ -57,43 +57,43 @@ uint8_t RF24_spiMultiByteTransfer(uint8_t cmd, uint8_t* buf, uint8_t len, bool a
5757
return status;
5858
}
5959

60-
uint8_t RF24_spiByteTransfer(uint8_t cmd) {
60+
LOCAL uint8_t RF24_spiByteTransfer(uint8_t cmd) {
6161
return RF24_spiMultiByteTransfer( cmd, NULL, 0, false);
6262
}
6363

64-
uint8_t RF24_RAW_readByteRegister(uint8_t cmd) {
64+
LOCAL uint8_t RF24_RAW_readByteRegister(uint8_t cmd) {
6565
uint8_t value = RF24_spiMultiByteTransfer( cmd, NULL, 1, true);
6666
RF24_DEBUG(PSTR("read register, reg=%d, value=%d\n"), cmd & (R_REGISTER ^ 0xFF), value);
6767
return value;
6868
}
6969

70-
uint8_t RF24_RAW_writeByteRegister(uint8_t cmd, uint8_t value) {
70+
LOCAL uint8_t RF24_RAW_writeByteRegister(uint8_t cmd, uint8_t value) {
7171
RF24_DEBUG(PSTR("write register, reg=%d, value=%d\n"), cmd & (W_REGISTER ^ 0xFF), value);
7272
return RF24_spiMultiByteTransfer( cmd , &value, 1, false);
7373
}
7474

75-
void RF24_flushRX(void) {
75+
LOCAL void RF24_flushRX(void) {
7676
RF24_DEBUG(PSTR("RF24_flushRX\n"));
7777
RF24_spiByteTransfer( FLUSH_RX );
7878
}
7979

80-
void RF24_flushTX(void) {
80+
LOCAL void RF24_flushTX(void) {
8181
RF24_DEBUG(PSTR("RF24_flushTX\n"));
8282
RF24_spiByteTransfer( FLUSH_TX );
8383
}
8484

85-
uint8_t RF24_getStatus(void) {
85+
LOCAL uint8_t RF24_getStatus(void) {
8686
return RF24_spiByteTransfer( NOP );
8787
}
8888

89-
void RF24_openWritingPipe(uint8_t recipient) {
89+
LOCAL void RF24_openWritingPipe(uint8_t recipient) {
9090
RF24_DEBUG(PSTR("open writing pipe, recipient=%d\n"), recipient);
9191
// only write LSB of RX0 and TX pipe
9292
RF24_writeByteRegister(RX_ADDR_P0, recipient);
9393
RF24_writeByteRegister(TX_ADDR, recipient);
9494
}
9595

96-
void RF24_startListening(void) {
96+
LOCAL void RF24_startListening(void) {
9797
RF24_DEBUG(PSTR("start listening\n"));
9898
// toggle PRX
9999
RF24_writeByteRegister(NRF_CONFIG, MY_RF24_CONFIGURATION | _BV(PWR_UP) | _BV(PRIM_RX) );
@@ -103,7 +103,7 @@ void RF24_startListening(void) {
103103
RF24_ce(HIGH);
104104
}
105105

106-
void RF24_stopListening(void) {
106+
LOCAL void RF24_stopListening(void) {
107107
RF24_DEBUG(PSTR("stop listening\n"));
108108
RF24_ce(LOW);
109109
// timing
@@ -113,13 +113,13 @@ void RF24_stopListening(void) {
113113
delayMicroseconds(100);
114114
}
115115

116-
void RF24_powerDown(void) {
116+
LOCAL void RF24_powerDown(void) {
117117
RF24_ce(LOW);
118118
RF24_writeByteRegister(NRF_CONFIG, 0x00);
119119
RF24_DEBUG(PSTR("power down\n"));
120120
}
121121

122-
bool RF24_sendMessage( uint8_t recipient, const void* buf, uint8_t len ) {
122+
LOCAL bool RF24_sendMessage( uint8_t recipient, const void* buf, uint8_t len ) {
123123
uint8_t status;
124124

125125
RF24_stopListening();
@@ -153,7 +153,7 @@ bool RF24_sendMessage( uint8_t recipient, const void* buf, uint8_t len ) {
153153
return (status & _BV(TX_DS));
154154
}
155155

156-
uint8_t RF24_getDynamicPayloadSize(void) {
156+
LOCAL uint8_t RF24_getDynamicPayloadSize(void) {
157157
uint8_t result = RF24_spiMultiByteTransfer(R_RX_PL_WID,NULL,1,true);
158158
// check if payload size invalid
159159
if(result > 32) {
@@ -165,7 +165,7 @@ uint8_t RF24_getDynamicPayloadSize(void) {
165165
}
166166

167167

168-
bool RF24_isDataAvailable(uint8_t* to) {
168+
LOCAL bool RF24_isDataAvailable(uint8_t* to) {
169169
uint8_t pipe_num = ( RF24_getStatus() >> RX_P_NO ) & 0b0111;
170170
#if defined(MY_DEBUG_VERBOSE_RF24)
171171
if(pipe_num <= 5)
@@ -179,7 +179,7 @@ bool RF24_isDataAvailable(uint8_t* to) {
179179
}
180180

181181

182-
uint8_t RF24_readMessage( void* buf) {
182+
LOCAL uint8_t RF24_readMessage( void* buf) {
183183
uint8_t len = RF24_getDynamicPayloadSize();
184184
RF24_DEBUG(PSTR("read message, len=%d\n"), len);
185185
RF24_spiMultiByteTransfer( R_RX_PAYLOAD , (uint8_t*)buf, len, true );
@@ -188,7 +188,7 @@ uint8_t RF24_readMessage( void* buf) {
188188
return len;
189189
}
190190

191-
void RF24_setNodeAddress(uint8_t address) {
191+
LOCAL void RF24_setNodeAddress(uint8_t address) {
192192
if(address!=AUTO){
193193
MY_RF24_NODE_ADDRESS = address;
194194
// enable node pipe
@@ -198,11 +198,11 @@ void RF24_setNodeAddress(uint8_t address) {
198198
}
199199
}
200200

201-
uint8_t RF24_getNodeID(void) {
201+
LOCAL uint8_t RF24_getNodeID(void) {
202202
return MY_RF24_NODE_ADDRESS;
203203
}
204204

205-
bool RF24_initialize(void) {
205+
LOCAL bool RF24_initialize(void) {
206206
// Initialize pins
207207
pinMode(MY_RF24_CE_PIN,OUTPUT);
208208
pinMode(MY_RF24_CS_PIN,OUTPUT);

‎libraries/MySensors/drivers/RF24/RF24.h

+22-20
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#ifndef __RF24_H__
2424
#define __RF24_H__
2525

26+
#define LOCAL static
27+
2628
// SPI settings
2729
#if !defined(MY_RF24_SPI_MAX_SPEED)
2830
// default 2Mhz - safe for nRF24L01+ clones
@@ -206,31 +208,31 @@
206208

207209
// functions
208210

209-
void RF24_csn(bool level);
210-
void RF24_ce(bool level);
211-
uint8_t RF24_spiMultiByteTransfer(uint8_t cmd, uint8_t* buf, uint8_t len, bool aReadMode);
212-
uint8_t RF24_spiByteTransfer(uint8_t cmd);
213-
uint8_t RF24_RAW_readByteRegister(uint8_t cmd);
214-
uint8_t RF24_RAW_writeByteRegister(uint8_t cmd, uint8_t value);
211+
LOCAL void RF24_csn(bool level);
212+
LOCAL void RF24_ce(bool level);
213+
LOCAL uint8_t RF24_spiMultiByteTransfer(uint8_t cmd, uint8_t* buf, uint8_t len, bool aReadMode);
214+
LOCAL uint8_t RF24_spiByteTransfer(uint8_t cmd);
215+
LOCAL uint8_t RF24_RAW_readByteRegister(uint8_t cmd);
216+
LOCAL uint8_t RF24_RAW_writeByteRegister(uint8_t cmd, uint8_t value);
215217

216218
#define RF24_readByteRegister(reg) RF24_RAW_readByteRegister( R_REGISTER | ( REGISTER_MASK & (reg) ) )
217219
#define RF24_writeByteRegister(reg, value) RF24_RAW_writeByteRegister( W_REGISTER | ( REGISTER_MASK & (reg) ), value )
218220
#define RF24_writeMultiByteRegister(reg, buf, len) RF24_spiMultiByteTransfer( W_REGISTER | ( REGISTER_MASK & (reg) ), (uint8_t*)buf, len, false )
219221

220-
void RF24_flushRX(void);
221-
void RF24_flushTX(void);
222-
uint8_t RF24_getStatus(void);
223-
void RF24_openWritingPipe(uint8_t recipient);
224-
void RF24_startListening(void);
225-
void RF24_stopListening(void);
226-
void RF24_powerDown(void);
227-
bool RF24_sendMessage(uint8_t recipient, const void* buf, uint8_t len);
228-
uint8_t RF24_getDynamicPayloadSize(void);
229-
bool RF24_isDataAvailable(uint8_t* to);
230-
uint8_t RF24_readMessage(void* buf);
231-
void RF24_setNodeAddress(uint8_t address);
232-
uint8_t RF24_getNodeID(void);
233-
bool RF24_initialize(void);
222+
LOCAL void RF24_flushRX(void);
223+
LOCAL void RF24_flushTX(void);
224+
LOCAL uint8_t RF24_getStatus(void);
225+
LOCAL void RF24_openWritingPipe(uint8_t recipient);
226+
LOCAL void RF24_startListening(void);
227+
LOCAL void RF24_stopListening(void);
228+
LOCAL void RF24_powerDown(void);
229+
LOCAL bool RF24_sendMessage(uint8_t recipient, const void* buf, uint8_t len);
230+
LOCAL uint8_t RF24_getDynamicPayloadSize(void);
231+
LOCAL bool RF24_isDataAvailable(uint8_t* to);
232+
LOCAL uint8_t RF24_readMessage(void* buf);
233+
LOCAL void RF24_setNodeAddress(uint8_t address);
234+
LOCAL uint8_t RF24_getNodeID(void);
235+
LOCAL bool RF24_initialize(void);
234236

235237
#endif // __RF24_H__
236238

0 commit comments

Comments
 (0)