Merge pull request #6 from Utyff/Utyf

fix button hold

CC2530DB/GenericApp.ewp

@@ -142,11 +142,11 @@
                 <option>
                     <name>Input variant</name>
                     <version>2</version>
-                    <state>0</state>
+                    <state>5</state>
                 </option>
                 <option>
                     <name>Input description</name>
-                    <state>Automatic choice of formatter.</state>
+                    <state>No float.</state>
                 </option>
                 <option>
                     <name>Output variant</name>
@@ -1284,11 +1284,11 @@
                 <option>
                     <name>Input variant</name>
                     <version>2</version>
-                    <state>0</state>
+                    <state>5</state>
                 </option>
                 <option>
                     <name>Input description</name>
-                    <state>Automatic choice of formatter.</state>
+                    <state>No float.</state>
                 </option>
                 <option>
                     <name>Output variant</name>
@@ -1604,7 +1604,7 @@
                 <option>
                     <name>Compiler Extra Options Edit</name>
                     <state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wRouter.cfg</state>
-                    <state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wConfig.cfg</state>
+                    <state>-f $PROJ_DIR$\..\zstack-lib\f8wConfig.cfg</state>
                     <state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wZCL.cfg</state>
                 </option>
                 <option>
@@ -3704,7 +3704,7 @@
                 </option>
                 <option>
                     <name>OGChipConfigPath</name>
-                    <state>$TOOLKIT_DIR$\config\devices\Texas Instruments\CC2530F256.i51</state>
+                    <state>$TOOLKIT_DIR$\config\devices\Texas Instruments\CC25xx\3x\CC2530F256.i51</state>
                 </option>
             </data>
         </settings>
@@ -3887,7 +3887,7 @@
                 <option>
                     <name>Compiler Extra Options Edit</name>
                     <state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wRouter.cfg</state>
-                    <state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wConfig.cfg</state>
+                    <state>-f $PROJ_DIR$\..\zstack-lib\f8wConfig.cfg</state>
                     <state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wZCL.cfg</state>
                 </option>
                 <option>
@@ -5989,7 +5989,7 @@
                 </option>
                 <option>
                     <name>OGChipConfigPath</name>
-                    <state>$TOOLKIT_DIR$\config\devices\Texas Instruments\CC2530F256.i51</state>
+                    <state>$TOOLKIT_DIR$\config\devices\Texas Instruments\CC25xx\3x\CC2530F256.i51</state>
                 </option>
             </data>
         </settings>
@@ -6174,7 +6174,7 @@
                 <option>
                     <name>Compiler Extra Options Edit</name>
                     <state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wRouter.cfg</state>
-                    <state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wConfig.cfg</state>
+                    <state>-f $PROJ_DIR$\..\zstack-lib\f8wConfig.cfg</state>
                     <state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wZCL.cfg</state>
                 </option>
                 <option>
@@ -8276,7 +8276,7 @@
                 </option>
                 <option>
                     <name>OGChipConfigPath</name>
-                    <state>$TOOLKIT_DIR$\config\devices\Texas Instruments\CC2530F256.i51</state>
+                    <state>$TOOLKIT_DIR$\config\devices\Texas Instruments\CC25xx\3x\CC2530F256.i51</state>
                 </option>
             </data>
         </settings>
@@ -8461,7 +8461,7 @@
                 <option>
                     <name>Compiler Extra Options Edit</name>
                     <state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wRouter.cfg</state>
-                    <state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wConfig.cfg</state>
+                    <state>-f $PROJ_DIR$\..\zstack-lib\f8wConfig.cfg</state>
                     <state>-f $PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wZCL.cfg</state>
                 </option>
                 <option>
@@ -9687,7 +9687,7 @@
             <name>$PROJ_DIR$\..\..\..\Tools\CC2530DB\f8w2530.xcl</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wConfig.cfg</name>
+            <name>$PROJ_DIR$\..\zstack-lib\f8wConfig.cfg</name>
         </file>
         <file>
             <name>$PROJ_DIR$\..\..\..\Tools\CC2530DB\f8wCoord.cfg</name>

