Просмотр исходного кода

Merge pull request #126 from SummerGGift/918

【添加】引脚中断功能
朱天龙 (Armink) 6 лет назад
Родитель
Сommit
c1955250d1

+ 41 - 3
docs/04-Hardware_Control_Module/02-machine-Pin.md

@@ -38,9 +38,23 @@
 #### **Pin.name**()
 #### **Pin.name**()
 返回引脚对象在构造时用户自定义的引脚名。
 返回引脚对象在构造时用户自定义的引脚名。
 
 
+#### **Pin.irq**(handler=None, trigger=(Pin.IRQ_RISING))
+
+配置在引脚的触发源处于活动状态时调用的中断处理程序。如果引脚模式是, `Pin.IN` 则触发源是引脚上的外部值。 如果引脚模式是, `Pin.OUT` 则触发源是引脚的输出缓冲器。 否则,如果引脚模式是, `Pin.OPEN_DRAIN` 那么触发源是状态'0'的输出缓冲器和状态'1'的外部引脚值。
+
+参数:
+
+- `handler` 是一个可选的函数,在中断触发时调用
+- `trigger` 配置可以触发中断的事件。可能的值是:
+    - `Pin.IRQ_FALLING` 下降沿中断
+    - `Pin.IRQ_RISING` 上升沿中断
+    - `Pin.IRQ_RISING_FALLING` 上升沿或下降沿中断
+    - `Pin.IRQ_LOW_LEVEL` 低电平中断
+    - `Pin.IRQ_HIGH_LEVEL` 高电平中断
+
 ### 常量
 ### 常量
 
 
-下面的常量用来配置 `Pin` 对象。  
+下面的常量用来配置 `Pin` 对象。 
 
 
 #### 选择引脚模式:
 #### 选择引脚模式:
 ##### **Pin.IN**
 ##### **Pin.IN**
@@ -53,7 +67,16 @@
 ##### **None**  
 ##### **None**  
 使用值 `None` 代表不进行上下拉。
 使用值 `None` 代表不进行上下拉。
 
 
-### 示例
+#### 选择中断触发模式:
+##### **Pin.IRQ_FALLING**
+##### **Pin.IRQ_RISING**
+##### **Pin.IRQ_RISING_FALLING**
+##### **Pin.IRQ_LOW_LEVEL** 
+##### **Pin.IRQ_HIGH_LEVEL** 
+
+### 示例一
+
+控制引脚输出高低电平信号,并读取按键引脚电平信号。
 
 
 ```
 ```
 from machine import Pin
 from machine import Pin
@@ -69,4 +92,19 @@ p_in = Pin(("key_0", PIN_IN), Pin.IN, Pin.PULL_UP)
 print(p_in.value() )           # get value, 0 or 1
 print(p_in.value() )           # get value, 0 or 1
 ```
 ```
 
 
-  更多内容可参考 [machine.Pin](http://docs.micropython.org/en/latest/pyboard/library/machine.Pin.html)  。
+### 示例二
+
+上升沿信号触发引脚中断后执行中断处理函数。
+
+```
+from machine import Pin
+
+PIN_KEY0 = 58    # PD10
+key_0 = Pin(("key_0", PIN_KEY0), Pin.IN, Pin.PULL_UP)
+
+def func(v):
+    print("Hello rt-thread!")
+
+key_0.irq(trigger=Pin.IRQ_RISING, handler=func)
+```
+更多内容可参考 [machine.Pin](http://docs.micropython.org/en/latest/pyboard/library/machine.Pin.html)  。

+ 3 - 0
port/genhdr/qstrdefs.generated.h

@@ -765,4 +765,7 @@ QDEF(MP_QSTR_set_color, (const byte*)"\x25\x09" "set_color")
 QDEF(MP_QSTR_file_crc32, (const byte*)"\x6f\x0a" "file_crc32")
 QDEF(MP_QSTR_file_crc32, (const byte*)"\x6f\x0a" "file_crc32")
 QDEF(MP_QSTR_list_device, (const byte*)"\x20\x0b" "list_device")
 QDEF(MP_QSTR_list_device, (const byte*)"\x20\x0b" "list_device")
 QDEF(MP_QSTR_show_image, (const byte*)"\xde\x0a" "show_image")
 QDEF(MP_QSTR_show_image, (const byte*)"\xde\x0a" "show_image")
+QDEF(MP_QSTR_IRQ, (const byte*)"\xaf\x03" "IRQ")
+QDEF(MP_QSTR_IRQ_HIGH_LEVEL, (const byte*)"\x57\x0e" "IRQ_HIGH_LEVEL")
+QDEF(MP_QSTR_IRQ_LOW_LEVEL, (const byte*)"\x8d\x0d" "IRQ_LOW_LEVEL")
 // This file was automatically generated by makeqstrdata.py
 // This file was automatically generated by makeqstrdata.py

+ 36 - 3
port/modules/machine/machine_pin.c

@@ -224,12 +224,43 @@ STATIC mp_uint_t machine_pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
     return MP_STREAM_ERROR;
     return MP_STREAM_ERROR;
 }
 }
 
 
