mod: naming convention

Author: eigen-value

desired.ino

@@ -11,9 +11,20 @@ void setup() {
     // ERRORE ignorato
     Bridge.provide("greet", greet);     // -> rpc.call("$/register", res, "greet");
 
+    Bridge.provide("get_index", get_index);
     // metodi forniti con provide possono ricevere anche notifiche (semplicemente il risultato non viene restituito)
+
+    Bridge.provide_safe("get_index", get_index);
+}
+
+int index;
+
+int get_index() {
+    return index;
 }
 
+
+
 bool set_led(bool state) {
     digitalWrite(LED_BUILTIN, state);
     return state;
@@ -28,6 +39,9 @@ String greet() {
 }
 
 void loop() {
+    
+    index++;
+
     float res;
     if (!Bridge.call("multiply", res, 1.0, 2.0)) {
         // ERRORE!
@@ -36,5 +50,5 @@ void loop() {
     Bridge.notify("signal", 200);
 
     // update viene chiamato automaticamente in un thread separato
-    // Bridge.update(); -> server.run();
+    Bridge.update(); // -> server->run();
 }

examples/simple_bridge/simple_bridge.ino

@@ -1,6 +1,18 @@
 #include <Arduino_BridgeImola.h>
 
-Bridge bridge(Serial1);
+
+bool set_led(bool state) {
+    digitalWrite(LED_BUILTIN, state);
+    return state;
+}
+
+int add(int a, int b) {
+    return a + b;
+}
+
+String greet() {
+    return String("Hello Friend");
+}
 
 void setup() {
     Serial.begin(115200);
@@ -11,48 +23,35 @@ void setup() {
 
     pinMode(LED_BUILTIN, OUTPUT);
 
-    if (!bridge.begin()) {
-        Serial.println("Error initializing bridge");
+    if (!Bridge.begin()) {
+        Serial.println("Error initializing Bridge");
         while(1);
     } else {
         Serial.println("Bridge initialized successfully");
     }
 
-    if (!bridge.provide("set_led", set_led)) {
+    if (!Bridge.provide("set_led", set_led)) {
         Serial.println("Error providing method: set_led");
     } else {
         Serial.println("Registered method: set_led");
     }
 
-    bridge.provide("add", add);
+    Bridge.provide("add", add);
 
-    bridge.provide("greet", greet);
+    Bridge.provide("greet", greet);
 
 }
 
-bool set_led(bool state) {
-    digitalWrite(LED_BUILTIN, state);
-    return state;
-}
-
-int add(int a, int b) {
-    return a + b;
-}
-
-String greet() {
-    return String("Hello Friend");
-}
-
 void loop() {
     float res;
-    if (!bridge.call("multiply", res, 1.0, 2.0)) {
+    if (!Bridge.call("multiply", res, 1.0, 2.0)) {
         Serial.println("Error calling method: multiply");
-        Serial.println(bridge.get_error_code());
-        Serial.println(bridge.get_error_message());
+        Serial.println(Bridge.get_error_code());
+        Serial.println(Bridge.get_error_message());
         delay(1000);
     };
 
-    bridge.notify("signal", 200);
+    Bridge.notify("signal", 200);
 
-    bridge.update();
+    //Bridge.update();
 }

examples/zephyr_thread/zephyr_thread.ino

@@ -2,7 +2,7 @@
 
 
 void setup() {
-    BRIDGE.begin();
+    Bridge.begin();
 }
 
 void loop() {

src/bridge.h

@@ -13,7 +13,7 @@
 #include <Arduino_RPClite.h>
 
 
-class Bridge {
+class BridgeClass {
 
     RPCClient* client = nullptr;
     RPCServer* server = nullptr;
@@ -23,9 +23,9 @@ class Bridge {
     struct k_mutex write_mutex;
 
 public:
-    Bridge(ITransport& t) : transport(&t) {}
+    BridgeClass(ITransport& t) : transport(&t) {}
 
-    Bridge(Stream& stream) {
+    BridgeClass(Stream& stream) {
         transport = new SerialTransport(stream);
     }
 
@@ -63,17 +63,19 @@ class Bridge {
 
     void update() {
 
-        k_msleep(1);
         // Lock read mutex
-        k_mutex_lock(&read_mutex, K_FOREVER);
-        if (!server->get_rpc()) {
+        while(1){
+            k_mutex_lock(&read_mutex, K_FOREVER);
+            if (server->get_rpc()) {
+                k_mutex_unlock(&read_mutex);
+                break;
+            }
             k_mutex_unlock(&read_mutex);
-            return;
+            k_msleep(1);
         }
-        k_mutex_unlock(&read_mutex);
 
         server->process_request();
-
+        
         // Lock write mutex
         k_mutex_lock(&write_mutex, K_FOREVER);
         server->send_response();
@@ -122,46 +124,48 @@ class Bridge {
     void update_safe() {
 
         // Lock read mutex
-        k_msleep(1);
-        k_mutex_lock(&read_mutex, K_FOREVER);
-        if (!server->get_rpc()) {
+        while(1){
+            k_mutex_lock(&read_mutex, K_FOREVER);
+            if (server->get_rpc()) {
+                k_mutex_unlock(&read_mutex);
+                break;
+            }
             k_mutex_unlock(&read_mutex);
-            return;
+            k_msleep(1);
         }
-        k_mutex_unlock(&read_mutex);
 
         server->process_request("__safe__");
-
+        
         // Lock write mutex
         k_mutex_lock(&write_mutex, K_FOREVER);
         server->send_response();
         k_mutex_unlock(&write_mutex);
 
     }
 
-    friend class BridgeUpdater;
+    friend class BridgeClassUpdater;
 
 };
 
-class BridgeUpdater {
+class BridgeClassUpdater {
 public:
-    static void safeUpdate(Bridge& bridge) {
+    static void safeUpdate(BridgeClass& bridge) {
         bridge.update_safe();  // access private method
     }
 
 private:
-    BridgeUpdater() = delete; // prevents instantiation
+    BridgeClassUpdater() = delete; // prevents instantiation
 };
 
-Bridge BRIDGE(Serial1);
+BridgeClass Bridge(Serial1);
 
 static void safeUpdate(){
-    BridgeUpdater::safeUpdate(BRIDGE);
+    BridgeClassUpdater::safeUpdate(Bridge);
 }
 
 
 void updateEntryPoint(void *, void *, void *){
-    BRIDGE.update();
+    Bridge.update();
 }
 
 static k_tid_t upd_tid;