89 files changed, 89 insertions, 86 deletions

diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json
index c2980732..e9c9e601 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": {
diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json
index 5e4aef4f..6ed233c0 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_IT.json b/Translations/translation_IT.json
index 41be5b11..40f4714c 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": {
diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json
index 1c408972..68254f40 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режима",
diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json
index 397589ac..4e2bdb6c 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": {
diff --git a/source/Core/BSP/Sequre_S60/BSP.cpp b/source/Core/BSP/Sequre/BSP.cpp
index b32f239e..ebf46e7f 100644
--- a/source/Core/BSP/Sequre_S60/BSP.cpp
+++ b/source/Core/BSP/Sequre/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/FreeRTOSConfig.h b/source/Core/BSP/Sequre/FreeRTOSConfig.h
index ef0451ef..ef0451ef 100644
--- a/source/Core/BSP/Sequre_S60/FreeRTOSConfig.h
+++ b/source/Core/BSP/Sequre/FreeRTOSConfig.h
diff --git a/source/Core/BSP/Sequre_S60/IRQ.cpp b/source/Core/BSP/Sequre/IRQ.cpp
index f20acc13..f20acc13 100644
--- a/source/Core/BSP/Sequre_S60/IRQ.cpp
+++ b/source/Core/BSP/Sequre/IRQ.cpp
diff --git a/source/Core/BSP/Sequre_S60/IRQ.h b/source/Core/BSP/Sequre/IRQ.h
index b3024636..b3024636 100644
--- a/source/Core/BSP/Sequre_S60/IRQ.h
+++ b/source/Core/BSP/Sequre/IRQ.h
diff --git a/source/Core/BSP/Sequre_S60/Pins.h b/source/Core/BSP/Sequre/Pins.h
index 24b65bb5..24b65bb5 100644
--- a/source/Core/BSP/Sequre_S60/Pins.h
+++ b/source/Core/BSP/Sequre/Pins.h
diff --git a/source/Core/BSP/Sequre_S60/Power.cpp b/source/Core/BSP/Sequre/Power.cpp
index a6b1f7c7..a6b1f7c7 100644
--- a/source/Core/BSP/Sequre_S60/Power.cpp
+++ b/source/Core/BSP/Sequre/Power.cpp
diff --git a/source/Core/BSP/Sequre_S60/README.md b/source/Core/BSP/Sequre/README.md
index bb9de245..bb9de245 100644
--- a/source/Core/BSP/Sequre_S60/README.md
+++ b/source/Core/BSP/Sequre/README.md
diff --git a/source/Core/BSP/Sequre_S60/Setup.cpp b/source/Core/BSP/Sequre/Setup.cpp
index 87a383f1..a5d5845e 100644
--- a/source/Core/BSP/Sequre_S60/Setup.cpp
+++ b/source/Core/BSP/Sequre/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/Setup.h b/source/Core/BSP/Sequre/Setup.h
index 4ebcd24d..4ebcd24d 100644
--- a/source/Core/BSP/Sequre_S60/Setup.h
+++ b/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
index d80bbfcb..d80bbfcb 100644
--- a/source/Core/BSP/Sequre_S60/Software_I2C.h
+++ b/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
index f8d1c8ed..f8d1c8ed 100644
--- a/source/Core/BSP/Sequre_S60/Startup/startup_stm32f103t8ux.S
+++ b/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
index 90c12ab1..90c12ab1 100644
--- a/source/Core/BSP/Sequre_S60/ThermoModel.cpp
+++ b/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
index 4f23a373..4f23a373 100644
--- 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
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
index f2281f74..f2281f74 100644
--- 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
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
index 32b28a81..32b28a81 100644
--- 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
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
index 1e605e0a..1e605e0a 100644
--- 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
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
index 410b36a2..410b36a2 100644
--- 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
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
index e78a3b47..e78a3b47 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/arm_math.h
+++ b/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
index e0b5447c..e0b5447c 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/cmsis_armcc.h
+++ b/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
index a0ee2e1b..a0ee2e1b 100644
--- 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
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
index ea4e5e68..ea4e5e68 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/cmsis_gcc.h
+++ b/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
index 168a4eaa..168a4eaa 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm0.h
+++ b/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
index 1bd0e9b8..1bd0e9b8 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm0plus.h
+++ b/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
index 6b652b9b..6b652b9b 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm3.h
+++ b/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
index a74d2c7c..a74d2c7c 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm4.h
+++ b/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
index 1041cee4..1041cee4 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cm7.h
+++ b/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
index 175420c2..175420c2 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cmFunc.h
+++ b/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
index 158125c3..158125c3 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cmInstr.h
+++ b/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
index b415a31c..b415a31c 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_cmSimd.h
+++ b/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
index c9fd84f3..c9fd84f3 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_sc000.h
+++ b/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
index 224e7a8b..224e7a8b 100644
--- a/source/Core/BSP/Sequre_S60/Vendor/CMSIS/Include/core_sc300.h
+++ b/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
index 0bede785..0bede785 100644
--- 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
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
index 2cd99b27..2cd99b27 100644
--- 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
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
index 6ba6f683..6ba6f683 100644
--- 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
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
index f6a8c35e..f6a8c35e 100644
--- 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
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
index ec86845c..ec86845c 100644
--- 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
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
index f5ba6e98..f5ba6e98 100644
--- 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
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
index 7972076a..7972076a 100644
--- 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
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
index adacc86b..adacc86b 100644
--- 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
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
index 112fa69f..112fa69f 100644
--- 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
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
index 805dbc7b..805dbc7b 100644
--- 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
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
index d7e8fdc9..d7e8fdc9 100644
--- 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
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
index dcacc179..dcacc179 100644
--- 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
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
index 817f86e9..817f86e9 100644
--- 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
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
index 6c850027..6c850027 100644
--- 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
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
index 3ff5f324..3ff5f324 100644
--- 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
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
index 8af7b6d9..8af7b6d9 100644
--- 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
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
index 3e43f365..3e43f365 100644
--- 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
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
index d472bfb9..d472bfb9 100644
--- 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
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
index 278b4594..278b4594 100644
--- 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
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
index 8725243a..8725243a 100644
--- 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
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
index 19ac9e7d..19ac9e7d 100644
--- 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
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
index 03c947f3..03c947f3 100644
--- 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
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
index b973ec02..b973ec02 100644
--- 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
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
index 5d46145d..5d46145d 100644
--- 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
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
index f4ed595a..f4ed595a 100644
--- 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
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
index d3fd2140..d3fd2140 100644
--- 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
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
index ec9f7eb1..ec9f7eb1 100644
--- 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
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
index 945205bb..945205bb 100644
--- 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
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
index 2c38ddb9..2c38ddb9 100644
--- 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
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
index c9b891e4..c9b891e4 100644
--- 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
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
index 9444ed51..9444ed51 100644
--- 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
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
index 56515b0b..56515b0b 100644
--- 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
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
index 25e902fa..25e902fa 100644
--- 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
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
index 31a02a5c..31a02a5c 100644
--- 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
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
index 87f66c3f..87f66c3f 100644
--- 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
diff --git a/source/Core/BSP/Sequre_S60/configuration.h b/source/Core/BSP/Sequre/configuration.h
index 008ce6b5..73568fda 100644
--- a/source/Core/BSP/Sequre_S60/configuration.h
+++ b/source/Core/BSP/Sequre/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 */
diff --git a/source/Core/BSP/Sequre_S60/flash.c b/source/Core/BSP/Sequre/flash.c
index 7df30992..7df30992 100644
--- a/source/Core/BSP/Sequre_S60/flash.c
+++ b/source/Core/BSP/Sequre/flash.c
diff --git a/source/Core/BSP/Sequre_S60/port.c b/source/Core/BSP/Sequre/port.c
index 02d09c0e..02d09c0e 100644
--- a/source/Core/BSP/Sequre_S60/port.c
+++ b/source/Core/BSP/Sequre/port.c
diff --git a/source/Core/BSP/Sequre_S60/portmacro.h b/source/Core/BSP/Sequre/portmacro.h
index 85fe3b13..85fe3b13 100644
--- a/source/Core/BSP/Sequre_S60/portmacro.h
+++ b/source/Core/BSP/Sequre/portmacro.h
diff --git a/source/Core/BSP/Sequre_S60/postRTOS.cpp b/source/Core/BSP/Sequre/postRTOS.cpp
index 4882cdf6..4882cdf6 100644
--- a/source/Core/BSP/Sequre_S60/postRTOS.cpp
+++ b/source/Core/BSP/Sequre/postRTOS.cpp
diff --git a/source/Core/BSP/Sequre_S60/preRTOS.cpp b/source/Core/BSP/Sequre/preRTOS.cpp
index 3a8fa4f4..3a8fa4f4 100644
--- a/source/Core/BSP/Sequre_S60/preRTOS.cpp
+++ b/source/Core/BSP/Sequre/preRTOS.cpp
diff --git a/source/Core/BSP/Sequre_S60/stm32f103.ld b/source/Core/BSP/Sequre/stm32f103.ld
index 3461bb86..3461bb86 100644
--- a/source/Core/BSP/Sequre_S60/stm32f103.ld
+++ b/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
index 6610a0d4..6610a0d4 100644
--- a/source/Core/BSP/Sequre_S60/stm32f1xx_hal_msp.c
+++ b/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
index db48d90b..db48d90b 100644
--- a/source/Core/BSP/Sequre_S60/stm32f1xx_hal_timebase_TIM.c
+++ b/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
index fed18b55..fed18b55 100644
--- a/source/Core/BSP/Sequre_S60/stm32f1xx_it.c
+++ b/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
index 32d5b674..32d5b674 100644
--- a/source/Core/BSP/Sequre_S60/system_stm32f1xx.c
+++ b/source/Core/BSP/Sequre/system_stm32f1xx.c
diff --git a/source/Core/Drivers/FS2711.cpp b/source/Core/Drivers/FS2711.cpp
index 1aec92e8..35e90898 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/OLED.hpp b/source/Core/Drivers/OLED.hpp
index 65bf8e58..f847939b 100644
--- a/source/Core/Drivers/OLED.hpp
+++ b/source/Core/Drivers/OLED.hpp
@@ -136,6 +136,7 @@ public:
   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/Drivers/USBPD.cpp b/source/Core/Drivers/USBPD.cpp
