From: p15692025051 <846603105@qq.com>
Date: Fri, 19 Jan 2024 07:11:03 +0000 (+0800)
Subject: DM提交
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=b9c5148b32da755d33ce1e943aef3b8e6ea1dbd5;p=mirrors%2FASR3603_Z5.git

DM提交
---

diff --git a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/core/dm_liblwm2m.h b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/core/dm_liblwm2m.h
index e2bc19a3..9bcd1c04 100644
--- a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/core/dm_liblwm2m.h
+++ b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/core/dm_liblwm2m.h
@@ -117,8 +117,9 @@ time_t lwm2m_gettime(void);
 // Same usage as C89 printf()
 //void lwm2m_printf(const char * format, ...);
 //#define lwm2m_printf(fmt, args...) do { cplog_printf("[lwm2m_dm]"fmt, ##args); } while(0)
-#define lwm2m_printf(FMT, ...)      printf("[lwm2m_printf]"FMT, ##__VA_ARGS__)
-// #define LOG_ARG(FMT, ...) lwm2m_printf("[%s:%d] " FMT "\r\n", __func__ , __LINE__ , __VA_ARGS__)
+//#define lwm2m_printf(FMT, ...)      
+#define lwm2m_printf(FMT, ...)      cplog_printf("[lwm2m_printf]"FMT, ##__VA_ARGS__)
+#define LOG_ARG(FMT, ...) lwm2m_printf("[%s:%d] " FMT "\r\n", __func__ , __LINE__ , __VA_ARGS__)
 #endif
 
 // communication layer
diff --git a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/sdk/dm_object_dmpRead.c b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/sdk/dm_object_dmpRead.c
index 0d8d9311..6c36ab53 100644
--- a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/sdk/dm_object_dmpRead.c
+++ b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/sdk/dm_object_dmpRead.c
@@ -38,7 +38,9 @@
 #define RES_DM_GPU                       6621
 #define RES_DM_ROUTER_MAC                6622
 #define RES_DM_NETWORK_STATUS            6623
-#define RES_DM_MAX                       (23)
+#define RES_DM_SN                6624
+#define RES_DM_BLUETOOTHMAC            6625
+#define RES_DM_MAX                       (25)
 
 #define RES_DM_DEV_INFO_STR                  "devinfo"
 #define RES_DM_APP_INFO_STR                  "appinfo"
@@ -63,7 +65,8 @@
 #define RES_DM_GPU_STR                       "gpu"
 #define RES_DM_ROUTER_MAC_STR                "routerMac"
 #define RES_DM_NETWORK_STATUS_STR            "networkStatus"
-
+#define RES_DM_SN_STR                        "sn"
+#define RES_DM_BLUETOOTHMAC_STR              "bluetoothMac" 
 #define RES_VALUE_BUFF_LEN  512
 
 typedef struct
@@ -144,6 +147,10 @@ int lwm2m_data_encode_json_buffer(int id, char *jsonOutBuff)
         len = snprintf(tmpBuff, sizeof(tmpBuff), "\"%s\":", RES_DM_ROUTER_MAC_STR);
     else if (id == RES_DM_NETWORK_STATUS)
         len = snprintf(tmpBuff, sizeof(tmpBuff), "\"%s\":", RES_DM_NETWORK_STATUS_STR);
+    else if (id == RES_DM_SN)
+        len = snprintf(tmpBuff, sizeof(tmpBuff), "\"%s\":", RES_DM_SN_STR);
+    else if (id == RES_DM_BLUETOOTHMAC)
+        len = snprintf(tmpBuff, sizeof(tmpBuff), "\"%s\":", RES_DM_BLUETOOTHMAC_STR);
     else 
         return -1;
 
diff --git a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/dm_main.c b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/dm_main.c
index d5415c1f..8aff4758 100644
--- a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/dm_main.c
+++ b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/dm_main.c
@@ -233,6 +233,12 @@ int myDMReadInfo(int resId,char **outbuff)
         case 6623://network status
             snprintf(buff,buflen,REG_NETWORK_STATUS);
             break;
+        case 6624://sn
+            snprintf(buff,buflen,REG_SN);
+            break;
+        case 6625://bluetoothMac
+            snprintf(buff,buflen,REG_BLUETOOTHMAC);
+            break;
 #endif //simware add end
 
     default:
diff --git a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/sdk_cmcc_register_info_def.h b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/sdk_cmcc_register_info_def.h
index aff2d2c4..bcb59ed3 100644
--- a/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/sdk_cmcc_register_info_def.h
+++ b/2.sdk/sdk/product/craneg_modem/pcac/lwm2m/src/lwm2m_dm/sdksrc/testsdk/sdk_cmcc_register_info_def.h
@@ -25,6 +25,7 @@
 #define REG_BATTERY                        "***"
 #define REG_ROUTER_MAC                     "***"
 #define REG_NETWORK_STATUS                 "***"
-
+#define REG_SN                             "***"
+#define REG_BLUETOOTHMAC                   "***"
 #endif