fix error

smartmx · smartmx · commit ec5a0885f49e · 2023-07-21T21:37:33.000+08:00
diff --git a/mfbd.c b/mfbd.c
@@ -266,7 +266,7 @@ void mfbd_nbtn_skip(const mfbd_group_t *_pbtn_group, mfbd_btn_count_t times)
         }
         else if(_pbtn->state == MFBD_BTN_STATE_LONG)
         {
-            if (((MFBD_REPEAT_TIME_IN_FUC) > 0) && (_pbtn->btn_info->btn_down_code[0] != 0))
+            if (((MFBD_REPEAT_TIME_IN_FUC) > 0) && (_pbtn->btn_info->btn_down_code != 0))
             {
                 if(((MFBD_REPEAT_TIME_IN_FUC) - 1 - _pbtn->repeat_count) > times)
                 {
@@ -401,15 +401,15 @@ void mfbd_mbtn_scan(const mfbd_group_t *_pbtn_group)
                     /* if multiclick_state is not 0 and less than max_multiclick_state, inc multiclick_state */
                     if (((MFBD_MULTICLICK_TIME_IN_FUC) != 0)  \
                             && (_pbtn->multiclick_state < _pbtn->btn_info->max_multiclick_state)  \
-                            && (!((((MFBD_LONG_TIME_IN_FUC) > 0) && (_pbtn->btn_info->btn_long_code != 0)) && (_pbtn->long_count >= (MFBD_LONG_TIME_IN_FUC)))))
+                            && (_pbtn->state == MFBD_BTN_STATE_DOWN))
                     {
                         _pbtn->multiclick_state++;
                         _pbtn->multiclick_count = 0;
                     }
 #else
                     /* if multiclick_state is not 0 and less than max_multiclick_state, inc multiclick_state */
                     if (((MFBD_MULTICLICK_TIME_IN_FUC) != 0)  \
-                            && (!((((MFBD_LONG_TIME_IN_FUC) > 0) && (_pbtn->btn_info->btn_long_code != 0)) && (_pbtn->long_count >= (MFBD_LONG_TIME_IN_FUC)))))
+                            && (_pbtn->state == MFBD_BTN_STATE_DOWN))
                     {
                         if(_pbtn->multiclick_state < _pbtn->btn_info->max_multiclick_state)
                         {
diff --git a/mfbd_sd.c b/mfbd_sd.c
@@ -275,7 +275,7 @@ void mfbd_nbtn_skip(const mfbd_group_t *_pbtn_group, const mfbd_nbtn_info_t *_pb
         }
         else if(_pbtn_info->btn->state == MFBD_BTN_STATE_LONG)
         {
-            if (((MFBD_REPEAT_TIME_IN_FUC) > 0) && (_pbtn_info->btn_down_code[0] != 0))
+            if (((MFBD_REPEAT_TIME_IN_FUC) > 0) && (_pbtn_info->btn_down_code != 0))
             {
                 if(((MFBD_REPEAT_TIME_IN_FUC) - 1 - _pbtn_info->btn->repeat_count) > times)
                 {
@@ -418,15 +418,15 @@ void mfbd_mbtn_scan(const mfbd_group_t *_pbtn_group, const mfbd_mbtn_info_t *_pb
                     /* if multiclick_state is not 0 and less than max_multiclick_state, inc multiclick_state */
                     if (((MFBD_MULTICLICK_TIME_IN_FUC) != 0)  \
                             && (_pbtn_info->btn->multiclick_state < _pbtn_info->max_multiclick_state)  \
-                            && (!((((MFBD_LONG_TIME_IN_FUC) > 0) && (_pbtn_info->btn_long_code != 0)) && (_pbtn_info->btn->long_count >= (MFBD_LONG_TIME_IN_FUC)))))
+                            && (_pbtn_info->btn->state == MFBD_BTN_STATE_DOWN))
                     {
                         _pbtn_info->btn->multiclick_state++;
                         _pbtn_info->btn->multiclick_count = 0;
                     }
 #else
                     /* if multiclick_state is not 0 and less than max_multiclick_state, inc multiclick_state */
                     if (((MFBD_MULTICLICK_TIME_IN_FUC) != 0)  \
-                            && (!((((MFBD_LONG_TIME_IN_FUC) > 0) && (_pbtn_info->btn_long_code != 0)) && (_pbtn_info->btn->long_count >= (MFBD_LONG_TIME_IN_FUC)))))
+                            && (_pbtn_info->btn->state == MFBD_BTN_STATE_DOWN))
                     {
                         if(_pbtn_info->btn->multiclick_state < _pbtn_info->max_multiclick_state)
                         {

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ void mfbd_nbtn_skip(const mfbd_group_t *_pbtn_group, mfbd_btn_count_t times)`
`266`	`266`	`}`
`267`	`267`	`else if(_pbtn->state == MFBD_BTN_STATE_LONG)`
`268`	`268`	`{`
`269`		`- if (((MFBD_REPEAT_TIME_IN_FUC) > 0) && (_pbtn->btn_info->btn_down_code[0] != 0))`
	`269`	`+ if (((MFBD_REPEAT_TIME_IN_FUC) > 0) && (_pbtn->btn_info->btn_down_code != 0))`
`270`	`270`	`{`
`271`	`271`	`if(((MFBD_REPEAT_TIME_IN_FUC) - 1 - _pbtn->repeat_count) > times)`
`272`	`272`	`{`
`@@ -401,15 +401,15 @@ void mfbd_mbtn_scan(const mfbd_group_t *_pbtn_group)`
`401`	`401`	`/* if multiclick_state is not 0 and less than max_multiclick_state, inc multiclick_state */`
`402`	`402`	`if (((MFBD_MULTICLICK_TIME_IN_FUC) != 0) \`
`403`	`403`	`&& (_pbtn->multiclick_state < _pbtn->btn_info->max_multiclick_state) \`
`404`		`- && (!((((MFBD_LONG_TIME_IN_FUC) > 0) && (_pbtn->btn_info->btn_long_code != 0)) && (_pbtn->long_count >= (MFBD_LONG_TIME_IN_FUC)))))`
	`404`	`+ && (_pbtn->state == MFBD_BTN_STATE_DOWN))`
`405`	`405`	`{`
`406`	`406`	`_pbtn->multiclick_state++;`
`407`	`407`	`_pbtn->multiclick_count = 0;`
`408`	`408`	`}`
`409`	`409`	`#else`
`410`	`410`	`/* if multiclick_state is not 0 and less than max_multiclick_state, inc multiclick_state */`
`411`	`411`	`if (((MFBD_MULTICLICK_TIME_IN_FUC) != 0) \`
`412`		`- && (!((((MFBD_LONG_TIME_IN_FUC) > 0) && (_pbtn->btn_info->btn_long_code != 0)) && (_pbtn->long_count >= (MFBD_LONG_TIME_IN_FUC)))))`
	`412`	`+ && (_pbtn->state == MFBD_BTN_STATE_DOWN))`
`413`	`413`	`{`
`414`	`414`	`if(_pbtn->multiclick_state < _pbtn->btn_info->max_multiclick_state)`
`415`	`415`	`{`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ void mfbd_nbtn_skip(const mfbd_group_t _pbtn_group, const mfbd_nbtn_info_t _pb`
`275`	`275`	`}`
`276`	`276`	`else if(_pbtn_info->btn->state == MFBD_BTN_STATE_LONG)`
`277`	`277`	`{`
`278`		`- if (((MFBD_REPEAT_TIME_IN_FUC) > 0) && (_pbtn_info->btn_down_code[0] != 0))`
	`278`	`+ if (((MFBD_REPEAT_TIME_IN_FUC) > 0) && (_pbtn_info->btn_down_code != 0))`
`279`	`279`	`{`
`280`	`280`	`if(((MFBD_REPEAT_TIME_IN_FUC) - 1 - _pbtn_info->btn->repeat_count) > times)`
`281`	`281`	`{`
`@@ -418,15 +418,15 @@ void mfbd_mbtn_scan(const mfbd_group_t _pbtn_group, const mfbd_mbtn_info_t _pb`
`418`	`418`	`/* if multiclick_state is not 0 and less than max_multiclick_state, inc multiclick_state */`
`419`	`419`	`if (((MFBD_MULTICLICK_TIME_IN_FUC) != 0) \`
`420`	`420`	`&& (_pbtn_info->btn->multiclick_state < _pbtn_info->max_multiclick_state) \`
`421`		`- && (!((((MFBD_LONG_TIME_IN_FUC) > 0) && (_pbtn_info->btn_long_code != 0)) && (_pbtn_info->btn->long_count >= (MFBD_LONG_TIME_IN_FUC)))))`
	`421`	`+ && (_pbtn_info->btn->state == MFBD_BTN_STATE_DOWN))`
`422`	`422`	`{`
`423`	`423`	`_pbtn_info->btn->multiclick_state++;`
`424`	`424`	`_pbtn_info->btn->multiclick_count = 0;`
`425`	`425`	`}`
`426`	`426`	`#else`
`427`	`427`	`/* if multiclick_state is not 0 and less than max_multiclick_state, inc multiclick_state */`
`428`	`428`	`if (((MFBD_MULTICLICK_TIME_IN_FUC) != 0) \`
`429`		`- && (!((((MFBD_LONG_TIME_IN_FUC) > 0) && (_pbtn_info->btn_long_code != 0)) && (_pbtn_info->btn->long_count >= (MFBD_LONG_TIME_IN_FUC)))))`
	`429`	`+ && (_pbtn_info->btn->state == MFBD_BTN_STATE_DOWN))`
`430`	`430`	`{`
`431`	`431`	`if(_pbtn_info->btn->multiclick_state < _pbtn_info->max_multiclick_state)`
`432`	`432`	`{`