Skip to content

Commit f179f14

Browse files
committed
mod: minor bridge. monitor._read as void
fix: monitor._read mux unlock
1 parent 49d5a77 commit f179f14

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

src/bridge.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class BridgeClass {
4646

4747
public:
4848

49-
BridgeClass(HardwareSerial& serial) {
49+
explicit BridgeClass(HardwareSerial& serial) {
5050
serial_ptr = &serial;
5151
}
5252

@@ -234,7 +234,7 @@ class BridgeClassUpdater {
234234

235235
BridgeClass Bridge(Serial1);
236236

237-
void updateEntryPoint(void *, void *, void *){
237+
inline void updateEntryPoint(void *, void *, void *){
238238
while (true) {
239239
if (Bridge) {
240240
Bridge.update();
@@ -247,7 +247,7 @@ static void safeUpdate(){
247247
BridgeClassUpdater::safeUpdate(&Bridge);
248248
}
249249

250-
void __loopHook(){
250+
inline void __loopHook(){
251251
k_msleep(1);
252252
safeUpdate();
253253
}

src/monitor.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class BridgeMonitor: public Stream {
3434
bool is_connected = false;
3535

3636
public:
37-
BridgeMonitor(BridgeClass& bridge): bridge(&bridge) {}
37+
explicit BridgeMonitor(BridgeClass& bridge): bridge(&bridge) {}
3838

3939
using Print::write;
4040

@@ -46,7 +46,7 @@ class BridgeMonitor: public Stream {
4646
return bridge->call(MON_CONNECTED_METHOD, is_connected);
4747
}
4848

49-
operator bool() const {
49+
explicit operator bool() const {
5050
return is_connected;
5151
}
5252

@@ -119,9 +119,9 @@ class BridgeMonitor: public Stream {
119119
return (ok && res);
120120
}
121121

122-
int _read(size_t size) {
122+
void _read(size_t size) {
123123

124-
if (size == 0) return 0;
124+
if (size == 0) return;
125125

126126
MsgPack::arr_t<uint8_t> message;
127127
bool ret = bridge->call(MON_READ_METHOD, message, size);
@@ -131,15 +131,13 @@ class BridgeMonitor: public Stream {
131131
for (size_t i = 0; i < message.size(); ++i) {
132132
temp_buffer.store_char(static_cast<char>(message[i]));
133133
}
134-
return message.size();
135134
}
136135

137136
// if (bridge.lastError.code > NO_ERR) {
138137
// is_connected = false;
139138
// }
140-
k_mutex_unlock(&monitor_mutex);
141-
return 0;
142139

140+
k_mutex_unlock(&monitor_mutex);
143141
}
144142

145143

0 commit comments

Comments
 (0)