Move to latest HAL release trying to get I2C DMA to be more reliable, and known good point.

Cleans up some redundant calls as well to make some flash room.

workspace/TS100/src/FRToSI2C.cpp

@@ -6,15 +6,14 @@
  */
 
 #include "FRToSI2C.hpp"
-//#define I2CUSESDMA
+#define I2CUSESDMA
 I2C_HandleTypeDef* FRToSI2C::i2c;
 SemaphoreHandle_t FRToSI2C::I2CSemaphore;
 void FRToSI2C::CpltCallback() {
-  BaseType_t xHigherPriorityTaskWoken = pdFALSE;
   i2c->State = HAL_I2C_STATE_READY;  // Force state reset (even if tx error)
   if (I2CSemaphore) {
-    xSemaphoreGiveFromISR(I2CSemaphore, &xHigherPriorityTaskWoken);
-    portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+
+    xSemaphoreGiveFromISR(I2CSemaphore, NULL);
   }
 }
 
@@ -29,7 +28,7 @@ void FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t MemAddress,
     // RToS is active, run threading
     // Get the mutex so we can use the I2C port
     // Wait up to 1 second for the mutex
-    if (xSemaphoreTake(I2CSemaphore, (TickType_t)5000) == pdTRUE) {
+    if (xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE) {
       if (HAL_I2C_Mem_Read(i2c, DevAddress, MemAddress, MemAddSize, pData, Size,
                            5000) != HAL_OK) {
       }
@@ -62,7 +61,7 @@ void FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress,
     // RToS is active, run threading
     // Get the mutex so we can use the I2C port
     // Wait up to 1 second for the mutex
-    if (xSemaphoreTake(I2CSemaphore, (TickType_t)5000) == pdTRUE) {
+    if (xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE) {
       if (HAL_I2C_Mem_Write(i2c, DevAddress, MemAddress, MemAddSize, pData,
                             Size, 5000) != HAL_OK) {
       }
@@ -86,7 +85,7 @@ void FRToSI2C::Transmit(uint16_t DevAddress, uint8_t* pData, uint16_t Size) {
     // RToS is active, run threading
     // Get the mutex so we can use the I2C port
     // Wait up to 1 second for the mutex
-    if (xSemaphoreTake(I2CSemaphore, (TickType_t)5000) == pdTRUE) {
+    if (xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE) {
       if (HAL_I2C_Master_Transmit_DMA(i2c, DevAddress, pData, Size) != HAL_OK) {
       }
       // xSemaphoreGive(I2CSemaphore);

workspace/TS100/src/Setup.c

@@ -20,7 +20,7 @@ TIM_HandleTypeDef htim3;
 uint16_t ADCReadings[64];  // room for 32 lots of the pair of readings
 
 // Functions
-void SystemClock_Config(void);
+static void SystemClock_Config(void);
 static void MX_ADC1_Init(void);
 static void MX_I2C1_Init(void);
 static void MX_IWDG_Init(void);
@@ -31,344 +31,344 @@ static void MX_GPIO_Init(void);
 static void MX_ADC2_Init(void);
 
 void Setup_HAL() {
-  SystemClock_Config();
-  __HAL_AFIO_REMAP_SWJ_DISABLE();
-  MX_GPIO_Init();
-  MX_DMA_Init();
-  MX_I2C1_Init();
-  MX_ADC1_Init();
-  MX_ADC2_Init();
-  MX_TIM3_Init();
-  MX_TIM2_Init();
-  MX_IWDG_Init();
-  HAL_ADC_Start(&hadc2);
-  HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t*)ADCReadings,
-                               64);  // start DMA of normal readings
-  HAL_ADCEx_InjectedStart(&hadc1);   // enable injected  readings
-  HAL_ADCEx_InjectedStart(&hadc2);   // enable injected  readings
+	SystemClock_Config();
+	__HAL_AFIO_REMAP_SWJ_DISABLE()
+	;
+	MX_GPIO_Init();
+	MX_DMA_Init();
+	MX_I2C1_Init();
+	MX_ADC1_Init();
+	MX_ADC2_Init();
+	MX_TIM3_Init();
+	MX_TIM2_Init();
+	MX_IWDG_Init();
+	HAL_ADC_Start(&hadc2);
+	HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t*) ADCReadings, 64); // start DMA of normal readings
+	HAL_ADCEx_InjectedStart(&hadc1);   // enable injected  readings
+	HAL_ADCEx_InjectedStart(&hadc2);   // enable injected  readings
 }
 
 // channel 0 -> temperature sensor, 1-> VIN
 uint16_t getADC(uint8_t channel) {
-  uint32_t sum = 0;
-  for (uint8_t i = 0; i < 32; i++) sum += ADCReadings[channel + (i * 2)];
-  return sum >> 2;
+	uint32_t sum = 0;
+	for (uint8_t i = 0; i < 32; i++)
+		sum += ADCReadings[channel + (i * 2)];
+	return sum >> 2;
 }
 
 /** System Clock Configuration
  */
 void SystemClock_Config(void) {
-  RCC_OscInitTypeDef RCC_OscInitStruct;
-  RCC_ClkInitTypeDef RCC_ClkInitStruct;
-  RCC_PeriphCLKInitTypeDef PeriphClkInit;
+	RCC_OscInitTypeDef RCC_OscInitStruct;
+	RCC_ClkInitTypeDef RCC_ClkInitStruct;
+	RCC_PeriphCLKInitTypeDef PeriphClkInit;
 
-  /**Initializes the CPU, AHB and APB busses clocks
-   */
-  RCC_OscInitStruct.OscillatorType =
-      RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_LSI;
-  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
-  RCC_OscInitStruct.HSICalibrationValue = 16;
-  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI_DIV2;
-  RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL16;  // 64MHz
-  HAL_RCC_OscConfig(&RCC_OscInitStruct);
+	/**Initializes the CPU, AHB and APB busses clocks
+	 */
+	RCC_OscInitStruct.OscillatorType =
+	RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_LSI;
+	RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+	RCC_OscInitStruct.HSICalibrationValue = 16;
+	RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+	RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+	RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI_DIV2;
+	RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL16;  // 64MHz
+	HAL_RCC_OscConfig(&RCC_OscInitStruct);
 
-  /**Initializes the CPU, AHB and APB busses clocks
-   */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK |
-                                RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
-  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV16;  // TIM
-                                                      // 2,3,4,5,6,7,12,13,14
-  RCC_ClkInitStruct.APB2CLKDivider =
-      RCC_HCLK_DIV1;  // 64 mhz to some peripherals and adc
+	/**Initializes the CPU, AHB and APB busses clocks
+	 */
+	RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK |
+	RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+	RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+	RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+	RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV16;  // TIM
+														// 2,3,4,5,6,7,12,13,14
+	RCC_ClkInitStruct.APB2CLKDivider =
+	RCC_HCLK_DIV1;  // 64 mhz to some peripherals and adc
 
-  HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2);
+	HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2);
 
-  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC;
-  PeriphClkInit.AdcClockSelection =
-      RCC_ADCPCLK2_DIV6;  // 6 or 8 are the only non overclocked options
-  HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit);
+	PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC;
+	PeriphClkInit.AdcClockSelection =
+	RCC_ADCPCLK2_DIV6;  // 6 or 8 are the only non overclocked options
+	HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit);
 
