Skip to content

Commit a165209

Browse files
authored
Merge pull request #236 from brijohn/fix-return-statements
Fix return statements
2 parents 4bd0913 + 8238a84 commit a165209

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

cores/nRF5/WInterrupts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ int attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
8686
break;
8787

8888
default:
89-
return;
89+
return 0;
9090
}
9191

9292
for (int ch = 0; ch < NUMBER_OF_GPIO_TE; ch++) {

cores/nRF5/main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,9 @@ int _write (int fd, const void *buf, size_t count)
114114

115115
if ( Serial )
116116
{
117-
Serial.write( (const uint8_t *) buf, count);
117+
return Serial.write( (const uint8_t *) buf, count);
118118
}
119+
return 0;
119120
}
120121

121122
}

libraries/Bluefruit52Lib/src/clients/BLEClientHidAdafruit.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ bool BLEClientHidAdafruit::begin(void)
8181
// set notify callback
8282
_kbd_boot_input.setNotifyCallback(kbd_client_notify_cb);
8383
_mse_boot_input.setNotifyCallback(mse_client_notify_cb);
84+
85+
return true;
8486
}
8587

8688
void BLEClientHidAdafruit::setKeyboardReportCallback(kbd_callback_t fp)
@@ -140,12 +142,12 @@ bool BLEClientHidAdafruit::keyboardPresent(void)
140142

141143
bool BLEClientHidAdafruit::enableKeyboard(void)
142144
{
143-
_kbd_boot_input.enableNotify();
145+
return _kbd_boot_input.enableNotify();
144146
}
145147

146148
bool BLEClientHidAdafruit::disableKeyboard(void)
147149
{
148-
_kbd_boot_input.disableNotify();
150+
return _kbd_boot_input.disableNotify();
149151
}
150152

151153
void BLEClientHidAdafruit::_handle_kbd_input(uint8_t* data, uint16_t len)
@@ -171,12 +173,12 @@ bool BLEClientHidAdafruit::mousePresent(void)
171173

172174
bool BLEClientHidAdafruit::enableMouse(void)
173175
{
174-
_mse_boot_input.enableNotify();
176+
return _mse_boot_input.enableNotify();
175177
}
176178

177179
bool BLEClientHidAdafruit::disableMouse(void)
178180
{
179-
_mse_boot_input.disableNotify();
181+
return _mse_boot_input.disableNotify();
180182
}
181183

182184
void BLEClientHidAdafruit::_handle_mse_input(uint8_t* data, uint16_t len)

libraries/Bluefruit52Lib/src/services/EddyStone.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ EddyStoneUrl::EddyStoneUrl(int8_t rssiAt0m, const char* url)
8181
_url = url;
8282
}
8383

84-
bool EddyStoneUrl::setUrl(const char* url)
84+
void EddyStoneUrl::setUrl(const char* url)
8585
{
8686
_url = url;
8787
}

libraries/Bluefruit52Lib/src/services/EddyStone.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class EddyStoneUrl
5959
EddyStoneUrl(void);
6060
EddyStoneUrl(int8_t rssiAt0m, const char* url = NULL);
6161

62-
bool setUrl(const char* url);
62+
void setUrl(const char* url);
6363
void setRssi(int8_t rssiAt0m);
6464

6565
bool start(void);

0 commit comments

Comments
 (0)