From 386464435fe80c2ebb310180aab209340b2a0d11 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Wed, 25 Nov 2020 19:52:23 +0200 Subject: [PATCH] WINC: Use static SPI handle to avoid conflicts. --- src/omv/boards/OPENMVPURETHERMAL/omv_boardconfig.h | 1 - src/winc1500/src/nm_bus_wrapper.c | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/omv/boards/OPENMVPURETHERMAL/omv_boardconfig.h b/src/omv/boards/OPENMVPURETHERMAL/omv_boardconfig.h index 60bcc0162..bb9a3699a 100644 --- a/src/omv/boards/OPENMVPURETHERMAL/omv_boardconfig.h +++ b/src/omv/boards/OPENMVPURETHERMAL/omv_boardconfig.h @@ -255,7 +255,6 @@ // SPI5 clock source is PLL2 (200MHz/4 == 50MHz) - Slightly over the maximum of 48 MHz. #define WINC_SPI_PRESCALER (SPI_BAUDRATEPRESCALER_4) #define WINC_SPI_CLK_ENABLE() __HAL_RCC_SPI5_CLK_ENABLE() -#define WINC_SPI_HANDLE SPIHandle5 #define WINC_SPI_SCLK_PIN (GPIO_PIN_6) #define WINC_SPI_MISO_PIN (GPIO_PIN_7) diff --git a/src/winc1500/src/nm_bus_wrapper.c b/src/winc1500/src/nm_bus_wrapper.c index 19dfd5a59..127d0c6eb 100644 --- a/src/winc1500/src/nm_bus_wrapper.c +++ b/src/winc1500/src/nm_bus_wrapper.c @@ -53,14 +53,7 @@ #include "extint.h" #include "omv_boardconfig.h" -// Re-use MicroPython's SPI2 Handle. -#ifndef WINC_SPI_HANDLE -extern SPI_HandleTypeDef SPIHandle2; -#define SPI_HANDLE (SPIHandle2) -#else -SPI_HandleTypeDef WINC_SPI_HANDLE; -#define SPI_HANDLE (WINC_SPI_HANDLE) -#endif +static SPI_HandleTypeDef SPI_HANDLE; #define NM_BUS_MAX_TRX_SZ 4096