introduce zstack-lib

diyruz · Aug 2, 2020 · af3fd2f · af3fd2f
1 parent 4e04959
commit af3fd2f
Show file tree

Hide file tree

Showing 15 changed files with 113 additions and 468 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "zstack-lib"]
+	path = zstack-lib
+	url = [email protected]:diyruz/zstack-lib.git
diff --git a/.release-it.yml b/.release-it.yml
@@ -2,5 +2,5 @@ git:
   requireCleanWorkingDir: false
 github:
   release: true
-  assets: ["firmwares/*.hex"]
+  assets: ["firmwares/FreePad_*_Keys.hex"]
   draft: true
diff --git a/CC2530DB/GenericApp.ewp b/CC2530DB/GenericApp.ewp
@@ -469,6 +469,7 @@
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$</state>
                     <state>$PROJ_DIR$\..\Source</state>
+                    <state>$PROJ_DIR$\..\zstack-lib</state>
                     <state>$PROJ_DIR$\..\..\Source</state>
                     <state>$PROJ_DIR$\..\..\..\ZMain\TI2530DB</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Components\hal\include</state>
@@ -1608,6 +1609,7 @@
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$</state>
                     <state>$PROJ_DIR$\..\Source</state>
+                    <state>$PROJ_DIR$\..\zstack-lib</state>
                     <state>$PROJ_DIR$\..\..\Source</state>
                     <state>$PROJ_DIR$\..\..\..\ZMain\TI2530DB</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Components\hal\include</state>
@@ -2747,6 +2749,7 @@
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$</state>
                     <state>$PROJ_DIR$\..\Source</state>
+                    <state>$PROJ_DIR$\..\zstack-lib</state>
                     <state>$PROJ_DIR$\..\..\Source</state>
                     <state>$PROJ_DIR$\..\..\..\ZMain\TI2530DB</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Components\hal\include</state>
@@ -3886,6 +3889,7 @@
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$</state>
                     <state>$PROJ_DIR$\..\Source</state>
+                    <state>$PROJ_DIR$\..\zstack-lib</state>
                     <state>$PROJ_DIR$\..\..\Source</state>
                     <state>$PROJ_DIR$\..\..\..\ZMain\TI2530DB</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Components\hal\include</state>
@@ -5025,6 +5029,7 @@
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$</state>
                     <state>$PROJ_DIR$\..\Source</state>
+                    <state>$PROJ_DIR$\..\zstack-lib</state>
                     <state>$PROJ_DIR$\..\..\Source</state>
                     <state>$PROJ_DIR$\..\..\..\ZMain\TI2530DB</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Components\hal\include</state>
@@ -6164,6 +6169,7 @@
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$</state>
                     <state>$PROJ_DIR$\..\Source</state>
+                    <state>$PROJ_DIR$\..\zstack-lib</state>
                     <state>$PROJ_DIR$\..\..\Source</state>
                     <state>$PROJ_DIR$\..\..\..\ZMain\TI2530DB</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Components\hal\include</state>
@@ -7303,6 +7309,7 @@
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$</state>
                     <state>$PROJ_DIR$\..\Source</state>
+                    <state>$PROJ_DIR$\..\zstack-lib</state>
                     <state>$PROJ_DIR$\..\..\Source</state>
                     <state>$PROJ_DIR$\..\..\..\ZMain\TI2530DB</state>
                     <state>$PROJ_DIR$\..\..\..\..\..\Components\hal\include</state>
@@ -7976,24 +7983,9 @@
     </configuration>
     <group>
         <name>App</name>
-        <file>
-            <name>$PROJ_DIR$\..\Source\battery.h</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\Source\bettery.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\Source\Debug.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\Source\Debug.h</name>
-        </file>
         <file>
             <name>$PROJ_DIR$\..\Source\hal_key.c</name>
         </file>
-        <file>
-            <name>$PROJ_DIR$\..\Source\hal_key.h</name>
-        </file>
         <file>
             <name>$PROJ_DIR$\..\Source\OSAL_FreePadApp.c</name>
         </file>
@@ -8562,4 +8554,40 @@
             <name>$PROJ_DIR$\..\..\..\ZMain\TI2530DB\ZMain.c</name>
         </file>
     </group>
+    <group>
+        <name>zstack-lib</name>
+        <file>
+            <name>$PROJ_DIR$\..\zstack-lib\battery.h</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\zstack-lib\bettery.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\zstack-lib\commissioning.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\zstack-lib\commissioning.h</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\zstack-lib\Debug.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\zstack-lib\Debug.h</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\zstack-lib\factory_reset.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\zstack-lib\factory_reset.h</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\zstack-lib\hal_key.h</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\zstack-lib\utils.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\zstack-lib\utils.h</name>
+        </file>
+    </group>
 </project>
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 
 # How to join:
 
-1. Press and hold button (1) for 3-100 seconds(depends whter or not device is on a network), until device start flashing led
+1. Press and hold *any* button for 3-10 seconds(depends whter or not device is on a network), until device start flashing led
 2. Wait, in case of successfull join, device will flash led 5 times
 3. If join failed, device will flash led 3 times
 

diff --git a/Source/Debug.c b/Source/Debug.c
diff --git a/Source/Debug.h b/Source/Debug.h
diff --git a/Source/OSAL_FreePadApp.c b/Source/OSAL_FreePadApp.c
@@ -15,6 +15,9 @@
 #endif
 
 #include "zcl_freepadapp.h"
+#include "commissioning.h"
+#include "factory_reset.h"
+#include "Debug.h"
 
 const pTaskEventHandlerFn tasksArr[] = {macEventLoop,
                                         nwk_event_loop,
@@ -27,13 +30,17 @@ const pTaskEventHandlerFn tasksArr[] = {macEventLoop,
                                         touchLinkInitiator_event_loop,
                                         #endif
                                         bdb_event_loop,
-                                        zclFreePadApp_event_loop};
+                                        zclFreePadApp_event_loop,
+                                        zclCommissioning_event_loop,
+                                        zclFactoryResetter_loop
+                                        };
 
 const uint8 tasksCnt = sizeof(tasksArr) / sizeof(tasksArr[0]);
 uint16 *tasksEvents;
 
 void osalInitTasks(void) {
     uint8 taskID = 0;
+    DebugInit();
 
     tasksEvents = (uint16 *)osal_mem_alloc(sizeof(uint16) * tasksCnt);
     osal_memset(tasksEvents, 0, (sizeof(uint16) * tasksCnt));
@@ -48,7 +55,9 @@ void osalInitTasks(void) {
     touchLinkInitiator_Init(taskID++);
     #endif
     bdb_Init(taskID++);
-    zclFreePadApp_Init(taskID);
+    zclFreePadApp_Init(taskID++);
+    zclCommissioning_Init(taskID++);
+    zclFactoryResetter_Init(taskID++);
 }
 
 /*********************************************************************

diff --git a/Source/battery.h b/Source/battery.h
diff --git a/Source/bettery.c b/Source/bettery.c
diff --git a/Source/f8wConfig.cfg b/Source/f8wConfig.cfg
@@ -163,7 +163,7 @@
 -DRFD_RCVC_ALWAYS_ON=FALSE
 
 /* The number of milliseconds to wait between data request polls to the coordinator. */
--DPOLL_RATE=0
+-DPOLL_RATE=1000
 
 /* This is used after receiving a data indication to poll immediately
  * for queued messages...in milliseconds.