From b2a563c84ee893f6c40ceafbbe6853954e2efa3b Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Wed, 27 Feb 2019 00:52:45 +0100 Subject: [PATCH] spislave.cpp: compiler directives fixed --- src/spislave.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/spislave.cpp b/src/spislave.cpp index 5f6a1b60..ed6ab7b0 100644 --- a/src/spislave.cpp +++ b/src/spislave.cpp @@ -22,6 +22,8 @@ licenses. Refer to LICENSE.txt file in repository for more details. */ +#ifdef HAS_SPI + #include "spislave.h" #include @@ -102,9 +104,6 @@ void spi_slave_task(void *param) { } esp_err_t spi_init() { -#ifndef HAS_SPI - return ESP_OK; -#else assert(SEND_QUEUE_SIZE); SPISendQueue = xQueueCreate(SEND_QUEUE_SIZE, sizeof(MessageBuffer_t)); if (SPISendQueue == 0) { @@ -146,13 +145,10 @@ esp_err_t spi_init() { } return ret; - -#endif } void spi_enqueuedata(MessageBuffer_t *message, sendprio_t prio) { // enqueue message in SPI send queue -#ifdef HAS_SPI BaseType_t ret; switch (prio) { case prio_high: @@ -170,17 +166,12 @@ void spi_enqueuedata(MessageBuffer_t *message, sendprio_t prio) { } else { ESP_LOGW(TAG, "SPI sendqueue is full"); } -#endif } -void spi_queuereset(void) { -#ifdef HAS_SPI - xQueueReset(SPISendQueue); -#endif -} +void spi_queuereset(void) { xQueueReset(SPISendQueue); } void spi_housekeeping(void) { -#ifdef HAS_SPI ESP_LOGD(TAG, "spiloop %d bytes left", uxTaskGetStackHighWaterMark(spiTask)); -#endif } + +#endif // HAS_SPI \ No newline at end of file