Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/monitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ class BridgeMonitor: public Stream {
using Print::write;

bool begin(unsigned long _legacy_baud=0, uint16_t _legacy_config=0) {
// unused parameters for compatibility with Stream
(void)_legacy_baud;
(void)_legacy_config;

k_mutex_init(&monitor_mutex);

if (is_connected()) return true;
Expand Down Expand Up @@ -68,19 +72,19 @@ class BridgeMonitor: public Stream {
}

int read() override {
uint8_t c;
uint8_t c = 0;
read(&c, 1);
return c;
}

int read(uint8_t* buffer, size_t size) {
k_mutex_lock(&monitor_mutex, K_FOREVER);
int i = 0;
size_t i = 0;
while (temp_buffer.available() && i < size) {
buffer[i++] = temp_buffer.read_char();
}
k_mutex_unlock(&monitor_mutex);
return i;
return (int)i;
}

int available() override {
Expand Down Expand Up @@ -164,4 +168,4 @@ extern BridgeClass Bridge;

inline BridgeMonitor<> Monitor(Bridge);

#endif // BRIDGE_MONITOR_H
#endif // BRIDGE_MONITOR_H
4 changes: 2 additions & 2 deletions src/tcp_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ class BridgeTCPClient : public Client {

int read(uint8_t *buf, size_t size) override {
k_mutex_lock(&client_mutex, K_FOREVER);
int i = 0;
size_t i = 0;
while (temp_buffer.available() && i < size) {
buf[i++] = temp_buffer.read_char();
}
k_mutex_unlock(&client_mutex);
return i;
return (int)i;
}

int peek() override {
Expand Down