Parcourir la source

Fix version issues

kurisaw il y a 8 mois
Parent
commit
97e1a5f143

+ 1 - 1
port/modules/machine/machine_adc.c

@@ -36,7 +36,7 @@
 #ifdef MICROPYTHON_USING_MACHINE_ADC
 
 #include <rtthread.h>
-#include <drivers/adc.h>
+#include <rtdevice.h>
 
 extern const mp_obj_type_t machine_adc_type;
 

+ 1 - 1
port/modules/machine/machine_pin.c

@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <rtthread.h>
-#include <drivers/pin.h>
+#include <rtdevice.h>
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mphal.h"

+ 1 - 1
port/modules/machine/machine_pwm.c

@@ -36,7 +36,7 @@
 #ifdef MICROPYTHON_USING_MACHINE_PWM
 
 #include <rtthread.h>
-#include <drivers/rt_drv_pwm.h>
+#include <rtdevice.h>
 
 #define MP_PWM_PULSE_MAX               255
 #define MP_PWM_PERIOD_GET(freq)        (1000000000 / (freq))

+ 1 - 1
port/modules/machine/machine_rtc.c

@@ -38,7 +38,7 @@
 #ifdef MICROPYTHON_USING_MACHINE_RTC
 
 #include <rtthread.h>
-#include <drivers/rtc.h>
+#include <rtdevice.h>
 #include <time.h>
 
 #define MP_YEAR_BASE   1900

+ 1 - 1
port/modules/machine/machine_timer.c

@@ -36,7 +36,7 @@
 #ifdef MICROPYTHON_USING_MACHINE_TIMER
 
 #include <rtthread.h>
-#include <drivers/hwtimer.h>
+#include <rtdevice.h>
 #include "machine_timer.h"
 
 #define  MAX_TIMER  17

+ 1 - 1
port/modules/machine/machine_wdt.c

@@ -35,7 +35,7 @@
 #ifdef MICROPYTHON_USING_MACHINE_WDT
 
 #include <rtthread.h>
-#include <drivers/watchdog.h>
+#include <rtdevice.h>
 #include "machine_wdt.h"
 
 typedef struct _machine_wdt_obj_t {

+ 4 - 4
port/modules/machine/modmachine.c

@@ -60,13 +60,13 @@ STATIC mp_obj_t machine_info(size_t n_args, const mp_obj_t *args) {
         mp_printf(&mp_plat_print, "---------------------------------------------\n");
 
 #ifdef RT_USING_FINSH
-        extern void cmd_free(void);
         extern void list_memheap(void);
+        extern void list_mempool(void);
 
-#ifdef RT_USING_MEMHEAP_AS_HEAP
+#if defined(RT_USING_MEMHEAP_AS_HEAP)
         list_memheap();
-#else
-        cmd_free();
+#elif defined(RT_USING_MEMPOOL)
+        list_mempool();
 #endif
 
         list_thread();

+ 1 - 1
port/mphalport.h

@@ -25,7 +25,7 @@
  */
 
 #include <rtthread.h>
-#include <drivers/pin.h>
+#include <rtdevice.h>
 
 #define MP_HAL_PIN_FMT                 "%s"