-  /**Configure the Systick interrupt time
-   */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
+	/**Configure the Systick interrupt time
+	 */
+	HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
 
-  /**Configure the Systick
-   */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
+	/**Configure the Systick
+	 */
+	HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
 
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 15, 0);
+	/* SysTick_IRQn interrupt configuration */
+	HAL_NVIC_SetPriority(SysTick_IRQn, 15, 0);
 }
 
 /* ADC1 init function */
 static void MX_ADC1_Init(void) {
-  ADC_MultiModeTypeDef multimode;
+	ADC_MultiModeTypeDef multimode;
 
-  ADC_ChannelConfTypeDef sConfig;
-  ADC_InjectionConfTypeDef sConfigInjected;
-  /**Common config
-   */
-  hadc1.Instance = ADC1;
-  hadc1.Init.ScanConvMode = ADC_SCAN_ENABLE;
-  hadc1.Init.ContinuousConvMode = ENABLE;
-  hadc1.Init.DiscontinuousConvMode = DISABLE;
-  hadc1.Init.ExternalTrigConv = ADC_SOFTWARE_START;
-  hadc1.Init.DataAlign = ADC_DATAALIGN_RIGHT;
-  hadc1.Init.NbrOfConversion = 2;
-  HAL_ADC_Init(&hadc1);
+	ADC_ChannelConfTypeDef sConfig;
+	ADC_InjectionConfTypeDef sConfigInjected;
+	/**Common config
+	 */
+	hadc1.Instance = ADC1;
+	hadc1.Init.ScanConvMode = ADC_SCAN_ENABLE;
+	hadc1.Init.ContinuousConvMode = ENABLE;
+	hadc1.Init.DiscontinuousConvMode = DISABLE;
+	hadc1.Init.ExternalTrigConv = ADC_SOFTWARE_START;
+	hadc1.Init.DataAlign = ADC_DATAALIGN_RIGHT;
+	hadc1.Init.NbrOfConversion = 2;
+	HAL_ADC_Init(&hadc1);
 
-  /**Configure the ADC multi-mode
-   */
-  multimode.Mode = ADC_DUALMODE_REGSIMULT_INJECSIMULT;
-  HAL_ADCEx_MultiModeConfigChannel(&hadc1, &multimode);
+	/**Configure the ADC multi-mode
+	 */
+	multimode.Mode = ADC_DUALMODE_REGSIMULT_INJECSIMULT;
+	HAL_ADCEx_MultiModeConfigChannel(&hadc1, &multimode);
 
-  /**Configure Regular Channel
-   */
-  sConfig.Channel = TMP36_ADC1_CHANNEL;
-  sConfig.Rank = 1;
-  sConfig.SamplingTime = ADC_SAMPLETIME_239CYCLES_5;
-  HAL_ADC_ConfigChannel(&hadc1, &sConfig);
+	/**Configure Regular Channel
+	 */
+	sConfig.Channel = TMP36_ADC1_CHANNEL;
+	sConfig.Rank = 1;
+	sConfig.SamplingTime = ADC_SAMPLETIME_239CYCLES_5;
+	HAL_ADC_ConfigChannel(&hadc1, &sConfig);
 
-  /**Configure Regular Channel
-   */
-  sConfig.Channel = VIN_ADC1_CHANNEL;
-  sConfig.Rank = 2;
-  HAL_ADC_ConfigChannel(&hadc1, &sConfig);
+	/**Configure Regular Channel
+	 */
+	sConfig.Channel = VIN_ADC1_CHANNEL;
+	sConfig.Rank = 2;
+	HAL_ADC_ConfigChannel(&hadc1, &sConfig);
 
-  /**Configure Injected Channel
-   */
-  // F in = 10.66 MHz
-  /*
-   * Injected time is 1 delay clock + (12 adc cycles*4)+4*sampletime =~217
-   * clocks = 0.2ms Charge time is 0.016 uS ideally So Sampling time must be >=
-   * 0.016uS 1/10.66MHz is 0.09uS, so 1 CLK is *should* be enough
-   * */
-  sConfigInjected.InjectedChannel = TIP_TEMP_ADC1_CHANNEL;
-  sConfigInjected.InjectedRank = 1;
-  sConfigInjected.InjectedNbrOfConversion = 4;
-  sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_7CYCLES_5;
-  sConfigInjected.ExternalTrigInjecConv = ADC_EXTERNALTRIGINJECCONV_T2_CC1;
-  sConfigInjected.AutoInjectedConv = DISABLE;
-  sConfigInjected.InjectedDiscontinuousConvMode = DISABLE;
-  sConfigInjected.InjectedOffset = 0;
+	/**Configure Injected Channel
+	 */
+	// F in = 10.66 MHz
+	/*
+	 * Injected time is 1 delay clock + (12 adc cycles*4)+4*sampletime =~217
+	 * clocks = 0.2ms Charge time is 0.016 uS ideally So Sampling time must be >=
+	 * 0.016uS 1/10.66MHz is 0.09uS, so 1 CLK is *should* be enough
+	 * */
+	sConfigInjected.InjectedChannel = TIP_TEMP_ADC1_CHANNEL;
+	sConfigInjected.InjectedRank = 1;
+	sConfigInjected.InjectedNbrOfConversion = 4;
+	sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_7CYCLES_5;
+	sConfigInjected.ExternalTrigInjecConv = ADC_EXTERNALTRIGINJECCONV_T2_CC1;
+	sConfigInjected.AutoInjectedConv = DISABLE;
+	sConfigInjected.InjectedDiscontinuousConvMode = DISABLE;
+	sConfigInjected.InjectedOffset = 0;
 
-  HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
+	HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
 
-  sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_1CYCLE_5;
-  sConfigInjected.InjectedRank = 2;
-  HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
-  sConfigInjected.InjectedRank = 3;
-  HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
-  sConfigInjected.InjectedRank = 4;
-  HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
-  SET_BIT(hadc1.Instance->CR1,
-          (ADC_CR1_JEOCIE));  // Enable end of injected conv irq
-  // Run ADC internal calibration
-  while (HAL_ADCEx_Calibration_Start(&hadc1) != HAL_OK)
-    ;
+	sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_1CYCLE_5;
+	sConfigInjected.InjectedRank = 2;
+	HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
+	sConfigInjected.InjectedRank = 3;
+	HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
+	sConfigInjected.InjectedRank = 4;
+	HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
+	SET_BIT(hadc1.Instance->CR1, (ADC_CR1_JEOCIE)); // Enable end of injected conv irq
+	// Run ADC internal calibration
+	while (HAL_ADCEx_Calibration_Start(&hadc1) != HAL_OK)
+		;
 }
 
 /* ADC2 init function */
 static void MX_ADC2_Init(void) {
-  ADC_ChannelConfTypeDef sConfig;
-  ADC_InjectionConfTypeDef sConfigInjected;
+	ADC_ChannelConfTypeDef sConfig;
+	ADC_InjectionConfTypeDef sConfigInjected;
 
-  /**Common config
-   */
-  hadc2.Instance = ADC2;
-  hadc2.Init.ScanConvMode = ADC_SCAN_ENABLE;
-  hadc2.Init.ContinuousConvMode = ENABLE;
-  hadc2.Init.DiscontinuousConvMode = DISABLE;
-  hadc2.Init.ExternalTrigConv = ADC_SOFTWARE_START;
-  hadc2.Init.DataAlign = ADC_DATAALIGN_RIGHT;
-  hadc2.Init.NbrOfConversion = 2;
-  HAL_ADC_Init(&hadc2);
+	/**Common config
+	 */
+	hadc2.Instance = ADC2;
+	hadc2.Init.ScanConvMode = ADC_SCAN_ENABLE;
+	hadc2.Init.ContinuousConvMode = ENABLE;
+	hadc2.Init.DiscontinuousConvMode = DISABLE;
+	hadc2.Init.ExternalTrigConv = ADC_SOFTWARE_START;
+	hadc2.Init.DataAlign = ADC_DATAALIGN_RIGHT;
+	hadc2.Init.NbrOfConversion = 2;
+	HAL_ADC_Init(&hadc2);
 
-  /**Configure Regular Channel
-   */
-  sConfig.Channel = TIP_TEMP_ADC2_CHANNEL;
-  sConfig.Rank = ADC_REGULAR_RANK_1;
-  sConfig.SamplingTime = ADC_SAMPLETIME_239CYCLES_5;
-  HAL_ADC_ConfigChannel(&hadc2, &sConfig);
-  sConfig.Channel = VIN_ADC2_CHANNEL;
-  sConfig.Rank = ADC_REGULAR_RANK_2;
-  sConfig.SamplingTime = ADC_SAMPLETIME_239CYCLES_5;
-  HAL_ADC_ConfigChannel(&hadc2, &sConfig);
+	/**Configure Regular Channel
+	 */
+	sConfig.Channel = TIP_TEMP_ADC2_CHANNEL;
+	sConfig.Rank = ADC_REGULAR_RANK_1;
+	sConfig.SamplingTime = ADC_SAMPLETIME_239CYCLES_5;
+	HAL_ADC_ConfigChannel(&hadc2, &sConfig);
+	sConfig.Channel = VIN_ADC2_CHANNEL;
+	sConfig.Rank = ADC_REGULAR_RANK_2;
+	sConfig.SamplingTime = ADC_SAMPLETIME_239CYCLES_5;
+	HAL_ADC_ConfigChannel(&hadc2, &sConfig);
 
-  /**Configure Injected Channel
-   */
-  sConfigInjected.InjectedChannel = TIP_TEMP_ADC2_CHANNEL;
-  sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1;
-  sConfigInjected.InjectedNbrOfConversion = 4;
-  sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_7CYCLES_5;
-  sConfigInjected.ExternalTrigInjecConv = ADC_EXTERNALTRIGINJECCONV_T2_CC1;
-  sConfigInjected.AutoInjectedConv = DISABLE;
-  sConfigInjected.InjectedDiscontinuousConvMode = DISABLE;
-  sConfigInjected.InjectedOffset = 0;
-  HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
-  sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_1CYCLE_5;
+	/**Configure Injected Channel
+	 */
+	sConfigInjected.InjectedChannel = TIP_TEMP_ADC2_CHANNEL;
+	sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1;
+	sConfigInjected.InjectedNbrOfConversion = 4;
+	sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_7CYCLES_5;
+	sConfigInjected.ExternalTrigInjecConv = ADC_EXTERNALTRIGINJECCONV_T2_CC1;
+	sConfigInjected.AutoInjectedConv = DISABLE;
+	sConfigInjected.InjectedDiscontinuousConvMode = DISABLE;
+	sConfigInjected.InjectedOffset = 0;
+	HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
+	sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_1CYCLE_5;
 
-  sConfigInjected.InjectedRank = ADC_INJECTED_RANK_2;
-  HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
-  sConfigInjected.InjectedRank = ADC_INJECTED_RANK_3;
-  HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
-  sConfigInjected.InjectedRank = ADC_INJECTED_RANK_4;
-  HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
+	sConfigInjected.InjectedRank = ADC_INJECTED_RANK_2;
+	HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
+	sConfigInjected.InjectedRank = ADC_INJECTED_RANK_3;
+	HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
+	sConfigInjected.InjectedRank = ADC_INJECTED_RANK_4;
+	HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
 
-  // Run ADC internal calibration
-  while (HAL_ADCEx_Calibration_Start(&hadc2) != HAL_OK)
-    ;
+	// Run ADC internal calibration
+	while (HAL_ADCEx_Calibration_Start(&hadc2) != HAL_OK)
+		;
 }
 /* I2C1 init function */
 static void MX_I2C1_Init(void) {
-  hi2c1.Instance = I2C1;
-  hi2c1.Init.ClockSpeed =
-      100000;  // OLED doesnt handle >100k when its asleep (off).
-  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);
+	hi2c1.Instance = I2C1;
+	hi2c1.Init.ClockSpeed = 50000;
+	// OLED doesnt handle >100k when its asleep (off).
+	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) {
-  hiwdg.Instance = IWDG;
-  hiwdg.Init.Prescaler = IWDG_PRESCALER_256;
-  hiwdg.Init.Reload = 100;
-  HAL_IWDG_Init(&hiwdg);
+	hiwdg.Instance = IWDG;
+	hiwdg.Init.Prescaler = IWDG_PRESCALER_256;
+	hiwdg.Init.Reload = 100;
+	HAL_IWDG_Init(&hiwdg);
 }
 
 /* TIM3 init function */
 static void MX_TIM3_Init(void) {
-  TIM_ClockConfigTypeDef sClockSourceConfig;
-  TIM_MasterConfigTypeDef sMasterConfig;
-  TIM_OC_InitTypeDef sConfigOC;
+	TIM_ClockConfigTypeDef sClockSourceConfig;
+	TIM_MasterConfigTypeDef sMasterConfig;
+	TIM_OC_InitTypeDef sConfigOC;
 
-  htim3.Instance = TIM3;
-  htim3.Init.Prescaler = 4;
-  htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim3.Init.Period = 100;                            // 10 Khz PWM freq
-  htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4;  // 4mhz before div
-  htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
-  HAL_TIM_Base_Init(&htim3);
+	htim3.Instance = TIM3;
+	htim3.Init.Prescaler = 4;
+	htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
+	htim3.Init.Period = 100;                            // 10 Khz PWM freq
+	htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4;  // 4mhz before div
+	htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+	HAL_TIM_Base_Init(&htim3);
 
-  sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
-  HAL_TIM_ConfigClockSource(&htim3, &sClockSourceConfig);
+	sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
+	HAL_TIM_ConfigClockSource(&htim3, &sClockSourceConfig);
 
-  HAL_TIM_PWM_Init(&htim3);
+	HAL_TIM_PWM_Init(&htim3);
 
-  HAL_TIM_OC_Init(&htim3);
+	HAL_TIM_OC_Init(&htim3);
 
-  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
-  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
-  HAL_TIMEx_MasterConfigSynchronization(&htim3, &sMasterConfig);
+	sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+	sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
+	HAL_TIMEx_MasterConfigSynchronization(&htim3, &sMasterConfig);
 
-  sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 50;
-  sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
-  sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
-  HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, PWM_Out_CHANNEL);
+	sConfigOC.OCMode = TIM_OCMODE_PWM1;
+	sConfigOC.Pulse = 50;
+	sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
+	sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
+	HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, PWM_Out_CHANNEL);
 
