examples/wolfmqtt_snclient: add example from wolfmqtt pkg

RIOT-OS · HendrikVE · Jan 10, 2022 · Jan 10, 2022 · Jan 18, 2022 · Jan 18, 2022
commit 5e2b332bd1cdf190612f7b5d9515e66bf0f1cfe6
diff --git a/examples/wolfmqtt_snclient/Makefile b/examples/wolfmqtt_snclient/Makefile
@@ -0,0 +1,51 @@
+# name of your application
+APPLICATION = wolfmqtt_snclient
+
+# If no BOARD is found in the environment, use this default:
+BOARD ?= native
+
+# This has to be the absolute path to the RIOT base directory:
+RIOTBASE ?= $(CURDIR)/../..
+
+# Comment this out to disable code in RIOT that does safety checking
+# which is not needed in a production environment but helps in the
+# development process:
+DEVELHELP ?= 1
+
+# Change this to 0 show compiler invocation lines by default:
+QUIET ?= 1
+
+WIFI_SSID ?= "WIFI_SSID"
+WIFI_PASS ?= "WIFI_PASS"
+
+# This firmware is implemented inside the package examples
+USEMODULE += wolfmqtt_examples_snclient
+
+LWIP_IPV4 ?= 1
+LWIP_IPV6 ?= 1
+
+USEMODULE += lwip_netdev
+
+ifneq (0,$(LWIP_IPV4))
+  USEMODULE += ipv4_addr
+  USEMODULE += lwip_arp
+  USEMODULE += lwip_ipv4
+  USEMODULE += lwip_dhcp_auto
+  CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
+endif
+
+ifneq (0,$(LWIP_IPV6))
+  USEMODULE += ipv6_addr
+  USEMODULE += lwip_ipv6
+  USEMODULE += lwip_ipv6_autoconfig
+endif
+
+USEMODULE += auto_init_sock_dns
+
+include $(RIOTBASE)/Makefile.include
+
+# needs to be put after "include $(RIOTBASE)/Makefile.include"
+ifneq (,$(filter arch_esp,$(FEATURES_USED)))
+  CFLAGS += -DESP_WIFI_SSID=\"$(WIFI_SSID)\"
+  CFLAGS += -DESP_WIFI_PASS=\"$(WIFI_PASS)\"
+endif
diff --git a/examples/wolfmqtt_snclient/Makefile.board.dep b/examples/wolfmqtt_snclient/Makefile.board.dep
@@ -0,0 +1,9 @@
+# Put board specific dependencies here
+
+ifneq (,$(filter arch_esp,$(FEATURES_USED)))
+  USEMODULE += esp_wifi
+else ifeq ($(BOARD),nucleo-f207zg)
+  USEMODULE += stm32_eth_auto
+else ifeq ($(BOARD),native)
+  USEMODULE += netdev_default
+endif
diff --git a/examples/wolfmqtt_snclient/user_settings.h b/examples/wolfmqtt_snclient/user_settings.h
@@ -0,0 +1,51 @@
+/* user_settings.h : custom configuration for wolfmqtt */
+
+#ifndef WOLFMQTT_USER_SETTINGS_H
+#define WOLFMQTT_USER_SETTINGS_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* MANDATORY */
+#undef  RIOT_OS
+#define RIOT_OS
+
+#undef  WOLFMQTT_SN
+#define WOLFMQTT_SN
+
+#define WOLFMQTT_USE_HOSTNAME 0
+
+#if WOLFMQTT_USE_HOSTNAME
+    #undef DEFAULT_MQTT_HOST
+    #ifdef SOCK_HAS_IPV6
+        #define DEFAULT_MQTT_HOST   "TODO" /* if you know a public mqttsn service put it here */
+    #else
+        #define DEFAULT_MQTT_HOST   "TODO" /* if you know a public mqttsn service put it here */
+    #endif
+#else
+    #ifdef SOCK_HAS_IPV4
+        #undef  DEFAULT_MQTT_HOST_IPV4
+        #define DEFAULT_MQTT_HOST_IPV4   "192.168.2.113" /* local */
+    #endif
+    #ifdef SOCK_HAS_IPV6
+        #undef  DEFAULT_MQTT_HOST_IPV6
+        #define DEFAULT_MQTT_HOST_IPV6   "2003:e9:f44:2f25:95dc:c243:6b3b:a257" /* local */
+    #endif
+#endif
+
+#undef  DEFAULT_MQTT_PORT
+#define DEFAULT_MQTT_PORT   10000
+
+/* OPTIONAL */
+#undef  TEST_MESSAGE
+#define TEST_MESSAGE    "wolfmqtt snclient on RIOT OS"
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* WOLFMQTT_USER_SETTINGS_H */
+
diff --git a/pkg/wolfmqtt/Makefile b/pkg/wolfmqtt/Makefile
@@ -7,7 +7,12 @@ include $(RIOTBASE)/pkg/pkg.mk
 
 CFLAGS += -Wno-unused-parameter
 