index 1f154080..6c21f5ed 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 b560fd3a..20f8c46f 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 e9bddfaf..e84fbd87 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 b9ded285..6b5c81a3 100644
--- a/source/Core/Src/settingsGUI.cpp
+++ b/source/Core/Src/settingsGUI.cpp
@@ -522,28 +522,25 @@ 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) {
   /*
-   * 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;
@@ -582,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);
@@ -601,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;
   }
 }
@@ -613,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);
@@ -622,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;
   }
 }
@@ -682,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; }
@@ -711,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);
@@ -725,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);
@@ -737,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(); }
@@ -835,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;
   }
 }
@@ -858,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);
@@ -883,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);
@@ -951,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();
   }
 }
 
diff --git a/source/Makefile b/source/Makefile
index f18d8089..ca47135e 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

-S_SRCS:=$(shell find $(S60_STARTUP_DIR) -type f -name '*.S')

-LDSCRIPT=./Core/BSP/Sequre_S60/stm32f103.ld

+DEVICE_BSP_DIR=./Core/BSP/Sequre

+S_SRCS:=$(shell find $(DEVICE_BSP_DIR) -type f -name '*.S')

+LDSCRIPT=./Core/BSP/Sequre/stm32f103.ld

 DEV_GLOBAL_DEFS=-D STM32F103T8Ux       \

                 -D STM32F1             \

                 -D STM32               \