45
45
#include "freertos/task.h"
46
46
#include "esp_system.h"
47
47
#include "esp_cpu.h"
48
+ #include "hal/spi_ll.h"
48
49
49
50
50
51
// SPI DEVICE CLASS
@@ -727,11 +728,11 @@ mp_obj_t esp32_hw_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args, siz
727
728
self = & esp32_hw_spi_bus_obj [host - 1 ];
728
729
default_pins = & default_pins_array [host - 1 ];
729
730
#if SOC_SPI_SUPPORT_OCT
730
- default_oct_pins = & default_pins_array [host - 1 ];
731
+ default_oct_pins = & default_oct_pins_array [host - 1 ];
731
732
#endif
732
733
} else {
733
734
mp_raise_msg_varg (& mp_type_ValueError , MP_ERROR_TEXT ("SPI(%d) doesn't exist" ), host );
734
- return mp_obj_none ;
735
+ return mp_const_none ;
735
736
}
736
737
737
738
if (self -> state == MACHINE_HW_SPI_STATE_INIT ) {
@@ -783,9 +784,9 @@ mp_obj_t esp32_hw_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args, siz
783
784
data7 = machine_pin_get_id (args [ARG_data7 ].u_obj );
784
785
}
785
786
786
- if (data2 != -1 && data5 != -1 && data6 != -1 && data7 != -1 ) {
787
+ if (data4 != -1 && data5 != -1 && data6 != -1 && data7 != -1 ) {
787
788
if (args [ARG_sck ].u_obj == MP_OBJ_NULL ) {
788
- sck = default_oct_pins -> sck_io_num ;
789
+ sck = default_oct_pins -> sclk_io_num ;
789
790
} else if (args [ARG_sck ].u_obj == mp_const_none ) {
790
791
sck = -1 ;
791
792
} else {
@@ -807,14 +808,6 @@ mp_obj_t esp32_hw_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args, siz
807
808
} else {
808
809
miso = machine_pin_get_id (args [ARG_miso ].u_obj );
809
810
}
810
-
811
- if (args [ARG_cs ].u_obj == MP_OBJ_NULL ) {
812
- miso = default_oct_pins -> cs_io_num ;
813
- } else if (args [ARG_miso ].u_obj == mp_const_none ) {
814
- miso = -1 ;
815
- } else {
816
- miso = machine_pin_get_id (args [ARG_miso ].u_obj );
817
- }
818
811
819
812
if (args [ARG_hd ].u_obj == MP_OBJ_NULL ) {
820
813
hd = -1 ;
@@ -838,7 +831,7 @@ mp_obj_t esp32_hw_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args, siz
838
831
data7 = -1 ;
839
832
840
833
if (args [ARG_sck ].u_obj == MP_OBJ_NULL ) {
841
- sck = default_pins -> sck_io_num ;
834
+ sck = default_pins -> sclk_io_num
842
835
} else if (args [ARG_sck ].u_obj == mp_const_none ) {
843
836
sck = -1 ;
844
837
} else {
@@ -881,7 +874,7 @@ mp_obj_t esp32_hw_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args, siz
881
874
#else
882
875
883
876
if (args [ARG_sck ].u_obj == MP_OBJ_NULL ) {
884
- sck = default_pins -> sck_io_num ;
877
+ sck = default_pins -> sclk_io_num ;
885
878
} else if (args [ARG_sck ].u_obj == mp_const_none ) {
886
879
sck = -1 ;
887
880
} else {
0 commit comments