Merge pull request #26 from SummerGGift/master

【完善】：修改 串口类 BUG , 删除 Pyb 多余定义

port/machine_uart.c

@@ -36,6 +36,13 @@
 #include <stdarg.h>
 #include "machine_uart.h"
 
+STATIC const mp_obj_type_t machine_uart_type;
+
+typedef struct _machine_uart_obj_t {
+    mp_obj_base_t base;
+    struct rt_serial_device *uart_device;
+}machine_uart_obj_t;
+
 STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_uart_obj_t *self = (machine_uart_obj_t*) self_in;
     mp_printf(print, "uart( device port : %s,baud_rate = %d, data_bits = %d, parity = %d, stop_bits = %d )",

port/machine_uart.h

@@ -24,18 +24,13 @@
  * THE SOFTWARE.
  */
 
-#ifndef _MACHINE_UART_H
-#define _MACHINE_UART_H
+#ifndef MICROPY_INCLUDED_MACHINE_UART_H
+#define MICROPY_INCLUDED_MACHINE_UART_H
 
 #include "py/obj.h"
 #include <rtthread.h>
 
-typedef struct _machine_uart_obj_t {
-    mp_obj_base_t base;
-    struct rt_serial_device *uart_device;
-};
-
 extern const mp_obj_type_t machine_uart_type;
-typedef struct _machine_uart_obj_t machine_uart_obj_t;
+extern const mp_obj_dict_t machine_uart_locals_dict;
 
 #endif // _MACHINE_UART_H

port/modmachine.c

@@ -41,12 +41,6 @@
 
 #include <rthw.h>
 
-#define PYB_RESET_SOFT      (0)
-#define PYB_RESET_POWER_ON  (1)
-#define PYB_RESET_HARD      (2)
-#define PYB_RESET_WDT       (3)
-#define PYB_RESET_DEEPSLEEP (4)
-
 #if MICROPY_PY_MACHINE
 
 STATIC mp_obj_t machine_info(uint n_args, const mp_obj_t *args) {
@@ -210,12 +204,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
 #if MICROPY_PY_MACHINE_UART
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type ) },
 #endif
-//    { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&pyb_wdt_type) },
-    { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),         MP_ROM_INT(PYB_RESET_POWER_ON) },
-    { MP_ROM_QSTR(MP_QSTR_HARD_RESET),          MP_ROM_INT(PYB_RESET_HARD) },
-    { MP_ROM_QSTR(MP_QSTR_WDT_RESET),           MP_ROM_INT(PYB_RESET_WDT) },
-    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP_RESET),     MP_ROM_INT(PYB_RESET_DEEPSLEEP) },
-    { MP_ROM_QSTR(MP_QSTR_SOFT_RESET),          MP_ROM_INT(PYB_RESET_SOFT) },
+
 };
 
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);