-all: $(filter wolfmqtt wolfmqtt_examples wolfmqtt_examples_mqttclient,$(USEMODULE))
+all: $(filter \
+    wolfmqtt \
+    wolfmqtt_examples \
+    wolfmqtt_examples_mqttclient \
+    wolfmqtt_examples_snclient \
+    ,$(USEMODULE))
 
 wolfmqtt:
 	"$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(CURDIR)/Makefile.$(PKG_NAME)
@@ -17,3 +22,6 @@ wolfmqtt_examples:
 
 wolfmqtt_examples_mqttclient:
 	"$(MAKE)" -C $(PKG_SOURCE_DIR)/wolfmqtt_examples/mqttclient -f $(CURDIR)/Makefile.$(PKG_NAME).examples.mqttclient
+
+wolfmqtt_examples_snclient:
+	"$(MAKE)" -C $(PKG_SOURCE_DIR)/wolfmqtt_examples/sn-client -f $(CURDIR)/Makefile.$(PKG_NAME).examples.snclient
diff --git a/pkg/wolfmqtt/Makefile.dep b/pkg/wolfmqtt/Makefile.dep
@@ -11,3 +11,7 @@ endif
 ifneq (,$(filter wolfmqtt_examples_mqttclient,$(USEMODULE)))
   USEMODULE += sock_tcp
 endif
+
+ifneq (,$(filter wolfmqtt_examples_snclient,$(USEMODULE)))
+  USEMODULE += sock_udp
+endif
diff --git a/pkg/wolfmqtt/Makefile.wolfmqtt.examples.snclient b/pkg/wolfmqtt/Makefile.wolfmqtt.examples.snclient
@@ -0,0 +1,5 @@
+MODULE = wolfmqtt_examples_snclient
+
+SRC := $(filter-out sn-client_qos-1.c sn-multithread.c,$(wildcard *.c))
+
+include $(RIOTBASE)/Makefile.base
diff --git a/pkg/wolfmqtt/patches/0006-sn-client-enable-overriding-of-TEST_MESSAGE.patch b/pkg/wolfmqtt/patches/0006-sn-client-enable-overriding-of-TEST_MESSAGE.patch
@@ -0,0 +1,35 @@
+From 2fa9077a4813035dd3c890ad5400281e069ae0e7 Mon Sep 17 00:00:00 2001
+From: Hendrik van Essen <hendrik.ve@fu-berlin.de>
+Date: Wed, 27 Jan 2021 19:04:04 +0100
+Subject: [PATCH 6/8] sn-client: enable overriding of TEST_MESSAGE
+
+---
+ wolfmqtt_examples/sn-client/sn-client.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/wolfmqtt_examples/sn-client/sn-client.c b/wolfmqtt_examples/sn-client/sn-client.c
+index 607986b..01d1a09 100644
+--- a/wolfmqtt_examples/sn-client/sn-client.c
++++ b/wolfmqtt_examples/sn-client/sn-client.c
+@@ -36,9 +36,15 @@ static int mStopRead = 0;
+
+ /* Configuration */
+ /* Maximum size for network read/write callbacks. */
+-#define MAX_BUFFER_SIZE 1024
+-#define TEST_MESSAGE    "test"
+-#define SHORT_TOPIC_NAME "s1"
++#define MAX_BUFFER_SIZE     1024
++
++#ifndef SHORT_TOPIC_NAME
++#define SHORT_TOPIC_NAME    "s1"
++#endif
++
++#ifndef TEST_MESSAGE
++#define TEST_MESSAGE        "test"
++#endif
+
+ static int sn_message_cb(MqttClient *client, MqttMessage *msg,
+     byte msg_new, byte msg_done)
+-- 
+2.25.1
+