mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/fix_spi_slave_example_sender_ccount_issue' into 'release/v4.4' 

spi: fix spi slave example sender ccount issue (v4.4)

See merge request espressif/esp-idf!18423
pull/9422/head
Jiang Jiang Jian 2022-07-12 11:49:28 +08:00
rodzic cd13a62952 afe3bfe19f
commit 724cbd4167
1 zmienionych plików z 14 dodań i 25 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

39
examples/peripherals/spi_slave/sender/main/app_main.c
Wyświetl plik

@ -10,29 +10,14 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include "esp_log.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "freertos/semphr.h" #include "freertos/semphr.h"
#include "freertos/queue.h" #include "freertos/queue.h"
#include "lwip/sockets.h"
#include "lwip/dns.h"
#include "lwip/netdb.h"
#include "lwip/igmp.h"
#include "esp_wifi.h"
#include "esp_system.h"
#include "esp_event.h"
#include "nvs_flash.h"
#include "soc/rtc_periph.h"
#include "driver/spi_master.h" #include "driver/spi_master.h"
#include "esp_log.h"
#include "esp_spi_flash.h"
#include "driver/gpio.h" #include "driver/gpio.h"
#include "esp_intr_alloc.h" #include "esp_timer.h"
/* /*
SPI sender (master) example. SPI sender (master) example.
@ -84,7 +69,7 @@ Pins in use. The SPI Master can use the GPIO mux, so feel free to change these i
//The semaphore indicating the slave is ready to receive stuff. //The semaphore indicating the slave is ready to receive stuff.
static xQueueHandle rdySem; static QueueHandle_t rdySem;
/* /*
This ISR is called when the handshake line goes high. This ISR is called when the handshake line goes high.
@ -93,16 +78,20 @@ static void IRAM_ATTR gpio_handshake_isr_handler(void* arg)
{ {
//Sometimes due to interference or ringing or something, we get two irqs after eachother. This is solved by //Sometimes due to interference or ringing or something, we get two irqs after eachother. This is solved by
//looking at the time between interrupts and refusing any interrupt too close to another one. //looking at the time between interrupts and refusing any interrupt too close to another one.
static uint32_t lasthandshaketime; static uint32_t lasthandshaketime_us;
uint32_t currtime=esp_cpu_get_ccount(); uint32_t currtime_us = esp_timer_get_time();
uint32_t diff=currtime-lasthandshaketime; uint32_t diff = currtime_us - lasthandshaketime_us;
if (diff<240000) return; //ignore everything <1ms after an earlier irq if (diff < 1000) {
lasthandshaketime=currtime; return; //ignore everything <1ms after an earlier irq
}
lasthandshaketime_us = currtime_us;
//Give the semaphore. //Give the semaphore.
BaseType_t mustYield=false; BaseType_t mustYield = false;
xSemaphoreGiveFromISR(rdySem, &mustYield); xSemaphoreGiveFromISR(rdySem, &mustYield);
if (mustYield) portYIELD_FROM_ISR(); if (mustYield) {
portYIELD_FROM_ISR();
}
} }
//Main application //Main application