@@ -411,6 +411,32 @@ mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
411
411
}
412
412
self -> base .type = & machine_hw_spi_type ;
413
413
414
+ int8_t sck , mosi , miso ;
415
+
416
+ if (args [ARG_sck ].u_obj == MP_OBJ_NULL ) {
417
+ sck = default_pins -> sck ;
418
+ } else if (args [ARG_sck ].u_obj == mp_const_none ) {
419
+ sck = -1 ;
420
+ } else {
421
+ sck = machine_pin_get_id (args [ARG_sck ].u_obj );
422
+ }
423
+
424
+ if (args [ARG_mosi ].u_obj == MP_OBJ_NULL ) {
425
+ mosi = default_pins -> mosi ;
426
+ } else if (args [ARG_mosi ].u_obj == mp_const_none ) {
427
+ mosi = -1 ;
428
+ } else {
429
+ mosi = machine_pin_get_id (args [ARG_mosi ].u_obj );
430
+ }
431
+
432
+ if (args [ARG_miso ].u_obj == MP_OBJ_NULL ) {
433
+ miso = default_pins -> miso ;
434
+ } else if (args [ARG_miso ].u_obj == mp_const_none ) {
435
+ miso = -1 ;
436
+ } else {
437
+ miso = machine_pin_get_id (args [ARG_miso ].u_obj );
438
+ }
439
+
414
440
machine_hw_spi_init_internal (
415
441
self ,
416
442
args [ARG_id ].u_int ,
@@ -419,9 +445,9 @@ mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
419
445
args [ARG_phase ].u_int ,
420
446
args [ARG_bits ].u_int ,
421
447
args [ARG_firstbit ].u_int ,
422
- args [ ARG_sck ]. u_obj == MP_OBJ_NULL ? default_pins -> sck : machine_pin_get_id ( args [ ARG_sck ]. u_obj ) ,
423
- args [ ARG_mosi ]. u_obj == MP_OBJ_NULL ? default_pins -> mosi : machine_pin_get_id ( args [ ARG_mosi ]. u_obj ) ,
424
- args [ ARG_miso ]. u_obj == MP_OBJ_NULL ? default_pins -> miso : machine_pin_get_id ( args [ ARG_miso ]. u_obj ) );
448
+ sck ,
449
+ mosi ,
450
+ miso );
425
451
426
452
return MP_OBJ_FROM_PTR (self );
427
453
}
0 commit comments