MHP30 ADC Mode change

* MHP30 move to I2C Bit Banging

* Fixup Accelerometer drivers so all can use I2CBB

* No STM32 I2C driver anymore

* TS100 on I2CBB

* Miniware on BB

* Fixup S60 build

* format

format

.github/workflows/push.yml

@@ -1,16 +1,6 @@
 name: CI
 
-on:
-  push:
-    branches:
-      - master
-      - dev
-      - main
-  pull_request:
-    branches:
-      - master
-      - dev
-      - main
+on: [push, pull_request]
 
 jobs:
 

source/Core/BSP/MHP30/BSP.cpp

@@ -263,25 +263,6 @@ void unstick_I2C() {
   int              timeout     = 100;
   int              timeout_cnt = 0;
 
-  // 1. Clear PE bit.
-  hi2c1.Instance->CR1 &= ~(0x0001);
-  /**I2C1 GPIO Configuration
-   PB6     ------> I2C1_SCL
-   PB7     ------> I2C1_SDA
-   */
-  //  2. Configure the SCL and SDA I/Os as General Purpose Output Open-Drain, High level (Write 1 to GPIOx_ODR).
-  GPIO_InitStruct.Mode  = GPIO_MODE_OUTPUT_OD;
-  GPIO_InitStruct.Pull  = GPIO_PULLUP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-
-  GPIO_InitStruct.Pin = SCL_Pin;
-  HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
-  HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
-
-  GPIO_InitStruct.Pin = SDA_Pin;
-  HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct);
-  HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET);
-
   while (GPIO_PIN_SET != HAL_GPIO_ReadPin(SDA_GPIO_Port, SDA_Pin)) {
     // Move clock to release I2C
     HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_RESET);
@@ -295,36 +276,6 @@ void unstick_I2C() {
     if (timeout_cnt > timeout)
       return;
   }
-
-  // 12. Configure the SCL and SDA I/Os as Alternate function Open-Drain.
-  GPIO_InitStruct.Mode  = GPIO_MODE_AF_OD;
-  GPIO_InitStruct.Pull  = GPIO_PULLUP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-
-  GPIO_InitStruct.Pin = SCL_Pin;
-  HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
-
-  GPIO_InitStruct.Pin = SDA_Pin;
-  HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct);
-
-  HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
-  HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET);
-
-  // 13. Set SWRST bit in I2Cx_CR1 register.
-  hi2c1.Instance->CR1 |= 0x8000;
-
-  asm("nop");
-
-  // 14. Clear SWRST bit in I2Cx_CR1 register.
-  hi2c1.Instance->CR1 &= ~0x8000;
-
-  asm("nop");
-
-  // 15. Enable the I2C peripheral by setting the PE bit in I2Cx_CR1 register
-  hi2c1.Instance->CR1 |= 0x0001;
-
-  // Call initialization function.
-  HAL_I2C_Init(&hi2c1);
 }
 
 uint8_t getButtonA() { return HAL_GPIO_ReadPin(KEY_A_GPIO_Port, KEY_A_Pin) == GPIO_PIN_RESET ? 1 : 0; }

source/Core/BSP/MHP30/I2C_Wrapper.cpp

@@ -1,91 +0,0 @@
-/*
- * FRToSI2C.cpp
- *
- *  Created on: 14Apr.,2018
- *      Author: Ralim
- */
-#include "BSP.h"
-#include "Setup.h"
-#include <I2C_Wrapper.hpp>
-SemaphoreHandle_t FRToSI2C::I2CSemaphore = nullptr;
-StaticSemaphore_t FRToSI2C::xSemaphoreBuffer;
-
-void FRToSI2C::CpltCallback() {
-  hi2c1.State = HAL_I2C_STATE_READY; // Force state reset (even if tx error)
-  if (I2CSemaphore) {
-    xSemaphoreGiveFromISR(I2CSemaphore, NULL);
-  }
-}
-
-bool FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t MemAddress, uint8_t *pData, uint16_t Size) {
-
-  if (!lock())
-    return false;
-  if (HAL_I2C_Mem_Read(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
-
-    I2C_Unstick();
-    unlock();
-    return false;
-  }
-
-  unlock();
-  return true;
-}
-bool FRToSI2C::I2C_RegisterWrite(uint8_t address, uint8_t reg, uint8_t data) { return Mem_Write(address, reg, &data, 1); }
-
-uint8_t FRToSI2C::I2C_RegisterRead(uint8_t add, uint8_t reg) {
-  uint8_t tx_data[1];
-  Mem_Read(add, reg, tx_data, 1);
-  return tx_data[0];
-}
-bool FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress, uint8_t *pData, uint16_t Size) {
-
-  if (!lock())
-    return false;
-  if (HAL_I2C_Mem_Write(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
-
-    I2C_Unstick();
-    unlock();
-    return false;
-  }
-
-  unlock();
-  return true;
-}
-
-bool FRToSI2C::Transmit(uint16_t DevAddress, uint8_t *pData, uint16_t Size) {
-  if (!lock())
-    return false;
-  if (HAL_I2C_Master_Transmit_DMA(&hi2c1, DevAddress, pData, Size) != HAL_OK) {
-    I2C_Unstick();
-    unlock();
-    return false;
-  }
-  return true;
-}
-
-bool FRToSI2C::probe(uint16_t DevAddress) {
-  if (!lock())
-    return false;
-  uint8_t buffer[1];
-  bool    worked = HAL_I2C_Mem_Read(&hi2c1, DevAddress, 0x0F, I2C_MEMADD_SIZE_8BIT, buffer, 1, 1000) == HAL_OK;
-  unlock();
-  return worked;
-}
-
-void FRToSI2C::I2C_Unstick() { unstick_I2C(); }
-
-void FRToSI2C::unlock() { xSemaphoreGive(I2CSemaphore); }
-
-bool FRToSI2C::lock() { return xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE; }
-
-bool FRToSI2C::writeRegistersBulk(const uint8_t address, const I2C_REG *registers, const uint8_t registersLength) {
-  for (int index = 0; index < registersLength; index++) {
-    if (!I2C_RegisterWrite(address, registers[index].reg, registers[index].val)) {
-      return false;
-    }
-    if (registers[index].pause_ms)
-      delay_ms(registers[index].pause_ms);
-  }
-  return true;
-}

source/Core/BSP/MHP30/IRQ.cpp

@@ -27,12 +27,6 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hadc) {
     }
   }
 }
-void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
 
 extern osThreadId POWTaskHandle;
 void              HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {

source/Core/BSP/MHP30/IRQ.h

@@ -18,12 +18,6 @@
 extern "C" {
 #endif
 void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hadc);
-void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c);
 void HAL_GPIO_EXTI_Callback(uint16_t);
 
 #ifdef __cplusplus

source/Core/BSP/MHP30/Setup.c

@@ -11,10 +11,6 @@ ADC_HandleTypeDef hadc1;
 ADC_HandleTypeDef hadc2;
 DMA_HandleTypeDef hdma_adc1;
 
-I2C_HandleTypeDef hi2c1;
-DMA_HandleTypeDef hdma_i2c1_rx;
-DMA_HandleTypeDef hdma_i2c1_tx;
-
 IWDG_HandleTypeDef hiwdg;
 TIM_HandleTypeDef  htim2;
 TIM_HandleTypeDef  htim3;
@@ -25,7 +21,7 @@ uint32_t ADCReadings[ADC_SAMPLES * ADC_CHANNELS]; // room for 32 lots of the pai
 // Functions
 static void SystemClock_Config(void);
 static void MX_ADC1_Init(void);
-static void MX_I2C1_Init(void);
+
 static void MX_IWDG_Init(void);
 static void MX_TIM3_Init(void);
 static void MX_TIM2_Init(void);
@@ -39,7 +35,7 @@ void        Setup_HAL() {
 
   MX_GPIO_Init();
   MX_DMA_Init();
-  MX_I2C1_Init();
+
   MX_ADC1_Init();
   MX_ADC2_Init();
   MX_TIM3_Init();
@@ -127,12 +123,12 @@ static void MX_ADC1_Init(void) {
 
   /**Configure the ADC multi-mode
    */
-  multimode.Mode = ADC_DUALMODE_REGSIMULT_INJECSIMULT;
+  multimode.Mode = ADC_MODE_INDEPENDENT;
   HAL_ADCEx_MultiModeConfigChannel(&hadc1, &multimode);
 
   /**Configure Regular Channel
    */
-  sConfig.SamplingTime = ADC_SAMPLETIME_239CYCLES_5;
+  sConfig.SamplingTime = ADC_SAMPLETIME_71CYCLES_5;
 
   sConfig.Channel = TMP36_ADC1_CHANNEL;
   sConfig.Rank    = ADC_REGULAR_RANK_1;
@@ -196,19 +192,6 @@ static void MX_ADC2_Init(void) {
     ;
   }
 }
-/* I2C1 init function */
-static void MX_I2C1_Init(void) {
-  hi2c1.Instance             = I2C1;
-  hi2c1.Init.ClockSpeed      = 300000;
-  hi2c1.Init.DutyCycle       = I2C_DUTYCYCLE_2;
-  hi2c1.Init.OwnAddress1     = 0;
-  hi2c1.Init.AddressingMode  = I2C_ADDRESSINGMODE_7BIT;
-  hi2c1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
-  hi2c1.Init.OwnAddress2     = 0;
-  hi2c1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
-  hi2c1.Init.NoStretchMode   = I2C_NOSTRETCH_DISABLE;
-  HAL_I2C_Init(&hi2c1);
-}
 
 /* IWDG init function */
 static void MX_IWDG_Init(void) {

source/Core/BSP/MHP30/Setup.h

@@ -20,7 +20,6 @@ extern DMA_HandleTypeDef hdma_adc1;
 
 extern DMA_HandleTypeDef hdma_i2c1_rx;
 extern DMA_HandleTypeDef hdma_i2c1_tx;
-extern I2C_HandleTypeDef hi2c1;
 
 extern IWDG_HandleTypeDef hiwdg;
 

source/Core/BSP/MHP30/Software_I2C.h

@@ -18,13 +18,26 @@
 #define SOFT_SDA2_LOW()  HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_RESET)
 #define SOFT_SDA2_READ() (HAL_GPIO_ReadPin(SDA2_GPIO_Port, SDA2_Pin) == GPIO_PIN_SET ? 1 : 0)
 #define SOFT_SCL2_READ() (HAL_GPIO_ReadPin(SCL2_GPIO_Port, SCL2_Pin) == GPIO_PIN_SET ? 1 : 0)
+
+#endif
+
+#ifdef I2C_SOFT_BUS_1
+#define SOFT_SCL1_HIGH() HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET)
+#define SOFT_SCL1_LOW()  HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA1_HIGH() HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET)
+#define SOFT_SDA1_LOW()  HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA1_READ() (HAL_GPIO_ReadPin(SDA_GPIO_Port, SDA_Pin) == GPIO_PIN_SET ? 1 : 0)
+#define SOFT_SCL1_READ() (HAL_GPIO_ReadPin(SCL_GPIO_Port, SCL_Pin) == GPIO_PIN_SET ? 1 : 0)
+
+#endif
+
 #define SOFT_I2C_DELAY()              \
   {                                   \
-    for (int xx = 0; xx < 20; xx++) { \
+    for (int xx = 0; xx < 15; xx++) { \
       asm("nop");                     \
     }                                 \
   }
 
-#endif
+// 40 ~= 100kHz; 15 gives around 250kHz or so which is fast _and_ stable
 
 #endif /* BSP_MINIWARE_SOFTWARE_I2C_H_ */

source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h

@@ -1,728 +0,0 @@
-/**
- ******************************************************************************
- * @file    stm32f1xx_hal_i2c.h
- * @author  MCD Application Team
- * @brief   Header file of I2C HAL module.
- ******************************************************************************
- * @attention
- *
- * <h2><center>&copy; Copyright (c) 2016 STMicroelectronics.
- * All rights reserved.</center></h2>
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- ******************************************************************************
- */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F1xx_HAL_I2C_H
-#define __STM32F1xx_HAL_I2C_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f1xx_hal_def.h"
-
-/** @addtogroup STM32F1xx_HAL_Driver
- * @{
- */
-
-/** @addtogroup I2C
- * @{
- */
-
-/* Exported types ------------------------------------------------------------*/
-/** @defgroup I2C_Exported_Types I2C Exported Types
- * @{
- */
-
-/** @defgroup I2C_Configuration_Structure_definition I2C Configuration Structure definition
- * @brief  I2C Configuration Structure definition
- * @{
- */
-typedef struct {
-  uint32_t ClockSpeed; /*!< Specifies the clock frequency.
-                            This parameter must be set to a value lower than 400kHz */
-
-  uint32_t DutyCycle; /*!< Specifies the I2C fast mode duty cycle.
-                           This parameter can be a value of @ref I2C_duty_cycle_in_fast_mode */
-
-  uint32_t OwnAddress1; /*!< Specifies the first device own address.
-                             This parameter can be a 7-bit or 10-bit address. */
-
-  uint32_t AddressingMode; /*!< Specifies if 7-bit or 10-bit addressing mode is selected.
-                                This parameter can be a value of @ref I2C_addressing_mode */
-
-  uint32_t DualAddressMode; /*!< Specifies if dual addressing mode is selected.
-                                 This parameter can be a value of @ref I2C_dual_addressing_mode */
-
-  uint32_t OwnAddress2; /*!< Specifies the second device own address if dual addressing mode is selected
-                             This parameter can be a 7-bit address. */
-
-  uint32_t GeneralCallMode; /*!< Specifies if general call mode is selected.
-                                 This parameter can be a value of @ref I2C_general_call_addressing_mode */
-
-  uint32_t NoStretchMode; /*!< Specifies if nostretch mode is selected.
-                               This parameter can be a value of @ref I2C_nostretch_mode */
-
-} I2C_InitTypeDef;
-
-/**
- * @}
- */
-
-/** @defgroup HAL_state_structure_definition HAL state structure definition
- * @brief  HAL State structure definition
- * @note  HAL I2C State value coding follow below described bitmap :
- *          b7-b6  Error information
- *             00 : No Error
- *             01 : Abort (Abort user request on going)
- *             10 : Timeout
- *             11 : Error
- *          b5     Peripheral initilisation status
- *             0  : Reset (Peripheral not initialized)
- *             1  : Init done (Peripheral initialized and ready to use. HAL I2C Init function called)
- *          b4     (not used)
- *             x  : Should be set to 0
- *          b3
- *             0  : Ready or Busy (No Listen mode ongoing)
- *             1  : Listen (Peripheral in Address Listen Mode)
- *          b2     Intrinsic process state
- *             0  : Ready
- *             1  : Busy (Peripheral busy with some configuration or internal operations)
- *          b1     Rx state
- *             0  : Ready (no Rx operation ongoing)
- *             1  : Busy (Rx operation ongoing)
- *          b0     Tx state
- *             0  : Ready (no Tx operation ongoing)
- *             1  : Busy (Tx operation ongoing)
- * @{
- */
-typedef enum {
-  HAL_I2C_STATE_RESET          = 0x00U, /*!< Peripheral is not yet Initialized         */
-  HAL_I2C_STATE_READY          = 0x20U, /*!< Peripheral Initialized and ready for use  */
-  HAL_I2C_STATE_BUSY           = 0x24U, /*!< An internal process is ongoing            */
-  HAL_I2C_STATE_BUSY_TX        = 0x21U, /*!< Data Transmission process is ongoing      */
-  HAL_I2C_STATE_BUSY_RX        = 0x22U, /*!< Data Reception process is ongoing         */
-  HAL_I2C_STATE_LISTEN         = 0x28U, /*!< Address Listen Mode is ongoing            */
-  HAL_I2C_STATE_BUSY_TX_LISTEN = 0x29U, /*!< Address Listen Mode and Data Transmission
-                                            process is ongoing                         */
-  HAL_I2C_STATE_BUSY_RX_LISTEN = 0x2AU, /*!< Address Listen Mode and Data Reception
-                                            process is ongoing                         */
-  HAL_I2C_STATE_ABORT   = 0x60U,        /*!< Abort user request ongoing                */
-  HAL_I2C_STATE_TIMEOUT = 0xA0U,        /*!< Timeout state                             */
-  HAL_I2C_STATE_ERROR   = 0xE0U         /*!< Error                                     */
-
-} HAL_I2C_StateTypeDef;
-
-/**
- * @}
- */
-
-/** @defgroup HAL_mode_structure_definition HAL mode structure definition
- * @brief  HAL Mode structure definition
- * @note  HAL I2C Mode value coding follow below described bitmap :\n
- *          b7     (not used)\n
- *             x  : Should be set to 0\n
- *          b6\n
- *             0  : None\n
- *             1  : Memory (HAL I2C communication is in Memory Mode)\n
- *          b5\n
- *             0  : None\n
- *             1  : Slave (HAL I2C communication is in Slave Mode)\n
- *          b4\n
- *             0  : None\n
- *             1  : Master (HAL I2C communication is in Master Mode)\n
- *          b3-b2-b1-b0  (not used)\n
- *             xxxx : Should be set to 0000
- * @{
- */
-typedef enum {
-  HAL_I2C_MODE_NONE   = 0x00U, /*!< No I2C communication on going             */
-  HAL_I2C_MODE_MASTER = 0x10U, /*!< I2C communication is in Master Mode       */
-  HAL_I2C_MODE_SLAVE  = 0x20U, /*!< I2C communication is in Slave Mode        */
-  HAL_I2C_MODE_MEM    = 0x40U  /*!< I2C communication is in Memory Mode       */
-
-} HAL_I2C_ModeTypeDef;
-
-/**
- * @}
- */
-
-/** @defgroup I2C_Error_Code_definition I2C Error Code definition
- * @brief  I2C Error Code definition
- * @{
- */
-#define HAL_I2C_ERROR_NONE      0x00000000U /*!< No error              */
-#define HAL_I2C_ERROR_BERR      0x00000001U /*!< BERR error            */
-#define HAL_I2C_ERROR_ARLO      0x00000002U /*!< ARLO error            */
-#define HAL_I2C_ERROR_AF        0x00000004U /*!< AF error              */
-#define HAL_I2C_ERROR_OVR       0x00000008U /*!< OVR error             */
-#define HAL_I2C_ERROR_DMA       0x00000010U /*!< DMA transfer error    */
-#define HAL_I2C_ERROR_TIMEOUT   0x00000020U /*!< Timeout Error         */
-#define HAL_I2C_ERROR_SIZE      0x00000040U /*!< Size Management error */
-#define HAL_I2C_ERROR_DMA_PARAM 0x00000080U /*!< DMA Parameter Error   */
-#define HAL_I2C_WRONG_START     0x00000200U /*!< Wrong start Error     */
-#if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-#define HAL_I2C_ERROR_INVALID_CALLBACK 0x00000100U /*!< Invalid Callback error */
-#endif                                             /* USE_HAL_I2C_REGISTER_CALLBACKS */
-/**
- * @}
- */
-
-/** @defgroup I2C_handle_Structure_definition I2C handle Structure definition
- * @brief  I2C handle Structure definition
- * @{
- */
-#if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-typedef struct __I2C_HandleTypeDef
-#else
-typedef struct
-#endif /* USE_HAL_I2C_REGISTER_CALLBACKS */
-{
-  I2C_TypeDef *Instance; /*!< I2C registers base address               */
-
-  I2C_InitTypeDef Init; /*!< I2C communication parameters             */
-
-  uint8_t *pBuffPtr; /*!< Pointer to I2C transfer buffer           */
-
-  uint16_t XferSize; /*!< I2C transfer size                        */
-
-  __IO uint16_t XferCount; /*!< I2C transfer counter                     */
-
-  __IO uint32_t XferOptions; /*!< I2C transfer options                     */
-
-  __IO uint32_t PreviousState; /*!< I2C communication Previous state and mode
-                                    context for internal usage               */
-
-  DMA_HandleTypeDef *hdmatx; /*!< I2C Tx DMA handle parameters             */
-
-  DMA_HandleTypeDef *hdmarx; /*!< I2C Rx DMA handle parameters             */
-
-  HAL_LockTypeDef Lock; /*!< I2C locking object                       */
-
-  __IO HAL_I2C_StateTypeDef State; /*!< I2C communication state                  */
-
-  __IO HAL_I2C_ModeTypeDef Mode; /*!< I2C communication mode                   */
-
-  __IO uint32_t ErrorCode; /*!< I2C Error code                           */
-
-  __IO uint32_t Devaddress; /*!< I2C Target device address                */
-
-  __IO uint32_t Memaddress; /*!< I2C Target memory address                */
-
-  __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 */
-  void (*SlaveTxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);  /*!< I2C Slave Tx Transfer completed callback  */
-  void (*SlaveRxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);  /*!< I2C Slave Rx Transfer completed callback  */
-  void (*ListenCpltCallback)(struct __I2C_HandleTypeDef *hi2c);   /*!< I2C Listen Complete callback              */
-  void (*MemTxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);    /*!< I2C Memory Tx Transfer completed callback */
-  void (*MemRxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);    /*!< I2C Memory Rx Transfer completed callback */
-  void (*ErrorCallback)(struct __I2C_HandleTypeDef *hi2c);        /*!< I2C Error callback                        */
-  void (*AbortCpltCallback)(struct __I2C_HandleTypeDef *hi2c);    /*!< I2C Abort callback                        */
-
-  void (*AddrCallback)(struct __I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, uint16_t AddrMatchCode); /*!< I2C Slave Address Match callback */
-
-  void (*MspInitCallback)(struct __I2C_HandleTypeDef *hi2c);   /*!< I2C Msp Init callback                     */
-  void (*MspDeInitCallback)(struct __I2C_HandleTypeDef *hi2c); /*!< I2C Msp DeInit callback                   */
-
-#endif /* USE_HAL_I2C_REGISTER_CALLBACKS */
-} I2C_HandleTypeDef;
-
-#if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-/**
- * @brief  HAL I2C Callback ID enumeration definition
- */
-typedef enum {
-  HAL_I2C_MASTER_TX_COMPLETE_CB_ID = 0x00U, /*!< I2C Master Tx Transfer completed callback ID  */
-  HAL_I2C_MASTER_RX_COMPLETE_CB_ID = 0x01U, /*!< I2C Master Rx Transfer completed callback ID  */
-  HAL_I2C_SLAVE_TX_COMPLETE_CB_ID  = 0x02U, /*!< I2C Slave Tx Transfer completed callback ID   */
-  HAL_I2C_SLAVE_RX_COMPLETE_CB_ID  = 0x03U, /*!< I2C Slave Rx Transfer completed callback ID   */
-  HAL_I2C_LISTEN_COMPLETE_CB_ID    = 0x04U, /*!< I2C Listen Complete callback ID               */
-  HAL_I2C_MEM_TX_COMPLETE_CB_ID    = 0x05U, /*!< I2C Memory Tx Transfer callback ID            */
-  HAL_I2C_MEM_RX_COMPLETE_CB_ID    = 0x06U, /*!< I2C Memory Rx Transfer completed callback ID  */
-  HAL_I2C_ERROR_CB_ID              = 0x07U, /*!< I2C Error callback ID                         */
-  HAL_I2C_ABORT_CB_ID              = 0x08U, /*!< I2C Abort callback ID                         */
-
-  HAL_I2C_MSPINIT_CB_ID   = 0x09U, /*!< I2C Msp Init callback ID                      */
-  HAL_I2C_MSPDEINIT_CB_ID = 0x0AU  /*!< I2C Msp DeInit callback ID                    */
-
-} HAL_I2C_CallbackIDTypeDef;
-
-/**
- * @brief  HAL I2C Callback pointer definition
- */
-typedef void (*pI2C_CallbackTypeDef)(I2C_HandleTypeDef *hi2c);                                                        /*!< pointer to an I2C callback function */
-typedef void (*pI2C_AddrCallbackTypeDef)(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, uint16_t AddrMatchCode); /*!< pointer to an I2C Address Match callback function */
-
-#endif /* USE_HAL_I2C_REGISTER_CALLBACKS */
-/**
- * @}
- */
-
-/**
- * @}
- */
-/* Exported constants --------------------------------------------------------*/
-
-/** @defgroup I2C_Exported_Constants I2C Exported Constants
- * @{
- */
-
-/** @defgroup I2C_duty_cycle_in_fast_mode I2C duty cycle in fast mode
- * @{
- */
-#define I2C_DUTYCYCLE_2    0x00000000U
-#define I2C_DUTYCYCLE_16_9 I2C_CCR_DUTY
-/**
- * @}
- */
-
-/** @defgroup I2C_addressing_mode I2C addressing mode
- * @{
- */
-#define I2C_ADDRESSINGMODE_7BIT  0x00004000U
-#define I2C_ADDRESSINGMODE_10BIT (I2C_OAR1_ADDMODE | 0x00004000U)
-/**
- * @}
- */
-
-/** @defgroup I2C_dual_addressing_mode  I2C dual addressing mode
- * @{
- */
-#define I2C_DUALADDRESS_DISABLE 0x00000000U
-#define I2C_DUALADDRESS_ENABLE  I2C_OAR2_ENDUAL
-/**
- * @}
- */
-
-/** @defgroup I2C_general_call_addressing_mode I2C general call addressing mode
- * @{
- */
-#define I2C_GENERALCALL_DISABLE 0x00000000U
-#define I2C_GENERALCALL_ENABLE  I2C_CR1_ENGC
-/**
- * @}
- */
-
-/** @defgroup I2C_nostretch_mode I2C nostretch mode
- * @{
- */
-#define I2C_NOSTRETCH_DISABLE 0x00000000U
-#define I2C_NOSTRETCH_ENABLE  I2C_CR1_NOSTRETCH
-/**
- * @}
- */
-
-/** @defgroup I2C_Memory_Address_Size I2C Memory Address Size
- * @{
- */
-#define I2C_MEMADD_SIZE_8BIT  0x00000001U
-#define I2C_MEMADD_SIZE_16BIT 0x00000010U
-/**
- * @}
- */
-
-/** @defgroup I2C_XferDirection_definition I2C XferDirection definition
- * @{
- */
-#define I2C_DIRECTION_RECEIVE  0x00000000U
-#define I2C_DIRECTION_TRANSMIT 0x00000001U
-/**
- * @}
- */
-
-/** @defgroup I2C_XferOptions_definition I2C XferOptions definition
- * @{
- */
-#define I2C_FIRST_FRAME          0x00000001U
-#define I2C_FIRST_AND_NEXT_FRAME 0x00000002U
-#define I2C_NEXT_FRAME           0x00000004U
-#define I2C_FIRST_AND_LAST_FRAME 0x00000008U
-#define I2C_LAST_FRAME_NO_STOP   0x00000010U
-#define I2C_LAST_FRAME           0x00000020U
-
-/* List of XferOptions in usage of :
- * 1- Restart condition in all use cases (direction change or not)
- */
-#define I2C_OTHER_FRAME          (0x00AA0000U)
-#define I2C_OTHER_AND_LAST_FRAME (0xAA000000U)
-/**
- * @}
- */
-
-/** @defgroup I2C_Interrupt_configuration_definition I2C Interrupt configuration definition
- * @brief I2C Interrupt definition
- *        Elements values convention: 0xXXXXXXXX
- *           - XXXXXXXX  : Interrupt control mask
- * @{
- */
-#define I2C_IT_BUF I2C_CR2_ITBUFEN
-#define I2C_IT_EVT I2C_CR2_ITEVTEN
-#define I2C_IT_ERR I2C_CR2_ITERREN
-/**
- * @}
- */
-
-/** @defgroup I2C_Flag_definition I2C Flag definition
- * @{
- */
-
-#define I2C_FLAG_OVR     0x00010800U
-#define I2C_FLAG_AF      0x00010400U
-#define I2C_FLAG_ARLO    0x00010200U
-#define I2C_FLAG_BERR    0x00010100U
-#define I2C_FLAG_TXE     0x00010080U
-#define I2C_FLAG_RXNE    0x00010040U
-#define I2C_FLAG_STOPF   0x00010010U
-#define I2C_FLAG_ADD10   0x00010008U
-#define I2C_FLAG_BTF     0x00010004U
-#define I2C_FLAG_ADDR    0x00010002U
-#define I2C_FLAG_SB      0x00010001U
-#define I2C_FLAG_DUALF   0x00100080U
-#define I2C_FLAG_GENCALL 0x00100010U
-#define I2C_FLAG_TRA     0x00100004U
-#define I2C_FLAG_BUSY    0x00100002U
-#define I2C_FLAG_MSL     0x00100001U
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-/* Exported macros -----------------------------------------------------------*/
-
-/** @defgroup I2C_Exported_Macros I2C Exported Macros
- * @{
- */
-
-/** @brief Reset I2C handle state.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @retval None
- */
-#if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-#define __HAL_I2C_RESET_HANDLE_STATE(__HANDLE__)           \
-  do {                                                     \
-    (__HANDLE__)->State             = HAL_I2C_STATE_RESET; \
-    (__HANDLE__)->MspInitCallback   = NULL;                \
-    (__HANDLE__)->MspDeInitCallback = NULL;                \
-  } while (0)
-#else
-#define __HAL_I2C_RESET_HANDLE_STATE(__HANDLE__) ((__HANDLE__)->State = HAL_I2C_STATE_RESET)
-#endif
-
-/** @brief  Enable or disable the specified I2C interrupts.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @param  __INTERRUPT__ specifies the interrupt source to enable or disable.
- *         This parameter can be one of the following values:
- *            @arg I2C_IT_BUF: Buffer interrupt enable
- *            @arg I2C_IT_EVT: Event interrupt enable
- *            @arg I2C_IT_ERR: Error interrupt enable
- * @retval None
- */
-#define __HAL_I2C_ENABLE_IT(__HANDLE__, __INTERRUPT__)  SET_BIT((__HANDLE__)->Instance->CR2, (__INTERRUPT__))
-#define __HAL_I2C_DISABLE_IT(__HANDLE__, __INTERRUPT__) CLEAR_BIT((__HANDLE__)->Instance->CR2, (__INTERRUPT__))
-
-/** @brief  Checks if the specified I2C interrupt source is enabled or disabled.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @param  __INTERRUPT__ specifies the I2C interrupt source to check.
- *          This parameter can be one of the following values:
- *            @arg I2C_IT_BUF: Buffer interrupt enable
- *            @arg I2C_IT_EVT: Event interrupt enable
- *            @arg I2C_IT_ERR: Error interrupt enable
- * @retval The new state of __INTERRUPT__ (TRUE or FALSE).
- */
-#define __HAL_I2C_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) ((((__HANDLE__)->Instance->CR2 & (__INTERRUPT__)) == (__INTERRUPT__)) ? SET : RESET)
-
-/** @brief  Checks whether the specified I2C flag is set or not.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @param  __FLAG__ specifies the flag to check.
- *         This parameter can be one of the following values:
- *            @arg I2C_FLAG_OVR: Overrun/Underrun flag
- *            @arg I2C_FLAG_AF: Acknowledge failure flag
- *            @arg I2C_FLAG_ARLO: Arbitration lost flag
- *            @arg I2C_FLAG_BERR: Bus error flag
- *            @arg I2C_FLAG_TXE: Data register empty flag
- *            @arg I2C_FLAG_RXNE: Data register not empty flag
- *            @arg I2C_FLAG_STOPF: Stop detection flag
- *            @arg I2C_FLAG_ADD10: 10-bit header sent flag
- *            @arg I2C_FLAG_BTF: Byte transfer finished flag
- *            @arg I2C_FLAG_ADDR: Address sent flag
- *                                Address matched flag
- *            @arg I2C_FLAG_SB: Start bit flag
- *            @arg I2C_FLAG_DUALF: Dual flag
- *            @arg I2C_FLAG_GENCALL: General call header flag
- *            @arg I2C_FLAG_TRA: Transmitter/Receiver flag
- *            @arg I2C_FLAG_BUSY: Bus busy flag
- *            @arg I2C_FLAG_MSL: Master/Slave flag
- * @retval The new state of __FLAG__ (TRUE or FALSE).
- */
-#define __HAL_I2C_GET_FLAG(__HANDLE__, __FLAG__)                                                                                                            \
-  ((((uint8_t)((__FLAG__) >> 16U)) == 0x01U) ? (((((__HANDLE__)->Instance->SR1) & ((__FLAG__)&I2C_FLAG_MASK)) == ((__FLAG__)&I2C_FLAG_MASK)) ? SET : RESET) \
-                                             : (((((__HANDLE__)->Instance->SR2) & ((__FLAG__)&I2C_FLAG_MASK)) == ((__FLAG__)&I2C_FLAG_MASK)) ? SET : RESET))
-
-/** @brief  Clears the I2C pending flags which are cleared by writing 0 in a specific bit.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @param  __FLAG__ specifies the flag to clear.
- *         This parameter can be any combination of the following values:
- *            @arg I2C_FLAG_OVR: Overrun/Underrun flag (Slave mode)
- *            @arg I2C_FLAG_AF: Acknowledge failure flag
- *            @arg I2C_FLAG_ARLO: Arbitration lost flag (Master mode)
- *            @arg I2C_FLAG_BERR: Bus error flag
- * @retval None
- */
-#define __HAL_I2C_CLEAR_FLAG(__HANDLE__, __FLAG__) ((__HANDLE__)->Instance->SR1 = ~((__FLAG__)&I2C_FLAG_MASK))
-
-/** @brief  Clears the I2C ADDR pending flag.
- * @param  __HANDLE__ specifies the I2C Handle.
- *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
- * @retval None
- */
-#define __HAL_I2C_CLEAR_ADDRFLAG(__HANDLE__)            \
-  do {                                                  \
-    __IO uint32_t tmpreg = 0x00U;                       \
-    tmpreg               = (__HANDLE__)->Instance->SR1; \
-    tmpreg               = (__HANDLE__)->Instance->SR2; \
-    UNUSED(tmpreg);                                     \
-  } while (0)
-
-/** @brief  Clears the I2C STOPF pending flag.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @retval None
- */
-#define __HAL_I2C_CLEAR_STOPFLAG(__HANDLE__)            \
-  do {                                                  \
-    __IO uint32_t tmpreg = 0x00U;                       \
-    tmpreg               = (__HANDLE__)->Instance->SR1; \
-    SET_BIT((__HANDLE__)->Instance->CR1, I2C_CR1_PE);   \
-    UNUSED(tmpreg);                                     \
-  } while (0)
-
-/** @brief  Enable the specified I2C peripheral.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @retval None
- */
-#define __HAL_I2C_ENABLE(__HANDLE__) SET_BIT((__HANDLE__)->Instance->CR1, I2C_CR1_PE)
-
-/** @brief  Disable the specified I2C peripheral.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @retval None
- */
-#define __HAL_I2C_DISABLE(__HANDLE__) CLEAR_BIT((__HANDLE__)->Instance->CR1, I2C_CR1_PE)
-
-/**
- * @}
- */
-
-/* Exported functions --------------------------------------------------------*/
-/** @addtogroup I2C_Exported_Functions
- * @{
- */
-
-/** @addtogroup I2C_Exported_Functions_Group1 Initialization and de-initialization functions
- * @{
- */
-/* Initialization and de-initialization functions******************************/
-HAL_StatusTypeDef HAL_I2C_Init(I2C_HandleTypeDef *hi2c);
-HAL_StatusTypeDef HAL_I2C_DeInit(I2C_HandleTypeDef *hi2c);
-void              HAL_I2C_MspInit(I2C_HandleTypeDef *hi2c);
-void              HAL_I2C_MspDeInit(I2C_HandleTypeDef *hi2c);
-
-/* Callbacks Register/UnRegister functions  ***********************************/
-#if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-HAL_StatusTypeDef HAL_I2C_RegisterCallback(I2C_HandleTypeDef *hi2c, HAL_I2C_CallbackIDTypeDef CallbackID, pI2C_CallbackTypeDef pCallback);
-HAL_StatusTypeDef HAL_I2C_UnRegisterCallback(I2C_HandleTypeDef *hi2c, HAL_I2C_CallbackIDTypeDef CallbackID);
-
-HAL_StatusTypeDef HAL_I2C_RegisterAddrCallback(I2C_HandleTypeDef *hi2c, pI2C_AddrCallbackTypeDef pCallback);
-HAL_StatusTypeDef HAL_I2C_UnRegisterAddrCallback(I2C_HandleTypeDef *hi2c);
-#endif /* USE_HAL_I2C_REGISTER_CALLBACKS */
-/**
- * @}
- */
-
-/** @addtogroup I2C_Exported_Functions_Group2 Input and Output operation functions
- * @{
- */
-/* IO operation functions  ****************************************************/
-/******* Blocking mode: Polling */
-HAL_StatusTypeDef HAL_I2C_Master_Transmit(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Slave_Transmit(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Slave_Receive(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Mem_Write(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Mem_Read(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_IsDeviceReady(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint32_t Trials, uint32_t Timeout);
-
-/******* Non-Blocking mode: Interrupt */
-HAL_StatusTypeDef HAL_I2C_Master_Transmit_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Master_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Slave_Transmit_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Slave_Receive_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Mem_Write_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Mem_Read_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
-
-HAL_StatusTypeDef HAL_I2C_Master_Seq_Transmit_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Master_Seq_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Slave_Seq_Transmit_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Slave_Seq_Receive_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_EnableListen_IT(I2C_HandleTypeDef *hi2c);
-HAL_StatusTypeDef HAL_I2C_DisableListen_IT(I2C_HandleTypeDef *hi2c);
-HAL_StatusTypeDef HAL_I2C_Master_Abort_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress);
-
-/******* Non-Blocking mode: DMA */
-HAL_StatusTypeDef HAL_I2C_Master_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Master_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Slave_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Slave_Receive_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Mem_Write_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Mem_Read_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
-
-HAL_StatusTypeDef HAL_I2C_Master_Seq_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Master_Seq_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Slave_Seq_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Slave_Seq_Receive_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-/**
- * @}
- */
-
-/** @addtogroup I2C_IRQ_Handler_and_Callbacks IRQ Handler and Callbacks
- * @{
- */
-/******* I2C IRQHandler and Callbacks used in non blocking modes (Interrupt and DMA) */
-void HAL_I2C_EV_IRQHandler(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_ER_IRQHandler(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_SlaveTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, uint16_t AddrMatchCode);
-void HAL_I2C_ListenCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c);
-/**
- * @}
- */
-
-/** @addtogroup I2C_Exported_Functions_Group3 Peripheral State, Mode and Error functions
- * @{
- */
-/* Peripheral State, Mode and Error functions  *********************************/
-HAL_I2C_StateTypeDef HAL_I2C_GetState(I2C_HandleTypeDef *hi2c);
-HAL_I2C_ModeTypeDef  HAL_I2C_GetMode(I2C_HandleTypeDef *hi2c);
-uint32_t             HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-/* Private types -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private constants ---------------------------------------------------------*/
-/** @defgroup I2C_Private_Constants I2C Private Constants
- * @{
- */
-#define I2C_FLAG_MASK              0x0000FFFFU
-#define I2C_MIN_PCLK_FREQ_STANDARD 2000000U /*!< 2 MHz                     */
-#define I2C_MIN_PCLK_FREQ_FAST     4000000U /*!< 4 MHz                     */
-/**
- * @}
- */
-
-/* Private macros ------------------------------------------------------------*/
-/** @defgroup I2C_Private_Macros I2C Private Macros
- * @{
- */
-
-#define I2C_MIN_PCLK_FREQ(__PCLK__, __SPEED__)              (((__SPEED__) <= 100000U) ? ((__PCLK__) < I2C_MIN_PCLK_FREQ_STANDARD) : ((__PCLK__) < I2C_MIN_PCLK_FREQ_FAST))
-#define I2C_CCR_CALCULATION(__PCLK__, __SPEED__, __COEFF__) (((((__PCLK__)-1U) / ((__SPEED__) * (__COEFF__))) + 1U) & I2C_CCR_CCR)
-#define I2C_FREQRANGE(__PCLK__)                             ((__PCLK__) / 1000000U)
-#define I2C_RISE_TIME(__FREQRANGE__, __SPEED__)             (((__SPEED__) <= 100000U) ? ((__FREQRANGE__) + 1U) : ((((__FREQRANGE__)*300U) / 1000U) + 1U))
-#define I2C_SPEED_STANDARD(__PCLK__, __SPEED__)             ((I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U) < 4U) ? 4U : I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U))
-#define I2C_SPEED_FAST(__PCLK__, __SPEED__, __DUTYCYCLE__) \
-  (((__DUTYCYCLE__) == I2C_DUTYCYCLE_2) ? I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 3U) : (I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 25U) | I2C_DUTYCYCLE_16_9))
-#define I2C_SPEED(__PCLK__, __SPEED__, __DUTYCYCLE__)                                                                                 \
-  (((__SPEED__) <= 100000U)                                                           ? (I2C_SPEED_STANDARD((__PCLK__), (__SPEED__))) \
-   : ((I2C_SPEED_FAST((__PCLK__), (__SPEED__), (__DUTYCYCLE__)) & I2C_CCR_CCR) == 0U) ? 1U                                            \
-                                                                                      : ((I2C_SPEED_FAST((__PCLK__), (__SPEED__), (__DUTYCYCLE__))) | I2C_CCR_FS))
-
-#define I2C_7BIT_ADD_WRITE(__ADDRESS__) ((uint8_t)((__ADDRESS__) & (uint8_t)(~I2C_OAR1_ADD0)))
-#define I2C_7BIT_ADD_READ(__ADDRESS__)  ((uint8_t)((__ADDRESS__) | I2C_OAR1_ADD0))
-
-#define I2C_10BIT_ADDRESS(__ADDRESS__)      ((uint8_t)((uint16_t)((__ADDRESS__) & (uint16_t)0x00FF)))
-#define I2C_10BIT_HEADER_WRITE(__ADDRESS__) ((uint8_t)((uint16_t)((uint16_t)(((uint16_t)((__ADDRESS__) & (uint16_t)0x0300)) >> 7) | (uint16_t)0x00F0)))
-#define I2C_10BIT_HEADER_READ(__ADDRESS__)  ((uint8_t)((uint16_t)((uint16_t)(((uint16_t)((__ADDRESS__) & (uint16_t)0x0300)) >> 7) | (uint16_t)(0x00F1))))
-
-#define I2C_MEM_ADD_MSB(__ADDRESS__) ((uint8_t)((uint16_t)(((uint16_t)((__ADDRESS__) & (uint16_t)0xFF00)) >> 8)))
-#define I2C_MEM_ADD_LSB(__ADDRESS__) ((uint8_t)((uint16_t)((__ADDRESS__) & (uint16_t)0x00FF)))
-
-/** @defgroup I2C_IS_RTC_Definitions I2C Private macros to check input parameters
- * @{
- */
-#define IS_I2C_DUTY_CYCLE(CYCLE)        (((CYCLE) == I2C_DUTYCYCLE_2) || ((CYCLE) == I2C_DUTYCYCLE_16_9))
-#define IS_I2C_ADDRESSING_MODE(ADDRESS) (((ADDRESS) == I2C_ADDRESSINGMODE_7BIT) || ((ADDRESS) == I2C_ADDRESSINGMODE_10BIT))
-#define IS_I2C_DUAL_ADDRESS(ADDRESS)    (((ADDRESS) == I2C_DUALADDRESS_DISABLE) || ((ADDRESS) == I2C_DUALADDRESS_ENABLE))
-#define IS_I2C_GENERAL_CALL(CALL)       (((CALL) == I2C_GENERALCALL_DISABLE) || ((CALL) == I2C_GENERALCALL_ENABLE))
-#define IS_I2C_NO_STRETCH(STRETCH)      (((STRETCH) == I2C_NOSTRETCH_DISABLE) || ((STRETCH) == I2C_NOSTRETCH_ENABLE))
-#define IS_I2C_MEMADD_SIZE(SIZE)        (((SIZE) == I2C_MEMADD_SIZE_8BIT) || ((SIZE) == I2C_MEMADD_SIZE_16BIT))
-#define IS_I2C_CLOCK_SPEED(SPEED)       (((SPEED) > 0U) && ((SPEED) <= 400000U))
-#define IS_I2C_OWN_ADDRESS1(ADDRESS1)   (((ADDRESS1)&0xFFFFFC00U) == 0U)
-#define IS_I2C_OWN_ADDRESS2(ADDRESS2)   (((ADDRESS2)&0xFFFFFF01U) == 0U)
-#define IS_I2C_TRANSFER_OPTIONS_REQUEST(REQUEST)                                                                                                                                          \
-  (((REQUEST) == I2C_FIRST_FRAME) || ((REQUEST) == I2C_FIRST_AND_NEXT_FRAME) || ((REQUEST) == I2C_NEXT_FRAME) || ((REQUEST) == I2C_FIRST_AND_LAST_FRAME) || ((REQUEST) == I2C_LAST_FRAME) \
-   || ((REQUEST) == I2C_LAST_FRAME_NO_STOP) || IS_I2C_TRANSFER_OTHER_OPTIONS_REQUEST(REQUEST))
-
-#define IS_I2C_TRANSFER_OTHER_OPTIONS_REQUEST(REQUEST) (((REQUEST) == I2C_OTHER_FRAME) || ((REQUEST) == I2C_OTHER_AND_LAST_FRAME))
-
-#define I2C_CHECK_FLAG(__ISR__, __FLAG__)    ((((__ISR__) & ((__FLAG__)&I2C_FLAG_MASK)) == ((__FLAG__)&I2C_FLAG_MASK)) ? SET : RESET)
-#define I2C_CHECK_IT_SOURCE(__CR1__, __IT__) ((((__CR1__) & (__IT__)) == (__IT__)) ? SET : RESET)
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-/* Private functions ---------------------------------------------------------*/
-/** @defgroup I2C_Private_Functions I2C Private Functions
- * @{
- */
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __STM32F1xx_HAL_I2C_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

source/Core/BSP/MHP30/configuration.h

@@ -155,7 +155,10 @@
 #define POW_PD     1
 #define POW_PD_EXT 0
 #define TEMP_NTC
-#define I2C_SOFT_BUS_2
+#define I2C_SOFT_BUS_2  1
+#define I2C_SOFT_BUS_1  1
+#define OLED_I2CBB1     1
+#define ACCEL_I2CBB1    1
 #define BATTFILTERDEPTH 8
 #define OLED_I2CBB2
 #define ACCEL_EXITS_ON_MOVEMENT

source/Core/BSP/MHP30/fusb_user.cpp

@@ -1,13 +1,13 @@
 #include "configuration.h"
 #ifdef POW_PD
 #include "BSP.h"
-#include "I2C_Wrapper.hpp"
+#include "I2CBB1.hpp"
 #include "Pins.h"
 #include "Setup.h"
 #include "USBPD.h"
-bool fusb_read_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return FRToSI2C::Mem_Read(deviceAddr, registerAdd, buf, size); }
+bool fusb_read_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return I2CBB1::Mem_Read(deviceAddr, registerAdd, buf, size); }
 
-bool fusb_write_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return FRToSI2C::Mem_Write(deviceAddr, registerAdd, (uint8_t *)buf, size); }
+bool fusb_write_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return I2CBB1::Mem_Write(deviceAddr, registerAdd, (uint8_t *)buf, size); }
 
 void setupFUSBIRQ() {
   GPIO_InitTypeDef GPIO_InitStruct;

source/Core/BSP/MHP30/preRTOS.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "BSP.h"
+#include "I2CBB1.hpp"
 #include "I2CBB2.hpp"
 #include "Pins.h"
 #include "Setup.h"
@@ -18,6 +19,5 @@ void preRToSInit() {
   Setup_HAL(); // Setup all the HAL objects
   BSPInit();
   I2CBB2::init();
-  /* Init the IPC objects */
-  FRToSI2C::FRToSInit();
+  I2CBB1::init();
 }

source/Core/BSP/MHP30/stm32f1xx_hal_msp.c

@@ -75,55 +75,6 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc) {
   }
 }
 