-  GPIO_InitTypeDef GPIO_InitStruct;
+	GPIO_InitTypeDef GPIO_InitStruct;
 
-  /**TIM3 GPIO Configuration
-   PWM_Out_Pin     ------> TIM3_CH1
-   */
-  GPIO_InitStruct.Pin = PWM_Out_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-  HAL_GPIO_Init(PWM_Out_GPIO_Port, &GPIO_InitStruct);
+	/**TIM3 GPIO Configuration
+	 PWM_Out_Pin     ------> TIM3_CH1
+	 */
+	GPIO_InitStruct.Pin = PWM_Out_Pin;
+	GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+	HAL_GPIO_Init(PWM_Out_GPIO_Port, &GPIO_InitStruct);
 #ifdef MODEL_TS100
-  // Remap TIM3_CH1 to be on pB4
-  __HAL_AFIO_REMAP_TIM3_PARTIAL();
+	// Remap TIM3_CH1 to be on pB4
+	__HAL_AFIO_REMAP_TIM3_PARTIAL();
 #else
-  // No re-map required
+	// No re-map required
 #endif
-  HAL_TIM_PWM_Start(&htim3, PWM_Out_CHANNEL);
+	HAL_TIM_PWM_Start(&htim3, PWM_Out_CHANNEL);
 }
 /* TIM3 init function */
 static void MX_TIM2_Init(void) {
-  /*
-   * We use the channel 1 to trigger the ADC at end of PWM period
-   * And we use the channel 4 as the PWM modulation source using Interrupts
-   * */
-  TIM_ClockConfigTypeDef sClockSourceConfig;
-  TIM_MasterConfigTypeDef sMasterConfig;
-  TIM_OC_InitTypeDef sConfigOC;
+	/*
+	 * We use the channel 1 to trigger the ADC at end of PWM period
+	 * And we use the channel 4 as the PWM modulation source using Interrupts
+	 * */
+	TIM_ClockConfigTypeDef sClockSourceConfig;
+	TIM_MasterConfigTypeDef sMasterConfig;
+	TIM_OC_InitTypeDef sConfigOC;
 
-  // Timer 2 is fairly slow as its being used to run the PWM and trigger the ADC
-  // in the PWM off time.
-  htim2.Instance = TIM2;
-  htim2.Init.Prescaler =
-      785;  // pwm out is 10k from tim3, we want to run our PWM at around 10hz or slower on the output stage
-  // The input is 1mhz after the div/4, so divide this by 785 to give around 4Hz output change rate
-  //Trade off is the slower the PWM output the slower we can respond and we gain temperature accuracy in settling time,
-  //But it increases the time delay between the heat cycle and the measurement and calculate cycle
-  htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim2.Init.Period = 255+60;
-  htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4;  // 4mhz before divide
-  htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
-  HAL_TIM_Base_Init(&htim2);
+	// Timer 2 is fairly slow as its being used to run the PWM and trigger the ADC
+	// in the PWM off time.
+	htim2.Instance = TIM2;
+	htim2.Init.Prescaler = 785; // pwm out is 10k from tim3, we want to run our PWM at around 10hz or slower on the output stage
+	// The input is 1mhz after the div/4, so divide this by 785 to give around 4Hz output change rate
+	//Trade off is the slower the PWM output the slower we can respond and we gain temperature accuracy in settling time,
+	//But it increases the time delay between the heat cycle and the measurement and calculate cycle
+	htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
+	htim2.Init.Period = 255 + 60;
+	htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4;  // 4mhz before divide
+	htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+	HAL_TIM_Base_Init(&htim2);
 
-  sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
-  HAL_TIM_ConfigClockSource(&htim2, &sClockSourceConfig);
+	sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
+	HAL_TIM_ConfigClockSource(&htim2, &sClockSourceConfig);
 
-  HAL_TIM_PWM_Init(&htim2);
-  HAL_TIM_OC_Init(&htim2);
+	HAL_TIM_PWM_Init(&htim2);
+	HAL_TIM_OC_Init(&htim2);
 
-  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
-  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
-  HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig);
+	sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+	sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
+	HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig);
 