+STATIC void machine_pin_isr_handler(void *arg) {
+    machine_pin_obj_t *self = arg;
+    mp_sched_schedule(self->pin_isr_cb, MP_OBJ_FROM_PTR(self));
+}
+
+// pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING)
+STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_handler, ARG_trigger, ARG_wake };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_handler, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = PIN_IRQ_MODE_RISING} },
+    };
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // configure irq
+        self->pin_isr_cb = args[ARG_handler].u_obj;
+        uint32_t trigger = args[ARG_trigger].u_int;
+
+        rt_pin_mode(self->pin, PIN_MODE_INPUT_PULLUP);
+        rt_pin_attach_irq(self->pin, trigger, machine_pin_isr_handler, (void*)self);
+        rt_pin_irq_enable(self->pin, PIN_IRQ_ENABLE);
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
+
 STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
 STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     // instance methods
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init),    MP_ROM_PTR(&machine_pin_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_init),    MP_ROM_PTR(&machine_pin_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&machine_pin_value_obj) },
     { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&machine_pin_value_obj) },
     { MP_ROM_QSTR(MP_QSTR_name),    MP_ROM_PTR(&machine_pin_name_obj) },
     { MP_ROM_QSTR(MP_QSTR_name),    MP_ROM_PTR(&machine_pin_name_obj) },
     { MP_ROM_QSTR(MP_QSTR_pin),     MP_ROM_PTR(&machine_pin_pin_obj) },
     { MP_ROM_QSTR(MP_QSTR_pin),     MP_ROM_PTR(&machine_pin_pin_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq),     MP_ROM_PTR(&machine_pin_irq_obj) },
 
 
     // class constants
     // class constants
     { MP_ROM_QSTR(MP_QSTR_ALT_OD),    MP_ROM_INT(GPIO_MODE_AF_OD) },
     { MP_ROM_QSTR(MP_QSTR_ALT_OD),    MP_ROM_INT(GPIO_MODE_AF_OD) },
@@ -241,9 +272,11 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULLDOWN) },
     { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULLDOWN) },
     { MP_ROM_QSTR(MP_QSTR_PULL_NONE), MP_ROM_INT(GPIO_NOPULL) },
     { MP_ROM_QSTR(MP_QSTR_PULL_NONE), MP_ROM_INT(GPIO_NOPULL) },
     { MP_ROM_QSTR(MP_QSTR_PULL_UP),   MP_ROM_INT(GPIO_PULLUP) },
     { MP_ROM_QSTR(MP_QSTR_PULL_UP),   MP_ROM_INT(GPIO_PULLUP) },
-    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_MODE_IT_RISING) },
-    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_MODE_IT_FALLING) },
-    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING_FALLING), MP_ROM_INT(GPIO_MODE_IT_RISING_FALLING) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(PIN_IRQ_MODE_RISING) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(PIN_IRQ_MODE_FALLING) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING_FALLING), MP_ROM_INT(PIN_IRQ_MODE_RISING_FALLING) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_LOW_LEVEL), MP_ROM_INT(PIN_IRQ_MODE_LOW_LEVEL) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_HIGH_LEVEL), MP_ROM_INT(PIN_IRQ_MODE_HIGH_LEVEL) },
 };
 };
 
 
 STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);

+ 1 - 0
port/modules/machine/modmachine.h

@@ -47,6 +47,7 @@ typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
     mp_obj_base_t base;
     char name[RT_NAME_MAX];
     char name[RT_NAME_MAX];
     uint32_t pin;
     uint32_t pin;
+    mp_obj_t pin_isr_cb;
 } machine_pin_obj_t;
 } machine_pin_obj_t;
 
 
 #endif // _MODMACHINE_H
 #endif // _MODMACHINE_H