-void HAL_I2C_MspInit(I2C_HandleTypeDef *hi2c) {
-
-  GPIO_InitTypeDef GPIO_InitStruct;
-  /**I2C1 GPIO Configuration
-   PB6     ------> I2C1_SCL
-   PB7     ------> I2C1_SDA
-   */
-  GPIO_InitStruct.Pin   = SCL_Pin | SDA_Pin;
-  GPIO_InitStruct.Mode  = GPIO_MODE_AF_OD;
-  GPIO_InitStruct.Pull  = GPIO_PULLUP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-
-  /* Peripheral clock enable */
-  __HAL_RCC_I2C1_CLK_ENABLE();
-  /* I2C1 DMA Init */
-  /* I2C1_RX Init */
-  hdma_i2c1_rx.Instance                 = DMA1_Channel7;
-  hdma_i2c1_rx.Init.Direction           = DMA_PERIPH_TO_MEMORY;
-  hdma_i2c1_rx.Init.PeriphInc           = DMA_PINC_DISABLE;
-  hdma_i2c1_rx.Init.MemInc              = DMA_MINC_ENABLE;
-  hdma_i2c1_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
-  hdma_i2c1_rx.Init.MemDataAlignment    = DMA_MDATAALIGN_BYTE;
-  hdma_i2c1_rx.Init.Mode                = DMA_NORMAL;
-  hdma_i2c1_rx.Init.Priority            = DMA_PRIORITY_LOW;
-  HAL_DMA_Init(&hdma_i2c1_rx);
-
-  __HAL_LINKDMA(hi2c, hdmarx, hdma_i2c1_rx);
-
-  /* I2C1_TX Init */
-  hdma_i2c1_tx.Instance                 = DMA1_Channel6;
-  hdma_i2c1_tx.Init.Direction           = DMA_MEMORY_TO_PERIPH;
-  hdma_i2c1_tx.Init.PeriphInc           = DMA_PINC_DISABLE;
-  hdma_i2c1_tx.Init.MemInc              = DMA_MINC_ENABLE;
-  hdma_i2c1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
-  hdma_i2c1_tx.Init.MemDataAlignment    = DMA_MDATAALIGN_BYTE;
-  hdma_i2c1_tx.Init.Mode                = DMA_NORMAL;
-  hdma_i2c1_tx.Init.Priority            = DMA_PRIORITY_MEDIUM;
-  HAL_DMA_Init(&hdma_i2c1_tx);
-
-  __HAL_LINKDMA(hi2c, hdmatx, hdma_i2c1_tx);
-
-  /* I2C1 interrupt Init */
-  HAL_NVIC_SetPriority(I2C1_EV_IRQn, 15, 0);
-  HAL_NVIC_EnableIRQ(I2C1_EV_IRQn);
-  HAL_NVIC_SetPriority(I2C1_ER_IRQn, 15, 0);
-  HAL_NVIC_EnableIRQ(I2C1_ER_IRQn);
-}
-
 void HAL_TIM_Base_MspInit(TIM_HandleTypeDef *htim_base) {
 
   if (htim_base->Instance == TIM3) {

source/Core/BSP/MHP30/stm32f1xx_it.c

@@ -44,10 +44,5 @@ void ADC1_2_IRQHandler(void) { HAL_ADC_IRQHandler(&hadc1); }
 
 // used for hal ticks
 void TIM4_IRQHandler(void) { HAL_TIM_IRQHandler(&htim4); }
-void I2C1_EV_IRQHandler(void) { HAL_I2C_EV_IRQHandler(&hi2c1); }
-void I2C1_ER_IRQHandler(void) { HAL_I2C_ER_IRQHandler(&hi2c1); }
 
-void DMA1_Channel6_IRQHandler(void) { HAL_DMA_IRQHandler(&hdma_i2c1_tx); }
-
-void DMA1_Channel7_IRQHandler(void) { HAL_DMA_IRQHandler(&hdma_i2c1_rx); }
 void EXTI9_5_IRQHandler(void) { HAL_GPIO_EXTI_IRQHandler(INT_PD_Pin); }

source/Core/BSP/Miniware/IRQ.h

@@ -18,7 +18,6 @@
 extern "C" {
 #endif
 void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef *hadc);
-
 void HAL_GPIO_EXTI_Callback(uint16_t);
 
 #ifdef __cplusplus

source/Core/BSP/Miniware/Setup.cpp

@@ -7,6 +7,7 @@
 #include "Setup.h"
 #include "BSP.h"
 #include "Pins.h"
+#include "configuration.h"
 #include "history.hpp"
 #include <stdint.h>
 ADC_HandleTypeDef hadc1;
@@ -40,6 +41,9 @@ void        Setup_HAL() {
 
   MX_GPIO_Init();
   MX_DMA_Init();
+#ifndef I2C_SOFT_BUS_1
+#error "Only Bit-Bang now"
+#endif
   MX_ADC1_Init();
   MX_ADC2_Init();
   MX_TIP_CONTROL_TIMER_Init();

source/Core/BSP/Miniware/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h

@@ -1,5 +1,639 @@
+/**
+ ******************************************************************************
+ * @file    stm32f1xx_hal_i2c.h
+ * @author  MCD Application Team
+ * @brief   Header file of I2C HAL module.
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; COPYRIGHT(c) 2016 STMicroelectronics</center></h2>
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. Neither the name of STMicroelectronics nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************
+ */
 
+/* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32F1xx_HAL_I2C_H
 #define __STM32F1xx_HAL_I2C_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32f1xx_hal_def.h"
+
+/** @addtogroup STM32F1xx_HAL_Driver
+ * @{
+ */
+
+/** @addtogroup I2C
+ * @{
+ */
+
+/* Exported types ------------------------------------------------------------*/
+/** @defgroup I2C_Exported_Types I2C Exported Types
+ * @{
+ */
+
+/**
+ * @brief  I2C Configuration Structure definition
+ */
+typedef struct {
+  uint32_t ClockSpeed; /*!< Specifies the clock frequency.
+                            This parameter must be set to a value lower than 400kHz */
+
+  uint32_t DutyCycle; /*!< Specifies the I2C fast mode duty cycle.
+                           This parameter can be a value of @ref I2C_duty_cycle_in_fast_mode */
+
+  uint32_t OwnAddress1; /*!< Specifies the first device own address.
+                             This parameter can be a 7-bit or 10-bit address. */
+
+  uint32_t AddressingMode; /*!< Specifies if 7-bit or 10-bit addressing mode is selected.
+                                This parameter can be a value of @ref I2C_addressing_mode */
+
+  uint32_t DualAddressMode; /*!< Specifies if dual addressing mode is selected.
+                                 This parameter can be a value of @ref I2C_dual_addressing_mode */
+
+  uint32_t OwnAddress2; /*!< Specifies the second device own address if dual addressing mode is selected
+                             This parameter can be a 7-bit address. */
+
+  uint32_t GeneralCallMode; /*!< Specifies if general call mode is selected.
+                                 This parameter can be a value of @ref I2C_general_call_addressing_mode */
+
+  uint32_t NoStretchMode; /*!< Specifies if nostretch mode is selected.
+                               This parameter can be a value of @ref I2C_nostretch_mode */
+
+} I2C_InitTypeDef;
+
+/**
+ * @brief  HAL State structure definition
+ * @note  HAL I2C State value coding follow below described bitmap :
+ *          b7-b6  Error information
+ *             00 : No Error
+ *             01 : Abort (Abort user request on going)
+ *             10 : Timeout
+ *             11 : Error
+ *          b5     IP initilisation status
+ *             0  : Reset (IP not initialized)
+ *             1  : Init done (IP initialized and ready to use. HAL I2C Init function called)
+ *          b4     (not used)
+ *             x  : Should be set to 0
+ *          b3
+ *             0  : Ready or Busy (No Listen mode ongoing)
+ *             1  : Listen (IP in Address Listen Mode)
+ *          b2     Intrinsic process state
+ *             0  : Ready
+ *             1  : Busy (IP busy with some configuration or internal operations)
+ *          b1     Rx state
+ *             0  : Ready (no Rx operation ongoing)
+ *             1  : Busy (Rx operation ongoing)
+ *          b0     Tx state
+ *             0  : Ready (no Tx operation ongoing)
+ *             1  : Busy (Tx operation ongoing)
+ */
+typedef enum {
+  HAL_I2C_STATE_RESET          = 0x00U, /*!< Peripheral is not yet Initialized         */
+  HAL_I2C_STATE_READY          = 0x20U, /*!< Peripheral Initialized and ready for use  */
+  HAL_I2C_STATE_BUSY           = 0x24U, /*!< An internal process is ongoing            */
+  HAL_I2C_STATE_BUSY_TX        = 0x21U, /*!< Data Transmission process is ongoing      */
+  HAL_I2C_STATE_BUSY_RX        = 0x22U, /*!< Data Reception process is ongoing         */
+  HAL_I2C_STATE_LISTEN         = 0x28U, /*!< Address Listen Mode is ongoing            */
+  HAL_I2C_STATE_BUSY_TX_LISTEN = 0x29U, /*!< Address Listen Mode and Data Transmission
+                                            process is ongoing                         */
+  HAL_I2C_STATE_BUSY_RX_LISTEN = 0x2AU, /*!< Address Listen Mode and Data Reception
+                                            process is ongoing                         */
+  HAL_I2C_STATE_ABORT   = 0x60U,        /*!< Abort user request ongoing                */
+  HAL_I2C_STATE_TIMEOUT = 0xA0U,        /*!< Timeout state                             */
+  HAL_I2C_STATE_ERROR   = 0xE0U         /*!< Error                                     */
+
+} HAL_I2C_StateTypeDef;
+
+/**
+ * @brief  HAL Mode structure definition
+ * @note  HAL I2C Mode value coding follow below described bitmap :
+ *          b7     (not used)
+ *             x  : Should be set to 0
+ *          b6
+ *             0  : None
+ *             1  : Memory (HAL I2C communication is in Memory Mode)
+ *          b5
+ *             0  : None
+ *             1  : Slave (HAL I2C communication is in Slave Mode)
+ *          b4
+ *             0  : None
+ *             1  : Master (HAL I2C communication is in Master Mode)
+ *          b3-b2-b1-b0  (not used)
+ *             xxxx : Should be set to 0000
+ */
+typedef enum {
+  HAL_I2C_MODE_NONE   = 0x00U, /*!< No I2C communication on going             */
+  HAL_I2C_MODE_MASTER = 0x10U, /*!< I2C communication is in Master Mode       */
+  HAL_I2C_MODE_SLAVE  = 0x20U, /*!< I2C communication is in Slave Mode        */
+  HAL_I2C_MODE_MEM    = 0x40U  /*!< I2C communication is in Memory Mode       */
+
+} HAL_I2C_ModeTypeDef;
+
+/**
+ * @brief  I2C handle Structure definition
+ */
+typedef struct {
+  I2C_TypeDef *Instance; /*!< I2C registers base address               */
+
+  I2C_InitTypeDef Init; /*!< I2C communication parameters             */
+
+  uint8_t *pBuffPtr; /*!< Pointer to I2C transfer buffer           */
+
+  uint16_t XferSize; /*!< I2C transfer size                        */
+
+  __IO uint16_t XferCount; /*!< I2C transfer counter                     */
+
+  __IO uint32_t XferOptions; /*!< I2C transfer options                     */
+
+  __IO uint32_t PreviousState; /*!< I2C communication Previous state and mode
+                                    context for internal usage               */
+
+  DMA_HandleTypeDef *hdmatx; /*!< I2C Tx DMA handle parameters             */
+
+  DMA_HandleTypeDef *hdmarx; /*!< I2C Rx DMA handle parameters             */
+
+  HAL_LockTypeDef Lock; /*!< I2C locking object                       */
+
+  __IO HAL_I2C_StateTypeDef State; /*!< I2C communication state                  */
+
+  __IO HAL_I2C_ModeTypeDef Mode; /*!< I2C communication mode                   */
+
+  __IO uint32_t ErrorCode; /*!< I2C Error code                           */
+
+  __IO uint32_t Devaddress; /*!< I2C Target device address                */
+
+  __IO uint32_t Memaddress; /*!< I2C Target memory address                */
+
+  __IO uint32_t MemaddSize; /*!< I2C Target memory address  size          */
+
+  __IO uint32_t EventCount; /*!< I2C Event counter                        */
+
+} I2C_HandleTypeDef;
+
+/**
+ * @}
+ */
+
+/* Exported constants --------------------------------------------------------*/
+/** @defgroup I2C_Exported_Constants I2C Exported Constants
+ * @{
+ */
+
+/** @defgroup I2C_Error_Code I2C Error Code
+ * @brief    I2C Error Code
+ * @{
+ */
+#define HAL_I2C_ERROR_NONE    0x00000000U /*!< No error           */
+#define HAL_I2C_ERROR_BERR    0x00000001U /*!< BERR error         */
+#define HAL_I2C_ERROR_ARLO    0x00000002U /*!< ARLO error         */
+#define HAL_I2C_ERROR_AF      0x00000004U /*!< AF error           */
+#define HAL_I2C_ERROR_OVR     0x00000008U /*!< OVR error          */
+#define HAL_I2C_ERROR_DMA     0x00000010U /*!< DMA transfer error */
+#define HAL_I2C_ERROR_TIMEOUT 0x00000020U /*!< Timeout Error      */
+/**
+ * @}
+ */
+
+/** @defgroup I2C_duty_cycle_in_fast_mode I2C duty cycle in fast mode
+ * @{
+ */
+#define I2C_DUTYCYCLE_2    0x00000000U
+#define I2C_DUTYCYCLE_16_9 I2C_CCR_DUTY
+/**
+ * @}
+ */
+
+/** @defgroup I2C_addressing_mode I2C addressing mode
+ * @{
+ */
+#define I2C_ADDRESSINGMODE_7BIT 0x00004000U
+// #define I2C_ADDRESSINGMODE_10BIT (I2C_OAR1_ADDMODE | 0x00004000U)
+/**
+ * @}
+ */
+
+/** @defgroup I2C_dual_addressing_mode  I2C dual addressing mode
+ * @{
+ */
+#define I2C_DUALADDRESS_DISABLE 0x00000000U
+#define I2C_DUALADDRESS_ENABLE  I2C_OAR2_ENDUAL
+/**
+ * @}
+ */
+
+/** @defgroup I2C_general_call_addressing_mode I2C general call addressing mode
+ * @{
+ */
+#define I2C_GENERALCALL_DISABLE 0x00000000U
+#define I2C_GENERALCALL_ENABLE  I2C_CR1_ENGC
+/**
+ * @}
+ */
+
+/** @defgroup I2C_nostretch_mode I2C nostretch mode
+ * @{
+ */
+#define I2C_NOSTRETCH_DISABLE 0x00000000U
+#define I2C_NOSTRETCH_ENABLE  I2C_CR1_NOSTRETCH
+/**
+ * @}
+ */
+
+/** @defgroup I2C_Memory_Address_Size I2C Memory Address Size
+ * @{
+ */
+#define I2C_MEMADD_SIZE_8BIT  0x00000001U
+#define I2C_MEMADD_SIZE_16BIT 0x00000010U
+/**
+ * @}
+ */
+
+/** @defgroup I2C_XferDirection_definition I2C XferDirection definition
+ * @{
+ */
+#define I2C_DIRECTION_RECEIVE  0x00000000U
+#define I2C_DIRECTION_TRANSMIT 0x00000001U
+/**
+ * @}
+ */
+
+/** @defgroup I2C_XferOptions_definition I2C XferOptions definition
+ * @{
+ */
+#define I2C_FIRST_FRAME          0x00000001U
+#define I2C_NEXT_FRAME           0x00000002U
+#define I2C_FIRST_AND_LAST_FRAME 0x00000004U
+#define I2C_LAST_FRAME           0x00000008U
+/**
+ * @}
+ */
+
+/** @defgroup I2C_Interrupt_configuration_definition I2C Interrupt configuration definition
+ * @{
+ */
+#define I2C_IT_BUF I2C_CR2_ITBUFEN
+#define I2C_IT_EVT I2C_CR2_ITEVTEN
+#define I2C_IT_ERR I2C_CR2_ITERREN
+/**
+ * @}
+ */
+
+/** @defgroup I2C_Flag_definition I2C Flag definition
+ * @{
+ */
+#define I2C_FLAG_SMBALERT 0x00018000U
+#define I2C_FLAG_TIMEOUT  0x00014000U
+#define I2C_FLAG_PECERR   0x00011000U
+#define I2C_FLAG_OVR      0x00010800U
+#define I2C_FLAG_AF       0x00010400U
+#define I2C_FLAG_ARLO     0x00010200U
+#define I2C_FLAG_BERR     0x00010100U
+#define I2C_FLAG_TXE      0x00010080U
+#define I2C_FLAG_RXNE     0x00010040U
+#define I2C_FLAG_STOPF    0x00010010U
+// #define I2C_FLAG_ADD10      0x00010008U
+#define I2C_FLAG_BTF        0x00010004U
+#define I2C_FLAG_ADDR       0x00010002U
+#define I2C_FLAG_SB         0x00010001U
+#define I2C_FLAG_DUALF      0x00100080U
+#define I2C_FLAG_SMBHOST    0x00100040U
+#define I2C_FLAG_SMBDEFAULT 0x00100020U
+#define I2C_FLAG_GENCALL    0x00100010U
+#define I2C_FLAG_TRA        0x00100004U
+#define I2C_FLAG_BUSY       0x00100002U
+#define I2C_FLAG_MSL        0x00100001U
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+/* Exported macro ------------------------------------------------------------*/
+/** @defgroup I2C_Exported_Macros I2C Exported Macros
+ * @{
+ */
+
+/** @brief Reset I2C handle state
+ * @param  __HANDLE__: specifies the I2C Handle.
+ *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
+ * @retval None
+ */
+#define __HAL_I2C_RESET_HANDLE_STATE(__HANDLE__) ((__HANDLE__)->State = HAL_I2C_STATE_RESET)
+
+/** @brief  Enable or disable the specified I2C interrupts.
+ * @param  __HANDLE__: specifies the I2C Handle.
+ *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
+ * @param  __INTERRUPT__: specifies the interrupt source to enable or disable.
+ *         This parameter can be one of the following values:
+ *            @arg I2C_IT_BUF: Buffer interrupt enable
+ *            @arg I2C_IT_EVT: Event interrupt enable
+ *            @arg I2C_IT_ERR: Error interrupt enable
+ * @retval None
+ */
+#define __HAL_I2C_ENABLE_IT(__HANDLE__, __INTERRUPT__)  ((__HANDLE__)->Instance->CR2 |= (__INTERRUPT__))
+#define __HAL_I2C_DISABLE_IT(__HANDLE__, __INTERRUPT__) ((__HANDLE__)->Instance->CR2 &= (~(__INTERRUPT__)))
+
+/** @brief  Checks if the specified I2C interrupt source is enabled or disabled.
+ * @param  __HANDLE__: specifies the I2C Handle.
+ *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
+ * @param  __INTERRUPT__: specifies the I2C interrupt source to check.
+ *          This parameter can be one of the following values:
+ *            @arg I2C_IT_BUF: Buffer interrupt enable
+ *            @arg I2C_IT_EVT: Event interrupt enable
+ *            @arg I2C_IT_ERR: Error interrupt enable
+ * @retval The new state of __INTERRUPT__ (TRUE or FALSE).
+ */
+#define __HAL_I2C_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) ((((__HANDLE__)->Instance->CR2 & (__INTERRUPT__)) == (__INTERRUPT__)) ? SET : RESET)
+
+/** @brief  Checks whether the specified I2C flag is set or not.
+ * @param  __HANDLE__: specifies the I2C Handle.
+ *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
+ * @param  __FLAG__: specifies the flag to check.
+ *         This parameter can be one of the following values:
+ *            @arg I2C_FLAG_SMBALERT: SMBus Alert flag
+ *            @arg I2C_FLAG_TIMEOUT: Timeout or Tlow error flag
+ *            @arg I2C_FLAG_PECERR: PEC error in reception flag
+ *            @arg I2C_FLAG_OVR: Overrun/Underrun flag
+ *            @arg I2C_FLAG_AF: Acknowledge failure flag
+ *            @arg I2C_FLAG_ARLO: Arbitration lost flag
+ *            @arg I2C_FLAG_BERR: Bus error flag
+ *            @arg I2C_FLAG_TXE: Data register empty flag
+ *            @arg I2C_FLAG_RXNE: Data register not empty flag
+ *            @arg I2C_FLAG_STOPF: Stop detection flag
+ *            @arg I2C_FLAG_ADD10: 10-bit header sent flag
+ *            @arg I2C_FLAG_BTF: Byte transfer finished flag
+ *            @arg I2C_FLAG_ADDR: Address sent flag
+ *                                Address matched flag
+ *            @arg I2C_FLAG_SB: Start bit flag
+ *            @arg I2C_FLAG_DUALF: Dual flag
+ *            @arg I2C_FLAG_SMBHOST: SMBus host header
+ *            @arg I2C_FLAG_SMBDEFAULT: SMBus default header
+ *            @arg I2C_FLAG_GENCALL: General call header flag
+ *            @arg I2C_FLAG_TRA: Transmitter/Receiver flag
+ *            @arg I2C_FLAG_BUSY: Bus busy flag
+ *            @arg I2C_FLAG_MSL: Master/Slave flag
+ * @retval The new state of __FLAG__ (TRUE or FALSE).
+ */
+#define __HAL_I2C_GET_FLAG(__HANDLE__, __FLAG__)                                                                                            \
+  ((((uint8_t)((__FLAG__) >> 16U)) == 0x01U) ? ((((__HANDLE__)->Instance->SR1) & ((__FLAG__)&I2C_FLAG_MASK)) == ((__FLAG__)&I2C_FLAG_MASK)) \
+                                             : ((((__HANDLE__)->Instance->SR2) & ((__FLAG__)&I2C_FLAG_MASK)) == ((__FLAG__)&I2C_FLAG_MASK)))
+
+/** @brief  Clears the I2C pending flags which are cleared by writing 0 in a specific bit.
+ * @param  __HANDLE__: specifies the I2C Handle.
+ *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
+ * @param  __FLAG__: specifies the flag to clear.
+ *         This parameter can be any combination of the following values:
+ *            @arg I2C_FLAG_SMBALERT: SMBus Alert flag
+ *            @arg I2C_FLAG_TIMEOUT: Timeout or Tlow error flag
+ *            @arg I2C_FLAG_PECERR: PEC error in reception flag
+ *            @arg I2C_FLAG_OVR: Overrun/Underrun flag (Slave mode)
+ *            @arg I2C_FLAG_AF: Acknowledge failure flag
+ *            @arg I2C_FLAG_ARLO: Arbitration lost flag (Master mode)
+ *            @arg I2C_FLAG_BERR: Bus error flag
+ * @retval None
+ */
+#define __HAL_I2C_CLEAR_FLAG(__HANDLE__, __FLAG__) ((__HANDLE__)->Instance->SR1 = ~((__FLAG__)&I2C_FLAG_MASK))
+
+/** @brief  Clears the I2C ADDR pending flag.
+ * @param  __HANDLE__: specifies the I2C Handle.
+ *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
+ * @retval None
+ */
+#define __HAL_I2C_CLEAR_ADDRFLAG(__HANDLE__)            \
+  do {                                                  \
+    __IO uint32_t tmpreg = 0x00U;                       \
+    tmpreg               = (__HANDLE__)->Instance->SR1; \
+    tmpreg               = (__HANDLE__)->Instance->SR2; \
+    UNUSED(tmpreg);                                     \
+  } while (0U)
+
+/** @brief  Clears the I2C STOPF pending flag.
+ * @param  __HANDLE__: specifies the I2C Handle.
+ *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
+ * @retval None
+ */
+#define __HAL_I2C_CLEAR_STOPFLAG(__HANDLE__)            \
+  do {                                                  \
+    __IO uint32_t tmpreg = 0x00U;                       \
+    tmpreg               = (__HANDLE__)->Instance->SR1; \
+    (__HANDLE__)->Instance->CR1 |= I2C_CR1_PE;          \
+    UNUSED(tmpreg);                                     \
+  } while (0U)
+
+/** @brief  Enable the I2C peripheral.
+ * @param  __HANDLE__: specifies the I2C Handle.
+ *         This parameter can be I2Cx where x: 1 or 2  to select the I2C peripheral.
+ * @retval None
+ */
+#define __HAL_I2C_ENABLE(__HANDLE__) ((__HANDLE__)->Instance->CR1 |= I2C_CR1_PE)
+
+/** @brief  Disable the I2C peripheral.
+ * @param  __HANDLE__: specifies the I2C Handle.
+ *         This parameter can be I2Cx where x: 1 or 2  to select the I2C peripheral.
+ * @retval None
+ */
+#define __HAL_I2C_DISABLE(__HANDLE__) ((__HANDLE__)->Instance->CR1 &= ~I2C_CR1_PE)
+
+/**
+ * @}
+ */
+
+/* Exported functions --------------------------------------------------------*/
+/** @addtogroup I2C_Exported_Functions
+ * @{
+ */
+
+/** @addtogroup I2C_Exported_Functions_Group1
+ * @{
+ */
+/* Initialization/de-initialization functions  **********************************/
+HAL_StatusTypeDef HAL_I2C_Init(I2C_HandleTypeDef *hi2c);
+HAL_StatusTypeDef HAL_I2C_DeInit(I2C_HandleTypeDef *hi2c);
+void              HAL_I2C_MspInit(I2C_HandleTypeDef *hi2c);
+void              HAL_I2C_MspDeInit(I2C_HandleTypeDef *hi2c);
+/**
+ * @}
+ */
+
+/** @addtogroup I2C_Exported_Functions_Group2
+ * @{
+ */
+/* I/O operation functions  *****************************************************/
+/******* Blocking mode: Polling */
+HAL_StatusTypeDef HAL_I2C_Master_Transmit(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t Timeout);
+HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t Timeout);
+HAL_StatusTypeDef HAL_I2C_Slave_Transmit(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t Timeout);
+HAL_StatusTypeDef HAL_I2C_Slave_Receive(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t Timeout);
+HAL_StatusTypeDef HAL_I2C_Mem_Write(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size, uint32_t Timeout);
+HAL_StatusTypeDef HAL_I2C_Mem_Read(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size, uint32_t Timeout);
+HAL_StatusTypeDef HAL_I2C_IsDeviceReady(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint32_t Trials, uint32_t Timeout);
+
+/******* Non-Blocking mode: Interrupt */
+HAL_StatusTypeDef HAL_I2C_Master_Transmit_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
+HAL_StatusTypeDef HAL_I2C_Master_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
+HAL_StatusTypeDef HAL_I2C_Slave_Transmit_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
+HAL_StatusTypeDef HAL_I2C_Slave_Receive_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
+HAL_StatusTypeDef HAL_I2C_Mem_Write_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
+HAL_StatusTypeDef HAL_I2C_Mem_Read_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
+
+HAL_StatusTypeDef HAL_I2C_Master_Sequential_Transmit_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
+HAL_StatusTypeDef HAL_I2C_Master_Sequential_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
+HAL_StatusTypeDef HAL_I2C_Slave_Sequential_Transmit_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
+HAL_StatusTypeDef HAL_I2C_Slave_Sequential_Receive_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
+HAL_StatusTypeDef HAL_I2C_Master_Abort_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress);
+HAL_StatusTypeDef HAL_I2C_EnableListen_IT(I2C_HandleTypeDef *hi2c);
+HAL_StatusTypeDef HAL_I2C_DisableListen_IT(I2C_HandleTypeDef *hi2c);
+
+/******* Non-Blocking mode: DMA */
+HAL_StatusTypeDef HAL_I2C_Master_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
+HAL_StatusTypeDef HAL_I2C_Master_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
+HAL_StatusTypeDef HAL_I2C_Slave_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
+HAL_StatusTypeDef HAL_I2C_Slave_Receive_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
+HAL_StatusTypeDef HAL_I2C_Mem_Write_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
+HAL_StatusTypeDef HAL_I2C_Mem_Read_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
+
+/******* I2C IRQHandler and Callbacks used in non blocking modes (Interrupt and DMA) */
+void HAL_I2C_EV_IRQHandler(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_ER_IRQHandler(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_SlaveTxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, uint16_t AddrMatchCode);
+void HAL_I2C_ListenCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c);
+/**
+ * @}
+ */
+
+/** @addtogroup I2C_Exported_Functions_Group3
+ * @{
+ */
+/* Peripheral State, Mode and Errors functions  *********************************/
+HAL_I2C_StateTypeDef HAL_I2C_GetState(I2C_HandleTypeDef *hi2c);
+HAL_I2C_ModeTypeDef  HAL_I2C_GetMode(I2C_HandleTypeDef *hi2c);
+uint32_t             HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+/* Private types -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Private constants ---------------------------------------------------------*/
+/** @defgroup I2C_Private_Constants I2C Private Constants
+ * @{
+ */
+#define I2C_FLAG_MASK              0x0000FFFFU
+#define I2C_MIN_PCLK_FREQ_STANDARD 2000000U /*!< 2 MHz                     */
+#define I2C_MIN_PCLK_FREQ_FAST     4000000U /*!< 4 MHz                     */
+/**
+ * @}
+ */
+
+/* Private macros ------------------------------------------------------------*/
+/** @defgroup I2C_Private_Macros I2C Private Macros
+ * @{
+ */
+
+#define I2C_MIN_PCLK_FREQ(__PCLK__, __SPEED__)              (((__SPEED__) <= 100000U) ? ((__PCLK__) < I2C_MIN_PCLK_FREQ_STANDARD) : ((__PCLK__) < I2C_MIN_PCLK_FREQ_FAST))
+#define I2C_CCR_CALCULATION(__PCLK__, __SPEED__, __COEFF__) (((((__PCLK__)-1U) / ((__SPEED__) * (__COEFF__))) + 1U) & I2C_CCR_CCR)
+#define I2C_FREQRANGE(__PCLK__)                             ((__PCLK__) / 1000000U)
+#define I2C_RISE_TIME(__FREQRANGE__, __SPEED__)             (((__SPEED__) <= 100000U) ? ((__FREQRANGE__) + 1U) : ((((__FREQRANGE__)*300U) / 1000U) + 1U))
+#define I2C_SPEED_STANDARD(__PCLK__, __SPEED__)             ((I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U) < 4U) ? 4U : I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U))
+#define I2C_SPEED_FAST(__PCLK__, __SPEED__, __DUTYCYCLE__) \
+  (((__DUTYCYCLE__) == I2C_DUTYCYCLE_2) ? I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 3U) : (I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 25U) | I2C_DUTYCYCLE_16_9))
+#define I2C_SPEED(__PCLK__, __SPEED__, __DUTYCYCLE__)                                                                                 \
+  (((__SPEED__) <= 100000U)                                                           ? (I2C_SPEED_STANDARD((__PCLK__), (__SPEED__))) \
+   : ((I2C_SPEED_FAST((__PCLK__), (__SPEED__), (__DUTYCYCLE__)) & I2C_CCR_CCR) == 0U) ? 1U                                            \
+                                                                                      : ((I2C_SPEED_FAST((__PCLK__), (__SPEED__), (__DUTYCYCLE__))) | I2C_CCR_FS))
+
+#define I2C_7BIT_ADD_WRITE(__ADDRESS__) ((uint8_t)((__ADDRESS__) & (~I2C_OAR1_ADD0)))
+#define I2C_7BIT_ADD_READ(__ADDRESS__)  ((uint8_t)((__ADDRESS__) | I2C_OAR1_ADD0))
+
+#define I2C_10BIT_ADDRESS(__ADDRESS__)      ((uint8_t)((uint16_t)((__ADDRESS__) & (uint16_t)(0x00FFU))))
+#define I2C_10BIT_HEADER_WRITE(__ADDRESS__) ((uint8_t)((uint16_t)((uint16_t)(((uint16_t)((__ADDRESS__) & (uint16_t)(0x0300U))) >> 7U) | (uint16_t)(0x00F0U))))
+#define I2C_10BIT_HEADER_READ(__ADDRESS__)  ((uint8_t)((uint16_t)((uint16_t)(((uint16_t)((__ADDRESS__) & (uint16_t)(0x0300U))) >> 7U) | (uint16_t)(0x00F1U))))
+
+#define I2C_MEM_ADD_MSB(__ADDRESS__) ((uint8_t)((uint16_t)(((uint16_t)((__ADDRESS__) & (uint16_t)(0xFF00U))) >> 8U)))
+#define I2C_MEM_ADD_LSB(__ADDRESS__) ((uint8_t)((uint16_t)((__ADDRESS__) & (uint16_t)(0x00FFU))))
+
+/** @defgroup I2C_IS_RTC_Definitions I2C Private macros to check input parameters
+ * @{
+ */
+#define IS_I2C_DUTY_CYCLE(CYCLE)                 (((CYCLE) == I2C_DUTYCYCLE_2) || ((CYCLE) == I2C_DUTYCYCLE_16_9))
+#define IS_I2C_ADDRESSING_MODE(ADDRESS)          (((ADDRESS) == I2C_ADDRESSINGMODE_7BIT) || ((ADDRESS) == I2C_ADDRESSINGMODE_10BIT))
+#define IS_I2C_DUAL_ADDRESS(ADDRESS)             (((ADDRESS) == I2C_DUALADDRESS_DISABLE) || ((ADDRESS) == I2C_DUALADDRESS_ENABLE))
+#define IS_I2C_GENERAL_CALL(CALL)                (((CALL) == I2C_GENERALCALL_DISABLE) || ((CALL) == I2C_GENERALCALL_ENABLE))
+#define IS_I2C_NO_STRETCH(STRETCH)               (((STRETCH) == I2C_NOSTRETCH_DISABLE) || ((STRETCH) == I2C_NOSTRETCH_ENABLE))
+#define IS_I2C_MEMADD_SIZE(SIZE)                 (((SIZE) == I2C_MEMADD_SIZE_8BIT) || ((SIZE) == I2C_MEMADD_SIZE_16BIT))
+#define IS_I2C_CLOCK_SPEED(SPEED)                (((SPEED) > 0) && ((SPEED) <= 400000U))
+#define IS_I2C_OWN_ADDRESS1(ADDRESS1)            (((ADDRESS1) & (uint32_t)(0xFFFFFC00U)) == 0U)
+#define IS_I2C_OWN_ADDRESS2(ADDRESS2)            (((ADDRESS2) & (uint32_t)(0xFFFFFF01U)) == 0U)
+#define IS_I2C_TRANSFER_OPTIONS_REQUEST(REQUEST) (((REQUEST) == I2C_FIRST_FRAME) || ((REQUEST) == I2C_NEXT_FRAME) || ((REQUEST) == I2C_FIRST_AND_LAST_FRAME) || ((REQUEST) == I2C_LAST_FRAME))
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+/* Private functions ---------------------------------------------------------*/
+/** @defgroup I2C_Private_Functions I2C Private Functions
+ * @{
+ */
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __STM32F1xx_HAL_I2C_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

