Merge branch 'eclipse-zenoh:master' into master

eclipse-zenoh · Oct 13, 2023 · 1113a02 · 1113a02
2 parents fb4086c + dd8b943
commit 1113a02
Show file tree

Hide file tree

Showing 34 changed files with 596 additions and 306 deletions.
diff --git a/examples/arduino/z_get.ino b/examples/arduino/z_get.ino
@@ -16,6 +16,7 @@
 #include <WiFi.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_QUERY == 1
 // WiFi-specific parameters
 #define SSID "SSID"
 #define PASS "PASS"
@@ -118,3 +119,9 @@ void loop() {
         Serial.println("Unable to send query.");
     }
 }
+#else
+void setup() {
+    Serial.println("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERY but this example requires it.");
+}
+void loop() {}
+#endif
diff --git a/examples/arduino/z_queryable.ino b/examples/arduino/z_queryable.ino
@@ -16,6 +16,7 @@
 #include <WiFi.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_QUERYABLE == 1
 // WiFi-specific parameters
 #define SSID "SSID"
 #define PASS "PASS"
@@ -106,3 +107,10 @@ void setup() {
 }
 
 void loop() { delay(5000); }
+
+#else
+void setup() {
+    Serial.println("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERYABLE but this example requires it.");
+}
+void loop() {}
+#endif
diff --git a/examples/espidf/z_get.c b/examples/espidf/z_get.c
@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_QUERY == 1
 #define ESP_WIFI_SSID "SSID"
 #define ESP_WIFI_PASS "PASS"
 #define ESP_MAXIMUM_RETRY 5
@@ -172,3 +173,6 @@ void app_main() {
     z_close(z_move(s));
     printf("OK!\n");
 }
+#else
+void app_main() { printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERY but this example requires it.\n"); }
+#endif
diff --git a/examples/espidf/z_queryable.c b/examples/espidf/z_queryable.c
@@ -30,6 +30,7 @@
 #define ESP_MAXIMUM_RETRY 5
 #define WIFI_CONNECTED_BIT BIT0
 
+#if Z_FEATURE_QUERYABLE == 1
 static bool s_is_wifi_connected = false;
 static EventGroupHandle_t s_event_group_handler;
 static int s_retry_count = 0;
@@ -171,3 +172,8 @@ void app_main() {
     z_close(z_move(s));
     printf("OK!\n");
 }
+#else
+void app_main() {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERYABLE but this example requires it.\n");
+}
+#endif
diff --git a/examples/mbed/z_get.cpp b/examples/mbed/z_get.cpp
@@ -16,6 +16,7 @@
 #include <randLIB.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_QUERY == 1
 #define CLIENT_OR_PEER 0  // 0: Client mode; 1: Peer mode
 #if CLIENT_OR_PEER == 0
 #define MODE "client"
@@ -94,3 +95,9 @@ int main(int argc, char **argv) {
 
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERY but this example requires it\n");
+    return -1;
+}
+#endif
diff --git a/examples/mbed/z_queryable.cpp b/examples/mbed/z_queryable.cpp
@@ -16,6 +16,7 @@
 #include <randLIB.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_QUERYABLE == 1
 #define CLIENT_OR_PEER 0  // 0: Client mode; 1: Peer mode
 #if CLIENT_OR_PEER == 0
 #define MODE "client"
@@ -94,3 +95,9 @@ int main(int argc, char **argv) {
 
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERYABLE but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/unix/c11/z_get.c b/examples/unix/c11/z_get.c
@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_QUERY == 1
 void reply_dropper(void *ctx) {
     (void)(ctx);
     printf(">> Received query final notification\n");
@@ -129,3 +130,9 @@ int main(int argc, char **argv) {
 
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERY but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/unix/c11/z_queryable.c b/examples/unix/c11/z_queryable.c
@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_QUERYABLE == 1
 const char *keyexpr = "demo/example/zenoh-pico-queryable";
 const char *value = "Queryable from Pico!";
 
@@ -124,3 +125,9 @@ int main(int argc, char **argv) {
 
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERYABLE but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/unix/c99/z_get.c b/examples/unix/c99/z_get.c
@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_QUERY == 1
 void reply_dropper(void *ctx) {
     (void)(ctx);
     printf(">> Received query final notification\n");
@@ -129,3 +130,9 @@ int main(int argc, char **argv) {
 
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERY but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/unix/c99/z_queryable.c b/examples/unix/c99/z_queryable.c
@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_QUERYABLE == 1
 const char *keyexpr = "demo/example/zenoh-pico-queryable";
 const char *value = "Queryable from Pico!";
 
@@ -120,3 +121,9 @@ int main(int argc, char **argv) {
 
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERYABLE but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/windows/z_get.c b/examples/windows/z_get.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_QUERY == 1
 void reply_dropper(void *ctx) {
     (void)(ctx);
     printf(">> Received query final notification\n");
@@ -94,3 +95,9 @@ int main(int argc, char **argv) {
 
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERY but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/windows/z_queryable.c b/examples/windows/z_queryable.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_QUERYABLE == 1
 const char *keyexpr = "demo/example/zenoh-pico-queryable";
 const char *value = "Queryable from Pico!";
 
@@ -89,3 +90,9 @@ int main(int argc, char **argv) {
 
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERYABLE but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/zephyr/z_get.c b/examples/zephyr/z_get.c
@@ -17,6 +17,7 @@
 #include <unistd.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_QUERY == 1
 #define CLIENT_OR_PEER 0  // 0: Client mode; 1: Peer mode
 #if CLIENT_OR_PEER == 0
 #define MODE "client"
@@ -88,3 +89,9 @@ int main(int argc, char **argv) {
 
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERY but this example requires it.\n");
+    return -1;
+}
+#endif