-  sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 255+50; //255 is the largest time period of the drive signal, and the 50 offsets this around 5ms afterwards
-  /*
-   * It takes 4 milliseconds for output to be stable after PWM turns off.
-   * Assume ADC samples in 0.5ms
-   * We need to set this to 100% + 4.5ms
-   * */
-  sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
-  sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
-  HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_1);
+	sConfigOC.OCMode = TIM_OCMODE_PWM1;
+	sConfigOC.Pulse = 255 + 50; //255 is the largest time period of the drive signal, and the 50 offsets this around 5ms afterwards
+	/*
+	 * It takes 4 milliseconds for output to be stable after PWM turns off.
+	 * Assume ADC samples in 0.5ms
+	 * We need to set this to 100% + 4.5ms
+	 * */
+	sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
+	sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
+	HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_1);
 
-  sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 0;
-  sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
-  sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
-  HAL_TIM_OC_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_4);
+	sConfigOC.OCMode = TIM_OCMODE_PWM1;
+	sConfigOC.Pulse = 0;
+	sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
+	sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
+	HAL_TIM_OC_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_4);
 
-  HAL_TIM_Base_Start_IT(&htim2);
-  HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1);
-  HAL_TIM_PWM_Start_IT(&htim2, TIM_CHANNEL_4);
-  HAL_NVIC_SetPriority(TIM2_IRQn, 15, 0);
-  HAL_NVIC_EnableIRQ(TIM2_IRQn);
+	HAL_TIM_Base_Start_IT(&htim2);
+	HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1);
+	HAL_TIM_PWM_Start_IT(&htim2, TIM_CHANNEL_4);
+	HAL_NVIC_SetPriority(TIM2_IRQn, 15, 0);
+	HAL_NVIC_EnableIRQ(TIM2_IRQn);
 }
 
 /**
  * Enable DMA controller clock
  */
 static void MX_DMA_Init(void) {
-  /* DMA controller clock enable */
-  __HAL_RCC_DMA1_CLK_ENABLE();
+	/* DMA controller clock enable */
+	__HAL_RCC_DMA1_CLK_ENABLE()
+	;
 
-  /* DMA interrupt init */
-  /* DMA1_Channel1_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 15, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
-  /* DMA1_Channel6_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 15, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn);
-  /* DMA1_Channel7_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 15, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
+	/* DMA interrupt init */
+	/* DMA1_Channel1_IRQn interrupt configuration */
+	HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 15, 0);
+	HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
+	/* DMA1_Channel6_IRQn interrupt configuration */
+	HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 15, 0);
+	HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn);
+	/* DMA1_Channel7_IRQn interrupt configuration */
+	HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 15, 0);
+	HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
 }
 
 /** Configure pins as
@@ -382,73 +382,77 @@ static void MX_DMA_Init(void) {
  PB1   ------> ADCx_IN9
  */
 static void MX_GPIO_Init(void) {
-  GPIO_InitTypeDef GPIO_InitStruct;
+	GPIO_InitTypeDef GPIO_InitStruct;
 
-  /* GPIO Ports Clock Enable */
-  __HAL_RCC_GPIOD_CLK_ENABLE();
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
+	/* GPIO Ports Clock Enable */
+	__HAL_RCC_GPIOD_CLK_ENABLE()
+	;
+	__HAL_RCC_GPIOA_CLK_ENABLE()
+	;
+	__HAL_RCC_GPIOB_CLK_ENABLE()
+	;
 
-  /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_RESET);
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  /*Configure GPIO pins : PD0 PD1 */
-  GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1;
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
-  /*Configure peripheral I/O remapping */
-  __HAL_AFIO_REMAP_PD01_ENABLE();
-  //^ remap XTAL so that pins can be analog (all input buffers off).
-  // reduces power consumption
+	/*Configure GPIO pin Output Level */
+	HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_RESET);
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+	/*Configure GPIO pins : PD0 PD1 */
+	GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1;
+	GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+	HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+	/*Configure peripheral I/O remapping */
+	__HAL_AFIO_REMAP_PD01_ENABLE()
+	;
+	//^ remap XTAL so that pins can be analog (all input buffers off).
+	// reduces power consumption
 