source/Core/BSP/Miniware/configuration.h

@@ -156,6 +156,10 @@
 #define MIN_BOOST_TEMP_C       250 // The min settable temp for boost mode °C
 #define MIN_BOOST_TEMP_F       480 // The min settable temp for boost mode °F
 
+// Miniware cant be trusted, and keep using the GD32 randomly now, so assume they will clones in the future
+
+#define I2C_SOFT_BUS_1 1
+
 #ifdef MODEL_TS100
 #define VOLTAGE_DIV        467 // 467 - Default divider from schematic
 #define CALIBRATION_OFFSET 900 // 900 - Default adc offset in uV
@@ -166,15 +170,13 @@
 #define OP_AMP_GAIN_STAGE  OP_AMP_GAIN_STAGE_TS100
 #define TEMP_uV_LOOKUP_HAKKO
 #define USB_PD_VMAX              20 // Maximum voltage for PD to negotiate
-
+#define OLED_I2CBB1              1
+#define ACCEL_I2CBB1             1
 #define HARDWARE_MAX_WATTAGE_X10 750
 #define TIP_THERMAL_MASS         65 // X10 watts to raise 1 deg C in 1 second
 #define TIP_RESISTANCE           75 // x10 ohms, 7.5 typical for ts100 tips
 
 #define POW_DC
-#define I2C_SOFT_BUS_1 1
-#define OLED_I2CBB1    1
-#define ACCEL_I2CBB1   1
 
 #define TEMP_TMP36
 #endif /* TS100 */
@@ -197,7 +199,6 @@
 #define POW_DC               1
 #define POW_PD               1
 #define I2C_SOFT_BUS_2       1
-#define I2C_SOFT_BUS_1       1
 #define OLED_I2CBB1          1
 #define USB_PD_I2CBB2        1
 #define USB_PD_VMAX          28 // Device supposedly can do 28V; looks like vmax is 33 ish
@@ -221,7 +222,7 @@
 
 #define TIP_THERMAL_MASS 40
 #define TIP_RESISTANCE   45 // x10 ohms, 4.5 typical for ts80 tips
