From 64cb9c115808145031cc60919ea95e4bed40e7da Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Mon, 3 May 2021 22:39:57 +1000 Subject: [PATCH] Fix build issues --- source/Core/BSP/MHP30/BSP.cpp | 1 + .../STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h | 10 +++++++++- .../STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h | 4 +++- .../STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/source/Core/BSP/MHP30/BSP.cpp b/source/Core/BSP/MHP30/BSP.cpp index 75fc3a33..a134d6cd 100644 --- a/source/Core/BSP/MHP30/BSP.cpp +++ b/source/Core/BSP/MHP30/BSP.cpp @@ -415,6 +415,7 @@ void setStatusLED(const enum StatusLED state) { static enum StatusLED lastState = LED_UNKNOWN; if (lastState != state || state == LED_HEATING) { switch (state) { + default: case LED_UNKNOWN: case LED_OFF: WS2812::led_set_color(0, 0, 0, 0); diff --git a/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h b/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h index 733684dd..ab865d8c 100644 --- a/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h +++ b/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h @@ -32,7 +32,15 @@ extern "C" { #include /* Exported types ------------------------------------------------------------*/ - +#ifndef USE_HAL_TIM_REGISTER_CALLBACKS +#define USE_HAL_TIM_REGISTER_CALLBACKS 0 +#endif +#ifndef USE_HAL_I2C_REGISTER_CALLBACKS +#define USE_HAL_I2C_REGISTER_CALLBACKS 0 +#endif +#ifndef USE_HAL_ADC_REGISTER_CALLBACKS +#define USE_HAL_ADC_REGISTER_CALLBACKS 0 +#endif /** * @brief HAL Status structures definition */ diff --git a/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h b/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h index 737dffce..576cf8e9 100644 --- a/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h +++ b/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h @@ -219,7 +219,9 @@ typedef struct __IO uint32_t MemaddSize; /*!< I2C Target memory address size */ __IO uint32_t EventCount; /*!< I2C Event counter */ - +#ifndef USE_HAL_I2C_REGISTER_CALLBACKS +#define USE_HAL_I2C_REGISTER_CALLBACKS 0 +#endif #if (USE_HAL_I2C_REGISTER_CALLBACKS == 1) void (*MasterTxCpltCallback)(struct __I2C_HandleTypeDef *hi2c); /*!< I2C Master Tx Transfer completed callback */ void (*MasterRxCpltCallback)(struct __I2C_HandleTypeDef *hi2c); /*!< I2C Master Rx Transfer completed callback */ diff --git a/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h b/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h index 5ee5f17b..129d0287 100644 --- a/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h +++ b/source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h @@ -1948,6 +1948,7 @@ void HAL_TIM_TriggerHalfCpltCallback(TIM_HandleTypeDef *htim); void HAL_TIM_ErrorCallback(TIM_HandleTypeDef *htim); /* Callbacks Register/UnRegister functions ***********************************/ + #if (USE_HAL_TIM_REGISTER_CALLBACKS == 1) HAL_StatusTypeDef HAL_TIM_RegisterCallback(TIM_HandleTypeDef *htim, HAL_TIM_CallbackIDTypeDef CallbackID, pTIM_CallbackTypeDef pCallback); HAL_StatusTypeDef HAL_TIM_UnRegisterCallback(TIM_HandleTypeDef *htim, HAL_TIM_CallbackIDTypeDef CallbackID);