From e925037988ebbe94051f00ae85a9890e798a573c Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" <5425387+Ralim@users.noreply.github.com> Date: Sat, 8 Jun 2024 17:34:20 +1000 Subject: [PATCH 01/10] Sequre Faster PWM (#1926) * 4x faster PWM * Add light filter to displayed temp --- source/Core/BSP/Sequre_S60/BSP.cpp | 2 +- source/Core/BSP/Sequre_S60/Setup.cpp | 15 ++++++--------- source/Core/BSP/Sequre_S60/configuration.h | 6 ++++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/source/Core/BSP/Sequre_S60/BSP.cpp b/source/Core/BSP/Sequre_S60/BSP.cpp index b32f239ecf..ebf46e7f8d 100644 --- a/source/Core/BSP/Sequre_S60/BSP.cpp +++ b/source/Core/BSP/Sequre_S60/BSP.cpp @@ -105,7 +105,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) { if (PWMSafetyTimer == 0) { htim4.Instance->CCR3 = 0; } else { - htim4.Instance->CCR3 = pendingPWM; + htim4.Instance->CCR3 = pendingPWM / 4; } } else if (htim->Instance == TIM1) { // STM uses this for internal functions as a counter for timeouts diff --git a/source/Core/BSP/Sequre_S60/Setup.cpp b/source/Core/BSP/Sequre_S60/Setup.cpp index 87a383f1c7..a5d5845ea1 100644 --- a/source/Core/BSP/Sequre_S60/Setup.cpp +++ b/source/Core/BSP/Sequre_S60/Setup.cpp @@ -57,7 +57,7 @@ void Setup_HAL() { GPIO_InitStruct.Pin = MOVEMENT_Pin; GPIO_InitStruct.Mode = GPIO_MODE_INPUT; GPIO_InitStruct.Pull = GPIO_PULLDOWN; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; // We would like sharp rising edges + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; HAL_GPIO_Init(MOVEMENT_GPIO_Port, &GPIO_InitStruct); } } @@ -254,23 +254,20 @@ static void MX_IWDG_Init(void) { static void MX_TIM4_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 + * On Sequre devies we run the output PWM as fast as possible due to the low tip resistance + no inductor for filtering. + * So we run it as fast as we can and hope that the caps filter out the current spikes. * */ TIM_ClockConfigTypeDef sClockSourceConfig; TIM_MasterConfigTypeDef sMasterConfig; TIM_OC_InitTypeDef sConfigOC; memset(&sConfigOC, 0, sizeof(sConfigOC)); - // Timer 2 is fairly slow as its being used to run the PWM and trigger the ADC - // in the PWM off time. + htim4.Instance = TIM4; // dummy value, will be reconfigured by BSPInit() - htim4.Init.Prescaler = 10; // 2 MHz timer clock/1000 = 2 kHz tick rate + htim4.Init.Prescaler = 10; // 2 MHz timer clock/10 = 200 kHz tick rate - // pwm out is 10k from tim3, we want to run our PWM at around 10hz or slower on the output stage - // These values give a rate of around 3.5 Hz for "fast" mode and 1.84 Hz for "slow" htim4.Init.CounterMode = TIM_COUNTERMODE_UP; - htim4.Init.Period = 255; + htim4.Init.Period = 64; htim4.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; // 8 MHz (x2 APB1) before divide htim4.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; diff --git a/source/Core/BSP/Sequre_S60/configuration.h b/source/Core/BSP/Sequre_S60/configuration.h index 008ce6b5ac..73568fdaef 100644 --- a/source/Core/BSP/Sequre_S60/configuration.h +++ b/source/Core/BSP/Sequre_S60/configuration.h @@ -148,7 +148,7 @@ #define HARDWARE_MAX_WATTAGE_X10 600 -#define TIP_THERMAL_MASS 8 // X10 watts to raise 1 deg C in 1 second +#define TIP_THERMAL_MASS 10 // X10 watts to raise 1 deg C in 1 second #define TIP_THERMAL_INERTIA 128 // We use a large inertia value to smooth out the drive to the tip since its stupidly sensitive #define TIP_RESISTANCE 20 //(actually 2.5 ish but we need to be more conservative on pwm'ing watt limit) x10 ohms @@ -162,6 +162,7 @@ #define TEMP_NTC #define I2C_SOFT_BUS_2 // For now we are doing software I2C to get around hardware chip issues #define OLED_I2CBB2 +#define FILTER_DISPLAYED_TIP_TEMP 4 // Filtering for GUI display #define MODEL_HAS_DCDC // We dont have DC/DC but have reallly fast PWM that gets us roughly the same place #endif /* S60 */ @@ -179,7 +180,7 @@ #define HARDWARE_MAX_WATTAGE_X10 600 -#define TIP_THERMAL_MASS 8 // X10 watts to raise 1 deg C in 1 second +#define TIP_THERMAL_MASS 10 // X10 watts to raise 1 deg C in 1 second #define TIP_THERMAL_INERTIA 128 // We use a large inertia value to smooth out the drive to the tip since its stupidly sensitive #define TIP_RESISTANCE 20 //(actually 2.5 ish but we need to be more conservative on pwm'ing watt limit) x10 ohms @@ -193,6 +194,7 @@ #define TEMP_NTC #define I2C_SOFT_BUS_2 // For now we are doing software I2C to get around hardware chip issues #define OLED_I2CBB2 +#define FILTER_DISPLAYED_TIP_TEMP 4 // Filtering for GUI display #define MODEL_HAS_DCDC // We dont have DC/DC but have reallly fast PWM that gets us roughly the same place #endif /* S60P */ From 2a4e1cd8ab9d00f0b845479a43ac3c93d355bb44 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" <5425387+Ralim@users.noreply.github.com> Date: Sat, 8 Jun 2024 17:53:19 +1000 Subject: [PATCH 02/10] Refactor: Rename Sequre bsp (#1927) * Rename Sequre BSP Folder * Update Makefile --- source/Core/BSP/{Sequre_S60 => Sequre}/BSP.cpp | 0 source/Core/BSP/{Sequre_S60 => Sequre}/FreeRTOSConfig.h | 0 source/Core/BSP/{Sequre_S60 => Sequre}/IRQ.cpp | 0 source/Core/BSP/{Sequre_S60 => Sequre}/IRQ.h | 0 source/Core/BSP/{Sequre_S60 => Sequre}/Pins.h | 0 source/Core/BSP/{Sequre_S60 => Sequre}/Power.cpp | 0 source/Core/BSP/{Sequre_S60 => Sequre}/README.md | 0 source/Core/BSP/{Sequre_S60 => Sequre}/Setup.cpp | 0 source/Core/BSP/{Sequre_S60 => Sequre}/Setup.h | 0 source/Core/BSP/{Sequre_S60 => Sequre}/Software_I2C.h | 0 .../{Sequre_S60 => Sequre}/Startup/startup_stm32f103t8ux.S | 0 source/Core/BSP/{Sequre_S60 => Sequre}/ThermoModel.cpp | 0 .../Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h | 0 .../Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h | 0 .../CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h | 0 .../Vendor/CMSIS/Include/arm_common_tables.h | 0 .../Vendor/CMSIS/Include/arm_const_structs.h | 0 .../{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/arm_math.h | 0 .../{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/cmsis_armcc.h | 0 .../Vendor/CMSIS/Include/cmsis_armcc_V6.h | 0 .../{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/cmsis_gcc.h | 0 .../{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cm0.h | 0 .../Vendor/CMSIS/Include/core_cm0plus.h | 0 .../{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cm3.h | 0 .../{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cm4.h | 0 .../{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cm7.h | 0 .../{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cmFunc.h | 0 .../Vendor/CMSIS/Include/core_cmInstr.h | 0 .../{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cmSimd.h | 0 .../{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_sc000.h | 0 .../{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_sc300.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c | 0 .../Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c | 0 source/Core/BSP/{Sequre_S60 => Sequre}/configuration.h | 0 source/Core/BSP/{Sequre_S60 => Sequre}/flash.c | 0 source/Core/BSP/{Sequre_S60 => Sequre}/port.c | 0 source/Core/BSP/{Sequre_S60 => Sequre}/portmacro.h | 0 source/Core/BSP/{Sequre_S60 => Sequre}/postRTOS.cpp | 0 source/Core/BSP/{Sequre_S60 => Sequre}/preRTOS.cpp | 0 source/Core/BSP/{Sequre_S60 => Sequre}/stm32f103.ld | 0 source/Core/BSP/{Sequre_S60 => Sequre}/stm32f1xx_hal_msp.c | 0 .../BSP/{Sequre_S60 => Sequre}/stm32f1xx_hal_timebase_TIM.c | 0 source/Core/BSP/{Sequre_S60 => Sequre}/stm32f1xx_it.c | 0 source/Core/BSP/{Sequre_S60 => Sequre}/system_stm32f1xx.c | 0 source/Makefile | 4 ++-- 78 files changed, 2 insertions(+), 2 deletions(-) rename source/Core/BSP/{Sequre_S60 => Sequre}/BSP.cpp (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/FreeRTOSConfig.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/IRQ.cpp (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/IRQ.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Pins.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Power.cpp (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/README.md (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Setup.cpp (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Setup.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Software_I2C.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Startup/startup_stm32f103t8ux.S (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/ThermoModel.cpp (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/arm_common_tables.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/arm_const_structs.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/arm_math.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/cmsis_armcc.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/cmsis_armcc_V6.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/cmsis_gcc.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cm0.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cm0plus.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cm3.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cm4.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cm7.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cmFunc.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cmInstr.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_cmSimd.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_sc000.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/CMSIS/Include/core_sc300.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/configuration.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/flash.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/port.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/portmacro.h (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/postRTOS.cpp (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/preRTOS.cpp (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/stm32f103.ld (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/stm32f1xx_hal_msp.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/stm32f1xx_hal_timebase_TIM.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/stm32f1xx_it.c (100%) rename source/Core/BSP/{Sequre_S60 => Sequre}/system_stm32f1xx.c (100%) diff --git a/source/Core/BSP/Sequre_S60/BSP.cpp b/source/Core/BSP/Sequre/BSP.cpp similarity index 100% rename from source/Core/BSP/Sequre_S60/BSP.cpp rename to source/Core/BSP/Sequre/BSP.cpp diff --git a/source/Core/BSP/Sequre_S60/FreeRTOSConfig.h b/source/Core/BSP/Sequre/FreeRTOSConfig.h similarity index 100% rename from source/Core/BSP/Sequre_S60/FreeRTOSConfig.h rename to source/Core/BSP/Sequre/FreeRTOSConfig.h diff --git a/source/Core/BSP/Sequre_S60/IRQ.cpp b/source/Core/BSP/Sequre/IRQ.cpp similarity index 100% rename from source/Core/BSP/Sequre_S60/IRQ.cpp rename to source/Core/BSP/Sequre/IRQ.cpp diff --git a/source/Core/BSP/Sequre_S60/IRQ.h b/source/Core/BSP/Sequre/IRQ.h similarity index 100% rename from source/Core/BSP/Sequre_S60/IRQ.h rename to source/Core/BSP/Sequre/IRQ.h diff --git a/source/Core/BSP/Sequre_S60/Pins.h b/source/Core/BSP/Sequre/Pins.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Pins.h rename to source/Core/BSP/Sequre/Pins.h diff --git a/source/Core/BSP/Sequre_S60/Power.cpp b/source/Core/BSP/Sequre/Power.cpp similarity index 100% rename from source/Core/BSP/Sequre_S60/Power.cpp rename to source/Core/BSP/Sequre/Power.cpp diff --git a/source/Core/BSP/Sequre_S60/README.md b/source/Core/BSP/Sequre/README.md similarity index 100% rename from source/Core/BSP/Sequre_S60/README.md rename to source/Core/BSP/Sequre/README.md diff --git a/source/Core/BSP/Sequre_S60/Setup.cpp b/source/Core/BSP/Sequre/Setup.cpp similarity index 100% rename from source/Core/BSP/Sequre_S60/Setup.cpp rename to source/Core/BSP/Sequre/Setup.cpp diff --git a/source/Core/BSP/Sequre_S60/Setup.h b/source/Core/BSP/Sequre/Setup.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Setup.h rename to source/Core/BSP/Sequre/Setup.h diff --git a/source/Core/BSP/Sequre_S60/Software_I2C.h b/source/Core/BSP/Sequre/Software_I2C.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Software_I2C.h rename to source/Core/BSP/Sequre/Software_I2C.h diff --git a/source/Core/BSP/Sequre_S60/Startup/startup_stm32f103t8ux.S b/source/Core/BSP/Sequre/Startup/startup_stm32f103t8ux.S similarity index 100% rename from source/Core/BSP/Sequre_S60/Startup/startup_stm32f103t8ux.S rename to source/Core/BSP/Sequre/Startup/startup_stm32f103t8ux.S diff --git a/source/Core/BSP/Sequre_S60/ThermoModel.cpp b/source/Core/BSP/Sequre/ThermoModel.cpp similarity index 100% rename from source/Core/BSP/Sequre_S60/ThermoModel.cpp rename to source/Core/BSP/Sequre/ThermoModel.cpp diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/arm_common_tables.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/arm_common_tables.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/arm_common_tables.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/arm_common_tables.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/arm_const_structs.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/arm_const_structs.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/arm_const_structs.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/arm_const_structs.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/arm_math.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/arm_math.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/arm_math.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/arm_math.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/cmsis_armcc.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/cmsis_armcc.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/cmsis_armcc.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/cmsis_armcc.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/cmsis_armcc_V6.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/cmsis_armcc_V6.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/cmsis_armcc_V6.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/cmsis_armcc_V6.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/cmsis_gcc.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/cmsis_gcc.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/cmsis_gcc.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/cmsis_gcc.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm0.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cm0.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm0.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cm0.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm0plus.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cm0plus.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm0plus.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cm0plus.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm3.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cm3.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm3.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cm3.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm4.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cm4.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm4.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cm4.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm7.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cm7.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm7.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cm7.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cmFunc.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cmFunc.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cmFunc.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cmFunc.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cmInstr.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cmInstr.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cmInstr.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cmInstr.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cmSimd.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cmSimd.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cmSimd.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_cmSimd.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_sc000.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_sc000.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_sc000.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_sc000.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_sc300.h b/source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_sc300.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_sc300.h rename to source/Core/BSP/Sequre/Vendor/CMSIS/Include/core_sc300.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c diff --git a/source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c b/source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c similarity index 100% rename from source/Core/BSP/Sequre_S60/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c rename to source/Core/BSP/Sequre/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c diff --git a/source/Core/BSP/Sequre_S60/configuration.h b/source/Core/BSP/Sequre/configuration.h similarity index 100% rename from source/Core/BSP/Sequre_S60/configuration.h rename to source/Core/BSP/Sequre/configuration.h diff --git a/source/Core/BSP/Sequre_S60/flash.c b/source/Core/BSP/Sequre/flash.c similarity index 100% rename from source/Core/BSP/Sequre_S60/flash.c rename to source/Core/BSP/Sequre/flash.c diff --git a/source/Core/BSP/Sequre_S60/port.c b/source/Core/BSP/Sequre/port.c similarity index 100% rename from source/Core/BSP/Sequre_S60/port.c rename to source/Core/BSP/Sequre/port.c diff --git a/source/Core/BSP/Sequre_S60/portmacro.h b/source/Core/BSP/Sequre/portmacro.h similarity index 100% rename from source/Core/BSP/Sequre_S60/portmacro.h rename to source/Core/BSP/Sequre/portmacro.h diff --git a/source/Core/BSP/Sequre_S60/postRTOS.cpp b/source/Core/BSP/Sequre/postRTOS.cpp similarity index 100% rename from source/Core/BSP/Sequre_S60/postRTOS.cpp rename to source/Core/BSP/Sequre/postRTOS.cpp diff --git a/source/Core/BSP/Sequre_S60/preRTOS.cpp b/source/Core/BSP/Sequre/preRTOS.cpp similarity index 100% rename from source/Core/BSP/Sequre_S60/preRTOS.cpp rename to source/Core/BSP/Sequre/preRTOS.cpp diff --git a/source/Core/BSP/Sequre_S60/stm32f103.ld b/source/Core/BSP/Sequre/stm32f103.ld similarity index 100% rename from source/Core/BSP/Sequre_S60/stm32f103.ld rename to source/Core/BSP/Sequre/stm32f103.ld diff --git a/source/Core/BSP/Sequre_S60/stm32f1xx_hal_msp.c b/source/Core/BSP/Sequre/stm32f1xx_hal_msp.c similarity index 100% rename from source/Core/BSP/Sequre_S60/stm32f1xx_hal_msp.c rename to source/Core/BSP/Sequre/stm32f1xx_hal_msp.c diff --git a/source/Core/BSP/Sequre_S60/stm32f1xx_hal_timebase_TIM.c b/source/Core/BSP/Sequre/stm32f1xx_hal_timebase_TIM.c similarity index 100% rename from source/Core/BSP/Sequre_S60/stm32f1xx_hal_timebase_TIM.c rename to source/Core/BSP/Sequre/stm32f1xx_hal_timebase_TIM.c diff --git a/source/Core/BSP/Sequre_S60/stm32f1xx_it.c b/source/Core/BSP/Sequre/stm32f1xx_it.c similarity index 100% rename from source/Core/BSP/Sequre_S60/stm32f1xx_it.c rename to source/Core/BSP/Sequre/stm32f1xx_it.c diff --git a/source/Core/BSP/Sequre_S60/system_stm32f1xx.c b/source/Core/BSP/Sequre/system_stm32f1xx.c similarity index 100% rename from source/Core/BSP/Sequre_S60/system_stm32f1xx.c rename to source/Core/BSP/Sequre/system_stm32f1xx.c diff --git a/source/Makefile b/source/Makefile index f18d80891d..a888bc8a79 100644 --- a/source/Makefile +++ b/source/Makefile @@ -118,9 +118,9 @@ endif # ALL_MINIWARE_MODELS ifeq ($(model),$(filter $(model),$(ALL_SEQURE_MODELS))) $(info Building for Sequre ) -DEVICE_BSP_DIR=./Core/BSP/Sequre_S60 +DEVICE_BSP_DIR=./Core/BSP/Sequre S_SRCS:=$(shell find $(S60_STARTUP_DIR) -type f -name '*.S') -LDSCRIPT=./Core/BSP/Sequre_S60/stm32f103.ld +LDSCRIPT=./Core/BSP/Sequre/stm32f103.ld DEV_GLOBAL_DEFS=-D STM32F103T8Ux \ -D STM32F1 \ -D STM32 \ From 3b344c86800dedb5a078d674de15298a9e7e9d73 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sat, 8 Jun 2024 17:58:08 +1000 Subject: [PATCH 03/10] Fixup! S60 asm source folder Been broken for a while but better to be correct --- source/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Makefile b/source/Makefile index a888bc8a79..ca47135e98 100644 --- a/source/Makefile +++ b/source/Makefile @@ -119,7 +119,7 @@ ifeq ($(model),$(filter $(model),$(ALL_SEQURE_MODELS))) $(info Building for Sequre ) DEVICE_BSP_DIR=./Core/BSP/Sequre -S_SRCS:=$(shell find $(S60_STARTUP_DIR) -type f -name '*.S') +S_SRCS:=$(shell find $(DEVICE_BSP_DIR) -type f -name '*.S') LDSCRIPT=./Core/BSP/Sequre/stm32f103.ld DEV_GLOBAL_DEFS=-D STM32F103T8Ux \ -D STM32F1 \ From 1b042fcf6571bf5be51357a04b1e0b9c897ecf57 Mon Sep 17 00:00:00 2001 From: eslng Date: Mon, 10 Jun 2024 01:36:04 +0300 Subject: [PATCH 04/10] Update translation_UK.json with PD mode option (#1929) --- Translations/translation_UK.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index 397589acbc..4e2bdb6cf8 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -107,13 +107,13 @@ }, "menuValues": { "USBPDModeDefault": { - "displayText": "Default\nMode" + "displayText": "Режим\nЗамовчуванню" }, "USBPDModeNoDynamic": { - "displayText": "No\nDynamic" + "displayText": "Без\nДинамічного" }, "USBPDModeSafe": { - "displayText": "Safe\nMode" + "displayText": "Безпечний\nРежим" } }, "menuOptions": { From 9007f6c0e892c5bebb20692a14e323fd68b37138 Mon Sep 17 00:00:00 2001 From: Ivan Zorin Date: Wed, 3 Jul 2024 03:51:40 +0300 Subject: [PATCH 05/10] Update RU translation for PD mode options (#1940) --- Translations/translation_RU.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index 1c4089721f..b3b35db879 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -107,13 +107,13 @@ }, "menuValues": { "USBPDModeDefault": { - "displayText": "Default\nMode" + "displayText": "Вкл.\nPPSиEPR" }, "USBPDModeNoDynamic": { - "displayText": "No\nDynamic" + "displayText": "Откл.\n" }, "USBPDModeSafe": { - "displayText": "Safe\nMode" + "displayText": "Вкл.без\nсопротив" } }, "menuOptions": { @@ -130,12 +130,12 @@ "description": "Максимальное напряжение для согласования с источником питания по QC" }, "PDNegTimeout": { - "displayText": "PD\nинтервал", + "displayText": "Интервал\nPD", "description": "Интервал согласования питания по Power Delivery с шагом 100 мс для совместимости с некоторыми источниками питания по QC (0=Откл.)" }, "USBPDMode": { - "displayText": "PD\nMode", - "description": "Включить режимы PPS & EPR" + "displayText": "Режим\nPD", + "description": "Вкл.без сопротив: включить PPS и EPR без 'выравнивания' сопротивления" }, "BoostTemperature": { "displayText": "t° турбо\nрежима", From 116afeca6016979ced328b098d2491d98ebb4dc2 Mon Sep 17 00:00:00 2001 From: fredericuslaurentii <157758058+fredericuslaurentii@users.noreply.github.com> Date: Wed, 3 Jul 2024 02:51:56 +0200 Subject: [PATCH 06/10] PD modes IT translation (#1937) Update translation_IT.json --- Translations/translation_IT.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json index 41be5b113a..40f4714c32 100644 --- a/Translations/translation_IT.json +++ b/Translations/translation_IT.json @@ -107,13 +107,13 @@ }, "menuValues": { "USBPDModeDefault": { - "displayText": "Default\nMode" + "displayText": "Modo\npredefinito" }, "USBPDModeNoDynamic": { - "displayText": "No\nDynamic" + "displayText": "Modo\nstatico" }, "USBPDModeSafe": { - "displayText": "Safe\nMode" + "displayText": "Modo\nsicuro" } }, "menuOptions": { From b72ff94ecef78a1a030a59a6f6b809f4bf233c8f Mon Sep 17 00:00:00 2001 From: dmitrygribenchuk Date: Sun, 7 Jul 2024 15:56:46 +0300 Subject: [PATCH 07/10] update translation_BE.json (#1942) --- Translations/translation_BE.json | 52 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json index c2980732b4..e9c9e60195 100644 --- a/Translations/translation_BE.json +++ b/Translations/translation_BE.json @@ -107,13 +107,13 @@ }, "menuValues": { "USBPDModeDefault": { - "displayText": "Default\nMode" + "displayText": "\nРэжым" }, "USBPDModeNoDynamic": { - "displayText": "No\nDynamic" + "displayText": "Няма\nдынамікі" }, "USBPDModeSafe": { - "displayText": "Safe\nMode" + "displayText": "Бяспечны\nрэжым" } }, "menuOptions": { @@ -134,7 +134,7 @@ "description": "Час чакання ўзгаднення PD з крокам 100 мс для сумяшчальнасці з некаторымі зараднымі зараднымі прыладамі QC (0: адключана)" }, "USBPDMode": { - "displayText": "PD\nMode", + "displayText": "PD\nРэжым", "description": "Уключае рэжымы PPS & EPR." }, "BoostTemperature": { @@ -158,59 +158,59 @@ "description": "Пры рабоце падоўжаны націск дзьвух кнопак блакуе іх (Т=Толькі турба | П=Поўная блакіроўка)" }, "ProfilePhases": { - "displayText": "Profile\nPhases", + "displayText": "Фазы\nпрофілю", "description": "Колькасць фаз у рэжыме профілю" }, "ProfilePreheatTemp": { - "displayText": "Preheat\nTemp", + "displayText": "Тэмпература\nразагравання", "description": "Разагрэйце да гэтай тэмпературы ў пачатку профільнага рэжыму" }, "ProfilePreheatSpeed": { - "displayText": "Preheat\nSpeed", + "displayText": "Хуткасть\nразагравання", "description": "Разагрэйце з гэтай хуткасцю (градусы ў секунду)" }, "ProfilePhase1Temp": { - "displayText": "Phase 1\nTemp", + "displayText": "Фаза 1\nтэмпература", "description": "Мэтавая тэмпература ў канцы гэтай фазы" }, "ProfilePhase1Duration": { - "displayText": "Phase 1\nDuration", + "displayText": "Фаза 1\nпрацягласць", "description": "Мэтавая працягласць гэтай фазы (секунды)" }, "ProfilePhase2Temp": { - "displayText": "Phase 2\nTemp", - "description": "" + "displayText": "Фаза 2\nтэмпература", + "description": "Мэтавая тэмпература ў канцы гэтай фазы" }, "ProfilePhase2Duration": { - "displayText": "Phase 2\nDuration", - "description": "" + "displayText": "Фаза 2\nпрацягласць", + "description": "Мэтавая працягласць гэтай фазы (секунды)" }, "ProfilePhase3Temp": { - "displayText": "Phase 3\nTemp", - "description": "" + "displayText": "Фаза 3\nтэмпература", + "description": "Мэтавая тэмпература ў канцы гэтай фазы" }, "ProfilePhase3Duration": { - "displayText": "Phase 3\nDuration", - "description": "" + "displayText": "Фаза 3\nпрацягласць", + "description": "Мэтавая працягласць гэтай фазы (секунды)" }, "ProfilePhase4Temp": { - "displayText": "Phase 4\nTemp", - "description": "" + "displayText": "Фаза 4\nтэмпература", + "description": "Мэтавая тэмпература ў канцы гэтай фазы" }, "ProfilePhase4Duration": { - "displayText": "Phase 4\nDuration", - "description": "" + "displayText": "Фаза 4\nпрацягласць", + "description": "Мэтавая працягласць гэтай фазы (секунды)" }, "ProfilePhase5Temp": { - "displayText": "Phase 5\nTemp", - "description": "" + "displayText": "Фаза 5\nтэмпература", + "description": "Мэтавая тэмпература ў канцы гэтай фазы" }, "ProfilePhase5Duration": { - "displayText": "Phase 5\nDuration", - "description": "" + "displayText": "Фаза 5\nпрацягласць", + "description": "Мэтавая працягласць гэтай фазы (секунды)" }, "ProfileCooldownSpeed": { - "displayText": "Cooldown\nSpeed", + "displayText": "Хуткасць\nастывання", "description": "Астуджаць з гэтай хуткасцю ў канцы профільнага рэжыму (градусы ў секунду)" }, "MotionSensitivity": { From ac6994a6768e7d3491eadcdd1c5abe3d69db091f Mon Sep 17 00:00:00 2001 From: Ivan Zorin Date: Mon, 8 Jul 2024 05:06:38 +0300 Subject: [PATCH 08/10] Update BG translation for PD mode options (#1941) * Update BG translation for PD mode options * Update BG and RU translations for PD mode options --- Translations/translation_BG.json | 10 +++++----- Translations/translation_RU.json | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json index 5e4aef4f85..6ed233c03a 100644 --- a/Translations/translation_BG.json +++ b/Translations/translation_BG.json @@ -107,13 +107,13 @@ }, "menuValues": { "USBPDModeDefault": { - "displayText": "Default\nMode" + "displayText": "Вкл.\nPPSиERP" }, "USBPDModeNoDynamic": { - "displayText": "No\nDynamic" + "displayText": "Изкл.\n" }, "USBPDModeSafe": { - "displayText": "Safe\nMode" + "displayText": "Вкл.без\nискане" } }, "menuOptions": { @@ -134,8 +134,8 @@ "description": "PD интервал за договаряне на захранването на стъпки от 100 мс за съвместимост с някои QC захранвания (0=Изкл.)" }, "USBPDMode": { - "displayText": "PD\nMode", - "description": "Включи PPS & EPR" + "displayText": "PD\nрежим", + "description": "Вкл.без искане: включи PPS и EPR без да искате повече мощност" }, "BoostTemperature": { "displayText": "Турбо\nтемп.", diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index b3b35db879..68254f4019 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -113,7 +113,7 @@ "displayText": "Откл.\n" }, "USBPDModeSafe": { - "displayText": "Вкл.без\nсопротив" + "displayText": "Вкл.без\nзапроса" } }, "menuOptions": { @@ -135,7 +135,7 @@ }, "USBPDMode": { "displayText": "Режим\nPD", - "description": "Вкл.без сопротив: включить PPS и EPR без 'выравнивания' сопротивления" + "description": "Вкл.без запроса: включить PPS и EPR без запроса большей мощности" }, "BoostTemperature": { "displayText": "t° турбо\nрежима", From c19e88233844f00dedb283276f3a5502ef05162a Mon Sep 17 00:00:00 2001 From: Ivan Zorin Date: Tue, 9 Jul 2024 12:20:02 +0300 Subject: [PATCH 09/10] Add enum for USB PD modes (#1943) * Add enum for USB PD modes * Update comments for clarification according to code review --- source/Core/Drivers/FS2711.cpp | 2 +- source/Core/Drivers/USBPD.cpp | 2 +- source/Core/Drivers/Utils.cpp | 4 ++-- source/Core/Inc/Settings.h | 6 ++++++ source/Core/Src/settingsGUI.cpp | 13 +++++++------ 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/source/Core/Drivers/FS2711.cpp b/source/Core/Drivers/FS2711.cpp index 1aec92e80d..35e90898a6 100644 --- a/source/Core/Drivers/FS2711.cpp +++ b/source/Core/Drivers/FS2711.cpp @@ -158,7 +158,7 @@ void FS2711::negotiate() { // FS2711 uses mV instead of V const uint16_t vmax = USB_PD_VMAX * 1000; uint8_t tip_resistance = getTipResistanceX10(); - if (getSettingValue(SettingsOptions::USBPDMode) == 1) { + if (getSettingValue(SettingsOptions::USBPDMode) == usbpdMode_t::DEFAULT) { tip_resistance += 5; } diff --git a/source/Core/Drivers/USBPD.cpp b/source/Core/Drivers/USBPD.cpp index 1f154080a4..6c21f5ed5d 100644 --- a/source/Core/Drivers/USBPD.cpp +++ b/source/Core/Drivers/USBPD.cpp @@ -136,7 +136,7 @@ bool parseCapabilitiesArray(const uint8_t numCaps, uint8_t *bestIndex, uint16_t // Fudge of 0.5 ohms to round up a little to account for us always having off periods in PWM uint8_t tipResistance = getTipResistanceX10(); - if (getSettingValue(SettingsOptions::USBPDMode) == 1) { + if (getSettingValue(SettingsOptions::USBPDMode) == usbpdMode_t::DEFAULT) { tipResistance += 5; } #ifdef MODEL_HAS_DCDC diff --git a/source/Core/Drivers/Utils.cpp b/source/Core/Drivers/Utils.cpp index b560fd3a40..20f8c46faa 100644 --- a/source/Core/Drivers/Utils.cpp +++ b/source/Core/Drivers/Utils.cpp @@ -23,7 +23,7 @@ int32_t Utils::LinearInterpolate(int32_t x1, int32_t y1, int32_t x2, int32_t y2, uint16_t Utils::RequiredCurrentForTipAtVoltage(uint16_t voltageX10) { uint8_t tipResistancex10 = getTipResistanceX10(); - if (getSettingValue(SettingsOptions::USBPDMode) == 1) { + if (getSettingValue(SettingsOptions::USBPDMode) == usbpdMode_t::DEFAULT) { tipResistancex10 += 5; } #ifdef MODEL_HAS_DCDC @@ -34,4 +34,4 @@ uint16_t Utils::RequiredCurrentForTipAtVoltage(uint16_t voltageX10) { // V/R = I uint16_t currentX10 = (voltageX10 * 10) / tipResistancex10; return currentX10; -} \ No newline at end of file +} diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h index e9bddfaf07..e84fbd872c 100644 --- a/source/Core/Inc/Settings.h +++ b/source/Core/Inc/Settings.h @@ -104,6 +104,12 @@ typedef enum { INFINITY = 6, // Show boot logo on repeat (if animated) until a button toggled } logoMode_t; +typedef enum { + DEFAULT = 1, // PPS + EPR + more power request through increasing resistance by 0.5 Ohm to compensate power loss over cable/PCB/etc. + SAFE = 2, // PPS + EPR, without requesting more power + NO_DYNAMIC = 0, // PPS + EPR disabled, fixed PDO only +} usbpdMode_t; + // Settings wide operations void saveSettings(); bool loadSettings(); diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp index b9ded2853b..180b8547c1 100644 --- a/source/Core/Src/settingsGUI.cpp +++ b/source/Core/Src/settingsGUI.cpp @@ -531,19 +531,20 @@ static void displayPDNegTimeout(void) { static void displayUSBPDMode(void) { /* - * PD Mode - * 0 = Safe mode, no PPS, no EPR - * 1 = Default mode, tolerant + PPS + EPR - * 2 = Strict mode + PPS + EPR + * Supported PD modes: + * DEFAULT, 1 = PPS + EPR + more power request through increasing resistance by 0.5 Ohm to compensate power loss over cable/PCB/etc. + * SAFE, 2 = PPS + EPR, without requesting more power + * NO_DYNAMIC, 0 = PPS + EPR disabled, fixed PDO only */ switch (getSettingValue(SettingsOptions::USBPDMode)) { - case 1: + case usbpdMode_t::DEFAULT: OLED::print(translatedString(Tr->USBPDModeDefault), FontStyle::SMALL, 255, OLED::getCursorX()); break; - case 2: + case usbpdMode_t::SAFE: OLED::print(translatedString(Tr->USBPDModeSafe), FontStyle::SMALL, 255, OLED::getCursorX()); break; + case usbpdMode_t::NO_DYNAMIC: default: OLED::print(translatedString(Tr->USBPDModeNoDynamic), FontStyle::SMALL, 255, OLED::getCursorX()); break; From 18e936ae6d5d4c02adb4d90635a031123e55d097 Mon Sep 17 00:00:00 2001 From: Ivan Zorin Date: Thu, 11 Jul 2024 17:34:12 +0300 Subject: [PATCH 10/10] Implement OLED::drawUnavailableIcon() to simplify duplicated calls (#1947) --- source/Core/Drivers/OLED.hpp | 1 + source/Core/Src/settingsGUI.cpp | 32 ++++++++++++++------------------ 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/source/Core/Drivers/OLED.hpp b/source/Core/Drivers/OLED.hpp index 65bf8e58fa..f847939b7a 100644 --- a/source/Core/Drivers/OLED.hpp +++ b/source/Core/Drivers/OLED.hpp @@ -136,6 +136,7 @@ class OLED { static void drawBattery(uint8_t state) { drawSymbol(3 + (state > 10 ? 10 : state)); } // Draws a checkbox static void drawCheckbox(bool state) { drawSymbol((state) ? 16 : 17); } + inline static void drawUnavailableIcon() { drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); } static void debugNumber(int32_t val, FontStyle fontStyle); static void drawHex(uint32_t x, FontStyle fontStyle, uint8_t digits); static void drawSymbol(uint8_t symbolID); // Used for drawing symbols of a predictable width diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp index 180b8547c1..6b5c81a3e0 100644 --- a/source/Core/Src/settingsGUI.cpp +++ b/source/Core/Src/settingsGUI.cpp @@ -522,11 +522,7 @@ static void displayQCInputV(void) { static void displayPDNegTimeout(void) { auto value = getSettingValue(SettingsOptions::PDNegTimeout); - if (value == 0) { - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); - } else { - OLED::printNumber(value, 2, FontStyle::LARGE); - } + value ? OLED::printNumber(value, 2, FontStyle::LARGE) : OLED::drawUnavailableIcon(); } static void displayUSBPDMode(void) { @@ -583,14 +579,14 @@ static void displayBoostTemp(void) { if (getSettingValue(SettingsOptions::BoostTemp)) { OLED::printNumber(getSettingValue(SettingsOptions::BoostTemp), 3, FontStyle::LARGE); } else { - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); } } static void displayAutomaticStartMode(void) { switch (getSettingValue(SettingsOptions::AutoStartMode)) { case autoStartMode_t::NO: - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); break; case autoStartMode_t::SOLDER: OLED::print(translatedString(Tr->SettingStartSolderingChar), FontStyle::LARGE); @@ -602,7 +598,7 @@ static void displayAutomaticStartMode(void) { OLED::print(translatedString(Tr->SettingStartSleepOffChar), FontStyle::LARGE); break; default: - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); break; } } @@ -614,7 +610,7 @@ static void displayTempChangeLongStep(void) { OLED::printNumber(getSettingValue( static void displayLockingMode(void) { switch (getSettingValue(SettingsOptions::LockingMode)) { case 0: - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); break; case 1: OLED::print(translatedString(Tr->SettingLockBoostChar), FontStyle::LARGE); @@ -623,7 +619,7 @@ static void displayLockingMode(void) { OLED::print(translatedString(Tr->SettingLockFullChar), FontStyle::LARGE); break; default: - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); break; } } @@ -683,7 +679,7 @@ static void displaySensitivity(void) { if (getSettingValue(SettingsOptions::Sensitivity)) { OLED::printNumber(getSettingValue(SettingsOptions::Sensitivity), 1, FontStyle::LARGE, false); } else { - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); } } static bool showSleepOptions(void) { return getSettingValue(SettingsOptions::Sensitivity) > 0; } @@ -712,7 +708,7 @@ static void displaySleepTemp(void) { OLED::printNumber(getSettingValue(SettingsO static void displaySleepTime(void) { if (getSettingValue(SettingsOptions::SleepTime) == 0) { - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); } else if (getSettingValue(SettingsOptions::SleepTime) < 6) { OLED::printNumber(getSettingValue(SettingsOptions::SleepTime) * 10, 2, FontStyle::LARGE); OLED::print(LargeSymbolSeconds, FontStyle::LARGE); @@ -726,7 +722,7 @@ static void displaySleepTime(void) { static void displayShutdownTime(void) { if (getSettingValue(SettingsOptions::ShutdownTime) == 0) { - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); } else { OLED::printNumber(getSettingValue(SettingsOptions::ShutdownTime), 2, FontStyle::LARGE); OLED::print(LargeSymbolMinutes, FontStyle::LARGE); @@ -738,7 +734,7 @@ static void displayHallEffect(void) { if (getSettingValue(SettingsOptions::HallEffectSensitivity)) { OLED::printNumber(getSettingValue(SettingsOptions::HallEffectSensitivity), 1, FontStyle::LARGE, false); } else { - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); } } static bool showHallEffect(void) { return getHallSensorFitted(); } @@ -836,7 +832,7 @@ static void displayAnimationSpeed(void) { OLED::print(translatedString(Tr->SettingFastChar), FontStyle::LARGE); break; default: - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); break; } } @@ -859,7 +855,7 @@ static void displayInvertColor(void) { static void displayLogoTime(void) { switch (getSettingValue(SettingsOptions::LOGOTime)) { case logoMode_t::SKIP: - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); break; case logoMode_t::ONETIME: OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, RepeatOnce); @@ -884,7 +880,7 @@ static void displayBluetoothLE(void) { OLED::drawCheckbox(getSettingValue(Settin static void displayPowerLimit(void) { if (getSettingValue(SettingsOptions::PowerLimit) == 0) { - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); } else { OLED::printNumber(getSettingValue(SettingsOptions::PowerLimit), 3, FontStyle::LARGE); OLED::print(LargeSymbolWatts, FontStyle::LARGE); @@ -952,7 +948,7 @@ static void displayPowerPulse(void) { OLED::print(LargeSymbolDot, FontStyle::LARGE); OLED::printNumber(getSettingValue(SettingsOptions::KeepAwakePulse) % 10, 1, FontStyle::LARGE); } else { - OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, UnavailableIcon); + OLED::drawUnavailableIcon(); } }