-
+#define I2C_SOFT_BUS_2   1
 #define LIS_ORI_FLIP
 #define OLED_FLIP
 #endif /* TS80(P) */
@@ -231,15 +232,14 @@
 #define CALIBRATION_OFFSET 900 // the adc offset in uV
 #define PID_POWER_LIMIT    35  // Sets the max pwm power limit
 #define POWER_LIMIT        32  // 24 watts default power limit
+#define OLED_I2CBB1        1
+#define ACCEL_I2CBB1       1
 
 #define HARDWARE_MAX_WATTAGE_X10 320
 
 #define POW_QC
 
 #define TEMP_TMP36
-#define I2C_SOFT_BUS_1 1
-#define OLED_I2CBB1    1
-#define ACCEL_I2CBB1   1
 #endif /* TS80 */
 
 #ifdef MODEL_TS80P
@@ -247,16 +247,14 @@
 #define CALIBRATION_OFFSET       1500 // the adc offset in uV
 #define PID_POWER_LIMIT          35   // Sets the max pwm power limit
 #define POWER_LIMIT              32   // 30 watts default power limit
-
+#define I2C_SOFT_BUS_2           1
 #define HARDWARE_MAX_WATTAGE_X10 320
+#define OLED_I2CBB1              1
+#define ACCEL_I2CBB1             1
 
 #define POW_PD 1
 #define POW_QC 1
 #define TEMP_NTC
-#define I2C_SOFT_BUS_2 1
-#define I2C_SOFT_BUS_1 1
-#define OLED_I2CBB1    1
-#define ACCEL_I2CBB1   1
 #define SC7_ORI_FLIP
 #endif /* TS80P */
 

source/Core/BSP/Miniware/stm32f1xx_it.c

@@ -57,13 +57,6 @@ void TIM4_IRQHandler(void) {
   HAL_TIM_IRQHandler(handle);
 }
 
