From 5474b1c6d09dd566ec3f17852287035164051532 Mon Sep 17 00:00:00 2001
From: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
Date: Wed, 22 Oct 2025 10:17:42 +0200
Subject: [PATCH] wifidmd: 1.4.1: Move WiFi.DataElements Object to decollector

---
 wifidmd/Config.in          |  8 --------
 wifidmd/Makefile           | 12 ++----------
 wifidmd/bbfdm_service.json | 24 ++++++++++++++++++++++--
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/wifidmd/Config.in b/wifidmd/Config.in
index 34946e780..53d0f4332 100644
--- a/wifidmd/Config.in
+++ b/wifidmd/Config.in
@@ -1,13 +1,5 @@
 if PACKAGE_wifidmd
 
-config WIFIDMD_DISABLE_LEGACY_WIFI
-	bool "Disable legacy Wireless Objects like WiFi.Radio., WiFi.SSID., WiFi.AccessPoint. etc"
-	default n
-
-config WIFIDMD_ENABLE_WIFI_DATAELEMENTS
-	bool "Enable Device.WiFi.DataElements. Object"
-	default y
-
 config WIFIDMD_VENDOR_PREFIX
 	string "Package specific datamodel Vendor Prefix for TR181 extensions"
 	default ""
diff --git a/wifidmd/Makefile b/wifidmd/Makefile
index 67fc0369e..6bc81e2a6 100644
--- a/wifidmd/Makefile
+++ b/wifidmd/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidmd
-PKG_VERSION:=1.3.14
+PKG_VERSION:=1.4.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/wifidmd.git
-PKG_SOURCE_VERSION:=882278e2783e37ffd65af261ed3ec404119a3ce8
+PKG_SOURCE_VERSION:=006359c351be70a45f5bc1ef3d78e14e270aa7cf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -53,14 +53,6 @@ endif
 
 TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
 
-ifeq ($(CONFIG_WIFIDMD_DISABLE_LEGACY_WIFI),y)
-MAKE_FLAGS += WIFIDMD_DISABLE_LEGACY_WIFI=y
-endif
-
-ifeq ($(CONFIG_WIFIDMD_ENABLE_WIFI_DATAELEMENTS),y)
-MAKE_FLAGS += WIFIDMD_ENABLE_WIFI_DATAELEMENTS=y
-endif
-
 define Package/wifidmd/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wifidmd $(1)/usr/sbin/wifidmd
diff --git a/wifidmd/bbfdm_service.json b/wifidmd/bbfdm_service.json
index f517c32e9..d5f7adbef 100644
--- a/wifidmd/bbfdm_service.json
+++ b/wifidmd/bbfdm_service.json
@@ -5,8 +5,28 @@
     "unified_daemon": true,
     "services": [
       {
-        "parent_dm": "Device.",
-        "object": "WiFi"
+        "parent_dm": "Device.WiFi.",
+        "object": "Radio"
+      },
+      {
+        "parent_dm": "Device.WiFi.",
+        "object": "SSID"
+      },
+      {
+        "parent_dm": "Device.WiFi.",
+        "object": "AccessPoint"
+      },
+      {
+        "parent_dm": "Device.WiFi.",
+        "object": "NeighboringWiFiDiagnostic"
+      },
+      {
+        "parent_dm": "Device.WiFi.",
+        "object": "EndPoint"
+      },
+      {
+        "parent_dm": "Device.WiFi.",
+        "object": "Reset()"
       }
     ],
     "config": {