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

Merge pull request #13 from SummerGGift/update_micropython

【更新】:micropython 兼容性更新
朱天龙 (Armink) 8 лет назад
Родитель
Сommit
afe111a1fc
3 измененных файлов с 17 добавлено и 3 удалено
  1. 1 1
      SConscript
  2. 14 2
      port/modmachine.c
  3. 2 0
      port/mphalport.h

+ 1 - 1
SConscript

@@ -10,10 +10,10 @@ src    += Glob('lib/utils/*.c')
 src    += Glob('extmod/*.c')
 src    += Glob('port/*.c')
 src    += Glob('lib/netutils/*.c')
+src    += Glob('drivers/bus/*.c')
 
 path    = [cwd + '/']
 path   += [cwd + '/port']
-path   += [cwd + '/lib/netutils']
 
 LOCAL_CCFLAGS = ''
 

+ 14 - 2
port/modmachine.c

@@ -49,15 +49,27 @@
 #if MICROPY_PY_MACHINE
 
 STATIC mp_obj_t machine_info(uint n_args, const mp_obj_t *args) {
-    extern int cmd_free(int argc, char **argv);
+#ifdef RT_USING_FINSH
     extern long list_thread(void);
+#endif
     // RT-Thread info
     {
         printf("---------------------------------------------\n");
         printf("RT-Thread\n");
         printf("---------------------------------------------\n");
-        cmd_free(0, NULL);
+
+#ifdef RT_USING_FINSH
+        extern void list_mem(void);
+        extern void list_memheap(void);
+
+#ifdef RT_USING_MEMHEAP_AS_HEAP
+        list_memheap();
+#else
+        list_mem();
+#endif
+
         list_thread();
+#endif
         printf("---------------------------------------------\n");
     }
 

+ 2 - 0
port/mphalport.h

@@ -63,3 +63,5 @@ extern void mp_hal_pin_open_set(void *machine_pin, int mode);
 #define mp_hal_pin_output(p)     mp_hal_pin_open_set(p, PIN_MODE_OUTPUT)
 #define mp_hal_pin_input(p)      mp_hal_pin_open_set(p, PIN_MODE_INPUT)
 #define mp_hal_pin_name(p)       mp_hal_pin_get_name(p)
+#define mp_hal_pin_high(p)       mp_hal_pin_write(p, 1)
+