djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SPI RX and remove debug prints

Browse Source
This commit is contained in:
Scott Shawcroft 2020-06-26 16:30:24 -07:00
parent 2d579cc995
commit 08749630a2
No known key found for this signature in database
GPG Key ID: 9349BC7E64B1921E
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ports/esp32s2/common-hal/busio/SPI.c
View File

@ -32,10 +32,6 @@
#include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/microcontroller/Pin.h"
#include "supervisor/shared/rgb_led_status.h" #include "supervisor/shared/rgb_led_status.h"
#include "esp_log.h"
static const char* TAG = "CircuitPython SPI";
static bool spi_never_reset[SOC_SPI_PERIPH_NUM]; static bool spi_never_reset[SOC_SPI_PERIPH_NUM];
// Store one lock handle per device so that we can free it. // Store one lock handle per device so that we can free it.
@ -101,8 +97,7 @@ static bool spi_bus_is_free(spi_host_device_t host_id) {
} }
static void spi_interrupt_handler(void *arg) { static void spi_interrupt_handler(void *arg) {
busio_spi_obj_t *self = arg; // busio_spi_obj_t *self = arg;
ESP_LOGE(TAG, "SPI interrupt %p", self);
} }
// The interrupt may get invoked by the bus lock. // The interrupt may get invoked by the bus lock.
@ -197,8 +192,8 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
// hal->cs_hold = 0; // hal->cs_hold = 0;
// hal->cs_pin_id = 0; // hal->cs_pin_id = 0;
hal->sio = 1; hal->sio = 0;
// hal->half_duplex = 0; hal->half_duplex = 0;
// hal->tx_lsbfirst = 0; // hal->tx_lsbfirst = 0;
// hal->rx_lsbfirst = 0; // hal->rx_lsbfirst = 0;
hal->dma_enabled = 1; hal->dma_enabled = 1;
@ -216,9 +211,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
// This must be set after spi_hal_init. // This must be set after spi_hal_init.
hal->timing_conf = &self->timing_conf; hal->timing_conf = &self->timing_conf;
if (hal->hw == NULL) {
ESP_LOGE(TAG, "SPI error %p", hal->hw);
}
common_hal_busio_spi_configure(self, 250000, 0, 0, 8); common_hal_busio_spi_configure(self, 250000, 0, 0, 8);
} }
@ -280,11 +272,7 @@ bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
return false; return false;
} }
ESP_LOGI(TAG, "configure");
ESP_LOGI(TAG, "real frequency %d", self->real_frequency);
ESP_LOGI(TAG, "timing_conf %p", self->hal_context.timing_conf);
spi_hal_setup_device(&self->hal_context); spi_hal_setup_device(&self->hal_context);
ESP_LOGI(TAG, "setup done");
return true; return true;
} }
@ -351,6 +339,7 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, const uint8_t *data_ou
while (!spi_hal_usr_is_done(hal)) { while (!spi_hal_usr_is_done(hal)) {
RUN_BACKGROUND_TASKS; RUN_BACKGROUND_TASKS;
} }
spi_hal_fetch_result(hal);
} }
return true; return true;