fix: update freertos examples with modular features

eclipse-zenoh · Oct 31, 2023 · 9e86cbb · 9e86cbb
1 parent d0828e9
commit 9e86cbb
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 1 deletion.
diff --git a/examples/freertos_plus_tcp/CMakeLists.txt b/examples/freertos_plus_tcp/CMakeLists.txt
@@ -64,6 +64,10 @@ target_link_libraries(zenohpico
 target_compile_definitions(zenohpico
   PUBLIC
     Z_FEATURE_MULTI_THREAD=1
+    Z_FEATURE_PUBLICATION=1
+    Z_FEATURE_SUBSCRIPTION=1
+    Z_FEATURE_QUERY=1
+    Z_FEATURE_QUERYABLE=1
     Z_FEATURE_LINK_TCP=1
     Z_FEATURE_SCOUTING_UDP=1
     Z_FEATURE_LINK_UDP_UNICAST=1

diff --git a/examples/freertos_plus_tcp/z_get.c b/examples/freertos_plus_tcp/z_get.c
@@ -16,6 +16,7 @@
 
 #include "FreeRTOS.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"
@@ -92,4 +93,10 @@ void app_main() {
     zp_stop_lease_task(z_loan(s));
 
     z_close(z_move(s));
-}
+}
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERY but this example requires it.\n");
+    return -2;
+}
+#endif
diff --git a/examples/freertos_plus_tcp/z_pub.c b/examples/freertos_plus_tcp/z_pub.c
@@ -16,6 +16,7 @@
 
 #include "FreeRTOS.h"
 
+#if Z_FEATURE_PUBLICATION == 1
 #define CLIENT_OR_PEER 0  // 0: Client mode; 1: Peer mode
 #if CLIENT_OR_PEER == 0
 #define MODE "client"
@@ -104,3 +105,9 @@ void app_main() {
 
     z_close(z_move(s));
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -2;
+}
+#endif
diff --git a/examples/freertos_plus_tcp/z_pub_st.c b/examples/freertos_plus_tcp/z_pub_st.c
@@ -16,6 +16,7 @@
 
 #include "FreeRTOS.h"
 
+#if Z_FEATURE_PUBLICATION == 1
 #define CLIENT_OR_PEER 0  // 0: Client mode; 1: Peer mode
 #if CLIENT_OR_PEER == 0
 #define MODE "client"
@@ -72,3 +73,9 @@ void app_main() {
 
     z_close(z_move(s));
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -2;
+}
+#endif
diff --git a/examples/freertos_plus_tcp/z_pull.c b/examples/freertos_plus_tcp/z_pull.c
@@ -14,6 +14,7 @@
 
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_PUBLICATION == 1
 #define CLIENT_OR_PEER 0  // 0: Client mode; 1: Peer mode
 #if CLIENT_OR_PEER == 0
 #define MODE "client"
@@ -77,3 +78,9 @@ void app_main() {
 
     z_close(z_move(s));
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -2;
+}
+#endif
diff --git a/examples/freertos_plus_tcp/z_queryable.c b/examples/freertos_plus_tcp/z_queryable.c
@@ -14,6 +14,7 @@
 
 #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"
@@ -89,3 +90,9 @@ void app_main() {
 
     z_close(z_move(s));
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_QUERYABLE but this example requires it.\n");
+    return -2;
+}
+#endif
diff --git a/examples/freertos_plus_tcp/z_sub.c b/examples/freertos_plus_tcp/z_sub.c
@@ -75,3 +75,9 @@ void app_main() {
 
     z_close(z_move(s));
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION but this example requires it.\n");
+    return -2;
+}
+#endif
diff --git a/examples/freertos_plus_tcp/z_sub_st.c b/examples/freertos_plus_tcp/z_sub_st.c
@@ -67,3 +67,9 @@ void app_main() {
 
     z_close(z_move(s));
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION but this example requires it.\n");
+    return -2;
+}
+#endif