-  /*
-   * Configure All pins as analog by default
-   */
-  GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1 | GPIO_PIN_2 | GPIO_PIN_3 |
-                        GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7 |
-                        GPIO_PIN_8 | GPIO_PIN_9 | GPIO_PIN_10 | GPIO_PIN_15;
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1 | GPIO_PIN_2 |
+	/*
+	 * Configure All pins as analog by default
+	 */
+	GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1 | GPIO_PIN_2 | GPIO_PIN_3 |
+	GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7 |
+	GPIO_PIN_8 | GPIO_PIN_9 | GPIO_PIN_10 | GPIO_PIN_15;
+	GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+	HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+	GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1 | GPIO_PIN_2 |
 #ifdef MODEL_TS100
-                        GPIO_PIN_3 |
+			GPIO_PIN_3 |
 #endif
-                        GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7 |
-                        GPIO_PIN_8 | GPIO_PIN_9 | GPIO_PIN_10 | GPIO_PIN_11 |
-                        GPIO_PIN_12 | GPIO_PIN_13 | GPIO_PIN_14 | GPIO_PIN_15;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+			GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7 |
+			GPIO_PIN_8 | GPIO_PIN_9 | GPIO_PIN_10 | GPIO_PIN_11 |
+			GPIO_PIN_12 | GPIO_PIN_13 | GPIO_PIN_14 | GPIO_PIN_15;
+	HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
 #ifdef MODEL_TS100