-void I2C1_EV_IRQHandler(void) {}
-void I2C1_ER_IRQHandler(void) {}
-
-void DMA1_Channel6_IRQHandler(void) {}
-
-void DMA1_Channel7_IRQHandler(void) {}
-
 void EXTI9_5_IRQHandler(void) {
 #ifdef INT_PD_Pin
   HAL_GPIO_EXTI_IRQHandler(INT_PD_Pin);

source/Core/BSP/Pinecil/Vendor/NMSIS/Core/Include/core_feature_base.h

@@ -282,7 +282,7 @@ typedef union {
  */
 #define __RV_CSR_SWAP(csr, val)                                                            \
   ({                                                                                       \
-    volatile rv_csr_t __v = (unsigned long)(val);                                          \
+    register rv_csr_t __v = (unsigned long)(val);                                          \
     __ASM volatile("csrrw %0, " STRINGIFY(csr) ", %1" : "=r"(__v) : "rK"(__v) : "memory"); \
     __v;                                                                                   \
   })
@@ -297,7 +297,7 @@ typedef union {
  */
 #define __RV_CSR_READ(csr)                                               \
   ({                                                                     \
-    volatile rv_csr_t __v;                                               \
+    register rv_csr_t __v;                                               \
     __ASM volatile("csrr %0, " STRINGIFY(csr) : "=r"(__v) : : "memory"); \
     __v;                                                                 \
   })
@@ -312,7 +312,7 @@ typedef union {
  */
 #define __RV_CSR_WRITE(csr, val)                                            \
   ({                                                                        \
-    volatile rv_csr_t __v = (rv_csr_t)(val);                                \
+    register rv_csr_t __v = (rv_csr_t)(val);                                \
     __ASM volatile("csrw " STRINGIFY(csr) ", %0" : : "rK"(__v) : "memory"); \
   })
 
@@ -328,7 +328,7 @@ typedef union {
  */
 #define __RV_CSR_READ_SET(csr, val)                                                        \
   ({                                                                                       \
-    volatile rv_csr_t __v = (rv_csr_t)(val);                                               \
+    register rv_csr_t __v = (rv_csr_t)(val);                                               \
     __ASM volatile("csrrs %0, " STRINGIFY(csr) ", %1" : "=r"(__v) : "rK"(__v) : "memory"); \
     __v;                                                                                   \
   })
@@ -343,7 +343,7 @@ typedef union {
  */
 #define __RV_CSR_SET(csr, val)                                              \
   ({                                                                        \
-    volatile rv_csr_t __v = (rv_csr_t)(val);                                \
+    register rv_csr_t __v = (rv_csr_t)(val);                                \
     __ASM volatile("csrs " STRINGIFY(csr) ", %0" : : "rK"(__v) : "memory"); \
   })
 
@@ -359,7 +359,7 @@ typedef union {
  */
 #define __RV_CSR_READ_CLEAR(csr, val)                                                      \
   ({                                                                                       \
-    volatile rv_csr_t __v = (rv_csr_t)(val);                                               \
+    register rv_csr_t __v = (rv_csr_t)(val);                                               \
     __ASM volatile("csrrc %0, " STRINGIFY(csr) ", %1" : "=r"(__v) : "rK"(__v) : "memory"); \
     __v;                                                                                   \
   })
@@ -374,7 +374,7 @@ typedef union {
  */
 #define __RV_CSR_CLEAR(csr, val)                                            \
   ({                                                                        \
-    volatile rv_csr_t __v = (rv_csr_t)(val);                                \
+    register rv_csr_t __v = (rv_csr_t)(val);                                \
     __ASM volatile("csrc " STRINGIFY(csr) ", %0" : : "rK"(__v) : "memory"); \
   })
 #endif /* __ASSEMBLY__ */

source/Core/BSP/Pinecil/configuration.h

@@ -151,7 +151,6 @@
 #define POW_DC     1
 #define POW_QC_20V 1
 #define ENABLE_QC2 1
-#define MAG_SLEEP_SUPPORT 1
 #define TEMP_TMP36
 #define ACCEL_BMA
 #define ACCEL_SC7

source/Core/BSP/Pinecilv2/ble_handlers.cpp

@@ -34,7 +34,7 @@
 #endif
 
 extern TickType_t    lastMovementTime;
-extern OperatingMode currentOperatingMode;
+extern OperatingMode currentMode;
 
 int ble_char_read_status_callback(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf, u16_t len, u16_t offset) {
   if (attr == NULL || attr->uuid == NULL) {
@@ -123,7 +123,7 @@ int ble_char_read_status_callback(struct bt_conn *conn, const struct bt_gatt_att
     break;
   case 13:
     // Operating mode
-    temp = (uint32_t)currentOperatingMode;
+    temp = currentMode;
     memcpy(buf, &temp, sizeof(temp));
     return sizeof(temp);
     break;
@@ -162,7 +162,7 @@ int ble_char_read_bulk_value_callback(struct bt_conn *conn, const struct bt_gatt
           TipThermoModel::getTipMaxInC(),                                      // 9  - max temp
           TipThermoModel::convertTipRawADCTouV(getTipRawTemp(0), true),        // 10 - Raw tip in μV
           abs(getRawHallEffect()),                                             // 11 - hall sensor
-          (uint32_t)currentOperatingMode,                                      // 12 - Operating mode
+          currentMode,                                                         // 12 - Operating mode
           x10WattHistory.average(),                                            // 13 - Estimated Wattage *10
       };
       int lenToCopy = sizeof(bulkData) - offset;

source/Core/BSP/Pinecilv2/configuration.h

@@ -152,7 +152,6 @@
 #define POW_QC_20V                 1                         // Supported features
 #define POW_EPR                    1
 #define ENABLE_QC2                 1
-#define MAG_SLEEP_SUPPORT          1
 #define DEVICE_HAS_VALIDATION_SUPPORT
 #define TEMP_NTC
 #define ACCEL_BMA

source/Core/BSP/Sequre_S60/I2C_Wrapper.cpp

@@ -1,91 +0,0 @@
-/*
- * FRToSI2C.cpp
- *
- *  Created on: 14Apr.,2018
- *      Author: Ralim
- */
-#include "BSP.h"
-#include "Setup.h"
-#include <I2C_Wrapper.hpp>
-SemaphoreHandle_t FRToSI2C::I2CSemaphore = nullptr;
-StaticSemaphore_t FRToSI2C::xSemaphoreBuffer;
-
-void FRToSI2C::CpltCallback() {
-  hi2c1.State = HAL_I2C_STATE_READY; // Force state reset (even if tx error)
-  if (I2CSemaphore) {
-    xSemaphoreGiveFromISR(I2CSemaphore, NULL);
-  }
-}
-
-bool FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t MemAddress, uint8_t *pData, uint16_t Size) {
-
-  if (!lock())
-    return false;
-  if (HAL_I2C_Mem_Read(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
-
-    I2C_Unstick();
-    unlock();
-    return false;
-  }
-
-  unlock();
-  return true;
-}
-bool FRToSI2C::I2C_RegisterWrite(uint8_t address, uint8_t reg, uint8_t data) { return Mem_Write(address, reg, &data, 1); }
-
-uint8_t FRToSI2C::I2C_RegisterRead(uint8_t add, uint8_t reg) {
-  uint8_t tx_data[1];
-  Mem_Read(add, reg, tx_data, 1);
-  return tx_data[0];
-}
-bool FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress, uint8_t *pData, uint16_t Size) {
-
-  if (!lock())
-    return false;
-  if (HAL_I2C_Mem_Write(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
-
-    I2C_Unstick();
-    unlock();
-    return false;
-  }
-
-  unlock();
-  return true;
-}
-
-bool FRToSI2C::Transmit(uint16_t DevAddress, uint8_t *pData, uint16_t Size) {
-  if (!lock())
-    return false;
-  if (HAL_I2C_Master_Transmit_IT(&hi2c1, DevAddress, pData, Size) != HAL_OK) {
-    I2C_Unstick();
-    unlock();
-    return false;
-  }
-  return true;
-}
-
-bool FRToSI2C::probe(uint16_t DevAddress) {
-  if (!lock())
-    return false;
-  uint8_t buffer[1];
-  bool    worked = HAL_I2C_Mem_Read(&hi2c1, DevAddress, 0x0F, I2C_MEMADD_SIZE_8BIT, buffer, 1, 1000) == HAL_OK;
-  unlock();
-  return worked;
-}
-
-void FRToSI2C::I2C_Unstick() { unstick_I2C(); }
-
-void FRToSI2C::unlock() { xSemaphoreGive(I2CSemaphore); }
-
-bool FRToSI2C::lock() { return xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE; }
-
-bool FRToSI2C::writeRegistersBulk(const uint8_t address, const I2C_REG *registers, const uint8_t registersLength) {
-  for (int index = 0; index < registersLength; index++) {
-    if (!I2C_RegisterWrite(address, registers[index].reg, registers[index].val)) {
-      return false;
-    }
-    if (registers[index].pause_ms)
-      delay_ms(registers[index].pause_ms);
-  }
-  return true;
-}

source/Core/BSP/Sequre_S60/IRQ.cpp

@@ -23,12 +23,6 @@ void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef *hadc) {
     }
   }
 }
-void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
 
 extern osThreadId POWTaskHandle;
 

source/Core/BSP/Sequre_S60/IRQ.h

@@ -18,12 +18,6 @@
 extern "C" {
 #endif
 void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef *hadc);
-void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c);
 void HAL_GPIO_EXTI_Callback(uint16_t);
 
 #ifdef __cplusplus

source/Core/BSP/Sequre_S60/Setup.cpp

@@ -14,10 +14,6 @@ ADC_HandleTypeDef hadc1;
 ADC_HandleTypeDef hadc2;
 DMA_HandleTypeDef hdma_adc1;
 
-I2C_HandleTypeDef hi2c1;
-DMA_HandleTypeDef hdma_i2c1_rx;
-DMA_HandleTypeDef hdma_i2c1_tx;
-
 IWDG_HandleTypeDef hiwdg;
 TIM_HandleTypeDef  htim4; // Tip control
 TIM_HandleTypeDef  htim2; // ADC Scheduling
@@ -28,7 +24,6 @@ uint16_t ADCReadings[ADC_SAMPLES]; // Used to store the adc readings for the han
 // Functions
 static void SystemClock_Config(void);
 static void MX_ADC1_Init(void);
-static void MX_I2C1_Init(void);
 static void MX_IWDG_Init(void);
 static void MX_TIM4_Init(void); // Tip control
 static void MX_TIM2_Init(void); // ADC Scheduling
@@ -44,9 +39,6 @@ void        Setup_HAL() {
 
   // These are not shared so no harm enabling
   __HAL_AFIO_REMAP_SWJ_NOJTAG();
-#ifdef SCL_Pin
-  MX_I2C1_Init();
-#endif
   MX_GPIO_Init();
   MX_DMA_Init();
   MX_ADC1_Init();
@@ -249,33 +241,6 @@ static void MX_ADC2_Init(void) {
     ;
   }
 }
-/* I2C1 init function */
-static void MX_I2C1_Init(void) {
-  hi2c1.Instance        = I2C1;
-  hi2c1.Init.ClockSpeed = 200000;
-  // OLED doesnt handle >100k when its asleep (off).
-  hi2c1.Init.DutyCycle       = I2C_DUTYCYCLE_16_9;
-  hi2c1.Init.OwnAddress1     = 0;
-  hi2c1.Init.AddressingMode  = I2C_ADDRESSINGMODE_7BIT;
-  hi2c1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
-  hi2c1.Init.OwnAddress2     = 0;
-  hi2c1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
-  hi2c1.Init.NoStretchMode   = I2C_NOSTRETCH_DISABLE;
-  __HAL_I2C_DISABLE(&hi2c1);
-
-  __HAL_RCC_I2C1_CLK_ENABLE();
-
-  // 13. Set SWRST bit in I2Cx_CR1 register.
-  hi2c1.Instance->CR1 |= 0x8000;
-
-  asm("nop");
-
-  // 14. Clear SWRST bit in I2Cx_CR1 register.
-  hi2c1.Instance->CR1 &= ~0x8000;
-
-  HAL_I2C_Init(&hi2c1);
-  unstick_I2C();
-}
 
 /* IWDG init function */
 static void MX_IWDG_Init(void) {

source/Core/BSP/Sequre_S60/Setup.h

@@ -18,10 +18,6 @@ extern ADC_HandleTypeDef hadc1;
 extern ADC_HandleTypeDef hadc2;
 extern DMA_HandleTypeDef hdma_adc1;
 
-extern DMA_HandleTypeDef hdma_i2c1_rx;
-extern DMA_HandleTypeDef hdma_i2c1_tx;
-extern I2C_HandleTypeDef hi2c1;
-
 extern IWDG_HandleTypeDef hiwdg;
 
 extern TIM_HandleTypeDef htim4;

source/Core/BSP/Sequre_S60/preRTOS.cpp

@@ -20,6 +20,4 @@ void preRToSInit() {
 #ifdef I2C_SOFT_BUS_2
   I2CBB2::init();
 #endif
-  /* Init the IPC objects */
-  FRToSI2C::FRToSInit();
 }

source/Core/BSP/Sequre_S60/stm32f1xx_hal_msp.c

@@ -72,54 +72,6 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc) {
   }
 }
 
-void HAL_I2C_MspInit(I2C_HandleTypeDef *hi2c) {
-#ifdef SCL_Pin
-  GPIO_InitTypeDef GPIO_InitStruct;
-  /**I2C1 GPIO Configuration
-   PB6     ------> I2C1_SCL
-   PB7     ------> I2C1_SDA
-   */
-  GPIO_InitStruct.Pin   = SCL_Pin | SDA_Pin;
-  GPIO_InitStruct.Mode  = GPIO_MODE_AF_OD;
-  GPIO_InitStruct.Pull  = GPIO_PULLUP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_MEDIUM;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-
-  /* I2C1 DMA Init */
-  /* I2C1_RX Init */
-  hdma_i2c1_rx.Instance                 = DMA1_Channel7;
-  hdma_i2c1_rx.Init.Direction           = DMA_PERIPH_TO_MEMORY;
-  hdma_i2c1_rx.Init.PeriphInc           = DMA_PINC_DISABLE;
-  hdma_i2c1_rx.Init.MemInc              = DMA_MINC_ENABLE;
-  hdma_i2c1_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
-  hdma_i2c1_rx.Init.MemDataAlignment    = DMA_MDATAALIGN_BYTE;
-  hdma_i2c1_rx.Init.Mode                = DMA_NORMAL;
-  hdma_i2c1_rx.Init.Priority            = DMA_PRIORITY_LOW;
-  HAL_DMA_Init(&hdma_i2c1_rx);
-
-  __HAL_LINKDMA(hi2c, hdmarx, hdma_i2c1_rx);
-
-  /* I2C1_TX Init */
-  hdma_i2c1_tx.Instance                 = DMA1_Channel6;
-  hdma_i2c1_tx.Init.Direction           = DMA_MEMORY_TO_PERIPH;
-  hdma_i2c1_tx.Init.PeriphInc           = DMA_PINC_DISABLE;
-  hdma_i2c1_tx.Init.MemInc              = DMA_MINC_ENABLE;
-  hdma_i2c1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
-  hdma_i2c1_tx.Init.MemDataAlignment    = DMA_MDATAALIGN_BYTE;
-  hdma_i2c1_tx.Init.Mode                = DMA_NORMAL;
-  hdma_i2c1_tx.Init.Priority            = DMA_PRIORITY_MEDIUM;
-  HAL_DMA_Init(&hdma_i2c1_tx);
-
-  __HAL_LINKDMA(hi2c, hdmatx, hdma_i2c1_tx);
-
-  /* I2C1 interrupt Init */
-  HAL_NVIC_SetPriority(I2C1_EV_IRQn, 15, 0);
-  HAL_NVIC_EnableIRQ(I2C1_EV_IRQn);
-  HAL_NVIC_SetPriority(I2C1_ER_IRQn, 15, 0);
-  HAL_NVIC_EnableIRQ(I2C1_ER_IRQn);
-#endif
-}
-
 void HAL_TIM_Base_MspInit(TIM_HandleTypeDef *htim_base) {
   if (htim_base->Instance == TIM4) {
     /* Peripheral clock enable */

source/Core/BSP/Sequre_S60/stm32f1xx_it.c

@@ -33,10 +33,4 @@ void TIM1_UP_IRQHandler(void) { HAL_TIM_IRQHandler(&htim1); }
 void TIM4_IRQHandler(void) { HAL_TIM_IRQHandler(&htim4); }
 void TIM2_IRQHandler(void) { HAL_TIM_IRQHandler(&htim2); }
 
-void I2C1_EV_IRQHandler(void) { HAL_I2C_EV_IRQHandler(&hi2c1); }
-void I2C1_ER_IRQHandler(void) { HAL_I2C_ER_IRQHandler(&hi2c1); }
-
-void DMA1_Channel6_IRQHandler(void) { HAL_DMA_IRQHandler(&hdma_i2c1_tx); }
-
-void DMA1_Channel7_IRQHandler(void) { HAL_DMA_IRQHandler(&hdma_i2c1_rx); }
 void EXTI9_5_IRQHandler(void) { HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_9); }

source/Core/Drivers/BMA223.cpp

@@ -9,7 +9,6 @@
 #include <BMA223.hpp>
 #include <array>
 
-
 bool BMA223::detect() {
   if (ACCEL_I2C_CLASS::probe(BMA223_ADDRESS)) {
     // Read chip id to ensure its not an address collision

source/Core/Drivers/BMA223.hpp

@@ -9,8 +9,9 @@
 #define CORE_DRIVERS_BMA223_HPP_
 #include "BMA223_defines.h"
 #include "BSP.h"
-#include "accelerometers_common.h"
 #include "I2C_Wrapper.hpp"
+#include "accelerometers_common.h"
+
 
 class BMA223 {
 public:

source/Core/Drivers/I2CBB1.cpp

@@ -314,4 +314,15 @@ bool I2CBB1::writeRegistersBulk(const uint8_t address, const I2C_REG *registers,
   }
   return true;
 }
+
+bool I2CBB1::wakePart(uint16_t DevAddress) {
+  // wakepart is a special case  where only the device address is sent
+  if (!lock())
+    return false;
+  start();
+  bool ack = send(DevAddress);
+  stop();
+  unlock();
+  return ack;
+}
 #endif

source/Core/Drivers/I2CBB1.hpp

@@ -36,6 +36,7 @@ public:
     const uint8_t pause_ms; // How many ms to pause _after_ writing this reg
   } I2C_REG;
   static bool writeRegistersBulk(const uint8_t address, const I2C_REG *registers, const uint8_t registersLength);
+  static bool wakePart(uint16_t DevAddress);
 
 private:
   static SemaphoreHandle_t I2CSemaphore;

source/Core/Drivers/I2CBB2.cpp

@@ -313,4 +313,15 @@ bool I2CBB2::writeRegistersBulk(const uint8_t address, const I2C_REG *registers,
   }
   return true;
 }
+
+bool I2CBB2::wakePart(uint16_t DevAddress) {
+  // wakepart is a special case  where only the device address is sent
+  if (!lock())
+    return false;
+  start();
+  bool ack = send(DevAddress);
+  stop();
+  unlock();
+  return ack;
+}
 #endif

source/Core/Drivers/I2CBB2.hpp

@@ -36,6 +36,7 @@ public:
     const uint8_t pause_ms; // How many ms to pause _after_ writing this reg
   } I2C_REG;
   static bool writeRegistersBulk(const uint8_t address, const I2C_REG *registers, const uint8_t registersLength);
+  static bool wakePart(uint16_t DevAddress);
 
 private:
   static SemaphoreHandle_t I2CSemaphore;

source/Core/Drivers/MMA8652FC.cpp

@@ -5,11 +5,10 @@
  *      Author: Ben V. Brown
  */
 
-#include <array>
-
 #include "MMA8652FC.hpp"
 #include "accelerometers_common.h"
 #include "cmsis_os.h"
+#include <array>
 
 static const ACCEL_I2C_CLASS::I2C_REG i2c_registers[] = {
     {CTRL_REG2, 0, 0},                // Normal mode

source/Core/Drivers/MSA301.cpp

@@ -8,6 +8,7 @@
 #include "MSA301_defines.h"
 #include "accelerometers_common.h"
 #include <MSA301.h>
+
 #define MSA301_I2C_ADDRESS 0x26 << 1
 bool MSA301::detect() { return ACCEL_I2C_CLASS::probe(MSA301_I2C_ADDRESS); }
 

source/Core/Drivers/OLED.cpp

@@ -262,8 +262,7 @@ void OLED::maskScrollIndicatorOnOLED() {
  * If forward is true, this displays a forward navigation to the second framebuffer contents.
  * Otherwise a rewinding navigation animation is shown to the second framebuffer contents.
  */
-void OLED::transitionSecondaryFramebuffer(const bool forwardNavigation, const TickType_t viewEnterTime) {
-  bool     buttonsReleased = getButtonState() == BUTTON_NONE;
+void OLED::transitionSecondaryFramebuffer(bool forwardNavigation) {
   uint8_t *stripBackPointers[4];
   stripBackPointers[0] = &secondFrameBuffer[FRAMEBUFFER_START + 0];
   stripBackPointers[1] = &secondFrameBuffer[FRAMEBUFFER_START + OLED_WIDTH];
@@ -318,14 +317,10 @@ void OLED::transitionSecondaryFramebuffer(const bool forwardNavigation, const Ti
 
     refresh(); // Now refresh to write out the contents to the new page
     vTaskDelayUntil(&startDraw, TICKS_100MS / 7);
-    buttonsReleased |= getButtonState() == BUTTON_NONE;
-    if (getButtonState() != BUTTON_NONE && buttonsReleased) {
-      memcpy(screenBuffer + FRAMEBUFFER_START, secondFrameBuffer + FRAMEBUFFER_START, sizeof(screenBuffer) - FRAMEBUFFER_START);
-      refresh(); // Now refresh to write out the contents to the new page
+    if (getButtonState() != BUTTON_NONE) {
       return;
     }
   }
-  refresh(); //
 }
 
 void OLED::useSecondaryFramebuffer(bool useSecondary) {
@@ -335,7 +330,6 @@ void OLED::useSecondaryFramebuffer(bool useSecondary) {
     setFramebuffer(screenBuffer);
   }
 }
-
 /**
  * This assumes that the current display output buffer has the current on screen contents
  * Then the secondary buffer has the "new" contents to be slid up onto the screen
@@ -343,9 +337,8 @@ void OLED::useSecondaryFramebuffer(bool useSecondary) {
  *
  * **This function blocks until the transition has completed or user presses button**
  */
-void OLED::transitionScrollDown(const TickType_t viewEnterTime) {
+void OLED::transitionScrollDown() {
   TickType_t startDraw = xTaskGetTickCount();
-  bool       buttonsReleased = getButtonState() == BUTTON_NONE;
 
   for (uint8_t heightPos = 0; heightPos < OLED_HEIGHT; heightPos++) {
     // For each line, we shuffle all bits up a row
@@ -372,9 +365,9 @@ void OLED::transitionScrollDown(const TickType_t viewEnterTime) {
       // Finally on the bottom row; we shuffle it up ready
       secondFrameBuffer[fourthStripPos] >>= 1;
 #else
-      // Move the LSB off the first strip, and pop MSB from second strip onto the first strip
+      // Move the MSB off the first strip, and pop MSB from second strip onto the first strip
       screenBuffer[firstStripPos] = (screenBuffer[firstStripPos] >> 1) | ((screenBuffer[secondStripPos] & 0x01) << 7);
-      // Now shuffle off the second strip MSB, and replace it with the LSB of the secondary buffer
+      // Now shuffle off the second strip MSB, and replace it with the MSB of the secondary buffer
       screenBuffer[secondStripPos] = (screenBuffer[secondStripPos] >> 1) | ((secondFrameBuffer[firstStripPos] & 0x01) << 7);
       // Finally, do the shuffle on the second frame buffer
       secondFrameBuffer[firstStripPos] = (secondFrameBuffer[firstStripPos] >> 1) | ((secondFrameBuffer[secondStripPos] & 0x01) << 7);
@@ -382,62 +375,7 @@ void OLED::transitionScrollDown(const TickType_t viewEnterTime) {
       secondFrameBuffer[secondStripPos] >>= 1;
 #endif /* OLED_128x32 */
     }
-    buttonsReleased |= getButtonState() == BUTTON_NONE;
-    if (getButtonState() != BUTTON_NONE && buttonsReleased) {
-      // Exit early, but have to transition whole buffer
-      memcpy(screenBuffer + FRAMEBUFFER_START, secondFrameBuffer + FRAMEBUFFER_START, sizeof(screenBuffer) - FRAMEBUFFER_START);
-      refresh(); // Now refresh to write out the contents to the new page
-      return;
-    }
-    refresh(); // Now refresh to write out the contents to the new page
-    vTaskDelayUntil(&startDraw, TICKS_100MS / 7);
-  }
-}
-/**
- * This assumes that the current display output buffer has the current on screen contents
- * Then the secondary buffer has the "new" contents to be slid down onto the screen
- * Sadly we cant use the hardware scroll as some devices with the 128x32 screens dont have the GRAM for holding both screens at once
- *
- * **This function blocks until the transition has completed or user presses button**
- */
-void OLED::transitionScrollUp(const TickType_t viewEnterTime) {
-  TickType_t startDraw       = xTaskGetTickCount();
-  bool       buttonsReleased = getButtonState() == BUTTON_NONE;
-
-  for (uint8_t heightPos = 0; heightPos < OLED_HEIGHT; heightPos++) {
-    // For each line, we shuffle all bits down a row
-    for (uint8_t xPos = 0; xPos < OLED_WIDTH; xPos++) {
-      const uint16_t firstStripPos  = FRAMEBUFFER_START + xPos;
-      const uint16_t secondStripPos = firstStripPos + OLED_WIDTH;
-#ifdef OLED_128x32
-      // For 32 pixel high OLED's we have four strips to tailchain
-      const uint16_t thirdStripPos  = secondStripPos + OLED_WIDTH;
-      const uint16_t fourthStripPos = thirdStripPos + OLED_WIDTH;
-      // We are shffling LSB's off the end and pushing bits down
-      screenBuffer[fourthStripPos] = (screenBuffer[fourthStripPos] << 1) | ((screenBuffer[thirdStripPos] & 0x80) >> 7);
-      screenBuffer[thirdStripPos]  = (screenBuffer[thirdStripPos] << 1) | ((screenBuffer[secondStripPos] & 0x80) >> 7);
-      screenBuffer[secondStripPos] = (screenBuffer[secondStripPos] << 1) | ((screenBuffer[firstStripPos] & 0x80) >> 7);
-      screenBuffer[firstStripPos]  = (screenBuffer[firstStripPos] << 1) | ((secondFrameBuffer[fourthStripPos] & 0x80) >> 7);
-
-      secondFrameBuffer[fourthStripPos] = (secondFrameBuffer[fourthStripPos] << 1) | ((secondFrameBuffer[thirdStripPos] & 0x80) >> 7);
-      secondFrameBuffer[thirdStripPos]  = (secondFrameBuffer[thirdStripPos] << 1) | ((secondFrameBuffer[secondStripPos] & 0x80) >> 7);
-      secondFrameBuffer[secondStripPos] = (secondFrameBuffer[secondStripPos] << 1) | ((secondFrameBuffer[firstStripPos] & 0x80) >> 7);
-      // Finally on the bottom row; we shuffle it up ready
-      secondFrameBuffer[firstStripPos] <<= 1;
-#else
-      // We pop the LSB off the bottom row, and replace the MSB in that byte with the LSB of the row above
-      screenBuffer[secondStripPos] = (screenBuffer[secondStripPos] << 1) | ((screenBuffer[firstStripPos] & 0x80) >> 7);
-      // Move the LSB off the first strip, and pop MSB from second strip onto the first strip
-      screenBuffer[firstStripPos] = (screenBuffer[firstStripPos] << 1) | ((secondFrameBuffer[secondStripPos] & 0x80) >> 7);
-
-      // Finally, do the shuffle on the second frame buffer
-      secondFrameBuffer[secondStripPos] = (secondFrameBuffer[secondStripPos] << 1) | ((secondFrameBuffer[firstStripPos] & 0x80) >> 7);
-      // Finally on the bottom row; we shuffle it up ready
-      secondFrameBuffer[firstStripPos] <<= 1;
-#endif /* OLED_128x32 */
-    }
-    buttonsReleased |= getButtonState() == BUTTON_NONE;
-    if (getButtonState() != BUTTON_NONE && buttonsReleased) {
+    if (getButtonState() != BUTTON_NONE) {
       // Exit early, but have to transition whole buffer
       memcpy(screenBuffer + FRAMEBUFFER_START, secondFrameBuffer + FRAMEBUFFER_START, sizeof(screenBuffer) - FRAMEBUFFER_START);
       refresh(); // Now refresh to write out the contents to the new page
@@ -490,18 +428,14 @@ void OLED::setRotation(bool leftHanded) {
 }
 
 void OLED::setBrightness(uint8_t contrast) {
-  if (OLED_Setup_Array[15].val != contrast) {
   OLED_Setup_Array[15].val = contrast;
   I2C_CLASS::writeRegistersBulk(DEVICEADDR_OLED, &OLED_Setup_Array[14], 2);
-  }
 }
 
 void OLED::setInverseDisplay(bool inverse) {
   uint8_t normalInverseCmd = inverse ? 0xA7 : 0xA6;
-  if (OLED_Setup_Array[21].val != normalInverseCmd) {
   OLED_Setup_Array[21].val = normalInverseCmd;
   I2C_CLASS::I2C_RegisterWrite(DEVICEADDR_OLED, 0x80, normalInverseCmd);
-  }
 }
 
 // print a string to the current cursor location, len chars MAX

source/Core/Drivers/OLED.hpp

@@ -149,10 +149,9 @@ public:
   static void drawHeatSymbol(uint8_t state);
   static void drawScrollIndicator(uint8_t p, uint8_t h); // Draws a scrolling position indicator
   static void maskScrollIndicatorOnOLED();
-  static void transitionSecondaryFramebuffer(const bool forwardNavigation, const TickType_t viewEnterTime);
+  static void transitionSecondaryFramebuffer(bool forwardNavigation);
   static void useSecondaryFramebuffer(bool useSecondary);
-  static void transitionScrollDown(const TickType_t viewEnterTime);
-  static void transitionScrollUp(const TickType_t viewEnterTime);
+  static void transitionScrollDown();
 
 private:
   static bool checkDisplayBufferChecksum() {

source/Core/Drivers/SC7A20.hpp

@@ -12,7 +12,6 @@
 #include "SC7A20_defines.h"
 #include "accelerometers_common.h"
 
-
 class SC7A20 {
 public:
   static bool detect();

source/Core/Drivers/Si7210.cpp

@@ -10,18 +10,17 @@
  *      This class is licensed as MIT to match this code base
  */
 
-#include "I2C_Wrapper.hpp"
 #include "Si7210_defines.h"
+#include "accelerometers_common.h"
 #include <Si7210.h>
-#ifdef MAG_SLEEP_SUPPORT
-bool Si7210::detect() { return FRToSI2C::wakePart(SI7210_ADDRESS); }
+bool Si7210::detect() { return ACCEL_I2C_CLASS::wakePart(SI7210_ADDRESS); }
 
 bool Si7210::init() {
   // Turn on auto increment and sanity check ID
   // Load OTP cal
 
   uint8_t temp;
-  if (FRToSI2C::Mem_Read(SI7210_ADDRESS, SI7210_REG_ID, &temp, 1)) {
+  if (ACCEL_I2C_CLASS::Mem_Read(SI7210_ADDRESS, SI7210_REG_ID, &temp, 1)) {
     // We don't really care what model it is etc, just probing to check its probably this iC
     if (temp != 0x00 && temp != 0xFF) {
       temp = 0x00;
@@ -78,10 +77,10 @@ bool Si7210::write_reg(const uint8_t reg, const uint8_t mask, const uint8_t val)
     temp &= mask;
   }
   temp |= val;
-  return FRToSI2C::Mem_Write(SI7210_ADDRESS, reg, &temp, 1);
+  return ACCEL_I2C_CLASS::Mem_Write(SI7210_ADDRESS, reg, &temp, 1);
 }
 
-bool Si7210::read_reg(const uint8_t reg, uint8_t *val) { return FRToSI2C::Mem_Read(SI7210_ADDRESS, reg, val, 1); }
+bool Si7210::read_reg(const uint8_t reg, uint8_t *val) { return ACCEL_I2C_CLASS::Mem_Read(SI7210_ADDRESS, reg, val, 1); }
 
 bool Si7210::start_periodic_measurement() {
   /* Enable periodic wakeup */
@@ -96,7 +95,7 @@ bool Si7210::start_periodic_measurement() {
 bool Si7210::get_field_strength(int16_t *field) {
   *field      = 0;
   uint8_t val = 0;
-  FRToSI2C::wakePart(SI7210_ADDRESS);
+  ACCEL_I2C_CLASS::wakePart(SI7210_ADDRESS);
 
   if (!write_reg(SI7210_POWER_CTRL, MEAS_MASK | USESTORE_MASK, STOP_MASK))
     return false;
@@ -176,4 +175,3 @@ bool Si7210::set_high_range() {
   worked &= write_reg(SI7210_A5, 0, val);
   return worked;
 }
-#endif // MAG_SLEEP_SUPPORT

source/Core/Drivers/Si7210.h

@@ -7,10 +7,7 @@
 
 #ifndef CORE_DRIVERS_SI7210_H_
 #define CORE_DRIVERS_SI7210_H_
-#include "configuration.h"
 #include <stdint.h>
-
-#ifdef MAG_SLEEP_SUPPORT
 class Si7210 {
 public:
   // Return true if present
@@ -26,5 +23,5 @@ private:
   static bool get_field_strength(int16_t *field);
   static bool set_high_range();
 };
-#endif // MAG_SLEEP_SUPPORT
+
 #endif /* CORE_DRIVERS_SI7210_H_ */

source/Core/Inc/ScrollMessage.hpp

@@ -4,10 +4,37 @@
 #include "portmacro.h"
 #include <stdint.h>
 /**
- * A helper for showing a full-screen scrolling message.
+ * A helper class for showing a full-screen scrolling message.
  */
+class ScrollMessage {
+  TickType_t messageStart = 0;
+  int16_t    lastOffset   = -1;
 
-/**
+  /**
+   * Calcualte the width in pixels of the message string, in the large
+   * font and taking into account multi-byte chars.
+   *
+   * @param message The null-terminated message string.
+   */
+  static uint16_t messageWidth(const char *message);
+
+public:
+  ScrollMessage() {}
+
+  /**
+   * Resets this `ScrollMessage` instance to its initial state.
+   */
+  void reset() {
+    messageStart = 0;
+    lastOffset   = -1;
+  }
+
+  /**
+   * Gets whether this `ScrollMessage` instance is in its initial state.
+   */
+  bool isReset() const { return messageStart == 0; }
+
+  /**
    * Draw and update the scroll message if needed.
    *
    * This function does not call `OLED::refresh()`. If this function
@@ -17,8 +44,10 @@
    * @param message The null-terminated message string. This must be the
    * same string as the previous call, unless this `ScrollMessage` instance
    * is in its initial state or `reset()` has been called.
- * @param currentTick The current tick as returned by `xTaskGetTickCount()` offset to 0 at start of scrolling.
+   * @param currentTick The current tick as returned by `xTaskGetTickCount()`.
+   * @return Whether the OLED framebuffer has been modified.
    */
-void drawScrollingText(const char *message, TickType_t currentTickOffset);
+  bool drawUpdate(const char *message, TickType_t currentTick);
+};
 
 #endif /* SCROLL_MESSAGE_HPP_ */

source/Core/Inc/settingsGUI.hpp

@@ -9,10 +9,10 @@
 #define GUI_HPP_
 #include "BSP.h"
 #include "FreeRTOS.h"
-#include "Buttons.hpp"
 #include "Settings.h"
 #include "Translation.h"
 
+
 #define PRESS_ACCEL_STEP         (TICKS_100MS / 3)
 #define PRESS_ACCEL_INTERVAL_MIN TICKS_100MS
 #define PRESS_ACCEL_INTERVAL_MAX (TICKS_100MS * 3)
@@ -37,8 +37,7 @@ typedef struct {
 } menuitem;
 
 void                  enterSettingsMenu();
-bool                   warnUser(const char *warning, const ButtonState buttons);
+void                  warnUser(const char *warning, const TickType_t timeout);
 extern const menuitem rootSettingsMenu[];
-extern const menuitem *subSettingsMenus[];
 
 #endif /* GUI_HPP_ */

source/Core/Inc/stm32f1xx_hal_conf.h

@@ -60,7 +60,7 @@ extern "C" {
 /*#define HAL_ETH_MODULE_ENABLED   */
 /*#define HAL_FLASH_MODULE_ENABLED   */
 #define HAL_GPIO_MODULE_ENABLED
-#define HAL_I2C_MODULE_ENABLED
+/* #define HAL_I2C_MODULE_ENABLED */
 /*#define HAL_I2S_MODULE_ENABLED   */
 /*#define HAL_IRDA_MODULE_ENABLED   */
 #define HAL_IWDG_MODULE_ENABLED

source/Core/Src/ScrollMessage.cpp

@@ -28,20 +28,19 @@ static uint16_t str_display_len(const char *const str) {
   return count;
 }
 
-/**
- * Calculate the width in pixels of the message string, in the large
- * font and taking into account multi-byte chars.
- *
- * @param message The null-terminated message string.
- */
-uint16_t messageWidth(const char *message) { return FONT_12_WIDTH * str_display_len(message); }
+uint16_t ScrollMessage::messageWidth(const char *message) { return FONT_12_WIDTH * str_display_len(message); }
 
-void drawScrollingText(const char *message, TickType_t currentTickOffset) {
+bool ScrollMessage::drawUpdate(const char *message, TickType_t currentTick) {
+  bool lcdRefresh = false;
 
+  if (messageStart == 0) {
+    messageStart = currentTick;
+    lcdRefresh   = true;
+  }
   int16_t  messageOffset;
   uint16_t msgWidth = messageWidth(message);
   if (msgWidth > OLED_WIDTH) {
-    messageOffset = (currentTickOffset / (getSettingValue(SettingsOptions::DescriptionScrollSpeed) == 1 ? TICKS_100MS / 10 : (TICKS_100MS / 5)));
+    messageOffset = ((currentTick - messageStart) / (getSettingValue(SettingsOptions::DescriptionScrollSpeed) == 1 ? TICKS_100MS / 10 : (TICKS_100MS / 5)));
     messageOffset %= msgWidth + OLED_WIDTH; // Roll around at the end
     if (messageOffset < OLED_WIDTH) {
       // Snap the message to the left edge.
@@ -55,7 +54,15 @@ void drawScrollingText(const char *message, TickType_t currentTickOffset) {
     messageOffset = (OLED_WIDTH - msgWidth) / 2 + msgWidth;
   }
 
+  if (lastOffset != messageOffset) {
+    OLED::clearScreen();
+
     //^ Rolling offset based on time
     OLED::setCursor((OLED_WIDTH - messageOffset), 0);
     OLED::print(message, FontStyle::LARGE);
+    lastOffset = messageOffset;
+    lcdRefresh = true;
+  }
+
+  return lcdRefresh;
 }

source/Core/Src/settingsGUI.cpp

@@ -120,12 +120,17 @@ static bool showHallEffect(void);
 
 #if defined(POW_DC) || defined(POW_QC)
 static void displayPowerMenu(void);
+static bool enterPowerMenu(void);
 #endif /* POW_DC or POW_QC */
 
 static void displaySolderingMenu(void);
+static bool enterSolderingMenu(void);
 static void displayPowerSavingMenu(void);
+static bool enterPowerSavingMenu(void);
 static void displayUIMenu(void);
+static bool enterUIMenu(void);
 static void displayAdvancedMenu(void);
+static bool enterAdvancedMenu(void);
 
 /*
  * Root Settings Menu
@@ -211,16 +216,16 @@ const menuitem rootSettingsMenu[] {
    */
 #if defined(POW_DC) || defined(POW_QC)
   /* Power */
-  {0, nullptr, displayPowerMenu, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0},
+  {0, enterPowerMenu, displayPowerMenu, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0},
 #endif
   /* Soldering */
-  {0, nullptr, displaySolderingMenu, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0},
+  {0, enterSolderingMenu, displaySolderingMenu, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0},
   /* Sleep Options Menu */
-  {0, nullptr, displayPowerSavingMenu, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0},
+  {0, enterPowerSavingMenu, displayPowerSavingMenu, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0},
   /* UI Menu */
-  {0, nullptr, displayUIMenu, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0},
+  {0, enterUIMenu, displayUIMenu, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0},
   /* Advanced Menu */
-  {0, nullptr, displayAdvancedMenu, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0},
+  {0, enterAdvancedMenu, displayAdvancedMenu, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0},
   /* Language Switch */
   {0, settings_setLanguageSwitch, settings_displayLanguageSwitch, settings_showLanguageSwitch, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0},
   /* vvvv end of menu marker. DO NOT REMOVE vvvv */
@@ -435,12 +440,6 @@ const menuitem advancedMenu[] = {
 
 /* clang-format on */
 
-const menuitem *subSettingsMenus[] {
-#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD)
-  powerMenu,
-#endif
-      solderingMenu, PowerSavingMenu, UIMenu, advancedMenu,
-};
 /* ^^^ !!!ENABLE CLANG-FORMAT back!!! ^^^ */
 
 /**
@@ -461,9 +460,10 @@ static void printShortDescription(SettingsItemIndex settingsItemIndex, uint16_t
 }
 
 static int userConfirmation(const char *message) {
-  TickType_t tickStart = xTaskGetTickCount();
+  ScrollMessage scrollMessage;
+
   for (;;) {
-    drawScrollingText(message, xTaskGetTickCount() - tickStart);
+    bool lcdRefresh = scrollMessage.drawUpdate(message, xTaskGetTickCount());
 
     ButtonState buttons = getButtonState();
     switch (buttons) {
@@ -481,9 +481,11 @@ static int userConfirmation(const char *message) {
       return 0;
     }
 
+    if (lcdRefresh) {
       OLED::refresh();
       osDelay(40);
     }
+  }
   return 0;
 }
 
@@ -824,13 +826,13 @@ static void displayAnimationLoop(void) { OLED::drawCheckbox(getSettingValue(Sett
 
 static void displayBrightnessLevel(void) {
   OLED::printNumber((getSettingValue(SettingsOptions::OLEDBrightness) / BRIGHTNESS_STEP + 1), 1, FontStyle::LARGE);
-  // While not optimal to apply this here, it is _very_ convenient
+  // While not optimal to apply this here, it is _very_ convienient
   OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness));
 }
 
 static void displayInvertColor(void) {
   OLED::drawCheckbox(getSettingValue(SettingsOptions::OLEDInversion));
-  // While not optimal to apply this here, it is _very_ convenient
+  // While not optimal to apply this here, it is _very_ convienient
   OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion));
 }
 
@@ -940,7 +942,7 @@ static void displayPowerPulseDuration(void) { OLED::printNumber(getSettingValue(
 static bool setResetSettings(void) {
   if (userConfirmation(translatedString(Tr->SettingsResetWarning))) {
     resetSettings();
-    // warnUser(translatedString(Tr->ResetOKMessage), buttons); //TODO
+    warnUser(translatedString(Tr->ResetOKMessage), 3 * TICKS_SECOND);
     reboot();
   }
   return false;
@@ -1024,3 +1026,214 @@ static bool enterAdvancedMenu(void) {
   gui_Menu(advancedMenu);
   return false;
 }
+
+uint8_t gui_getMenuLength(const menuitem *menu) {
+  uint8_t scrollContentSize = 0;
+  for (uint8_t i = 0; menu[i].draw != nullptr; i++) {
+    if (menu[i].isVisible == nullptr) {
+      scrollContentSize += 1; // Always visible
+    } else if (menu[i].isVisible()) {
+      scrollContentSize += 1; // Selectively visible and chosen to show
+    }
+  }
+  return scrollContentSize;
+}
+
+void gui_Menu(const menuitem *menu) {
+  // Draw the settings menu and provide iteration support etc
+
+  // This is used to detect whether a menu-exit transition should be played.
+  static bool wasInGuiMenu;
+  wasInGuiMenu = true;
+
+  enum class NavState {
+    Idle,
+    Entering,
+    ScrollingDown,
+    Exiting,
+  };
+
+  uint8_t    currentScreen          = 0; // Current screen index in the menu struct
+  uint8_t    screensSkipped         = 0; // Number of screens skipped due to being disabled
+  TickType_t autoRepeatTimer        = 0;
+  TickType_t autoRepeatAcceleration = 0;
+  bool       earlyExit              = false;
+  bool       lcdRefresh             = true;
+
+  ButtonState lastButtonState   = BUTTON_NONE;
+  uint8_t     scrollContentSize = gui_getMenuLength(menu);
+
+  bool     scrollBlink = false;
+  bool     lastValue   = false;
+  NavState navState    = NavState::Entering;
+
+  ScrollMessage scrollMessage;
+
+  while ((menu[currentScreen].draw != nullptr) && earlyExit == false) {
+    bool valueChanged = false;
+    // Handle menu transition:
+    if (navState != NavState::Idle) {
+      // Check if this menu item shall be skipped. If it shall be skipped,
+      // `draw()` returns true. Draw on the secondary framebuffer as we want
+      // to keep the primary framebuffer intact for the upcoming transition
+      // animation.
+      OLED::useSecondaryFramebuffer(true);
+      if (menu[currentScreen].isVisible != nullptr) {
+        if (!menu[currentScreen].isVisible()) {
+          currentScreen++;
+          screensSkipped++;
+          OLED::useSecondaryFramebuffer(false);
+          continue;
+        }
+      }
+
+      animOpenState = true;
+      // The menu entering/exiting transition uses the secondary framebuffer,
+      // but the scroll down transition does not.
+      OLED::setCursor(0, 0);
+      OLED::clearScreen();
+      if (menu[currentScreen].shortDescriptionSize > 0) {
+        printShortDescription(menu[currentScreen].shortDescriptionIndex, menu[currentScreen].shortDescriptionSize);
+      }
+      menu[currentScreen].draw();
+      if (navState == NavState::ScrollingDown) {
+        // Play the scroll down animation.
+        OLED::maskScrollIndicatorOnOLED();
+        OLED::transitionScrollDown();
+        OLED::useSecondaryFramebuffer(false);
+      } else {
+        // The menu was drawn in a secondary framebuffer.
+        // Now we play a transition from the pre-drawn primary
+        // framebuffer to the new buffer.
+        // The extra buffer is discarded at the end of the transition.
+        OLED::useSecondaryFramebuffer(false);
+        OLED::transitionSecondaryFramebuffer(navState == NavState::Entering);
+      }
+      animOpenState = false;
+      navState      = NavState::Idle;
+    }
+
+    // If the user has hesitated for >=3 seconds, show the long text
+    // Otherwise "draw" the option
+    if ((xTaskGetTickCount() - lastButtonTime < (TICKS_SECOND * 3)) || menu[currentScreen].description == 0) {
+      lcdRefresh = true;
+      OLED::setCursor(0, 0);
+      OLED::clearScreen();
+      if (menu[currentScreen].shortDescriptionSize > 0) {
+        printShortDescription(menu[currentScreen].shortDescriptionIndex, menu[currentScreen].shortDescriptionSize);
+      }
+      menu[currentScreen].draw();
+      uint8_t indicatorHeight = OLED_HEIGHT / scrollContentSize;
+      uint8_t position        = OLED_HEIGHT * (currentScreen - screensSkipped) / scrollContentSize;
+      if (lastValue) {
+        scrollBlink = !scrollBlink;
+      }
+      if (!lastValue || !scrollBlink) {
+        OLED::drawScrollIndicator(position, indicatorHeight);
+      }
+    } else {
+      // Draw description
+      const char *description = translatedString(Tr->SettingsDescriptions[menu[currentScreen].description - 1]);
+      lcdRefresh |= scrollMessage.drawUpdate(description, xTaskGetTickCount());
+    }
+
+    if (lcdRefresh) {
+      OLED::refresh(); // update the LCD
+      osDelay(40);
+      lcdRefresh = false;
+    }
+
+    ButtonState buttons = getButtonState();
+
+    if (buttons != lastButtonState) {
+      autoRepeatAcceleration = 0;
+      lastButtonState        = buttons;
+    }
+
+    auto callIncrementHandler = [&]() {
+      wasInGuiMenu = false;
+      valueChanged = true;
+      bool res     = false;
+      if ((int)menu[currentScreen].autoSettingOption < (int)SettingsOptions::SettingsOptionsLength) {
+        res = nextSettingValue(menu[currentScreen].autoSettingOption);
+      } else if (menu[currentScreen].incrementHandler != nullptr) {
+        res = menu[currentScreen].incrementHandler();
+      } else {
+        earlyExit = true;
+      }
+      if (wasInGuiMenu) {
+        navState = NavState::Exiting;
+      }
+      wasInGuiMenu = true;
+      return res;
+    };
+
+    switch (buttons) {
+    case BUTTON_BOTH:
+      earlyExit = true; // will make us exit next loop
+      scrollMessage.reset();
+      break;
+    case BUTTON_F_SHORT:
+      // increment
+      if (scrollMessage.isReset()) {
+        lastValue = callIncrementHandler();
+      } else {
+        scrollMessage.reset();
+      }
+      break;
+    case BUTTON_B_SHORT:
+      if (scrollMessage.isReset()) {
+        currentScreen++;
+        navState  = NavState::ScrollingDown;
+        lastValue = false;
+      } else {
+        scrollMessage.reset();
+      }
+      break;
+    case BUTTON_F_LONG:
+      if (xTaskGetTickCount() + autoRepeatAcceleration > autoRepeatTimer + PRESS_ACCEL_INTERVAL_MAX) {
+        if ((lastValue = callIncrementHandler())) {
+          autoRepeatTimer = 1000;
+        } else {
+          autoRepeatTimer = 0;
+        }
+        autoRepeatTimer += xTaskGetTickCount();
+        scrollMessage.reset();
+        autoRepeatAcceleration += PRESS_ACCEL_STEP;
+      }
+      break;
+    case BUTTON_B_LONG:
+      if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration > PRESS_ACCEL_INTERVAL_MAX) {
+        currentScreen++;
+        navState        = NavState::ScrollingDown;
+        autoRepeatTimer = xTaskGetTickCount();
+        scrollMessage.reset();
+        autoRepeatAcceleration += PRESS_ACCEL_STEP;
+      }
+      break;
+    case BUTTON_NONE:
+    default:
+      break;
+    }
+
+    if ((PRESS_ACCEL_INTERVAL_MAX - autoRepeatAcceleration) < PRESS_ACCEL_INTERVAL_MIN) {
+      autoRepeatAcceleration = PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN;
+    }
+
+    if ((xTaskGetTickCount() - lastButtonTime) > (TICKS_SECOND * 2 * 60)) {
+      // If user has not pressed any buttons in 30 seconds, exit back a menu layer
+      // This will trickle the user back to the main screen eventually
+      earlyExit = true;
+      scrollMessage.reset();
+    }
+    if (valueChanged) {
+      // If user changed value, update the scroll content size
+      scrollContentSize = gui_getMenuLength(menu);
+    }
+  }
+}
+
+void enterSettingsMenu() {
+  gui_Menu(rootSettingsMenu); // Call the root menu
+  saveSettings();
+}

source/Core/Threads/GUIRendering.md

@@ -1,40 +0,0 @@
-# GUI Rendering
-
-The GUI aims to be somewhat similar to immediate mode rendering, where the screen is re-rendered each sweep.
-This is due to a few aims:
-
-1. Functions should try and contain their state to the context struct (helps keep state usage flatter)
-2. Allows external events to change the state
-3. Means state can be read/write over BLE or other external control interfaces
-
-## Transitions
-
-When changing the view to a new view it can be preferable to transition using an animation.
-The tooling provides for left, right and down animations at this point.
-The use of these gives a notion of "direction" when navigating the menu.
-
-```
-                          ┌───────────┐
-                          │ Debug Menu│
-                          └─────┬─────┘
-                                │
-                                │
-                                │
-┌──────────────┐           ┌────┴─────┐           ┌──────────────────┐           ┌─────────────────┐
-│Soldering Mode│           │          │           │                  │           │                 │
-│      OR      ├───────────┤Home Menu ├───────────┤Settings Main Menu├───────────┤Settings sub menu│
-│Reflow    Mode│           │          │           │                  │           │                 │
-└──────────────┘           └──────────┘           └──────────────────┘           └─────────┬───────┘
-                                                                                           │
-                                                                                 ┌─────────┴───────┐
-                                                                                 │                 │
-                                                                                 │Settings sub menu│
-                                                                                 │                 │
-                                                                                 └─────────────────┘
-```
-
-The downside of supporting transitions is that for these to work, the code should render the screen _first_ then return the new state.
-This ensures there is a good working copy in the buffer before the transition changes the view.
-
-The code that handles the dispatch will run a new render pass again to get the new buffer contents and then transition between the two for you.
-At the moment scrolling "Up" isn't implemented but the enumeration is there so that its implementation can follow.

source/Core/Threads/GUIThread.cpp

@@ -31,159 +31,8 @@ extern "C" {
 #include "pd.h"
 #endif
 // File local variables
-#define MOVEMENT_INACTIVITY_TIME (60 * configTICK_RATE_HZ)
-#define BUTTON_INACTIVITY_TIME   (60 * configTICK_RATE_HZ)
 
-ButtonState   buttonsAtDeviceBoot;                                      // We record button state at startup, incase of jumping to debug modes
-OperatingMode currentOperatingMode = OperatingMode::InitialisationDone; // Current mode we are rendering
-guiContext    context;                                                  // Context passed to functions to aid in state during render passes
-
-OperatingMode handle_post_init_state();
-OperatingMode guiHandleDraw(void) {
-  OLED::clearScreen(); // Clear ready for render pass
-  // Read button state
-  ButtonState buttons = getButtonState();
-  // Enforce screen on if buttons pressed, movement, hot tip etc
-  // if (buttons != BUTTON_NONE) {
-  //   OLED::setDisplayState(OLED::DisplayState::ON);
-  // } else {
-  //   // Buttons are none; check if we can sleep display
-  //   uint32_t tipTemp = TipThermoModel::getTipInC();
-  //   if ((tipTemp < 50) && getSettingValue(SettingsOptions::Sensitivity)
-  //       && (((xTaskGetTickCount() - lastMovementTime) > MOVEMENT_INACTIVITY_TIME) && ((xTaskGetTickCount() - lastButtonTime) > BUTTON_INACTIVITY_TIME))) {
-  //     OLED::setDisplayState(OLED::DisplayState::OFF);
-  //     setStatusLED(LED_OFF);
-  //   } else {
-  //     OLED::setDisplayState(OLED::DisplayState::ON);
-  //     if (tipTemp > 55) {
-  //       setStatusLED(LED_COOLING_STILL_HOT);
-  //     } else {
-  //       setStatusLED(LED_STANDBY);
-  //     }
-  //   }
-  // }
-  // Dispatch button state to gui mode
-  OperatingMode newMode = currentOperatingMode;
-  switch (currentOperatingMode) {
-  case OperatingMode::StartupWarnings:
-    newMode = showWarnings(buttons, &context);
-    break;
-  case OperatingMode::UsbPDDebug:
-#ifdef HAS_POWER_DEBUG_MENU
-    newMode = showPDDebug(buttons, &context);
-    break;
-#else
-    newMode = OperatingMode::InitialisationDone;
-#endif
-  case OperatingMode::StartupLogo:
-    BootLogo::handleShowingLogo((uint8_t *)FLASH_LOGOADDR); // TODO needs refactor
-    if (getSettingValue(SettingsOptions::AutoStartMode) == 1) {
-      // jump directly to the autostart mode
-      newMode = OperatingMode::Sleeping;
-    } else if (getSettingValue(SettingsOptions::AutoStartMode) == 2) {
-      newMode = OperatingMode::Hibernating;
-    } else {
-      newMode = OperatingMode::HomeScreen;
-    }
-    break;
-  default:
-    /* Fallthrough */
-  case OperatingMode::HomeScreen:
-    newMode = drawHomeScreen(buttons, &context);
-    break;
-  case OperatingMode::Soldering:
-    newMode = gui_solderingMode(buttons, &context);
-    break;
-  case OperatingMode::SolderingProfile:
-    newMode = gui_solderingProfileMode(buttons, &context);
-    break;
-  case OperatingMode::Sleeping:
-    newMode = gui_SolderingSleepingMode(buttons, &context);
-    break;
-  case OperatingMode::TemperatureAdjust:
-    newMode = gui_solderingTempAdjust(buttons, &context);
-    break;
-  case OperatingMode::DebugMenuReadout:
-    newMode = showDebugMenu(buttons, &context);
-    break;
-  case OperatingMode::CJCCalibration:
-    newMode = performCJCC(buttons, &context);
-    break;
-  case OperatingMode::SettingsMenu:
-    newMode = gui_SettingsMenu(buttons, &context);
-    break;
-  case OperatingMode::InitialisationDone:
-    newMode = handle_post_init_state();
-    break;
-  case OperatingMode::Hibernating:
-    newMode = OperatingMode::HomeScreen;
-    break;
-  case OperatingMode::ThermalRunaway:
-    newMode = OperatingMode::HomeScreen;
-    break;
-  };
-  return newMode;
-}
-void guiRenderLoop(void) {
-  OperatingMode newMode = guiHandleDraw(); // This does the screen drawing
-
-  // Post draw we handle any state transitions
-
-  if (newMode != currentOperatingMode) {
-    context.viewEnterTime = xTaskGetTickCount();
-    context.previousMode  = currentOperatingMode;
-    memset(&context.scratch_state, 0, sizeof(context.scratch_state));
-    currentOperatingMode = newMode;
-  }
-  // If the transition marker is set, we need to make the next draw occur to the secondary buffer so we have something to transition to
-  if (context.transitionMode != TransitionAnimation::None) {
-    OLED::useSecondaryFramebuffer(true);
-    // Now we need to fill the secondary buffer with the _next_ frame to transistion to
-    guiHandleDraw();
-    OLED::useSecondaryFramebuffer(false);
-    // Now dispatch the transition
-    switch (context.transitionMode) {
-    case TransitionAnimation::Down:
-      OLED::transitionScrollDown(context.viewEnterTime);
-      break;
-    case TransitionAnimation::Left:
-      OLED::transitionSecondaryFramebuffer(false, context.viewEnterTime);
-      break;
-    case TransitionAnimation::Right:
-      OLED::transitionSecondaryFramebuffer(true, context.viewEnterTime);
-      break;
-    case TransitionAnimation::Up:
-      OLED::transitionScrollUp(context.viewEnterTime);
-
-    case TransitionAnimation::None:
-    default:
-      break; // Do nothing on unknown
-    }
-
-    context.transitionMode = TransitionAnimation::None; // Clear transition flag
-  }
-  // Render done, draw it out
-  OLED::refresh();
-}
-
-OperatingMode handle_post_init_state() {
-#ifdef HAS_POWER_DEBUG_MENU
-#ifdef DEBUG_POWER_MENU_BUTTON_B
-  if (buttonsAtDeviceBoot == BUTTON_B_LONG || buttonsAtDeviceBoot == BUTTON_B_SHORT) {
-#else
-  if (buttonsAtDeviceBoot == BUTTON_F_LONG || buttonsAtDeviceBoot == BUTTON_F_SHORT) {
-#endif
-    buttonsAtDeviceBoot = BUTTON_NONE;
-    return OperatingMode::UsbPDDebug;
-  }
-#endif
-
-  if (getSettingValue(SettingsOptions::CalibrateCJC) > 0) {
-    return OperatingMode::CJCCalibration;
-  }
-
-  return OperatingMode::StartupLogo;
-}
+extern bool heaterThermalRunaway;
 
 /* StartGUITask function */
 void startGUITask(void const *argument) {
@@ -197,34 +46,43 @@ void startGUITask(void const *argument) {
   bool buttonLockout = false;
   renderHomeScreenAssets();
   getTipRawTemp(1); // reset filter
-  memset(&context, 0, sizeof(context));
 
   OLED::setRotation(getSettingValue(SettingsOptions::OrientationMode) & 1);
-
-  // // If the boot logo is enabled with timeout and the autostart mode is enabled (but not set to sleep w/o heat), start heating during boot logo
-  // if (getSettingValue(SettingsOptions::LOGOTime) > 0 && getSettingValue(SettingsOptions::LOGOTime) < 5 && getSettingValue(SettingsOptions::AutoStartMode) > 0
-  //     && getSettingValue(SettingsOptions::AutoStartMode) < 3) {
-  //   uint16_t sleepTempDegC;
-  //   if (getSettingValue(SettingsOptions::TemperatureInF)) {
-  //     sleepTempDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::SleepTemp));
-  //   } else {
-  //     sleepTempDegC = getSettingValue(SettingsOptions::SleepTemp);
-  //   }
-  //   // Only heat to sleep temperature (but no higher than 75°C for safety)
-  //   currentTempTargetDegC = min(sleepTempDegC, 75);
-  // }
-  // Read boot button state
-  if (getButtonA()) {
-    buttonsAtDeviceBoot = BUTTON_F_LONG;
-  }
+  // If the front button is held down, on supported devices, show PD debugging metrics
+#ifdef HAS_POWER_DEBUG_MENU
+#ifdef DEBUG_POWER_MENU_BUTTON_B
   if (getButtonB()) {
-    buttonsAtDeviceBoot = BUTTON_B_LONG;
+#else
+  if (getButtonA()) {
+#endif
+    showPDDebug();
+  }
+#endif
+
+  if (getSettingValue(SettingsOptions::CalibrateCJC) > 0) {
+    performCJCC();
   }
 
-  TickType_t startRender = xTaskGetTickCount();
-  for (;;) {
-    guiRenderLoop();
-    resetWatchdog();
-    vTaskDelayUntil(&startRender, TICKS_100MS * 4 / 10); // Try and maintain 20-25fps ish update rate, way to fast but if we can its nice
+  // If the boot logo is enabled (but it times out) and the autostart mode is enabled (but not set to sleep w/o heat), start heating during boot logo
+  if (getSettingValue(SettingsOptions::LOGOTime) > 0 && getSettingValue(SettingsOptions::LOGOTime) < 5 && getSettingValue(SettingsOptions::AutoStartMode) > 0
+      && getSettingValue(SettingsOptions::AutoStartMode) < 3) {
+    uint16_t sleepTempDegC;
+    if (getSettingValue(SettingsOptions::TemperatureInF)) {
+      sleepTempDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::SleepTemp));
+    } else {
+      sleepTempDegC = getSettingValue(SettingsOptions::SleepTemp);
     }
+    // Only heat to sleep temperature (but no higher than 75°C for safety)
+    currentTempTargetDegC = min(sleepTempDegC, 75);
+  }
+
+  showBootLogo();
+  showWarnings();
+  if (getSettingValue(SettingsOptions::AutoStartMode)) {
+    // jump directly to the autostart mode
+    gui_solderingMode(getSettingValue(SettingsOptions::AutoStartMode) - 1);
+    buttonLockout = true;
+  }
+
+  drawHomeScreen(buttonLockout);
 }

source/Core/Threads/OperatingModes/CJC.cpp

@@ -1,38 +1,39 @@
 
 
 #include "OperatingModes.h"
-OperatingMode performCJCC(const ButtonState buttons, guiContext *cxt) {
+void performCJCC(void) {
   // Calibrate Cold Junction Compensation directly at boot, before internal components get warm.
+  OLED::refresh();
+  osDelay(50);
   if (!isTipDisconnected() && abs(int(TipThermoModel::getTipInC() - getHandleTemperature(0) / 10)) < 10) {
-    // Take 16 samples
-    if (cxt->scratch_state.state1 < 16) {
-      cxt->scratch_state.state3 += getTipRawTemp(1);
+    uint16_t setoffset = 0;
+    // If the thermo-couple at the end of the tip, and the handle are at
+    // equilibrium, then the output should be zero, as there is no temperature
+    // differential.
+    while (setoffset == 0) {
+      uint32_t offset = 0;
+      for (uint8_t i = 0; i < 16; i++) {
+        offset += getTipRawTemp(1);
+        // cycle through the filter a fair bit to ensure we're stable.
+        OLED::clearScreen();
         OLED::setCursor(0, 0);
         OLED::print(translatedString(Tr->CJCCalibrating), FontStyle::SMALL);
         OLED::setCursor(0, 8);
         OLED::print(SmallSymbolDot, FontStyle::SMALL);
-      for (uint8_t x = 0; x < (cxt->scratch_state.state1 / 4); x++) {
+        for (uint8_t x = 0; x < (i / 4); x++) {
           OLED::print(SmallSymbolDot, FontStyle::SMALL);
         }
-
-      cxt->scratch_state.state1++;
-      return OperatingMode::CJCCalibration;
+        OLED::refresh();
+        osDelay(100);
       }
-
-    // If the thermo-couple at the end of the tip, and the handle are at
-    // equilibrium, then the output should be zero, as there is no temperature
-    // differential.
-
-    uint16_t setOffset = TipThermoModel::convertTipRawADCTouV(cxt->scratch_state.state3 / 16, true);
-    setSettingValue(SettingsOptions::CalibrationOffset, setOffset);
-    if (warnUser(translatedString(Tr->CJCCalibrationDone), buttons)) {
+      setoffset = TipThermoModel::convertTipRawADCTouV(offset / 16, true);
+    }
+    setSettingValue(SettingsOptions::CalibrationOffset, setoffset);
+    OLED::clearScreen();
+    warnUser(translatedString(Tr->CalibrationDone), 3 * TICKS_SECOND);
+    OLED::refresh();
     // Preventing to repeat calibration at boot automatically (only one shot).
     setSettingValue(SettingsOptions::CalibrateCJC, 0);
     saveSettings();
-      return OperatingMode::InitialisationDone;
   }
-    return OperatingMode::CJCCalibration;
-  }
-  // Cant run calibration without the tip and for temps to be close
-  return OperatingMode::InitialisationDone;
 }

source/Core/Threads/OperatingModes/DebugMenu.cpp

@@ -2,13 +2,19 @@
 extern osThreadId    GUITaskHandle;
 extern osThreadId    MOVTaskHandle;
 extern osThreadId    PIDTaskHandle;
+extern OperatingMode currentMode;
 
-OperatingMode showDebugMenu(const ButtonState buttons, guiContext *cxt) {
+void showDebugMenu(void) {
+  currentMode        = OperatingMode::debug;
+  uint8_t     screen = 0;
+  ButtonState b;
+  for (;;) {
+    OLED::clearScreen();                                     // Ensure the buffer starts clean
     OLED::setCursor(0, 0);                                   // Position the cursor at the 0,0 (top left)
     OLED::print(SmallSymbolVersionNumber, FontStyle::SMALL); // Print version number
     OLED::setCursor(0, 8);                                   // second line
-  OLED::print(DebugMenu[cxt->scratch_state.state1], FontStyle::SMALL);
-  switch (cxt->scratch_state.state1) {
+    OLED::print(DebugMenu[screen], FontStyle::SMALL);
+    switch (screen) {
     case 0: // Build Date
       break;
     case 1: // Device ID
@@ -18,7 +24,7 @@ OperatingMode showDebugMenu(const ButtonState buttons, guiContext *cxt) {
       // If device has validation code; then we want to take over both lines of the screen
       OLED::clearScreen();   // Ensure the buffer starts clean
       OLED::setCursor(0, 0); // Position the cursor at the 0,0 (top left)
-    OLED::print(DebugMenu[cxt->scratch_state.state1], FontStyle::SMALL);
+      OLED::print(DebugMenu[screen], FontStyle::SMALL);
       OLED::drawHex(getDeviceValidation(), FontStyle::SMALL, 8);
       OLED::setCursor(0, 8); // second line
 #endif
@@ -51,8 +57,8 @@ OperatingMode showDebugMenu(const ButtonState buttons, guiContext *cxt) {
     case 9: // Movement Timestamp
       OLED::printNumber(lastMovementTime / TICKS_100MS, 8, FontStyle::SMALL);
       break;
-  case 10:                                                              // Tip Resistance in Ω
-    OLED::printNumber(getTipResistanceX10() / 10, 6, FontStyle::SMALL); // large to pad over so that we cover ID left overs
+    case 10: // Tip Resistance in Ω large to pad over so that we cover ID left overs
+      OLED::printNumber(getTipResistanceX10() / 10, 6, FontStyle::SMALL);
       OLED::print(SmallSymbolDot, FontStyle::SMALL);
       OLED::printNumber(getTipResistanceX10() % 10, 1, FontStyle::SMALL);
       break;
@@ -87,16 +93,19 @@ OperatingMode showDebugMenu(const ButtonState buttons, guiContext *cxt) {
       break;
     }
 
-  if (buttons == BUTTON_B_SHORT) {
-    cxt->transitionMode = TransitionAnimation::Down;
-    return OperatingMode::HomeScreen;
-  } else if (buttons == BUTTON_F_SHORT) {
-    cxt->scratch_state.state1++;
+    OLED::refresh();
+    b = getButtonState();
+    if (b == BUTTON_B_SHORT) {
+      return;
+    } else if (b == BUTTON_F_SHORT) {
+      screen++;
 #ifdef HALL_SENSOR
-    cxt->scratch_state.state1 = cxt->scratch_state.state1 % 17;
+      screen = screen % 17;
 #else
-    cxt->scratch_state.state1 = cxt->scratch_state.state1 % 16;
+      screen = screen % 16;
 #endif
     }
-  return OperatingMode::DebugMenuReadout; // Stay in debug menu
+
+    GUIDelay();
+  }
 }

source/Core/Threads/OperatingModes/HomeScreen.cpp

@@ -2,9 +2,13 @@
 #include "Buttons.hpp"
 #include "OperatingModes.h"
 
+#define MOVEMENT_INACTIVITY_TIME (60 * configTICK_RATE_HZ)
+#define BUTTON_INACTIVITY_TIME   (60 * configTICK_RATE_HZ)
+
 uint8_t              buttonAF[sizeof(buttonA)];
 uint8_t              buttonBF[sizeof(buttonB)];
 uint8_t              disconnectedTipF[sizeof(disconnectedTip)];
+extern OperatingMode currentMode;
 bool                 showExitMenuTransition = false;
 
 void renderHomeScreenAssets(void) {
@@ -20,50 +24,59 @@ void renderHomeScreenAssets(void) {
   }
 }
 
-OperatingMode handleHomeButtons(const ButtonState buttons, guiContext *cxt) {
-  if (buttons != BUTTON_NONE && cxt->scratch_state.state1 == 0) {
-    return OperatingMode::HomeScreen; // Ignore button press
+void handleButtons(bool *buttonLockout) {
+  ButtonState buttons = getButtonState();
+  if (buttons != BUTTON_NONE) {
+    OLED::setDisplayState(OLED::DisplayState::ON);
+  }
+  if (buttons != BUTTON_NONE && *buttonLockout) {
+    buttons = BUTTON_NONE;
   } else {
-    cxt->scratch_state.state1 = 1;
+    *buttonLockout = false;
   }
   switch (buttons) {
   case BUTTON_NONE:
     // Do nothing
     break;
   case BUTTON_BOTH:
+    // Not used yet
+    // In multi-language this might be used to reset language on a long hold
+    // or some such
     break;
 
   case BUTTON_B_LONG:
-    cxt->transitionMode = TransitionAnimation::Up;
-    return OperatingMode::DebugMenuReadout;
+    // Show the version information
+    showDebugMenu();
     break;
   case BUTTON_F_LONG:
 #ifdef PROFILE_SUPPORT
     if (!isTipDisconnected()) {
-      cxt->transitionMode = TransitionAnimation::Left;
-      return OperatingMode::SolderingProfile;
-    } else {
-      return OperatingMode::HomeScreen;
+      gui_solderingProfileMode(); // enter profile mode
+      *buttonLockout = true;
     }
 #else
-    cxt->transitionMode = TransitionAnimation::Left;
-    return OperatingMode::TemperatureAdjust;
+    gui_solderingTempAdjust();
+    saveSettings();
 #endif
     break;
   case BUTTON_F_SHORT:
     if (!isTipDisconnected()) {
-      cxt->transitionMode = TransitionAnimation::Left;
-      return OperatingMode::Soldering;
+      gui_solderingMode(0); // enter soldering mode
+      *buttonLockout = true;
     }
     break;
   case BUTTON_B_SHORT:
-    cxt->transitionMode = TransitionAnimation::Right;
-    return OperatingMode::SettingsMenu;
+    currentMode = OperatingMode::settings;
+    enterSettingsMenu(); // enter the settings menu
+    {
+      OLED::useSecondaryFramebuffer(true);
+      showExitMenuTransition = true;
+    }
+    *buttonLockout = true;
     break;
   default:
     break;
   }
-  return OperatingMode::HomeScreen;
 }
 
 void drawDetailedHomeScreen(uint32_t tipTemp) {
@@ -168,13 +181,37 @@ void drawSimplifiedHomeScreen(uint32_t tipTemp) {
     }
   }
 }
-OperatingMode drawHomeScreen(const ButtonState buttons, guiContext *cxt) {
+void drawHomeScreen(bool buttonLockout) {
+
+  for (;;) {
+    currentMode = OperatingMode::idle;
+    handleButtons(&buttonLockout);
 
     currentTempTargetDegC = 0; // ensure tip is off
     getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), 0);
     uint32_t tipTemp = TipThermoModel::getTipInC();
+    // Preemptively turn the display on.  Turn it off if and only if
+    // the tip temperature is below 50 degrees C *and* motion sleep
+    // detection is enabled *and* there has been no activity (movement or
+    // button presses) in a while.
+    // This is zero cost really as state is only changed on display updates
+    OLED::setDisplayState(OLED::DisplayState::ON);
 
-  // Setup LCD Cursor location
+    if ((tipTemp < 50) && getSettingValue(SettingsOptions::Sensitivity)
+        && (((xTaskGetTickCount() - lastMovementTime) > MOVEMENT_INACTIVITY_TIME) && ((xTaskGetTickCount() - lastButtonTime) > BUTTON_INACTIVITY_TIME))) {
+      OLED::setDisplayState(OLED::DisplayState::OFF);
+      setStatusLED(LED_OFF);
+    } else {
+      OLED::setDisplayState(OLED::DisplayState::ON);
+      if (tipTemp > 55) {
+        setStatusLED(LED_COOLING_STILL_HOT);
+      } else {
+        setStatusLED(LED_STANDBY);
+      }
+    }
+
+    // Clear the lcd buffer
+    OLED::clearScreen();
     if (OLED::getRotation()) {
       OLED::setCursor(50, 0);
     } else {
@@ -185,5 +222,14 @@ OperatingMode drawHomeScreen(const ButtonState buttons, guiContext *cxt) {
     } else {
       drawSimplifiedHomeScreen(tipTemp);
     }
-  return handleHomeButtons(buttons, cxt);
+
+    if (showExitMenuTransition) {
+      OLED::useSecondaryFramebuffer(false);
+      OLED::transitionSecondaryFramebuffer(false);
+      showExitMenuTransition = false;
+    } else {
+      OLED::refresh();
+      GUIDelay();
+    }
+  }
 }

source/Core/Threads/OperatingModes/OperatingModes.cpp

@@ -3,3 +3,6 @@
 //
 
 #include "OperatingModes.h"
+
+// Global variables
+OperatingMode currentMode = OperatingMode::idle;

source/Core/Threads/OperatingModes/OperatingModes.h

@@ -24,64 +24,29 @@ extern "C" {
 #include "pd.h"
 #endif
 
-enum class OperatingMode {
-  StartupLogo = 0,    // Showing the startup logo
-  CJCCalibration,     // Cold Junction Calibration
-  StartupWarnings,    // Startup checks and warnings
-  InitialisationDone, // Special state we use just before we to home screen at first startup. Allows jumping to extra startup states
-  HomeScreen,         // Home/Idle screen that is the main launchpad to other modes
-  Soldering,          // Main soldering operating mode
-  SolderingProfile,   // Soldering by following a profile, used for reflow for example
-  Sleeping,           // Sleep state holds iron at lower sleep temp
-  Hibernating,        // Like sleeping but keeps heater fully off until woken
-  SettingsMenu,       // Settings Menu
-  DebugMenuReadout,   // Debug metrics
-  TemperatureAdjust,  // Set point temperature adjustment
-  UsbPDDebug,         // USB PD debugging information
-  ThermalRunaway,     // Thermal Runaway warning state.
-};
-
-enum class TransitionAnimation {
-  None  = 0,
-  Right = 1,
-  Left  = 2,
-  Down  = 3,
-  Up    = 4,
-};
-
-// Generic context struct used for gui functions to be able to retain state
-struct guiContext {
-  TickType_t          viewEnterTime; // Set to ticks when this view state was first entered
-  OperatingMode       previousMode;
-  TransitionAnimation transitionMode;
-  // Below is scratch state, this is retained over re-draws but blown away on state change
-  struct scratch {
-    uint16_t state1; // 16 bit state scratch
-    uint16_t state2; // 16 bit state scratch
-    uint32_t state3; // 32 bit state scratch
-    uint32_t state4; // 32 bit state scratch
-    uint16_t state5; // 16 bit state scratch
-    uint16_t state6; // 16 bit state scratch
-
-  } scratch_state;
+// Exposed modes
+enum OperatingMode {
+  idle      = 0,
+  soldering = 1,
+  boost     = 2,
+  sleeping  = 3,
+  settings  = 4,
+  debug     = 5
 };
 
 // Main functions
-OperatingMode gui_SolderingSleepingMode(const ButtonState buttons, guiContext *cxt); // Sleep mode
-OperatingMode gui_solderingMode(const ButtonState buttons, guiContext *cxt);         // Main mode for hot pointy tool
-OperatingMode gui_solderingTempAdjust(const ButtonState buttons, guiContext *cxt);   // For adjusting the setpoint temperature of the iron
-OperatingMode drawHomeScreen(const ButtonState buttons, guiContext *cxt);            // IDLE / Home screen
-OperatingMode gui_SettingsMenu(const ButtonState buttons, guiContext *cxt);          //
-
-OperatingMode gui_solderingProfileMode(const ButtonState buttons, guiContext *cxt); // Profile mode for hot likely-not-so-pointy tool
-OperatingMode performCJCC(const ButtonState buttons, guiContext *cxt);              // Used to calibrate the Cold Junction offset
-OperatingMode showDebugMenu(const ButtonState buttons, guiContext *cxt);            // Debugging values
-OperatingMode showPDDebug(const ButtonState buttons, guiContext *cxt);              // Debugging menu that shows PD adaptor info
-OperatingMode showWarnings(const ButtonState buttons, guiContext *cxt);             // Shows user warnings if required
+void performCJCC(void);                                            // Used to calibrate the Cold Junction offset
+void gui_solderingTempAdjust(void);                                // For adjusting the setpoint temperature of the iron
+int  gui_SolderingSleepingMode(bool stayOff, bool autoStarted);    // Sleep mode
+void gui_solderingMode(uint8_t jumpToSleep);                       // Main mode for hot pointy tool
+void gui_solderingProfileMode();                                   // Profile mode for hot likely-not-so-pointy tool
+void showDebugMenu(void);                                          // Debugging values
+void showPDDebug(void);                                            // Debugging menu that shows PD adaptor info
+void showWarnings(void);                                           // Shows user warnings if required
+void drawHomeScreen(bool buttonLockout) __attribute__((noreturn)); // IDLE / Home screen
+void renderHomeScreenAssets(void);                                 // Called to act as start delay and used to render out flipped images for home screen graphics
 
 // Common helpers
 int8_t            getPowerSourceNumber(void); // Returns number ID of power source
-void   renderHomeScreenAssets(void); // Called to act as start delay and used to render out flipped images for home screen graphics
-
-extern bool heaterThermalRunaway;
+TemperatureType_t getTipTemp(void);           // Returns temperature of the tip in *C/*F (based on user settings)
 #endif

source/Core/Threads/OperatingModes/SettingsMenu.cpp

@@ -1,233 +0,0 @@
-#include "OperatingModes.h"
-#include "ScrollMessage.hpp"
-
-#define HELP_TEXT_TIMEOUT_TICKS (TICKS_SECOND * 3)
-/*
- * The settings menu is the most complex bit of GUI code we have
- * The menu consists of a two tier menu
- * Main menu -> Categories
- * Secondary menu -> Settings
- *
- * For each entry in the menu
- */
-
-/**
- * Prints two small lines (or one line for CJK) of short description for
- * setting items and prepares cursor after it.
- * @param settingsItemIndex Index of the setting item.
- * @param cursorCharPosition Custom cursor char position to set after printing
- * description.
- */
-static void printShortDescription(SettingsItemIndex settingsItemIndex, uint16_t cursorCharPosition) {
-  // print short description (default single line, explicit double line)
-  uint8_t shortDescIndex = static_cast<uint8_t>(settingsItemIndex);
-  OLED::printWholeScreen(translatedString(Tr->SettingsShortNames[shortDescIndex]));
-
-  // prepare cursor for value
-  // make room for scroll indicator
-  OLED::setCursor(cursorCharPosition * FONT_12_WIDTH - 2, 0);
-}
-
-// Render a menu, based on the position given
-// This will either draw the menu item, or the help text depending on how long its been since button press
-void render_menu(const menuitem *item, guiContext *cxt) {
-
-  // If recent interaction or not help text draw the entry
-  if ((xTaskGetTickCount() - lastButtonTime < HELP_TEXT_TIMEOUT_TICKS) || item->description == 0) {
-
-    if (item->shortDescriptionSize > 0) {
-      printShortDescription(item->shortDescriptionIndex, item->shortDescriptionSize);
-    }
-    item->draw();
-  } else {
-
-    uint16_t *isRenderingHelp = &(cxt->scratch_state.state6);
-    *isRenderingHelp          = 1;
-    // Draw description
-    const char *description = translatedString(Tr->SettingsDescriptions[item->description - 1]);
-    drawScrollingText(description, xTaskGetTickCount() - lastButtonTime);
-  }
-}
-
-uint16_t getMenuLength(const menuitem *menu, const uint16_t stop) {
-  // walk this menu to find the length
-  uint16_t counter = 0;
-  for (uint16_t pos = 0; pos < stop; pos++) {
-    if (menu[pos].draw == nullptr) {
-      return counter;
-    }
-    if (menu[pos].isVisible == nullptr || menu[pos].isVisible()) {
-      counter++;
-    }
-  }
-  return counter;
-}
-
-OperatingMode moveToNextEntry(guiContext *cxt) {
-  uint16_t *mainEntry       = &(cxt->scratch_state.state1);
-  uint16_t *subEntry        = &(cxt->scratch_state.state2);
-  uint16_t *isRenderingHelp = &(cxt->scratch_state.state6);
-  if (*isRenderingHelp) {
-    *isRenderingHelp = 0;
-  } else {
-    // Scroll down
-    // We can increment freely _once_
-    cxt->transitionMode = TransitionAnimation::Down;
-    if (*subEntry == 0) {
-      (*mainEntry) += 1;
-      if (rootSettingsMenu[*mainEntry].draw == nullptr) {
-        // We are off the end of the menu now
-        saveSettings();
-        cxt->transitionMode = TransitionAnimation::Left;
-        return OperatingMode::HomeScreen;
-      }
-      // Check if visible
-      if (rootSettingsMenu[*mainEntry].isVisible != nullptr && !rootSettingsMenu[*mainEntry].isVisible()) {
-        // We need to move on as this one isn't visible
-        return moveToNextEntry(cxt);
-      }
-    } else {
-      (*subEntry) += 1;
-
-      // If the new entry is null, we need to exit
-      if (subSettingsMenus[*mainEntry][(*subEntry) - 1].draw == nullptr) {
-        (*subEntry)         = 0; // Reset back to the main menu
-        cxt->transitionMode = TransitionAnimation::Left;
-        // Have to break early to avoid the below check underflowing
-        return OperatingMode::SettingsMenu;
-      }
-      // Check if visible
-      if (subSettingsMenus[*mainEntry][(*subEntry) - 1].isVisible != nullptr && !subSettingsMenus[*mainEntry][(*subEntry) - 1].isVisible()) {
-        // We need to move on as this one isn't visible
-        return moveToNextEntry(cxt);
-      }
-    }
-  }
-  return OperatingMode::SettingsMenu;
-}
-
-OperatingMode gui_SettingsMenu(const ButtonState buttons, guiContext *cxt) {
-  // Render out the current settings menu
-  // State 1 -> Root menu
-  // State 2 -> Sub entry
-  // Draw main entry if sub-entry is 0, otherwise draw sub-entry
-
-  uint16_t *mainEntry              = &(cxt->scratch_state.state1);
-  uint16_t *subEntry               = &(cxt->scratch_state.state2);
-  uint32_t *autoRepeatAcceleration = &(cxt->scratch_state.state3);
-  uint32_t *autoRepeatTimer        = &(cxt->scratch_state.state4);
-  uint16_t *currentMenuLength      = &(cxt->scratch_state.state5);
-  uint16_t *isRenderingHelp        = &(cxt->scratch_state.state6);
-
-  const menuitem *currentMenu;
-  // Draw the currently on screen item
-  uint16_t currentScreen;
-  if (*subEntry == 0) {
-    // Drawing main menu
-    currentMenu   = rootSettingsMenu;
-    currentScreen = *mainEntry;
-  } else {
-    // Drawing sub menu
-    currentMenu   = subSettingsMenus[*mainEntry];
-    currentScreen = (*subEntry) - 1;
-  }
-  render_menu(&(currentMenu[currentScreen]), cxt);
-
-  // Update the cached menu length if unknown
-  if (*currentMenuLength == 0) {
-    // We walk the current menu to find the length
-    *currentMenuLength = getMenuLength(currentMenu, 64);
-  }
-  if (*isRenderingHelp == 0) {
-    //  Draw scroll
-    uint16_t currentVirtualPosition = getMenuLength(currentMenu, currentScreen + 1) - 1;
-
-    uint8_t indicatorHeight = OLED_HEIGHT / *currentMenuLength;
-    uint8_t position        = (OLED_HEIGHT * currentVirtualPosition) / *currentMenuLength;
-    // Draw if not last item
-    if ((*currentMenuLength != currentVirtualPosition) || xTaskGetTickCount() % 1000 < 500) {
-      OLED::drawScrollIndicator(position, indicatorHeight);
-    }
-  }
-  // Now handle user button input
-
-  auto callIncrementHandler = [&]() {
-    if ((int)currentMenu[currentScreen].autoSettingOption < (int)SettingsOptions::SettingsOptionsLength) {
-      return nextSettingValue(currentMenu[currentScreen].autoSettingOption);
-    } else if (currentMenu[currentScreen].incrementHandler != nullptr) {
-      return currentMenu[currentScreen].incrementHandler();
-    }
-    return false;
-  };
-
-  //
-  OperatingMode newMode = OperatingMode::SettingsMenu;
-  switch (buttons) {
-  case BUTTON_NONE:
-    (*autoRepeatAcceleration) = 0; // reset acceleration
-    (*autoRepeatTimer)        = 0; // reset acceleration
-    break;
-  case BUTTON_BOTH:
-    if (*subEntry == 0) {
-      saveSettings();
-      cxt->transitionMode = TransitionAnimation::Left;
-      return OperatingMode::HomeScreen;
-    } else {
-      cxt->transitionMode = TransitionAnimation::Left;
-      *subEntry           = 0;
-      return OperatingMode::SettingsMenu;
-    }
-    break;
-
-  case BUTTON_F_LONG:
-    if (xTaskGetTickCount() + (*autoRepeatAcceleration) > (*autoRepeatTimer) + PRESS_ACCEL_INTERVAL_MAX) {
-      if (callIncrementHandler()) {
-        (*autoRepeatTimer) = TICKS_SECOND * 2;
-      } else {
-        (*autoRepeatTimer) = 0;
-      }
-      (*autoRepeatTimer) += xTaskGetTickCount();
-      (*autoRepeatAcceleration) += PRESS_ACCEL_STEP;
-    }
-    break;
-  case BUTTON_F_SHORT:
-    // Increment setting
-    if (*isRenderingHelp) {
-      *isRenderingHelp = 0;
-    } else {
-      if (*subEntry == 0) {
-        // In a root menu, if its null handler we enter the menu
-        if (currentMenu[currentScreen].incrementHandler != nullptr) {
-          currentMenu[currentScreen].incrementHandler();
-        } else {
-          (*subEntry) += 1;
-          cxt->transitionMode = TransitionAnimation::Right;
-        }
-      } else {
-        callIncrementHandler();
-      }
-    }
-    break;
-  case BUTTON_B_LONG:
-    if (xTaskGetTickCount() + (*autoRepeatAcceleration) > (*autoRepeatTimer) + PRESS_ACCEL_INTERVAL_MAX) {
-      (*autoRepeatTimer) = xTaskGetTickCount();
-      (*autoRepeatAcceleration) += PRESS_ACCEL_STEP;
-    } else {
-      break;
-    }
-    /* Fall through*/
-  case BUTTON_B_SHORT:
-    // Increment menu item
-    newMode = moveToNextEntry(cxt);
-    break;
-
-  default:
-    break;
-  }
-  if ((PRESS_ACCEL_INTERVAL_MAX - (*autoRepeatAcceleration)) < PRESS_ACCEL_INTERVAL_MIN) {
-    (*autoRepeatAcceleration) = PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN;
-  }
-
-  // Otherwise we stay put for next render iteration
-  return newMode;
-}

source/Core/Threads/OperatingModes/ShowStartupWarnings.cpp

@@ -1,78 +1,56 @@
 #include "HUB238.hpp"
 #include "OperatingModes.h"
-OperatingMode showWarnings(const ButtonState buttons, guiContext *cxt) {
+void showWarnings(void) {
   // Display alert if settings were reset
-
-  switch (cxt->scratch_state.state1) {
-  case 0: // Settings reset warning
   if (settingsWereReset) {
-      if (warnUser(translatedString(Tr->SettingsResetMessage), buttons)) {
-        settingsWereReset         = false;
-        cxt->scratch_state.state1 = 1;
+    warnUser(translatedString(Tr->SettingsResetMessage), 10 * TICKS_SECOND);
   }
-    }
-    break;
-  case 1: // Device validations
 #ifdef DEVICE_HAS_VALIDATION_SUPPORT
   if (getDeviceValidationStatus()) {
     // Warn user this device might be counterfeit
-      if (warnUser(translatedString(Tr->DeviceFailedValidationWarning), buttons)) {
-        cxt->scratch_state.state1 = 2;
+    warnUser(translatedString(Tr->DeviceFailedValidationWarning), 10 * TICKS_SECOND);
   }
-    }
-#else
-    cxt->scratch_state.state1 = 2;
 #endif
-    break;
-  case 2: // Accelerometer detection
-    if (DetectedAccelerometerVersion == AccelType::Scanning) {
-      break;
+
+#ifndef NO_WARN_MISSING
+  // We also want to alert if accel or pd is not detected / not responding
+  // In this case though, we dont want to nag the user _too_ much
+  // So only show first 2 times
+  while (DetectedAccelerometerVersion == AccelType::Scanning) {
+    osDelay(5);
+    resetWatchdog();
   }
   // Display alert if accelerometer is not detected
   if (DetectedAccelerometerVersion == AccelType::None) {
     if (getSettingValue(SettingsOptions::AccelMissingWarningCounter) < 2) {
       nextSettingValue(SettingsOptions::AccelMissingWarningCounter);
       saveSettings();
-        if (warnUser(translatedString(Tr->NoAccelerometerMessage), buttons)) {
-          cxt->scratch_state.state1 = 3;
+      warnUser(translatedString(Tr->NoAccelerometerMessage), 10 * TICKS_SECOND);
     }
   }
-    }
-    break;
-  case 3:
-
 #ifdef POW_PD
   // We expect pd to be present
+  resetWatchdog();
   if (!USBPowerDelivery::fusbPresent()) {
     if (getSettingValue(SettingsOptions::PDMissingWarningCounter) < 2) {
       nextSettingValue(SettingsOptions::PDMissingWarningCounter);
       saveSettings();
-        if (warnUser(translatedString(Tr->NoPowerDeliveryMessage), buttons)) {
-          cxt->scratch_state.state1 = 4;
+      warnUser(translatedString(Tr->NoPowerDeliveryMessage), 10 * TICKS_SECOND);
     }
   }
-    }
-#else
+#endif /*POW_PD*/
 #if POW_PD_EXT == 1
   if (!hub238_probe()) {
     if (getSettingValue(SettingsOptions::PDMissingWarningCounter) < 2) {
       nextSettingValue(SettingsOptions::PDMissingWarningCounter);
       saveSettings();
-        if (warnUser(translatedString(Tr->NoPowerDeliveryMessage), buttons)) {
-          cxt->scratch_state.state1 = 4;
+      warnUser(translatedString(Tr->NoPowerDeliveryMessage), 10 * TICKS_SECOND);
     }
   }
-    }
-#else
-    cxt->scratch_state.state1 = 4;
 #endif /*POW_PD_EXT==1*/
-#endif /*POW_PD*/
-
-    break;
-  default:
-    // We are off the end, warnings done
-    return OperatingMode::InitialisationDone;
+       // If tip looks to be shorted, yell at user and dont auto dismiss
+  if (isTipShorted()) {
+    warnUser(translatedString(Tr->WarningTipShorted), portMAX_DELAY);
   }
-
-  return OperatingMode::StartupWarnings; // Stay in warnings
+#endif /*NO_WARN_MISSING*/
 }

source/Core/Threads/OperatingModes/Sleep.cpp

@@ -1,26 +1,31 @@
 #include "OperatingModes.h"
 
-OperatingMode gui_SolderingSleepingMode(const ButtonState buttons, guiContext *cxt) {
-#ifdef NO_SLEEP_MODE
-  return OperatingMode::Soldering;
-#endif
-  // Drop to sleep temperature and display until movement or button press
+extern OperatingMode currentMode;
 
+int gui_SolderingSleepingMode(bool stayOff, bool autoStarted) {
+#ifndef NO_SLEEP_MODE
+  // Drop to sleep temperature and display until movement or button press
+  currentMode = OperatingMode::sleeping;
+
+  for (;;) {
     // user moved or pressed a button, go back to soldering
     // If in the first two seconds we disable this to let accelerometer warm up
 
 #ifdef POW_DC
     if (checkForUnderVoltage()) {
-    return OperatingMode::HomeScreen; // return non-zero on error
+      // return non-zero on error
+      return 1;
     }
 #endif
+
     if (getSettingValue(SettingsOptions::TemperatureInF)) {
-    currentTempTargetDegC = TipThermoModel::convertFtoC(min(getSettingValue(SettingsOptions::SleepTemp), getSettingValue(SettingsOptions::SolderingTemp)));
+      currentTempTargetDegC = stayOff ? 0 : TipThermoModel::convertFtoC(min(getSettingValue(SettingsOptions::SleepTemp), getSettingValue(SettingsOptions::SolderingTemp)));
     } else {
-    currentTempTargetDegC = min(getSettingValue(SettingsOptions::SleepTemp), getSettingValue(SettingsOptions::SolderingTemp));
+      currentTempTargetDegC = stayOff ? 0 : min(getSettingValue(SettingsOptions::SleepTemp), getSettingValue(SettingsOptions::SolderingTemp));
     }
+
     // draw the lcd
-  uint16_t tipTemp = getSettingValue(SettingsOptions::TemperatureInF) ? TipThermoModel::getTipInF() : TipThermoModel::getTipInC();
+    TemperatureType_t tipTemp = getTipTemp();
 
     OLED::clearScreen();
     OLED::setCursor(0, 0);
@@ -29,12 +34,7 @@ OperatingMode gui_SolderingSleepingMode(const ButtonState buttons, guiContext *c
       OLED::setCursor(0, 8);
       OLED::print(translatedString(Tr->SleepingTipAdvancedString), FontStyle::SMALL);
       OLED::printNumber(tipTemp, 3, FontStyle::SMALL);
-    if (getSettingValue(SettingsOptions::TemperatureInF)) {
-      OLED::print(SmallSymbolDegF, FontStyle::SMALL);
-    } else {
-      OLED::print(SmallSymbolDegC, FontStyle::SMALL);
-    }
-
+      OLED::printSymbolDeg(FontStyle::SMALL);
       OLED::print(SmallSymbolSpace, FontStyle::SMALL);
       printVoltage();
       OLED::print(SmallSymbolVolts, FontStyle::SMALL);
@@ -47,14 +47,18 @@ OperatingMode gui_SolderingSleepingMode(const ButtonState buttons, guiContext *c
     OLED::refresh();
     GUIDelay();
 
-  if (!shouldBeSleeping()) {
-    return cxt->previousMode;
+    if (!shouldBeSleeping(autoStarted)) {
+      return 0;
     }
 
     if (shouldShutdown()) {
       // shutdown
       currentTempTargetDegC = 0;
-    return OperatingMode::HomeScreen;
+      // we want to exit soldering mode
+      return 1;
     }
-  return OperatingMode::Sleeping;
+  }
+#endif
+
+  return 0;
 }

source/Core/Threads/OperatingModes/Soldering.cpp

@@ -1,62 +1,10 @@
 
 #include "OperatingModes.h"
 #include "SolderingCommon.h"
-// State 1 = button locking
-// State 2 = boost mode
-// State 3 = buzzer timer
 
-OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt) {
-  if (cxt->scratch_state.state1 == 1) {
-    // Buttons are currently locked
-    if (buttons == BUTTON_F_LONG) {
-      if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) == 1)) {
-        cxt->scratch_state.state2 = 1;
-      }
-    } else if (buttons == BUTTON_BOTH_LONG) {
-      // Unlocking
-      if (warnUser(translatedString(Tr->UnlockingKeysString), buttons)) {
-        cxt->scratch_state.state1 = 0;
-      }
-    } else if (buttons != BUTTON_NONE) {
-      // Do nothing and display a lock warning
-      warnUser(translatedString(Tr->WarningKeysLockedString), buttons);
-    }
-    return OperatingMode::Soldering;
-  }
-  // otherwise we are unlocked
-  switch (buttons) {
-  case BUTTON_NONE:
-    cxt->scratch_state.state2 = 0;
-    break;
-  case BUTTON_BOTH:
-  /*Fall through*/
-  case BUTTON_B_LONG:
-    cxt->transitionMode = TransitionAnimation::Right;
-    return OperatingMode::HomeScreen;
-  case BUTTON_F_LONG:
-    // if boost mode is enabled turn it on
-    if (getSettingValue(SettingsOptions::BoostTemp)) {
-      cxt->scratch_state.state2 = 1;
-    }
-    break;
-  case BUTTON_F_SHORT:
-  case BUTTON_B_SHORT:
-    cxt->transitionMode = TransitionAnimation::Left;
-    return OperatingMode::TemperatureAdjust;
-  case BUTTON_BOTH_LONG:
-    if (getSettingValue(SettingsOptions::LockingMode) != 0) {
-      // Lock buttons
-      if (warnUser(translatedString(Tr->LockingKeysString), buttons)) {
-        cxt->scratch_state.state1 = 1;
-      }
-    }
-    break;
-  default:
-    break;
-  }
-  return OperatingMode::Soldering;
-}
-OperatingMode gui_solderingMode(const ButtonState buttons, guiContext *cxt) {
+extern OperatingMode currentMode;
+
+void gui_solderingMode(uint8_t jumpToSleep) {
   /*
    * * Soldering (gui_solderingMode)
    * -> Main loop where we draw temp, and animations
@@ -71,40 +19,88 @@ OperatingMode gui_solderingMode(const ButtonState buttons, guiContext *cxt) {
    * --> Double button to exit
    * --> Long hold double button to toggle key lock
    */
+  bool boostModeOn   = false;
+  bool buttonsLocked = false;
+  bool converged     = false;
+  currentMode        = OperatingMode::soldering;
 
-  // Update the setpoints for the temperature
-  if (cxt->scratch_state.state2) {
-    if (getSettingValue(SettingsOptions::TemperatureInF)) {
-      currentTempTargetDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::BoostTemp));
-    } else {
-      currentTempTargetDegC = (getSettingValue(SettingsOptions::BoostTemp));
-    }
-  } else {
-    if (getSettingValue(SettingsOptions::TemperatureInF)) {
-      currentTempTargetDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::SolderingTemp));
-    } else {
-      currentTempTargetDegC = (getSettingValue(SettingsOptions::SolderingTemp));
-    }
-  }
+  TickType_t buzzerEnd = 0;
 
-  // Update status
-  int error = currentTempTargetDegC - TipThermoModel::getTipInC();
-  if (error >= -10 && error <= 10) {
-    // converged
-    if (!cxt->scratch_state.state5) {
-      setBuzzer(true);
-      cxt->scratch_state.state3 = xTaskGetTickCount() + TICKS_SECOND / 3;
-      cxt->scratch_state.state5 = true;
+  if (jumpToSleep) {
+    if (gui_SolderingSleepingMode(jumpToSleep == 2, true) == 1) {
+      lastButtonTime = xTaskGetTickCount();
+      return; // If the function returns non-0 then exit
     }
-    setStatusLED(LED_HOT);
-  } else {
-    setStatusLED(LED_HEATING);
-    cxt->scratch_state.state5 = false;
   }
-  if (cxt->scratch_state.state3 != 0 && xTaskGetTickCount() >= cxt->scratch_state.state3) {
-    setBuzzer(false);
+  for (;;) {
+    ButtonState buttons = getButtonState();
+    if (buttonsLocked && (getSettingValue(SettingsOptions::LockingMode) != 0)) { // If buttons locked
+      switch (buttons) {
+      case BUTTON_NONE:
+        boostModeOn = false;
+        break;
+      case BUTTON_BOTH_LONG:
+        // Unlock buttons
+        buttonsLocked = false;
+        warnUser(translatedString(Tr->UnlockingKeysString), TICKS_SECOND);
+        break;
+      case BUTTON_F_LONG:
+        // if boost mode is enabled turn it on
+        if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) == 1)) {
+          boostModeOn = true;
+          currentMode = OperatingMode::boost;
         }
+        break;
+        // fall through
+      case BUTTON_BOTH:
+      case BUTTON_B_LONG:
+      case BUTTON_F_SHORT:
+      case BUTTON_B_SHORT:
+        // Do nothing and display a lock warning
+        warnUser(translatedString(Tr->WarningKeysLockedString), TICKS_SECOND / 2);
+        break;
+      default:
+        break;
+      }
+    } else { // Button not locked
+      switch (buttons) {
+      case BUTTON_NONE:
+        // stay
+        boostModeOn = false;
+        currentMode = OperatingMode::soldering;
+        break;
+      case BUTTON_BOTH:
+      case BUTTON_B_LONG:
+        return; // exit on back long hold
+      case BUTTON_F_LONG:
+        // if boost mode is enabled turn it on
+        if (getSettingValue(SettingsOptions::BoostTemp)) {
+          boostModeOn = true;
+          currentMode = OperatingMode::boost;
+        }
+        break;
+      case BUTTON_F_SHORT:
+      case BUTTON_B_SHORT: {
+        uint16_t oldTemp = getSettingValue(SettingsOptions::SolderingTemp);
+        gui_solderingTempAdjust(); // goto adjust temp mode
+        if (oldTemp != getSettingValue(SettingsOptions::SolderingTemp)) {
+          saveSettings(); // only save on change
+        }
+      } break;
+      case BUTTON_BOTH_LONG:
+        if (getSettingValue(SettingsOptions::LockingMode) != 0) {
+          // Lock buttons
+          buttonsLocked = true;
+          warnUser(translatedString(Tr->LockingKeysString), TICKS_SECOND);
+        }
+        break;
+      default:
+        break;
+      }
+    }
+    // else we update the screen information
 
+    OLED::clearScreen();
     // Draw in the screen details
     if (getSettingValue(SettingsOptions::DetailedSoldering)) {
       if (OLED::getRotation()) {
@@ -126,7 +122,7 @@ OperatingMode gui_solderingMode(const ButtonState buttons, guiContext *cxt) {
       }
 #endif
 
-    if (cxt->scratch_state.state2) { // Boost mode is on
+      if (boostModeOn) {
         if (OLED::getRotation()) {
           OLED::setCursor(38, 8);
         } else {
@@ -145,32 +141,49 @@ OperatingMode gui_solderingMode(const ButtonState buttons, guiContext *cxt) {
       detailedPowerStatus();
 
     } else {
-    basicSolderingStatus(cxt->scratch_state.state2);
+      basicSolderingStatus(boostModeOn);
     }
-  // Check if we should bail due to undervoltage for example
+
+    OLED::refresh();
+    // Update the setpoints for the temperature
+    if (boostModeOn) {
+      if (getSettingValue(SettingsOptions::TemperatureInF)) {
+        currentTempTargetDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::BoostTemp));
+      } else {
+        currentTempTargetDegC = (getSettingValue(SettingsOptions::BoostTemp));
+      }
+    } else {
+      if (getSettingValue(SettingsOptions::TemperatureInF)) {
+        currentTempTargetDegC = TipThermoModel::convertFtoC(getSettingValue(SettingsOptions::SolderingTemp));
+      } else {
+        currentTempTargetDegC = (getSettingValue(SettingsOptions::SolderingTemp));
+      }
+    }
+
     if (checkExitSoldering()) {
       setBuzzer(false);
-    cxt->transitionMode = TransitionAnimation::Right;
-    return OperatingMode::HomeScreen;
-  }
-#ifdef NO_SLEEP_MODE
-
-  if (shouldShutdown()) {
-    // shutdown
-    currentTempTargetDegC = 0;
-    cxt->transitionMode   = TransitionAnimation::Right;
-    return OperatingMode::HomeScreen;
-  }
-#endif
-  if (shouldBeSleeping()) {
-    return OperatingMode::Sleeping;
+      return;
     }
 
-  if (heaterThermalRunaway) {
-    currentTempTargetDegC = 0; // heater control off
-    heaterThermalRunaway  = false;
-    cxt->transitionMode   = TransitionAnimation::Right;
-    return OperatingMode::ThermalRunaway;
+    // Update status
+    int error = currentTempTargetDegC - TipThermoModel::getTipInC();
+    if (error >= -10 && error <= 10) {
+      // converged
+      if (!converged) {
+        setBuzzer(true);
+        buzzerEnd = xTaskGetTickCount() + TICKS_SECOND / 3;
+        converged = true;
+      }
+      setStatusLED(LED_HOT);
+    } else {
+      setStatusLED(LED_HEATING);
+      converged = false;
+    }
+    if (buzzerEnd != 0 && xTaskGetTickCount() >= buzzerEnd) {
+      setBuzzer(false);
+    }
+
+    // slow down ui update rate
+    GUIDelay();
   }
-  return handleSolderingButtons(buttons, cxt);
 }

source/Core/Threads/OperatingModes/SolderingProfile.cpp

@@ -2,127 +2,143 @@
 #include "OperatingModes.h"
 #include "SolderingCommon.h"
 
-OperatingMode gui_solderingProfileMode(const ButtonState buttons, guiContext *cxt) {
+extern OperatingMode currentMode;
+
+void gui_solderingProfileMode() {
   /*
-   * * Soldering
+   * * Soldering (gui_solderingMode)
    * -> Main loop where we draw temp, and animations
+   * PID control
    * --> Long hold back button to exit
    * --> Double button to exit
    */
+  currentMode = OperatingMode::soldering;
+
+  TickType_t buzzerEnd = 0;
+
+  bool       waitForRelease = true;
+  TickType_t phaseStartTime = xTaskGetTickCount();
 
   uint16_t tipTemp      = 0;
+  uint8_t  profilePhase = 0;
 
-  // If this is during init, start at preheat
-  if (cxt->scratch_state.state1 == 0) {
-    cxt->scratch_state.state5 = getSettingValue(SettingsOptions::ProfilePreheatTemp);
-  }
+  uint16_t phaseElapsedSeconds      = 0;
+  uint16_t phaseTotalSeconds        = 0;
+  uint16_t phaseStartTemp           = 0;
+  uint16_t phaseEndTemp             = getSettingValue(SettingsOptions::ProfilePreheatTemp);
   uint16_t phaseTicksPerDegree      = TICKS_SECOND / getSettingValue(SettingsOptions::ProfilePreheatSpeed);
   uint16_t profileCurrentTargetTemp = 0;
 
+  for (;;) {
+    ButtonState buttons = getButtonState();
+    if (buttons) {
+      if (waitForRelease) {
+        buttons = BUTTON_NONE;
+      }
+    } else {
+      waitForRelease = false;
+    }
+
     switch (buttons) {
+    case BUTTON_NONE:
+      break;
     case BUTTON_BOTH:
     case BUTTON_B_LONG:
-    cxt->transitionMode = TransitionAnimation::Right;
-    return OperatingMode::HomeScreen; // exit on back long hold
+      return; // exit on back long hold
     case BUTTON_F_LONG:
     case BUTTON_F_SHORT:
     case BUTTON_B_SHORT:
-  case BUTTON_NONE:
       // Not used yet
       break;
     default:
       break;
     }
 
-  if (getSettingValue(SettingsOptions::TemperatureInF)) {
-    tipTemp = TipThermoModel::getTipInF();
-  } else {
-    tipTemp = TipThermoModel::getTipInC();
-  }
-  // If time of entering is unknown; then we start now
-  if (cxt->scratch_state.state3 == 0) {
-    cxt->scratch_state.state3 = xTaskGetTickCount();
-  }
+    tipTemp = getTipTemp();
 
     // if start temp is unknown (preheat), we're setting it now
-  if (cxt->scratch_state.state6 == 0) {
-    cxt->scratch_state.state6 = tipTemp;
+    if (phaseStartTemp == 0) {
+      phaseStartTemp = tipTemp;
       // if this is hotter than the preheat temperature, we should fail
-    if (cxt->scratch_state.state6 >= 55) {
-      warnUser(translatedString(Tr->TooHotToStartProfileWarning), buttons);
-      return OperatingMode::HomeScreen;
+      if (phaseStartTemp >= 55) {
+        warnUser(translatedString(Tr->TooHotToStartProfileWarning), 10 * TICKS_SECOND);
+        return;
       }
     }
-  uint16_t phaseElapsedSeconds = (xTaskGetTickCount() - cxt->scratch_state.state3) / TICKS_SECOND;
+
+    phaseElapsedSeconds = (xTaskGetTickCount() - phaseStartTime) / TICKS_SECOND;
 
     // have we finished this phase?
-  if (phaseElapsedSeconds >= cxt->scratch_state.state2 && tipTemp == cxt->scratch_state.state5) {
-    cxt->scratch_state.state1++;
-    cxt->scratch_state.state6 = cxt->scratch_state.state5;
-    cxt->scratch_state.state3 = xTaskGetTickCount();
+    if (phaseElapsedSeconds >= phaseTotalSeconds && tipTemp == phaseEndTemp) {
+      profilePhase++;
+
+      phaseStartTemp      = phaseEndTemp;
+      phaseStartTime      = xTaskGetTickCount();
       phaseElapsedSeconds = 0;
-    if (cxt->scratch_state.state1 > getSettingValue(SettingsOptions::ProfilePhases)) {
+
+      if (profilePhase > getSettingValue(SettingsOptions::ProfilePhases)) {
         // done with all phases, lets go to cooldown
-      cxt->scratch_state.state2 = 0;
-      cxt->scratch_state.state5 = 0;
+        phaseTotalSeconds   = 0;
+        phaseEndTemp        = 0;
         phaseTicksPerDegree = TICKS_SECOND / getSettingValue(SettingsOptions::ProfileCooldownSpeed);
       } else {
         // set up next phase
-      switch (cxt->scratch_state.state1) {
+        switch (profilePhase) {
         case 1:
-        cxt->scratch_state.state2 = getSettingValue(SettingsOptions::ProfilePhase1Duration);
-        cxt->scratch_state.state5 = getSettingValue(SettingsOptions::ProfilePhase1Temp);
+          phaseTotalSeconds = getSettingValue(SettingsOptions::ProfilePhase1Duration);
+          phaseEndTemp      = getSettingValue(SettingsOptions::ProfilePhase1Temp);
           break;
         case 2:
-        cxt->scratch_state.state2 = getSettingValue(SettingsOptions::ProfilePhase2Duration);
-        cxt->scratch_state.state5 = getSettingValue(SettingsOptions::ProfilePhase2Temp);
+          phaseTotalSeconds = getSettingValue(SettingsOptions::ProfilePhase2Duration);
+          phaseEndTemp      = getSettingValue(SettingsOptions::ProfilePhase2Temp);
           break;
         case 3:
-        cxt->scratch_state.state2 = getSettingValue(SettingsOptions::ProfilePhase3Duration);
-        cxt->scratch_state.state5 = getSettingValue(SettingsOptions::ProfilePhase3Temp);
+          phaseTotalSeconds = getSettingValue(SettingsOptions::ProfilePhase3Duration);
+          phaseEndTemp      = getSettingValue(SettingsOptions::ProfilePhase3Temp);
           break;
         case 4:
-        cxt->scratch_state.state2 = getSettingValue(SettingsOptions::ProfilePhase4Duration);
-        cxt->scratch_state.state5 = getSettingValue(SettingsOptions::ProfilePhase4Temp);
+          phaseTotalSeconds = getSettingValue(SettingsOptions::ProfilePhase4Duration);
+          phaseEndTemp      = getSettingValue(SettingsOptions::ProfilePhase4Temp);
           break;
         case 5:
-        cxt->scratch_state.state2 = getSettingValue(SettingsOptions::ProfilePhase5Duration);
-        cxt->scratch_state.state5 = getSettingValue(SettingsOptions::ProfilePhase5Temp);
+          phaseTotalSeconds = getSettingValue(SettingsOptions::ProfilePhase5Duration);
+          phaseEndTemp      = getSettingValue(SettingsOptions::ProfilePhase5Temp);
           break;
         default:
           break;
         }
-      if (cxt->scratch_state.state6 < cxt->scratch_state.state5) {
-        phaseTicksPerDegree = (cxt->scratch_state.state2 * TICKS_SECOND) / (cxt->scratch_state.state5 - cxt->scratch_state.state6);
+        if (phaseStartTemp < phaseEndTemp) {
+          phaseTicksPerDegree = (phaseTotalSeconds * TICKS_SECOND) / (phaseEndTemp - phaseStartTemp);
         } else {
-        phaseTicksPerDegree = (cxt->scratch_state.state2 * TICKS_SECOND) / (cxt->scratch_state.state6 - cxt->scratch_state.state5);
+          phaseTicksPerDegree = (phaseTotalSeconds * TICKS_SECOND) / (phaseStartTemp - phaseEndTemp);
         }
       }
     }
 
     // cooldown phase done?
-  if (cxt->scratch_state.state1 > getSettingValue(SettingsOptions::ProfilePhases)) {
+    if (profilePhase > getSettingValue(SettingsOptions::ProfilePhases)) {
       if (TipThermoModel::getTipInC() < 55) {
         // we're done, let the buzzer beep too
         setStatusLED(LED_STANDBY);
-      if (cxt->scratch_state.state4 == 0) {
+        if (buzzerEnd == 0) {
           setBuzzer(true);
-        cxt->scratch_state.state4 = xTaskGetTickCount() + TICKS_SECOND / 3;
+          buzzerEnd = xTaskGetTickCount() + TICKS_SECOND / 3;
         }
       }
     }
 
     // determine current target temp
-  if (cxt->scratch_state.state6 < cxt->scratch_state.state5) {
-    if (profileCurrentTargetTemp < cxt->scratch_state.state5) {
-      profileCurrentTargetTemp = cxt->scratch_state.state6 + ((xTaskGetTickCount() - cxt->viewEnterTime) / phaseTicksPerDegree);
+    if (phaseStartTemp < phaseEndTemp) {
+      if (profileCurrentTargetTemp < phaseEndTemp) {
+        profileCurrentTargetTemp = phaseStartTemp + ((xTaskGetTickCount() - phaseStartTime) / phaseTicksPerDegree);
       }
     } else {
-    if (profileCurrentTargetTemp > cxt->scratch_state.state5) {
-      profileCurrentTargetTemp = cxt->scratch_state.state6 - ((xTaskGetTickCount() - cxt->viewEnterTime) / phaseTicksPerDegree);
+      if (profileCurrentTargetTemp > phaseEndTemp) {
+        profileCurrentTargetTemp = phaseStartTemp - ((xTaskGetTickCount() - phaseStartTime) / phaseTicksPerDegree);
       }
     }
 
+    OLED::clearScreen();
     // Draw in the screen details
     if (getSettingValue(SettingsOptions::DetailedSoldering)) {
       // print temperature
@@ -135,21 +151,16 @@ OperatingMode gui_solderingProfileMode(const ButtonState buttons, guiContext *cx
       OLED::printNumber(tipTemp, 3, FontStyle::SMALL);
       OLED::print(SmallSymbolSlash, FontStyle::SMALL);
       OLED::printNumber(profileCurrentTargetTemp, 3, FontStyle::SMALL);
-
-    if (getSettingValue(SettingsOptions::TemperatureInF)) {
-      OLED::print(SmallSymbolDegF, FontStyle::SMALL);
-    } else {
-      OLED::print(SmallSymbolDegC, FontStyle::SMALL);
-    }
+      OLED::printSymbolDeg(FontStyle::SMALL);
 
       // print phase
-    if (cxt->scratch_state.state1 > 0 && cxt->scratch_state.state1 <= getSettingValue(SettingsOptions::ProfilePhases)) {
+      if (profilePhase > 0 && profilePhase <= getSettingValue(SettingsOptions::ProfilePhases)) {
         if (OLED::getRotation()) {
           OLED::setCursor(36, 0);
         } else {
           OLED::setCursor(55, 0);
         }
-      OLED::printNumber(cxt->scratch_state.state1, 1, FontStyle::SMALL);
+        OLED::printNumber(profilePhase, 1, FontStyle::SMALL);
       }
 
       // print time progress / preheat / cooldown
@@ -159,9 +170,9 @@ OperatingMode gui_solderingProfileMode(const ButtonState buttons, guiContext *cx
         OLED::setCursor(0, 8);
       }
 
-    if (cxt->scratch_state.state1 == 0) {
+      if (profilePhase == 0) {
         OLED::print(translatedString(Tr->ProfilePreheatString), FontStyle::SMALL);
-    } else if (cxt->scratch_state.state1 > getSettingValue(SettingsOptions::ProfilePhases)) {
+      } else if (profilePhase > getSettingValue(SettingsOptions::ProfilePhases)) {
         OLED::print(translatedString(Tr->ProfileCooldownString), FontStyle::SMALL);
       } else {
         OLED::printNumber(phaseElapsedSeconds / 60, 1, FontStyle::SMALL);
@@ -171,10 +182,10 @@ OperatingMode gui_solderingProfileMode(const ButtonState buttons, guiContext *cx
         OLED::print(SmallSymbolSlash, FontStyle::SMALL);
 
         // blink if we can't keep up with the time goal
-      if (phaseElapsedSeconds < cxt->scratch_state.state2 + 2 || (xTaskGetTickCount() / TICKS_SECOND) % 2 == 0) {
-        OLED::printNumber(cxt->scratch_state.state2 / 60, 1, FontStyle::SMALL);
+        if (phaseElapsedSeconds < phaseTotalSeconds + 2 || (xTaskGetTickCount() / TICKS_SECOND) % 2 == 0) {
+          OLED::printNumber(phaseTotalSeconds / 60, 1, FontStyle::SMALL);
           OLED::print(SmallSymbolColon, FontStyle::SMALL);
-        OLED::printNumber(cxt->scratch_state.state2 % 60, 2, FontStyle::SMALL, false);
+          OLED::printNumber(phaseTotalSeconds % 60, 2, FontStyle::SMALL, false);
         }
       }
 
@@ -184,6 +195,7 @@ OperatingMode gui_solderingProfileMode(const ButtonState buttons, guiContext *cx
       basicSolderingStatus(false);
     }
 
+    OLED::refresh();
     // Update the setpoints for the temperature
     if (getSettingValue(SettingsOptions::TemperatureInF)) {
       currentTempTargetDegC = TipThermoModel::convertFtoC(profileCurrentTargetTemp);
@@ -191,23 +203,21 @@ OperatingMode gui_solderingProfileMode(const ButtonState buttons, guiContext *cx
       currentTempTargetDegC = profileCurrentTargetTemp;
     }
 
-  if (checkExitSoldering() || (cxt->scratch_state.state4 != 0 && xTaskGetTickCount() >= cxt->scratch_state.state4)) {
+    if (checkExitSoldering() || (buzzerEnd != 0 && xTaskGetTickCount() >= buzzerEnd)) {
       setBuzzer(false);
-    return OperatingMode::HomeScreen;
-  }
-  if (heaterThermalRunaway) {
-    currentTempTargetDegC = 0; // heater control off
-    heaterThermalRunaway  = false;
-    return OperatingMode::ThermalRunaway;
+      return;
     }
 
     // Update LED status
-  if (cxt->scratch_state.state1 == 0) {
+    if (profilePhase == 0) {
       setStatusLED(LED_HEATING);
-  } else if (cxt->scratch_state.state1 > getSettingValue(SettingsOptions::ProfilePhases)) {
+    } else if (profilePhase > getSettingValue(SettingsOptions::ProfilePhases)) {
       setStatusLED(LED_COOLING_STILL_HOT);
     } else {
       setStatusLED(LED_HOT);
     }
-  return OperatingMode::SolderingProfile;
+
+    // slow down ui update rate
+    GUIDelay();
+  }
 }

source/Core/Threads/OperatingModes/TemperatureAdjust.cpp

@@ -1,47 +1,60 @@
 #include "OperatingModes.h"
-OperatingMode gui_solderingTempAdjust(const ButtonState buttonIn, guiContext *cxt) {
-
+void gui_solderingTempAdjust(void) {
+  TickType_t lastChange             = xTaskGetTickCount();
   currentTempTargetDegC             = 0; // Turn off heater while adjusting temp
-  uint16_t   *waitForRelease         = &(cxt->scratch_state.state1);
-  uint32_t   *autoRepeatTimer        = &(cxt->scratch_state.state3);
-  uint16_t   *autoRepeatAcceleration = &(cxt->scratch_state.state2);
-  ButtonState buttons                = buttonIn;
-  if (*waitForRelease == 0) {
-    // When we first enter we wait for the user to release buttons before enabling changes
+  TickType_t autoRepeatTimer        = 0;
+  uint8_t    autoRepeatAcceleration = 0;
+#ifndef PROFILE_SUPPORT
+  bool        waitForRelease = false;
+  ButtonState buttons        = getButtonState();
+
   if (buttons != BUTTON_NONE) {
-      buttons = BUTTON_NONE;
-    } else {
-      (*waitForRelease)++;
-    }
+    // Temp adjust entered by long-pressing F button.
+    waitForRelease = true;
   }
+#else
+  ButtonState buttons;
+#endif
 
+  for (;;) {
     OLED::setCursor(0, 0);
-
+    OLED::clearScreen();
+    buttons = getButtonState();
+    if (buttons) {
+      lastChange = xTaskGetTickCount();
+#ifndef PROFILE_SUPPORT
+      if (waitForRelease) {
+        buttons = BUTTON_NONE;
+      }
+    } else {
+      waitForRelease = false;
+#endif
+    }
     int16_t delta = 0;
     switch (buttons) {
     case BUTTON_NONE:
       // stay
-    (*autoRepeatAcceleration) = 0;
+      autoRepeatAcceleration = 0;
       break;
     case BUTTON_BOTH:
       // exit
-    cxt->transitionMode = TransitionAnimation::Right;
-    return cxt->previousMode;
+      return;
+      break;
     case BUTTON_B_LONG:
-    if (xTaskGetTickCount() - (*autoRepeatTimer) + (*autoRepeatAcceleration) > PRESS_ACCEL_INTERVAL_MAX) {
+      if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration > PRESS_ACCEL_INTERVAL_MAX) {
         delta           = -getSettingValue(SettingsOptions::TempChangeLongStep);
-      (*autoRepeatTimer) = xTaskGetTickCount();
-      (*autoRepeatAcceleration) += PRESS_ACCEL_STEP;
+        autoRepeatTimer = xTaskGetTickCount();
+        autoRepeatAcceleration += PRESS_ACCEL_STEP;
       }
       break;
     case BUTTON_B_SHORT:
       delta = -getSettingValue(SettingsOptions::TempChangeShortStep);
       break;
     case BUTTON_F_LONG:
-    if (xTaskGetTickCount() - (*autoRepeatTimer) + (*autoRepeatAcceleration) > PRESS_ACCEL_INTERVAL_MAX) {
+      if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration > PRESS_ACCEL_INTERVAL_MAX) {
         delta           = getSettingValue(SettingsOptions::TempChangeLongStep);
-      (*autoRepeatTimer) = xTaskGetTickCount();
-      (*autoRepeatAcceleration) += PRESS_ACCEL_STEP;
+        autoRepeatTimer = xTaskGetTickCount();
+        autoRepeatAcceleration += PRESS_ACCEL_STEP;
       }
       break;
     case BUTTON_F_SHORT:
@@ -50,8 +63,8 @@ OperatingMode gui_solderingTempAdjust(const ButtonState buttonIn, guiContext *cx
     default:
       break;
     }
-  if ((PRESS_ACCEL_INTERVAL_MAX - (*autoRepeatAcceleration)) < PRESS_ACCEL_INTERVAL_MIN) {
-    (*autoRepeatAcceleration) = PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN;
+    if ((PRESS_ACCEL_INTERVAL_MAX - autoRepeatAcceleration) < PRESS_ACCEL_INTERVAL_MIN) {
+      autoRepeatAcceleration = PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN;
     }
     // If buttons are flipped; flip the delta
     if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {
@@ -68,22 +81,24 @@ OperatingMode gui_solderingTempAdjust(const ButtonState buttonIn, guiContext *cx
       if (getSettingValue(SettingsOptions::TemperatureInF)) {
         if (newTemp > MAX_TEMP_F) {
           newTemp = MAX_TEMP_F;
-      } else if (newTemp < MIN_TEMP_F) {
+        }
+        if (newTemp < MIN_TEMP_F) {
           newTemp = MIN_TEMP_F;
         }
       } else {
         if (newTemp > MAX_TEMP_C) {
           newTemp = MAX_TEMP_C;
-      } else if (newTemp < MIN_TEMP_C) {
+        }
+        if (newTemp < MIN_TEMP_C) {
           newTemp = MIN_TEMP_C;
         }
       }
       setSettingValue(SettingsOptions::SolderingTemp, (uint16_t)newTemp);
     }
-  if (xTaskGetTickCount() - lastButtonTime > (TICKS_SECOND * 3)) {
-    cxt->transitionMode = TransitionAnimation::Right;
-    return cxt->previousMode; // exit if user just doesn't press anything for a bit
+    if (xTaskGetTickCount() - lastChange > (TICKS_SECOND * 2)) {
+      return; // exit if user just doesn't press anything for a bit
     }
+
     if (OLED::getRotation()) {
       OLED::print(getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled) ? LargeSymbolPlus : LargeSymbolMinus, FontStyle::LARGE);
     } else {
@@ -99,6 +114,7 @@ OperatingMode gui_solderingTempAdjust(const ButtonState buttonIn, guiContext *cx
     } else {
       OLED::print(getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled) ? LargeSymbolPlus : LargeSymbolMinus, FontStyle::LARGE);
     }
-
-  return OperatingMode::TemperatureAdjust; // Stay in temp adjust
+    OLED::refresh();
+    GUIDelay();
+  }
 }

source/Core/Threads/OperatingModes/USBPDDebug_FUSB.cpp

@@ -2,14 +2,17 @@
 
 #ifdef POW_PD
 #ifdef HAS_POWER_DEBUG_MENU
-OperatingMode showPDDebug(const ButtonState buttons, guiContext *cxt) {
+void showPDDebug(void) {
   // Print out the USB-PD state
   // Basically this is like the Debug menu, but instead we want to print out the PD status
-  uint16_t *screen = &(cxt->scratch_state.state1);
+  uint8_t     screen = 0;
+  ButtonState b;
+  for (;;) {
+    OLED::clearScreen();                               // Ensure the buffer starts clean
     OLED::setCursor(0, 0);                             // Position the cursor at the 0,0 (top left)
     OLED::print(SmallSymbolPDDebug, FontStyle::SMALL); // Print Title
     OLED::setCursor(0, 8);                             // second line
-  if ((*screen) == 0) {
+    if (screen == 0) {
       // Print the PD state machine
       OLED::print(SmallSymbolState, FontStyle::SMALL);
       OLED::print(SmallSymbolSpace, FontStyle::SMALL);
@@ -28,31 +31,31 @@ OperatingMode showPDDebug(const ButtonState buttons, guiContext *cxt) {
     } else {
       // Print out the Proposed power options one by one
       auto lastCaps = USBPowerDelivery::getLastSeenCapabilities();
-    if (((*screen) - 1) < 11) {
+      if ((screen - 1) < 11) {
         int voltage_mv     = 0;
         int min_voltage    = 0;
         int current_a_x100 = 0;
         int wattage        = 0;
 
-      if ((lastCaps[(*screen) - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_FIXED) {
-        voltage_mv     = PD_PDV2MV(PD_PDO_SRC_FIXED_VOLTAGE_GET(lastCaps[(*screen) - 1])); // voltage in mV units
-        current_a_x100 = PD_PDO_SRC_FIXED_CURRENT_GET(lastCaps[(*screen) - 1]);            // current in 10mA units
-      } else if (((lastCaps[(*screen) - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED) && ((lastCaps[(*screen) - 1] & PD_APDO_TYPE) == PD_APDO_TYPE_AVS)) {
-        voltage_mv  = PD_PAV2MV(PD_APDO_AVS_MAX_VOLTAGE_GET(lastCaps[(*screen) - 1]));
-        min_voltage = PD_PAV2MV(PD_APDO_PPS_MIN_VOLTAGE_GET(lastCaps[(*screen) - 1]));
+        if ((lastCaps[screen - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_FIXED) {
+          voltage_mv     = PD_PDV2MV(PD_PDO_SRC_FIXED_VOLTAGE_GET(lastCaps[screen - 1])); // voltage in mV units
+          current_a_x100 = PD_PDO_SRC_FIXED_CURRENT_GET(lastCaps[screen - 1]);            // current in 10mA units
+        } else if (((lastCaps[screen - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED) && ((lastCaps[screen - 1] & PD_APDO_TYPE) == PD_APDO_TYPE_AVS)) {
+          voltage_mv  = PD_PAV2MV(PD_APDO_AVS_MAX_VOLTAGE_GET(lastCaps[screen - 1]));
+          min_voltage = PD_PAV2MV(PD_APDO_PPS_MIN_VOLTAGE_GET(lastCaps[screen - 1]));
           // Last value is wattage
-        wattage = PD_APDO_AVS_MAX_POWER_GET(lastCaps[(*screen) - 1]);
-      } else if (((lastCaps[(*screen) - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED) && ((lastCaps[(*screen) - 1] & PD_APDO_TYPE) == PD_APDO_TYPE_PPS)) {
-        voltage_mv     = PD_PAV2MV(PD_APDO_PPS_MAX_VOLTAGE_GET(lastCaps[(*screen) - 1]));
-        min_voltage    = PD_PAV2MV(PD_APDO_PPS_MIN_VOLTAGE_GET(lastCaps[(*screen) - 1]));
-        current_a_x100 = PD_PAI2CA(PD_APDO_PPS_CURRENT_GET(lastCaps[(*screen) - 1])); // max current in 10mA units
+          wattage = PD_APDO_AVS_MAX_POWER_GET(lastCaps[screen - 1]);
+        } else if (((lastCaps[screen - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED) && ((lastCaps[screen - 1] & PD_APDO_TYPE) == PD_APDO_TYPE_PPS)) {
+          voltage_mv     = PD_PAV2MV(PD_APDO_PPS_MAX_VOLTAGE_GET(lastCaps[screen - 1]));
+          min_voltage    = PD_PAV2MV(PD_APDO_PPS_MIN_VOLTAGE_GET(lastCaps[screen - 1]));
+          current_a_x100 = PD_PAI2CA(PD_APDO_PPS_CURRENT_GET(lastCaps[screen - 1])); // max current in 10mA units
         }
         // Skip not used entries
         if (voltage_mv == 0) {
-        (*screen) += 1;
+          screen++;
         } else {
           // print out this entry of the proposal
-        OLED::printNumber(*screen, 2, FontStyle::SMALL, true); // print the entry number
+          OLED::printNumber(screen, 2, FontStyle::SMALL, true); // print the entry number
           OLED::print(SmallSymbolSpace, FontStyle::SMALL);
           if (min_voltage > 0) {
             OLED::printNumber(min_voltage / 1000, 2, FontStyle::SMALL, true); // print the voltage
@@ -72,15 +75,20 @@ OperatingMode showPDDebug(const ButtonState buttons, guiContext *cxt) {
           }
         }
       } else {
-      (*screen) = 0;
+        screen = 0;
       }
     }
-  if (buttons == BUTTON_B_SHORT) {
-    return OperatingMode::InitialisationDone;
-  } else if (buttons == BUTTON_F_SHORT) {
-    (*screen) += 1;
+
+    OLED::refresh();
+    b = getButtonState();
+    if (b == BUTTON_B_SHORT) {
+      return;
+    } else if (b == BUTTON_F_SHORT) {
+      screen++;
+    }
+
+    GUIDelay();
   }
-  return OperatingMode::UsbPDDebug;
 }
 #endif
 #endif

source/Core/Threads/OperatingModes/USBPDDebug_HUSB238.cpp

@@ -2,7 +2,7 @@
 #include "OperatingModes.h"
 #if POW_PD_EXT == 1
 #ifdef HAS_POWER_DEBUG_MENU
-OperatingMode showPDDebug(const ButtonState buttons, guiContext *cxt) {
+void showPDDebug(void) {
   // Print out the USB-PD state
   // Basically this is like the Debug menu, but instead we want to print out the PD status
   uint8_t     screen = 0;
@@ -44,14 +44,13 @@ OperatingMode showPDDebug(const ButtonState buttons, guiContext *cxt) {
     OLED::refresh();
     b = getButtonState();
     if (b == BUTTON_B_SHORT) {
-      return OperatingMode::InitialisationDone;
+      return;
     } else if (b == BUTTON_F_SHORT) {
       screen++;
     }
 
     GUIDelay();
   }
-  return OperatingMode::UsbPDDebug;
 }
 #endif
 #endif

source/Core/Threads/OperatingModes/utils/DrawTipTemperature.cpp

@@ -1,6 +1,5 @@
 #include "OperatingModeUtilities.h"
 #include "OperatingModes.h"
-#include "SolderingCommon.h"
 #include "TipThermoModel.h"
 
 void gui_drawTipTemp(bool symbol, const FontStyle font) {

source/Core/Threads/OperatingModes/utils/OperatingModeUtilities.h

@@ -1,17 +1,16 @@
 #ifndef OPERATING_MODE_UTILITIES_H_
 #define OPERATING_MODE_UTILITIES_H_
-#include "Buttons.hpp"
 #include "OLED.hpp"
 #include <stdbool.h>
 
 void     GUIDelay();                                              //
 bool     checkForUnderVoltage(void);                              //
 uint32_t getSleepTimeout(void);                                   //
-bool     shouldBeSleeping();                                       //
+bool     shouldBeSleeping(bool inAutoStart);                      //
 bool     shouldShutdown(void);                                    //
 void     gui_drawTipTemp(bool symbol, const FontStyle font);      //
 void     printVoltage(void);                                      //
-bool     warnUser(const char *warning, const ButtonState buttons); //
+void     warnUser(const char *warning, const TickType_t timeout); //
 void     gui_drawBatteryIcon(void);                               //
 bool     checkForUnderVoltage(void);                              //
 uint16_t min(uint16_t a, uint16_t b);                             //

source/Core/Threads/OperatingModes/utils/ShowWarning.cpp

@@ -1,9 +1,8 @@
 #include "Buttons.hpp"
 #include "OperatingModeUtilities.h"
-#include "OperatingModes.h"
-bool warnUser(const char *warning, const ButtonState buttons) {
+void warnUser(const char *warning, const TickType_t timeout) {
   OLED::clearScreen();
   OLED::printWholeScreen(warning);
-  // TODO also timeout
-  return buttons != BUTTON_NONE;
+  OLED::refresh();
+  waitForButtonPressOrTimeout(timeout);
 }

source/Core/Threads/OperatingModes/utils/SolderingCommon.cpp

@@ -106,8 +106,30 @@ bool checkExitSoldering(void) {
     }
   }
 #endif
+#ifdef NO_SLEEP_MODE
+  // No sleep mode, but still want shutdown timeout
+
+  if (shouldShutdown()) {
+    // shutdown
+    currentTempTargetDegC = 0;
+    lastMovementTime      = xTaskGetTickCount(); // We manually move the movement time to now such that shutdown timer is reset
+
+    return true; // we want to exit soldering mode
+  }
+#endif
+  if (shouldBeSleeping(false)) {
+    if (gui_SolderingSleepingMode(false, false)) {
+      return true; // If the function returns non-0 then exit
+    }
+  }
 
   // If we have tripped thermal runaway, turn off heater and show warning
+  if (heaterThermalRunaway) {
+    currentTempTargetDegC = 0; // heater control off
+    warnUser(translatedString(Tr->WarningThermalRunaway), 10 * TICKS_SECOND);
+    heaterThermalRunaway = false;
+    return true;
+  }
 
   return false;
 }

source/Core/Threads/OperatingModes/utils/SolderingCommon.h

@@ -1,10 +1,8 @@
 #ifndef SOLDERING_COMMON_H
 #define SOLDERING_COMMON_H
-#include <stdint.h>
 
 void detailedPowerStatus();
 void basicSolderingStatus(bool boostModeOn);
 bool checkExitSoldering();
-uint16_t getTipTemp(void);
 
-#endif // SOLDERING_COMMON_H
+#endif //SOLDERING_COMMON_H

source/Core/Threads/OperatingModes/utils/shouldDeviceSleep.cpp

@@ -4,14 +4,16 @@
 TickType_t        lastHallEffectSleepStart = 0;
 extern TickType_t lastMovementTime;
 
-bool shouldBeSleeping() {
+bool shouldBeSleeping(bool inAutoStart) {
 #ifndef NO_SLEEP_MODE
   // Return true if the iron should be in sleep mode
   if (getSettingValue(SettingsOptions::Sensitivity) && getSettingValue(SettingsOptions::SleepTime)) {
+    if (inAutoStart) {
       // In auto start we are asleep until movement
       if (lastMovementTime == 0 && lastButtonTime == 0) {
         return true;
       }
+    }
     if (lastMovementTime > 0 || lastButtonTime > 0) {
       if (((xTaskGetTickCount() - lastMovementTime) > getSleepTimeout()) && ((xTaskGetTickCount() - lastButtonTime) > getSleepTimeout())) {
         return true;