From bf70f2f9f28c5b99349416219a434adb5b7a3391 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Sat, 3 Aug 2019 11:35:16 +0200 Subject: [PATCH] removed spi & lora houskeeping functions --- include/lorawan.h | 1 - include/spislave.h | 2 -- src/cyclic.cpp | 12 +++++------- src/spislave.cpp | 4 ---- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/include/lorawan.h b/include/lorawan.h index 0b6cabad..b3331751 100644 --- a/include/lorawan.h +++ b/include/lorawan.h @@ -37,7 +37,6 @@ void switch_lora(uint8_t sf, uint8_t tx); void lora_send(osjob_t *job); void lora_enqueuedata(MessageBuffer_t *message, sendprio_t prio); void lora_queuereset(void); -void lora_housekeeping(void); #if (TIME_SYNC_LORAWAN) void user_request_network_time_callback(void *pVoidUserUTCTime, int flagSuccess); diff --git a/include/spislave.h b/include/spislave.h index 74b77db0..44c58455 100644 --- a/include/spislave.h +++ b/include/spislave.h @@ -31,6 +31,4 @@ esp_err_t spi_init(); void spi_enqueuedata(MessageBuffer_t *message, sendprio_t prio); void spi_queuereset(); -void spi_housekeeping(); - #endif // _SPISLAVE_H diff --git a/src/cyclic.cpp b/src/cyclic.cpp index 9e338cef..d78d56c4 100644 --- a/src/cyclic.cpp +++ b/src/cyclic.cpp @@ -23,13 +23,6 @@ void doHousekeeping() { if (cfg.runmode == 1) do_reset(); -#ifdef HAS_SPI - spi_housekeeping(); -#endif -#if (HAS_LORA) - lora_housekeeping(); -#endif - // task storage debugging // ESP_LOGD(TAG, "IRQhandler %d bytes left | Taskstate = %d", uxTaskGetStackHighWaterMark(irqHandlerTask), @@ -42,6 +35,11 @@ void doHousekeeping() { ESP_LOGD(TAG, "Gpsloop %d bytes left | Taskstate = %d", uxTaskGetStackHighWaterMark(GpsTask), eTaskGetState(GpsTask)); #endif +#ifdef HAS_SPI + ESP_LOGD(TAG, "spiloop %d bytes left | Taskstate = %d", + uxTaskGetStackHighWaterMark(spiTask), eTaskGetState(spiTask)); +#endif + #if (defined HAS_DCF77 || defined HAS_IF482) ESP_LOGD(TAG, "Clockloop %d bytes left | Taskstate = %d", uxTaskGetStackHighWaterMark(ClockTask), eTaskGetState(ClockTask)); diff --git a/src/spislave.cpp b/src/spislave.cpp index a288d4b0..9801058b 100644 --- a/src/spislave.cpp +++ b/src/spislave.cpp @@ -170,8 +170,4 @@ void spi_enqueuedata(MessageBuffer_t *message, sendprio_t prio) { void spi_queuereset(void) { xQueueReset(SPISendQueue); } -void spi_housekeeping(void) { - ESP_LOGD(TAG, "spiloop %d bytes left", uxTaskGetStackHighWaterMark(spiTask)); -} - #endif // HAS_SPI \ No newline at end of file