-  /* Pull USB lines low to disable, pull down debug too*/
-  GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_14 | GPIO_PIN_13;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-  HAL_GPIO_WritePin(GPIOA, GPIO_PIN_11, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(GPIOA, GPIO_PIN_13, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(GPIOA, GPIO_PIN_14, GPIO_PIN_RESET);
+	/* Pull USB lines low to disable, pull down debug too*/
+	GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_14 | GPIO_PIN_13;
+	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+	HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_11, GPIO_PIN_RESET);
+	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET);
+	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_13, GPIO_PIN_RESET);
+	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_14, GPIO_PIN_RESET);
 #else
-  /* TS80 */
-  /* Leave USB lines open circuit*/
+	/* TS80 */
+	/* Leave USB lines open circuit*/
 
 #endif
 
-  /*Configure GPIO pins : KEY_B_Pin KEY_A_Pin */
-  GPIO_InitStruct.Pin = KEY_B_Pin | KEY_A_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
-  GPIO_InitStruct.Pull = GPIO_PULLUP;
-  HAL_GPIO_Init(KEY_B_GPIO_Port, &GPIO_InitStruct);
+	/*Configure GPIO pins : KEY_B_Pin KEY_A_Pin */
+	GPIO_InitStruct.Pin = KEY_B_Pin | KEY_A_Pin;
+	GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+	GPIO_InitStruct.Pull = GPIO_PULLUP;
+	HAL_GPIO_Init(KEY_B_GPIO_Port, &GPIO_InitStruct);
 
