Skip to content

Bridge getRouterVersion & Monitor compatibility mode #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eigen-value wants to merge 1 commit into
base: rpccall_thread_safety
Choose a base branch
from
Open

Bridge getRouterVersion & Monitor compatibility mode #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions src/bridge.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

#define RESET_METHOD "$/reset"
#define BIND_METHOD "$/register"
#define GET_VERSION_METHOD "$/version"

//#define BRIDGE_ERROR "$/bridgeLog"

#define UPDATE_THREAD_STACK_SIZE 500
Expand Down Expand Up @@ -157,6 +159,8 @@ class BridgeClass {

bool started = false;

MsgPack::str_t router_ver;

public:

explicit BridgeClass(HardwareSerial& serial) {
Expand Down Expand Up @@ -203,6 +207,10 @@ class BridgeClass {
return res;
}

bool getRouterVersion(MsgPack::str_t& version) {
return call(GET_VERSION_METHOD).result(version);
}

template<typename F>
bool provide(const MsgPack::str_t& name, F&& func) {
k_mutex_lock(&bridge_mutex, K_FOREVER);
Expand Down
14 changes: 11 additions & 3 deletions src/monitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class BridgeMonitor: public Stream {
RingBufferN<BufferSize> temp_buffer;
struct k_mutex monitor_mutex{};
bool _connected = false;
bool _compatibility_mode;

public:
explicit BridgeMonitor(BridgeClass& bridge): bridge(&bridge) {}
Expand All @@ -52,6 +53,8 @@ class BridgeMonitor: public Stream {
k_mutex_lock(&monitor_mutex, K_FOREVER);
bool out = false;
_connected = bridge->call(MON_CONNECTED_METHOD).result(out) && out;
MsgPack::str_t ver;
_compatibility_mode = !bridge->call(GET_VERSION_METHOD).result(ver);
k_mutex_unlock(&monitor_mutex);
return out;
}
Expand Down Expand Up @@ -114,10 +117,15 @@ class BridgeMonitor: public Stream {
send_buffer += static_cast<char>(buffer[i]);
}

size_t written;
const bool ret = bridge->call(MON_WRITE_METHOD, send_buffer).result(written);
size_t written = 0;

return ret? written : 0;
if (_compatibility_mode) {
bridge->call(MON_WRITE_METHOD, send_buffer).result(written);
} else {
bridge->notify(MON_WRITE_METHOD, send_buffer);
}

return written;
}

bool reset() {
Expand Down