Skip to content

Commit 7932a81

Browse files
committed
Change all Bridge.call in library
1 parent c966151 commit 7932a81

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void setup() {
4141

4242
void loop() {
4343
float res;
44-
if (!Bridge.call("multiply", res, 1.0, 2.0)) {
44+
if (!Bridge.call("multiply", 1.0, 2.0).result(res)) {
4545
Serial.println("Error calling method: multiply");
4646
Serial.println(Bridge.get_error_code());
4747
Serial.println(Bridge.get_error_message());

examples/simple_bridge/simple_bridge.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void setup() {
4747

4848
void loop() {
4949
float res;
50-
if (!Bridge.call("multiply", res, 1.0, 2.0)) {
50+
if (!Bridge.call("multiply", 1.0, 2.0).result(res)) {
5151
Serial.println("Error calling method: multiply");
5252
Serial.println(Bridge.get_error_code());
5353
Serial.println(Bridge.get_error_message());

src/bridge.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class BridgeClass {
110110
UPDATE_THREAD_PRIORITY, 0, K_NO_WAIT);
111111

112112
bool res;
113-
call(RESET_METHOD, res);
113+
call(RESET_METHOD).result(res);
114114
if (res) {
115115
started = true;
116116
}
@@ -120,7 +120,7 @@ class BridgeClass {
120120
template<typename F>
121121
bool provide(const MsgPack::str_t& name, F&& func) {
122122
bool res;
123-
if (!call(BIND_METHOD, res, name)) {
123+
if (!call(BIND_METHOD, name).result(res)) {
124124
return false;
125125
}
126126
return server->bind(name, func);
@@ -129,7 +129,7 @@ class BridgeClass {
129129
template<typename F>
130130
bool provide_safe(const MsgPack::str_t& name, F&& func) {
131131
bool res;
132-
if (!call(BIND_METHOD, res, name)) {
132+
if (!call(BIND_METHOD, name).result(res)) {
133133
return false;
134134
}
135135

src/monitor.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class BridgeMonitor: public Stream {
4444
if (!bridge_started) {
4545
bridge_started = bridge->begin();
4646
}
47-
return bridge_started && bridge->call(MON_CONNECTED_METHOD, is_connected);
47+
return bridge_started && bridge->call(MON_CONNECTED_METHOD).result(is_connected);
4848
}
4949

5050
explicit operator bool() const {
@@ -99,7 +99,7 @@ class BridgeMonitor: public Stream {
9999
}
100100

101101
size_t written;
102-
const bool ret = bridge->call(MON_WRITE_METHOD, written, send_buffer);
102+
const bool ret = bridge->call(MON_WRITE_METHOD, send_buffer).result(written);
103103
if (ret) {
104104
return written;
105105
}
@@ -109,7 +109,7 @@ class BridgeMonitor: public Stream {
109109

110110
bool reset() {
111111
bool res;
112-
bool ok = bridge->call(MON_RESET_METHOD, res);
112+
bool ok = bridge->call(MON_RESET_METHOD).result(res);
113113
if (ok && res) {
114114
is_connected = false;
115115
}
@@ -124,7 +124,7 @@ class BridgeMonitor: public Stream {
124124
k_mutex_lock(&monitor_mutex, K_FOREVER);
125125

126126
MsgPack::arr_t<uint8_t> message;
127-
bool ret = bridge->call(MON_READ_METHOD, message, size);
127+
bool ret = bridge->call(MON_READ_METHOD, size).result(message);
128128

129129
if (ret) {
130130
for (size_t i = 0; i < message.size(); ++i) {

src/tcp_client.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class BridgeTCPClient : public Client {
6161

6262
k_mutex_lock(&client_mutex, K_FOREVER);
6363

64-
const bool resp = bridge->call(TCP_CONNECT_METHOD, connection_id, hostname, port);
64+
const bool resp = bridge->call(TCP_CONNECT_METHOD, hostname, port).result(connection_id);
6565

6666
if (!resp) {
6767
_connected = false;
@@ -84,7 +84,7 @@ class BridgeTCPClient : public Client {
8484

8585
k_mutex_lock(&client_mutex, K_FOREVER);
8686

87-
const bool resp = bridge->call(TCP_CONNECT_SSL_METHOD, connection_id, hostname, port, ca_cert_str);
87+
const bool resp = bridge->call(TCP_CONNECT_SSL_METHOD, hostname, port, ca_cert_str).result(connection_id);
8888

8989
if (!resp) {
9090
_connected = false;
@@ -116,7 +116,7 @@ class BridgeTCPClient : public Client {
116116
}
117117

118118
size_t written;
119-
const bool ret = bridge->call(TCP_WRITE_METHOD, written, connection_id, payload);
119+
const bool ret = bridge->call(TCP_WRITE_METHOD, connection_id, payload).result(written);
120120
if (ret) {
121121
return written;
122122
}
@@ -170,7 +170,7 @@ class BridgeTCPClient : public Client {
170170
void stop() override {
171171
k_mutex_lock(&client_mutex, K_FOREVER);
172172
String msg;
173-
const bool resp = bridge->call(TCP_CLOSE_METHOD, msg, connection_id);
173+
const bool resp = bridge->call(TCP_CLOSE_METHOD, connection_id).result(msg);
174174
if (resp) {
175175
_connected = false;
176176
}
@@ -198,7 +198,7 @@ class BridgeTCPClient : public Client {
198198
k_mutex_lock(&client_mutex, K_FOREVER);
199199

200200
MsgPack::arr_t<uint8_t> message;
201-
const bool ret = bridge->call(TCP_READ_METHOD, message, connection_id, size);
201+
const bool ret = bridge->call(TCP_READ_METHOD, connection_id, size).result(message);
202202

203203
if (ret) {
204204
for (size_t i = 0; i < message.size(); ++i) {

src/tcp_server.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class BridgeTCPServer final: public Server {
5252
k_mutex_lock(&server_mutex, K_FOREVER);
5353

5454
String hostname = _addr.toString();
55-
_listening = bridge->call(TCP_LISTEN_METHOD, listener_id, hostname, _port);
55+
_listening = bridge->call(TCP_LISTEN_METHOD, hostname, _port).result(listener_id);
5656

5757
k_mutex_unlock(&server_mutex);
5858

@@ -70,7 +70,7 @@ class BridgeTCPServer final: public Server {
7070

7171
k_mutex_lock(&server_mutex, K_FOREVER);
7272

73-
const bool ret = bridge->call(TCP_ACCEPT_METHOD, connection_id, listener_id);
73+
const bool ret = bridge->call(TCP_ACCEPT_METHOD, listener_id).result(connection_id);
7474

7575
k_mutex_unlock(&server_mutex);
7676

@@ -104,7 +104,7 @@ class BridgeTCPServer final: public Server {
104104
k_mutex_lock(&server_mutex, K_FOREVER);
105105

106106
String msg;
107-
const bool ret = bridge->call(TCP_CLOSE_LISTENER_METHOD, msg, listener_id);
107+
const bool ret = bridge->call(TCP_CLOSE_LISTENER_METHOD, listener_id).result(msg);
108108

109109
if (ret) {
110110
_listening = false;

0 commit comments

Comments
 (0)