-  /*Configure GPIO pin : OLED_RESET_Pin */
-  GPIO_InitStruct.Pin = OLED_RESET_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(OLED_RESET_GPIO_Port, &GPIO_InitStruct);
-  HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_RESET);
+	/*Configure GPIO pin : OLED_RESET_Pin */
+	GPIO_InitStruct.Pin = OLED_RESET_Pin;
+	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+	HAL_GPIO_Init(OLED_RESET_GPIO_Port, &GPIO_InitStruct);
+	HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_RESET);
 
-  // Pull down LCD reset
-  HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_RESET);
-  HAL_Delay(10);
-  HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_SET);
+	// Pull down LCD reset
+	HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_RESET);
+	HAL_Delay(30);
+	HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_SET);
 }

workspace/TS100/src/hardware.c

@@ -9,6 +9,7 @@
 #include "hardware.h"
 #include "FreeRTOS.h"
 #include "stm32f1xx_hal.h"
+#include "cmsis_os.h"
 volatile uint16_t PWMSafetyTimer = 0;
 volatile int16_t CalibrationTempOffset = 0;
 uint16_t tipGainCalValue = 0;
@@ -420,9 +421,7 @@ int16_t calculateMaxVoltage(uint8_t useHP) {
 
 #endif
 volatile uint32_t pendingPWM = 0;
-uint8_t getTipPWM() {
-	return pendingPWM;
-}
+
 void setTipPWM(uint8_t pulse) {
 	PWMSafetyTimer = 50; // This is decremented in the handler for PWM so that the tip pwm is
 						 // disabled if the PID task is not scheduled often enough.
@@ -456,10 +455,8 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
 }
 
 void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) {
-	if (htim->Instance == TIM2) {
-		// This was a when the PWM for the output has timed out
-		if (htim->Channel == HAL_TIM_ACTIVE_CHANNEL_4) {
-			HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_1);
-		}
+	// This was a when the PWM for the output has timed out
+	if (htim->Channel == HAL_TIM_ACTIVE_CHANNEL_4) {
+		HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_1);
 	}
 }

workspace/TS100/src/main.cpp

@@ -506,7 +506,12 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 		sleepThres = systemSettings.SleepTime * 10 * 100;
 	else
 		sleepThres = (systemSettings.SleepTime - 5) * 60 * 100;
-
+	if (jumpToSleep) {
+		if (gui_SolderingSleepingMode()) {
+			lastButtonTime = xTaskGetTickCount();
+			return;  // If the function returns non-0 then exit
+		}
+	}
 	for (;;) {
 
 		ButtonState buttons = getButtonState();
@@ -552,7 +557,6 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 			currentlyActiveTemperatureTarget = 0;
 			return;
 		} else {
-			OLED::setCursor(0, 0);
 			if (systemSettings.detailedSoldering) {
 				OLED::setFont(1);
 				OLED::print(SolderingAdvancedPowerPrompt);  // Power:
@@ -573,13 +577,11 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 				printVoltage();
 				OLED::drawChar('V');
 			} else {
-				OLED::setFont(0);
 				// We switch the layout direction depending on the orientation of the
 				// OLED::
 				if (OLED::getRotation()) {
 					// battery
 					gui_drawBatteryIcon();
-
 					OLED::drawChar(' '); // Space out gap between battery <-> temp
 					gui_drawTipTemp(true);  // Draw current tip temp
 
@@ -591,10 +593,14 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 						OLED::drawChar(' ');
 
 					// Draw heating/cooling symbols
-					OLED::drawHeatSymbol(milliWattsToPWM(milliWattHistory[0],systemSettings.voltageDiv));
+					OLED::drawHeatSymbol(
+							milliWattsToPWM(milliWattHistory[0],
+									systemSettings.voltageDiv));
 				} else {
 					// Draw heating/cooling symbols
-					OLED::drawHeatSymbol(milliWattsToPWM(milliWattHistory[0],systemSettings.voltageDiv));
+					OLED::drawHeatSymbol(
+							milliWattsToPWM(milliWattHistory[0],
+									systemSettings.voltageDiv));
 					// We draw boost arrow if boosting, or else gap temp <-> heat
 					// indicator
 					if (boostModeOn)
@@ -637,26 +643,21 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 		}
 #else
 		// on the TS80 we only want to check for over voltage to prevent tip damage
-		if (getInputVoltageX10(systemSettings.voltageDiv, 1) > 150) {
-			lastButtonTime = xTaskGetTickCount();
-			currentlyActiveTemperatureTarget = 0;
-			return;  // Over voltage
-		}
+		/*if (getInputVoltageX10(systemSettings.voltageDiv, 1) > 150) {
+		 lastButtonTime = xTaskGetTickCount();
+		 currentlyActiveTemperatureTarget = 0;
+		 return;  // Over voltage
+		 }*/
 #endif
-		if (jumpToSleep) {
-			if (gui_SolderingSleepingMode()) {
-				lastButtonTime = xTaskGetTickCount();
-				return;  // If the function returns non-0 then exit
-			}
-		}
+
 		if (systemSettings.sensitivity && systemSettings.SleepTime)
 			if (xTaskGetTickCount() - lastMovementTime > sleepThres
 					&& xTaskGetTickCount() - lastButtonTime > sleepThres) {
 				if (gui_SolderingSleepingMode()) {
-					lastButtonTime = xTaskGetTickCount();
 					return;  // If the function returns non-0 then exit
 				}
 			}
+		//slow down ui update rate
 		GUIDelay();
 	}
 }
