BugID:19084924:synchonize changes in network/umesh folder

shinyshy · Mar 11, 2019 · 6952225 · 6952225
1 parent 913e47b
commit 6952225
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 10 deletions.
diff --git a/network/umesh/Config.in b/network/umesh/Config.in
@@ -0,0 +1,6 @@
+config AOS_COMP_UMESH
+    bool "uMesh"
+    default n
+    select AOS_COMP_YLOOP
+    help
+        AliOS Things uMesh network protocol
diff --git a/network/umesh/umesh.mk → network/umesh/aos.mk b/network/umesh/umesh.mk → network/umesh/aos.mk
@@ -1,6 +1,8 @@
 NAME := umesh
 
 $(NAME)_MBINS_TYPE := kernel
+$(NAME)_VERSION := 1.0.0
+$(NAME)_SUMMARY := uMesh provides the ability to form local area mesh network.
 GLOBAL_INCLUDES += include
 GLOBAL_DEFINES += CONFIG_AOS_MESH
 
@@ -10,6 +12,8 @@ else ifeq ($(COMPILER),iar)
 $(NAME)_PREBUILT_LIBRARY := lib/$(HOST_ARCH)/iar/umesh.a
 else ifeq ($(ENABLE_VFP),1)
 $(NAME)_PREBUILT_LIBRARY := lib/$(HOST_ARCH)/VFP/gcc/umesh.a
+else ifeq ($(ipv6),1)
+$(NAME)_PREBUILT_LIBRARY := lib/$(HOST_ARCH)/IPv6/gcc/umesh.a
 else
 $(NAME)_PREBUILT_LIBRARY := lib/$(HOST_ARCH)/gcc/umesh.a
 endif
diff --git a/network/umesh/include/umesh.h b/network/umesh/include/umesh.h
@@ -23,12 +23,14 @@ bool       umesh_is_initialized(void);
 ur_error_t umesh_stop(void);
 ur_error_t umesh_register_callback(ur_adapter_callback_t *callback);
 
+#ifdef CONFIG_AOS_MESH_BCAST
 /* provide broadcast transmit capability within the scope of overall
  * mesh network in the case that leader has been offline.
  */
 typedef void (* umesh_bcast_recv_t)(uint8_t *buf, uint32_t len);
 ur_error_t umesh_register_bcast_callback(umesh_bcast_recv_t callback);
 ur_error_t umesh_bcast_send(uint8_t *buf, uint32_t len);
+#endif
 
 /* per device API */
 uint8_t umesh_get_device_state(void);

diff --git a/network/umesh/include/umesh_config.h b/network/umesh/include/umesh_config.h
@@ -10,12 +10,14 @@
 #define ATTACH_REQUEST_RETRY_TIMES 2
 #define ATTACH_REQUEST_INTERVAL 1000
 
+#ifdef CONFIG_AOS_MESH_BCAST
 #define KEEP_ALIVE_COUNT 3               /* maximum retransmission count of keep alive msg */
 #define KEEP_ALIVE_SHORT_TIMEOUT 3000    /* keep alive short interval in case that leader exists */
 #define KEEP_ALIVE_LONG_TIMEOUT 10000    /* keep alive long interval during leader recover */
 
-#define LEADER_RECOVER_COUNT 3           /* double check if leader has recovered really*/
-#define LEADER_RECOVER_TIMEOUT 3000      /* leader recover timer timeout */
+#define LEADER_RECOVER_COUNT 5           /* double check if leader has recovered really*/
+#define LEADER_RECOVER_TIMEOUT 2000      /* leader recover timer timeout */
+#endif
 
 #ifdef CONFIG_AOS_MESH_LOWPOWER
 #define SCHEDULE_SLOTS_SIZE 3

diff --git a/network/umesh/lib/ANDES_N10/gcc/umesh.a b/network/umesh/lib/ANDES_N10/gcc/umesh.a
diff --git a/network/umesh/lib/ARM968E-S/gcc/umesh.a b/network/umesh/lib/ARM968E-S/gcc/umesh.a
diff --git a/network/umesh/lib/Cortex-M4/IPv6/gcc/umesh.a b/network/umesh/lib/Cortex-M4/IPv6/gcc/umesh.a
diff --git a/network/umesh/lib/Cortex-M4/VFP/gcc/umesh.a b/network/umesh/lib/Cortex-M4/VFP/gcc/umesh.a
diff --git a/network/umesh/lib/Cortex-M4/gcc/umesh.a b/network/umesh/lib/Cortex-M4/gcc/umesh.a
diff --git a/network/umesh/lib/linux/gcc/umesh.a b/network/umesh/lib/linux/gcc/umesh.a
diff --git a/network/umesh/lib/rockchiplinux/gcc/umesh.a b/network/umesh/lib/rockchiplinux/gcc/umesh.a
diff --git a/network/umesh/lib/xtensa/gcc/umesh.a b/network/umesh/lib/xtensa/gcc/umesh.a
diff --git a/network/umesh/ucube.py b/network/umesh/ucube.py