Procházet zdrojové kódy

【更新】:SPI 模块输出函数完善

SummerGift před 8 roky
rodič
revize
342b0116ab
2 změnil soubory, kde provedl 6 přidání a 7 odebrání
  1. 4 7
      extmod/machine_spi.c
  2. 2 0
      port/mphalport.h

+ 4 - 7
extmod/machine_spi.c

@@ -172,13 +172,10 @@ STATIC uint32_t baudrate_to_delay_half(uint32_t baudrate) {
 
 STATIC void mp_machine_soft_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mp_machine_soft_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "SoftSPI(baudrate=%u, polarity=%u, phase=%u, sck= %s, mosi= %s, miso= %s)",
-    baudrate_from_delay_half(self->spi.delay_half),
-    self->spi.polarity,
-    self->spi.phase,
-    mp_hal_pin_name(self->spi.sck),
-    mp_hal_pin_name(self->spi.mosi),
-    mp_hal_pin_name(self->spi.miso));
+    mp_printf(print, "SoftSPI(baudrate=%u, polarity=%u, phase=%u,"
+        " sck=" MP_HAL_PIN_FMT ", mosi=" MP_HAL_PIN_FMT ", miso=" MP_HAL_PIN_FMT ")",
+        baudrate_from_delay_half(self->spi.delay_half), self->spi.polarity, self->spi.phase,
+        mp_hal_pin_name(self->spi.sck), mp_hal_pin_name(self->spi.mosi), mp_hal_pin_name(self->spi.miso));
 }
 
 STATIC mp_obj_t mp_machine_soft_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {

+ 2 - 0
port/mphalport.h

@@ -47,6 +47,8 @@ static inline void mp_hal_delay_ms(mp_uint_t delay) {
     rt_thread_delay(rt_tick_from_millisecond(delay));
 }
 
+#define MP_HAL_PIN_FMT                 "%s"
+
 extern void mp_hal_set_interrupt_char (int c);
 extern void mp_pin_od_write(void *machine_pin, int stat);
 extern void mp_hal_pin_open_set(void *machine_pin, int mode);