@@ -787,7 +788,10 @@ void startGUITask(void const *argument __unused) {
 
 	for (;;) {
 		ButtonState buttons = getButtonState();
-
+		if (buttons != BUTTON_NONE) {
+			OLED::displayOnOff(true);  // turn lcd on
+			OLED::setFont(0);
+		}
 		if (tempWarningState == 2)
 			buttons = BUTTON_F_SHORT;
 		if (buttons != BUTTON_NONE && buttonLockout)
@@ -814,21 +818,10 @@ void startGUITask(void const *argument __unused) {
 			saveSettings();
 			break;
 		case BUTTON_F_SHORT:
-			OLED::setFont(0);
-			OLED::displayOnOff(true);  // turn lcd on
-#ifdef MODEL_TS80
-			//Here we re-check for tip presence
-			if (idealQCVoltage < 90)
-				idealQCVoltage = calculateMaxVoltage(
-						systemSettings.cutoutSetting);
-			seekQC(idealQCVoltage, systemSettings.voltageDiv);
-#endif
 			gui_solderingMode(0);  // enter soldering mode
 			buttonLockout = true;
 			break;
 		case BUTTON_B_SHORT:
-			OLED::setFont(0);
-			OLED::displayOnOff(true);  // turn lcd on
 			enterSettingsMenu();       // enter the settings menu
 			saveSettings();
 			buttonLockout = true;
@@ -854,9 +847,6 @@ void startGUITask(void const *argument __unused) {
 		} else
 			OLED::displayOnOff(true);  // turn lcd on when temp > 50C
 
-		if (tipTemp > 600)
-			tipTemp = 0;
-
 		// Clear the lcd buffer
 		OLED::clearScreen();
 		OLED::setCursor(0, 0);
@@ -912,13 +902,11 @@ void startGUITask(void const *argument __unused) {
 					OLED::setCursor(0, 0);
 				}
 				// draw in the temp
-				OLED::setFont(0);  // big font
 				if (!(systemSettings.coolingTempBlink
-						&& (xTaskGetTickCount() % 50 < 25)))
+						&& (xTaskGetTickCount() % 25 < 16)))
 					gui_drawTipTemp(false);  // draw in the temp
 			}
 		}
-
 		OLED::refresh();
 		GUIDelay();
 	}
@@ -946,7 +934,7 @@ void startPIDTask(void const *argument __unused) {
 #endif
 	history<int32_t> tempError = { { 0 }, 0, 0 };
 	currentlyActiveTemperatureTarget = 0; // Force start with no output (off). If in sleep / soldering this will
-											  // be over-ridden rapidly
+										  // be over-ridden rapidly
 	pidTaskNotification = xTaskGetCurrentTaskHandle();
 	for (;;) {
 
@@ -1015,14 +1003,14 @@ void startPIDTask(void const *argument __unused) {
 				//~200ms @ a low wattage
 				//Doesnt keep all power banks awake but helps with some
 				/*if (xTaskGetTickCount() - lastPowerPulse < 20) {
-					// for the first 200mS turn on for a bit
-					setTipMilliWatts(4000);	// typically its around 5W to hold the current temp, so this wont raise temp much
-				} else
-					setTipMilliWatts(0);
-				//Then wait until the next second
-				if (xTaskGetTickCount() - lastPowerPulse > 100) {
-					lastPowerPulse = xTaskGetTickCount();
-				}*/
+				 // for the first 200mS turn on for a bit
+				 setTipMilliWatts(4000);	// typically its around 5W to hold the current temp, so this wont raise temp much
+				 } else
+				 setTipMilliWatts(0);
+				 //Then wait until the next second
+				 if (xTaskGetTickCount() - lastPowerPulse > 100) {
+				 lastPowerPulse = xTaskGetTickCount();
+				 }*/
 				setTipMilliWatts(0);
 #else
 				setTipMilliWatts(0);

workspace/TS100/src/power.cpp

@@ -11,7 +11,7 @@
 
 uint8_t tipResistance = 85; //x10 ohms, 8.5 typical for ts100, 4.5 typical for ts80
 const uint16_t powerPWM = 255;
-const uint16_t totalPWM = 255 + 65; //htim2.Init.Period, the full PWM cycle
+const uint16_t totalPWM = 255 + 60; //htim2.Init.Period, the full PWM cycle
 
 history<uint32_t, oscillationPeriod> milliWattHistory = { { 0 }, 0, 0 };
 
@@ -44,9 +44,8 @@ uint8_t milliWattsToPWM(int32_t milliWatts, uint8_t divisor) {
 	int32_t v = getInputVoltageX10(divisor, 1);	// 100 = 10v
 	int32_t availableMilliWatts = v * v / tipResistance;
 
-	int32_t pwm = ((powerPWM * totalPWM / powerPWM) * milliWatts)
-			/ availableMilliWatts;
-
+	//int32_t pwm = ((powerPWM * totalPWM / powerPWM) * milliWatts)	/ availableMilliWatts;
+	int32_t pwm = (totalPWM * milliWatts) / availableMilliWatts;
 	if (pwm > powerPWM) {
 		pwm = powerPWM;
 	} else if (pwm < 0) {

workspace/TS100/src/stm32f1xx_hal_msp.c

@@ -103,7 +103,7 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) {
 	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_MEDIUM;
+	hdma_i2c1_rx.Init.Priority = DMA_PRIORITY_LOW;
 	HAL_DMA_Init(&hdma_i2c1_rx);
 
 	__HAL_LINKDMA(hi2c, hdmarx, hdma_i2c1_rx);