Source/preinclude.h

@@ -42,20 +42,29 @@
 #endif
 
 #if defined( HAL_BOARD_TARGET )
+    // Income ring - P0_0
+    #define KEY_INCOME_PORT HAL_KEY_PORT0
     #define HAL_KEY_P0_INPUT_PINS BV(0)
     #define HAL_KEY_P0_INPUT_PINS_EDGE HAL_KEY_RISING_EDGE
+    // Button - P2_0
+    #define KEY1_PORT HAL_KEY_PORT2
     #define HAL_KEY_P2_INPUT_PINS BV(0)
     #define HAL_KEY_P2_INPUT_PINS_EDGE HAL_KEY_FALLING_EDGE
     #define INT_HEAP_LEN 2200//2256
 #elif defined( HAL_BOARD_CHDTECH_DEV )
+    // Income ring - P0_1
+    #define KEY_INCOME_PORT HAL_KEY_PORT0
     #define HAL_KEY_P0_INPUT_PINS BV(1)
     #define HAL_KEY_P0_INPUT_PINS_EDGE HAL_KEY_FALLING_EDGE
+    // Button - P2_0
+    #define KEY1_PORT HAL_KEY_PORT2
     #define HAL_KEY_P2_INPUT_PINS BV(0)
     #define HAL_KEY_P2_INPUT_PINS_EDGE HAL_KEY_FALLING_EDGE
     #define DO_DEBUG_UART
     #define INT_HEAP_LEN 2060
 #endif
 
+#define BTN_HOLD_TIME 1000
 #define FACTORY_RESET_HOLD_TIME_LONG 5000
 
 #if defined( DO_DEBUG_UART )

Source/zcl_app.c

@@ -136,7 +136,7 @@ static void zclApp_HandleKeys(byte portAndAction, byte keyCode) {
     //LREP("zclApp_HandleKeys portAndAction=0x%X keyCode=0x%X\r\n", portAndAction, keyCode);
     //zclCommissioning_HandleKeys(portAndAction, keyCode);
     
-    if (portAndAction & 0x01) { //P0 Ring //S1 P0_1
+    if (portAndAction & KEY_INCOME_PORT) { //P0 Ring //S1 P0_1  TODO add check Income pin
       
       //exit old stop timer
       osal_stop_timerEx(zclApp_TaskID, APP_RING_STOP_EVT);
@@ -167,24 +167,24 @@ static void zclApp_HandleKeys(byte portAndAction, byte keyCode) {
       
     }
 
-    if (portAndAction & 0x04) { //P2 Btn //S2 P2_0
+    if (portAndAction & KEY1_PORT) { //P2 Btn //S2 P2_0  TODO add check BUTTON pin
       zclFactoryResetter_HandleKeys(portAndAction, keyCode);
       if (portAndAction & HAL_KEY_PRESS) {
         LREPMaster("Key pressed\r\n");
-	zclApp_State.pressTime = osal_getClock();
+	zclApp_State.pressTime = osal_GetSystemClock();
-        LREP("pressTime = %d\r\n", zclApp_State.pressTime); 
+        LREP("pressTime = %ld\r\n", zclApp_State.pressTime);
       }
       if (portAndAction & HAL_KEY_RELEASE) {
         LREPMaster("Key released\r\n");
-        uint32 holdTime = osal_getClock() - zclApp_State.pressTime;
+        uint32 holdTime = osal_GetSystemClock() - zclApp_State.pressTime;
-        LREP("holdTime = %d \r\n", holdTime);
+        LREP("holdTime = %ld \r\n", holdTime);
-        zclApp_State.pressTime = 0;
+        if (zclApp_State.pressTime != 0 && holdTime >= BTN_HOLD_TIME) { // check release without press and hold milliseconds
-        if (holdTime >= 1) { //seconds
           osal_start_timerEx(zclApp_TaskID, APP_BTN_HOLD_EVT, 50);
         }
         else {
           osal_start_timerEx(zclApp_TaskID, APP_BTN_CLICK_EVT, 50);
         }
+        zclApp_State.pressTime = 0;
       }
     }
 }