Quellcode durchsuchen

Merge pull request #7 from mysterywolf/master

同步上游, 修复例程笔误 更新有限状态机图例
流光 vor 4 Jahren
Ursprung
Commit
05186a9987
4 geänderte Dateien mit 4 neuen und 3 gelöschten Zeilen
  1. 2 2
      examples/event_async.c
  2. 1 1
      examples/event_inquire.c
  3. 1 0
      multi_button.c
  4. BIN
      states.png

+ 2 - 2
examples/event_async.c

@@ -39,7 +39,7 @@ void button_callback(void *btn)
         rt_kprintf("button double click\n");
     break;
 
-    case LONG_RRESS_START:
+    case LONG_PRESS_START:
         rt_kprintf("button long press start\n");
     break;
 
@@ -79,7 +79,7 @@ int multi_button_test(void)
     button_attach(&btn, PRESS_REPEAT,     button_callback);
     button_attach(&btn, SINGLE_CLICK,     button_callback);
     button_attach(&btn, DOUBLE_CLICK,     button_callback);
-    button_attach(&btn, LONG_RRESS_START, button_callback);
+    button_attach(&btn, LONG_PRESS_START, button_callback);
     button_attach(&btn, LONG_PRESS_HOLD,  button_callback);
     button_start (&btn);
 

+ 1 - 1
examples/event_inquire.c

@@ -43,7 +43,7 @@ void btn_test_thread_entry(void *p)
                 rt_kprintf("button double click\n");
             break;
 
-            case LONG_RRESS_START:
+            case LONG_PRESS_START:
                 rt_kprintf("button long press start\n");
             break;
 

+ 1 - 0
multi_button.c

@@ -236,6 +236,7 @@ void button_stop(struct button* handle)
         if (entry == handle)
         {
             *curr = entry->next;
+            return;
         }
         else
         {

BIN
states.png