Merge a5560ae4ea into 40655a9501

Updated Overall French Translations (#2085 )
* Updated French translation. * Updated * Update Translations/translation_FR.json (discip) Co-authored-by: discip <53649486+discip@users.noreply.github.com> * added missing options For some reason the following options were missing: * Cool Down Blink * Reverse Temp Change Buttons * Update translation_FR.json * Update translation_FR.json --------- Co-authored-by: discip <53649486+discip@users.noreply.github.com>
2025-02-26 07:53:55 +00:00 · 2025-02-25 22:01:44 +01:00 · 2025-02-25 18:09:15 +01:00 · 2025-01-13 22:20:48 +01:00 · 2024-12-07 00:04:31 +01:00 · 2024-12-06 23:51:36 +01:00
29 changed files with 277 additions and 155 deletions
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -26,6 +26,7 @@ jobs:
            "S60",
            "S60P",
            "T55",
+            "S99",
            "TS101",
          ]
      fail-fast: true
--- a/Documentation/DebugMenu.md
+++ b/Documentation/DebugMenu.md
@@ -104,7 +104,7 @@ This can be used for checking performance of the movement detection code.

 This indicates the tip resistance that the device is currently using. For devices with multiple possible values to choose from (Pinecil V2), the appropriate value is automatically detected at every boot-up. Tip should be installed before boot-up or reading can not be done.

-### Tip R
+### Tip uV

 This is the raw tip reading in μV. Tip must be installed or reading will be high/inaccurate. At cool, the range of 700-1000 is normal for larger tips and ~1500 for smaller tips (TS80). This is used to evaluate the calibration routines.

--- a/2
+++ b/2
@@ -52,7 +52,7 @@ DOCKER_CMD=$(DOCKER_BIN)  -f $(DOCKER_YML)  run  --rm  builder
 MKDOCS_YML=$(CURDIR)/scripts/IronOS-mkdocs.yml

 # supported models
-MODELS=TS100 TS80 TS80P Pinecil MHP30 Pinecilv2 S60 TS101 S60P T55 # target names & dir names
+MODELS=TS100 TS80 TS80P Pinecil MHP30 Pinecilv2 S60 TS101 S60P T55 S99 # target names & dir names
 MODELS_ML=Pinecil  Pinecilv2 # target names
 MODELS_MULTILANG=Pinecil_multi-lang  Pinecilv2_multi-lang # dir names

--- a/README.md
+++ b/README.md
@@ -30,7 +30,8 @@ _This firmware does **NOT** support the USB port while running for changing sett
 |   Pinecil V2   | ✔️  | ✔️  | ✔️  | ✔️  | ✔️  |    ✔️     |          ✔️          |                                         |
 | Miniware TS101 | ✔️  | ❌  | ✔️  | ✔️  | ❌  |    ✔️     |          ✔️          | Full OLED resolution not yet supported. |
 |   Sequre S60   | ❌  | ❌  | ✔️  | ❌  | ❌  |    ❌     |          ✔️          | Full OLED resolution not yet supported. |
-|  Sequre S60P   | ❌  | ❌  | ✔️  | ❌  | ❌  |    ❌     |          ✔️          | Full OLED resolution not yet supported. |
+|  Sequre S60P   | ✔️  | ❌  | ✔️  | ❌  | ❌  |    ❌     |          ✔️          | Full OLED resolution not yet supported. |
+|  Sequre S99    | ✔️  | ❌  | ✔️  | ❌  | ❌  |    ❌     |          ✔️          | Full OLED resolution not yet supported. |
 |   Sequre T55   | ❌  | ❌  | ✔️  | ❌  | ❌  |    N/A    |          ✔️          | Full OLED resolution not yet supported. |
 | Miniware TS80P | ❌  | ✔️  | ✔️  | ❌  | ❌  |    N/A    |          ✔️          |                                         |
 | Miniware TS100 | ✔️  | ❌  | ❌  | ❌  | ❌  |    ❌     |        ❌\*\*        |                                         |
--- a/Translations/make_translation.py
+++ b/Translations/make_translation.py
@@ -163,7 +163,7 @@ def get_debug_menu() -> List[str]:
        "UpTime ",
        "Move   ",
        "Tip Res",
-        "Tip R  ",
+        "Tip uV ",
        "Tip O  ",
        "HW G   ",
        "HW M   ",
--- a/Translations/translation_FR.json
+++ b/Translations/translation_FR.json
@@ -4,7 +4,7 @@
  "tempUnitFahrenheit": false,
  "messagesWarn": {
    "CalibrationDone": {
-      "message": "Étalonnage\nterminé!"
+      "message": "Étalonnage\nterminé !"
    },
    "ResetOKMessage": {
      "message": "Reset OK"
@@ -19,37 +19,37 @@
      "message": "USB-PD\nnon détecté !"
    },
    "LockingKeysString": {
-      "message": "VERROUIL"
+      "message": "VERROUILLÉ"
    },
    "UnlockingKeysString": {
-      "message": "DEVERROU"
+      "message": "DEVERROUILLÉ"
    },
    "WarningKeysLockedString": {
      "message": "! VERR. !"
    },
    "WarningThermalRunaway": {
-      "message": "Emballement\nthermique"
+      "message": "Surchauffe\ncritique"
    },
    "WarningTipShorted": {
-      "message": "!Tip Shorted!"
+      "message": "!Court-circuit Panne!"
    },
    "SettingsCalibrationWarning": {
      "message": "Avant de redémarrer, assurez-vous que la panne et la poignée sont à température ambiante !"
    },
    "CJCCalibrating": {
-      "message": "Etalonnage\n"
+      "message": "Étalonnage\n"
    },
    "SettingsResetWarning": {
      "message": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs par défaut ?"
    },
    "UVLOWarningString": {
-      "message": "DC FAIBL"
+      "message": "TENSION FAIBLE"
    },
    "UndervoltageString": {
      "message": "Sous-tension\n"
    },
    "InputVoltageString": {
-      "message": "V d'entrée: \n"
+      "message": "Tension d'entrée:\n"
    },
    "SleepingAdvancedString": {
      "message": "En veille...\n"
@@ -58,10 +58,10 @@
      "message": "Panne: \n"
    },
    "ProfilePreheatString": {
-      "message": "Preheat\n"
+      "message": "Préchauffage\n"
    },
    "ProfileCooldownString": {
-      "message": "Cooldown\n"
+      "message": "Refroidissement\n"
    },
    "DeviceFailedValidationWarning": {
      "message": "Votre appareil semble être une contrefaçon !"
@@ -107,22 +107,22 @@
  },
  "menuValues": {
    "USBPDModeDefault": {
-      "displayText": "Default\nMode"
+      "displayText": "Mode\npar Défaut"
    },
    "USBPDModeNoDynamic": {
-      "displayText": "No\nDynamic"
+      "displayText": "Non\nDynamique"
    },
    "USBPDModeSafe": {
-      "displayText": "Safe\nMode"
+      "displayText": "Mode\nSafe"
    },
    "TipTypeAuto": {
-      "displayText": "Auto\nSense"
+      "displayText": "Détéction\nAuto."
    },
    "TipTypeT12Long": {
      "displayText": "TS100\nLong"
    },
    "TipTypeT12Short": {
-      "displayText": "Pine\nShort"
+      "displayText": "Pine\nCourt"
    },
    "TipTypeT12PTS": {
      "displayText": "PTS\n200"
@@ -137,11 +137,11 @@
  "menuOptions": {
    "DCInCutoff": {
      "displayText": "Source\nd'alim.",
-      "description": "Source d'alimentation. Règle la tension de coupure (DC 10V) (S 3.3V par cellules, désactive la limite de puissance)"
+      "description": "Source d'alimentation. Définit la tension de coupure (DC 10V) (S 3.3V par cellule, désactive la limite de puissance)"
    },
    "MinVolCell": {
      "displayText": "Tension\nminimale",
-      "description": "Tension minimale autorisée par cellule (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+      "description": "Tension minimale autorisée par cellule (3S : 3 - 3.7V | 4-6S : 2.4 - 3.7V)"
    },
    "QCMaxVoltage": {
      "displayText": "Tension\nQC",
@@ -149,18 +149,18 @@
    },
    "PDNegTimeout": {
      "displayText": "Délai\nexpir. PD",
-      "description": "Délai de la negociation PD par étapes de 100ms pour la compatiblité avec certains chargeurs QC"
+      "description": "Délai de négociation PD par paliers de 100ms pour la compatibilité avec certains chargeurs QC"
    },
    "USBPDMode": {
-      "displayText": "PD\nMode",
-      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
+      "displayText": "Mode\nPD",
+      "description": "Aucune dynamique ne désactive EPR & PPS, le mode sécurisé n'utilise pas de résistance de protection"
    },
    "BoostTemperature": {
      "displayText": "Temp.\nboost",
      "description": "Température utilisée en \"mode boost\""
    },
    "AutoStart": {
-      "displayText": "Chauffer au\ndémarrage",
+      "displayText": "Chauffer audémarrage",
      "description": "A=activé | V=mode veille | O=mode veille à température ambiante"
    },
    "TempChangeShortStep": {
@@ -177,23 +177,23 @@
    },
    "ProfilePhases": {
      "displayText": "Profile\nPhases",
-      "description": "Number of phases in profile mode"
+      "description": "Nombre de phases dans le mode de profile"
    },
    "ProfilePreheatTemp": {
-      "displayText": "Preheat\nTemp",
-      "description": "Preheat to this temperature at the start of profile mode"
+      "displayText": "Temp.\nPréchauffage",
+      "description": "Préchauffer à cette température au début du mode de profile"
    },
    "ProfilePreheatSpeed": {
-      "displayText": "Preheat\nSpeed",
-      "description": "Preheat at this rate (degrees per second)"
+      "displayText": "Vitesse\nPréchauffage",
+      "description": "Préchauffer à cette vitesse (degrés par seconde)"
    },
    "ProfilePhase1Temp": {
-      "displayText": "Phase 1\nTemp",
-      "description": "Target temperature for the end of this phase"
+      "displayText": "Temp.\nPhase 1",
+      "description": "Température séléctionnée pour la fin de cette phase"
    },
    "ProfilePhase1Duration": {
-      "displayText": "Phase 1\nDuration",
-      "description": "Target duration of this phase (seconds)"
+      "displayText": "Durée\nPhase 1",
+      "description": "Durée séléctionnée pour cette phase (secondes)"
    },
    "ProfilePhase2Temp": {
      "displayText": "Phase 2\nTemp",
@@ -228,12 +228,12 @@
      "description": ""
    },
    "ProfileCooldownSpeed": {
-      "displayText": "Cooldown\nSpeed",
-      "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+      "displayText": "Vitesse de\nRefroidissement",
+      "description": "Refroidissement à ce rythme à la fin du mode profil (degrés par seconde)"
    },
    "MotionSensitivity": {
      "displayText": "Sensibilité\nau mouvement",
-      "description": "1=peu sensible | ... | 9=très sensible"
+      "description": "1=très peu sensible | ... | 9=extrêmement sensible"
    },
    "SleepTemperature": {
      "displayText": "Temp.\nveille",
@@ -252,15 +252,15 @@
      "description": "Sensibilité du capteur à effet Hall pour la mise en veille (1=peu sensible | ... | 9=très sensible)"
    },
    "HallEffSleepTimeout": {
-      "displayText": "HallSensor\nSleepTime",
+      "displayText": "TempsVeille\nCapteurHall",
      "description": "Intervalle avant le démarrage du \"mode veille\" lorsque l'effet Hall est supérieur au seuil"
    },
    "TemperatureUnit": {
-      "displayText": "Unité de\ntempérature",
+      "displayText": "Unité de température",
      "description": "C=Celsius | F=Fahrenheit"
    },
    "DisplayRotation": {
-      "displayText": "Orientation\nde l'écran",
+      "displayText": "Orientation de l'écran",
      "description": "D=droitier | G=gaucher | A=automatique"
    },
    "CooldownBlink": {
@@ -268,7 +268,7 @@
      "description": "Faire clignoter la température lors du refroidissement tant que la panne est chaude"
    },
    "ScrollingSpeed": {
-      "displayText": "Vitesse de\ndéfilement",
+      "displayText": "Vitesse de défilement",
      "description": "Vitesse de défilement du texte (R=rapide | L=lent)"
    },
    "ReverseButtonTempChange": {
@@ -276,7 +276,7 @@
      "description": "Inverser les boutons d'ajustement de température"
    },
    "AnimSpeed": {
-      "displayText": "Vitesse\nanim. icônes",
+      "displayText": "Vitesse anim. icônes",
      "description": "Vitesse des animations des icônes dans le menu (L=lente | M=moyenne | R=rapide)"
    },
    "AnimLoop": {
@@ -340,8 +340,8 @@
      "description": ""
    },
    "SolderingTipType": {
-      "displayText": "Soldering\nTip Type",
-      "description": "Select the tip type fitted"
+      "displayText": "Soudure\nType de panne",
+      "description": "Séléctionner le type de panne utilisé"
    }
  }
 }
--- a/Translations/translations_definitions.json
+++ b/Translations/translations_definitions.json
@@ -18,7 +18,7 @@
    },
    {
      "id": "NoPowerDeliveryMessage",
-      "include": ["POW_PD"],
+      "include": ["POW_PD", "POW_PD_EXT"],
      "description": "The IC required for USB-PD could not be communicated with. This is an error warning that USB-PD WILL NOT FUNCTION. Generally indicative of either a hardware or software issues."
    },
    {
@@ -264,14 +264,14 @@
      "id": "PDNegTimeout",
      "maxLen": 8,
      "maxLen2": 15,
-      "include": ["POW_PD"],
+      "include": ["POW_PD", "POW_PD_EXT"],
      "description": "How long until firmware stops trying to negotiate for USB-PD and tries QC instead. Longer times may help dodgy / old PD adapters, faster times move onto PD quickly. Units of 100ms. Recommended to keep small values."
    },
    {
      "id": "USBPDMode",
      "maxLen": 7,
      "maxLen2": 15,
-      "include": ["POW_PD"],
+      "include": ["POW_PD", "POW_PD_EXT"],
      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
    },
    {
--- a/source/Core/BSP/MHP30/configuration.h
+++ b/source/Core/BSP/MHP30/configuration.h
@@ -153,6 +153,7 @@
 #define PROFILE_SUPPORT
 #define OLED_96x16         1
 #define POW_PD             1
+#define USB_PD_TIMEOUT     20 // Default Timeout for USB-PD Protocol negotiation in x100ms
 #define POW_PD_EXT         0
 #define USB_PD_EPR_WATTAGE 0 /*No EPR*/
 #define TEMP_NTC
--- a/source/Core/BSP/Miniware/configuration.h
+++ b/source/Core/BSP/Miniware/configuration.h
@@ -132,6 +132,7 @@
 #define ADC_VDD_MV      3300       // ADC max reading millivolts

 #define POW_PD_EXT 0
+#define USB_PD_TIMEOUT    20  // Default Timeout for USB-PD Protocol negotiation in x100ms

 // Deriving the Voltage div:
 // Vin_max = (3.3*(r1+r2))/(r2)
--- a/source/Core/BSP/Pinecil/configuration.h
+++ b/source/Core/BSP/Pinecil/configuration.h
@@ -149,6 +149,7 @@
 #define POW_PD             1
 #define USB_PD_EPR_WATTAGE 0 /*No EPR (Yet?) */
 #define POW_PD_EXT         0
+#define USB_PD_TIMEOUT    20  // Default Timeout for USB-PD Protocol negotiation in x100ms
 #define POW_QC             1
 #define POW_DC             1
 #define POW_QC_20V         1
--- a/source/Core/BSP/Pinecilv2/configuration.h
+++ b/source/Core/BSP/Pinecilv2/configuration.h
@@ -148,6 +148,7 @@
 #define POW_PD                     1                         // Supported features
 #define USB_PD_EPR_WATTAGE         140                       // USB PD EPR Wattage
 #define POW_PD_EXT                 0                         // Future-proof macro for other models with other PD modes
+#define USB_PD_TIMEOUT             20                        // Default Timeout for USB-PD Protocol negotiation in x100ms
 #define POW_QC                     1                         // Supported features
 #define POW_DC                     1                         // Supported features
 #define POW_QC_20V                 1                         // Supported features
--- a/source/Core/BSP/Sequre/BSP.cpp
+++ b/source/Core/BSP/Sequre/BSP.cpp
@@ -126,77 +126,7 @@ void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) {
  }
 }

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

 uint8_t getButtonA() { return HAL_GPIO_ReadPin(KEY_A_GPIO_Port, KEY_A_Pin) == GPIO_PIN_RESET ? 1 : 0; }
 uint8_t getButtonB() { return HAL_GPIO_ReadPin(KEY_B_GPIO_Port, KEY_B_Pin) == GPIO_PIN_RESET ? 1 : 0; }
--- a/source/Core/BSP/Sequre/Pins.h
+++ b/source/Core/BSP/Sequre/Pins.h
@@ -5,8 +5,8 @@
 *      Author: Ralim
 */

-#ifndef BSP_MINIWARE_PINS_H_
-#define BSP_MINIWARE_PINS_H_
+#ifndef BSP_SEQURE_PINS_H_
+#define BSP_SEQURE_PINS_H_
 #include "configuration.h"

 #ifdef MODEL_S60
@@ -65,6 +65,45 @@
 #define SCL2_GPIO_Port        GPIOB
 #define SDA2_Pin              GPIO_PIN_7
 #define SDA2_GPIO_Port        GPIOB
+#define SCL_Pin               GPIO_PIN_11
+#define SCL_GPIO_Port         GPIOB
+#define SDA_Pin               GPIO_PIN_10
+#define SDA_GPIO_Port         GPIOB
+// Pin gets pulled high on movement
+#define MOVEMENT_Pin       GPIO_PIN_3
+#define MOVEMENT_GPIO_Port GPIOA
+
+#endif
+
+#ifdef MODEL_S99
+
+#define KEY_B_Pin             GPIO_PIN_1
+#define KEY_B_GPIO_Port       GPIOB
+#define TMP36_INPUT_Pin       GPIO_PIN_5
+#define TMP36_INPUT_GPIO_Port GPIOA
+#define TMP36_ADC1_CHANNEL    ADC_CHANNEL_5
+#define TMP36_ADC2_CHANNEL    ADC_CHANNEL_5
+#define TIP_TEMP_Pin          GPIO_PIN_0
+#define TIP_TEMP_GPIO_Port    GPIOA
+#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_0
+#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_0
+#define VIN_Pin               GPIO_PIN_4
+#define VIN_GPIO_Port         GPIOA
+#define VIN_ADC1_CHANNEL      ADC_CHANNEL_4
+#define VIN_ADC2_CHANNEL      ADC_CHANNEL_4
+#define KEY_A_Pin             GPIO_PIN_0
+#define KEY_A_GPIO_Port       GPIOB
+#define PWM_Out_Pin           GPIO_PIN_8
+#define PWM_Out_GPIO_Port     GPIOB
+#define PWM_Out_CHANNEL       TIM_CHANNEL_3 // Timer 4; channel 3
+#define SCL2_Pin              GPIO_PIN_6
+#define SCL2_GPIO_Port        GPIOB
+#define SDA2_Pin              GPIO_PIN_7
+#define SDA2_GPIO_Port        GPIOB
+#define SCL_Pin               GPIO_PIN_11
+#define SCL_GPIO_Port         GPIOB
+#define SDA_Pin               GPIO_PIN_10
+#define SDA_GPIO_Port         GPIOB
 // Pin gets pulled high on movement
 #define MOVEMENT_Pin       GPIO_PIN_3
 #define MOVEMENT_GPIO_Port GPIOA
@@ -98,4 +137,4 @@

 #endif // MODEL_T55

-#endif /* BSP_MINIWARE_PINS_H_ */
+#endif /* BSP_SEQURE_PINS_H_ */
--- a/source/Core/BSP/Sequre/Power.cpp
+++ b/source/Core/BSP/Sequre/Power.cpp
@@ -1,5 +1,6 @@
 #include "BSP.h"
 #include "BSP_Power.h"
+#include "FS2711.hpp"
 #include "Pins.h"
 #include "QC3.h"
 #include "Settings.h"
@@ -16,9 +17,26 @@ void power_check() {
    return; // We are using PD
  }
 #endif
+#if POW_PD_EXT == 2
+  if (FS2711::has_run_selection()) {
+    return;
+  }
+#endif
 #ifdef POW_QC
  QC_resync();
 #endif
 }

-bool getIsPoweredByDCIN() { return false; }
+bool getIsPoweredByDCIN() {
+#if POW_PD_EXT == 2 && defined(POW_DC)
+  if (!FS2711::has_run_selection()) {
+    return true;
+  } else if (FS2711::debug_get_state().source_voltage > 0) {
+    return false;
+  } else {
+    return true;
+  }
+#else
+  return false;
+#endif
+}
--- a/source/Core/BSP/Sequre/README.md
+++ b/source/Core/BSP/Sequre/README.md
@@ -1,6 +1,6 @@
-# BSP section for STM32F103 based Miniware products
+# BSP section for STM32F103 based Sequre products

-This folder contains the hardware abstractions required for the TS100, TS80 and probably TS80P soldering irons.
+This folder contains the hardware abstractions required for the S60, S60P and S99 soldering irons.

 ## Main abstractions

--- a/source/Core/BSP/Sequre/Software_I2C.h
+++ b/source/Core/BSP/Sequre/Software_I2C.h
@@ -5,19 +5,32 @@
 *      Author: Ralim
 */

-#ifndef BSP_MINIWARE_SOFTWARE_I2C_H_
-#define BSP_MINIWARE_SOFTWARE_I2C_H_
+#ifndef BSP_SEQURE_SOFTWARE_I2C_H_
+#define BSP_SEQURE_SOFTWARE_I2C_H_
 #include "BSP.h"
 #include "configuration.h"
 #include "stm32f1xx_hal.h"
-#ifdef I2C_SOFT_BUS_2

+#ifdef I2C_SOFT_BUS_1
+#define SOFT_SCL1_HIGH() HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET)
+#define SOFT_SCL1_LOW()  HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA1_HIGH() HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET)
+#define SOFT_SDA1_LOW()  HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA1_READ() (HAL_GPIO_ReadPin(SDA_GPIO_Port, SDA_Pin) == GPIO_PIN_SET ? 1 : 0)
+#define SOFT_SCL1_READ() (HAL_GPIO_ReadPin(SCL_GPIO_Port, SCL_Pin) == GPIO_PIN_SET ? 1 : 0)
+
+#endif /* I2C_SOFT_BUS_1 */
+
+#ifdef I2C_SOFT_BUS_2
 #define SOFT_SCL2_HIGH() HAL_GPIO_WritePin(SCL2_GPIO_Port, SCL2_Pin, GPIO_PIN_SET)
 #define SOFT_SCL2_LOW()  HAL_GPIO_WritePin(SCL2_GPIO_Port, SCL2_Pin, GPIO_PIN_RESET)
 #define SOFT_SDA2_HIGH() HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_SET)
 #define SOFT_SDA2_LOW()  HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_RESET)
 #define SOFT_SDA2_READ() (HAL_GPIO_ReadPin(SDA2_GPIO_Port, SDA2_Pin) == GPIO_PIN_SET ? 1 : 0)
 #define SOFT_SCL2_READ() (HAL_GPIO_ReadPin(SCL2_GPIO_Port, SCL2_Pin) == GPIO_PIN_SET ? 1 : 0)
+
+#endif /* I2C_SOFT_BUS_2 */
+
 // clang-format off
 #define SOFT_I2C_DELAY()              \
  {                                   \
@@ -27,7 +40,6 @@
  }
 // clang-format on

-#endif
 // 40 ~= 100kHz; 15 gives around 250kHz or so which is fast _and_ stable

-#endif /* BSP_MINIWARE_SOFTWARE_I2C_H_ */
+#endif /* BSP_SEQURE_SOFTWARE_I2C_H_ */
--- a/source/Core/BSP/Sequre/ThermoModel.cpp
+++ b/source/Core/BSP/Sequre/ThermoModel.cpp
@@ -83,3 +83,10 @@ TemperatureType_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) {
 #ifdef TEMP_uV_LOOKUP_S60
 TemperatureType_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) { return (tipuVDelta * 50) / 485; }
 #endif // TEMP_uV_LOOKUP_S60
+
+#ifdef TEMP_uV_LOOKUP_S99
+// 42.85 uV / K -> 1/42.85 K/uV = 20/857
+// TemperatureType_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) { return (tipuVDelta * 20) / 857; }
+// Measurement is probably with heating element in series, thats why the reading differs from the approx 42.85 uV/K
+TemperatureType_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) { return (tipuVDelta * 1) / 30; }
+#endif // TEMP_uV_LOOKUP_S99
--- a/source/Core/BSP/Sequre/configuration.h
+++ b/source/Core/BSP/Sequre/configuration.h
@@ -116,7 +116,7 @@
 // Vin_max = (3.3*(r1+r2))/(r2)
 // vdiv = (32768*4)/(vin_max*10)

-#if defined(MODEL_S60) + defined(MODEL_S60P) + defined(MODEL_T55) == 0
+#if defined(MODEL_S60) + defined(MODEL_S60P) + defined(MODEL_T55) + defined(MODEL_S99) == 0
 #error "No model defined!"
 #endif

@@ -131,9 +131,10 @@
 #define POWER_LIMIT_STEPS  5
 #define OP_AMP_GAIN_STAGE  536
 #define TEMP_uV_LOOKUP_S60
-#define USB_PD_VMAX              12 // Maximum voltage for PD to negotiate
+#define USB_PD_VMAX                     12  // Maximum voltage for PD to negotiate
 #define THERMAL_RUNAWAY_TIME_SEC 20
 #define THERMAL_RUNAWAY_TEMP_C   3
+#define USB_PD_TIMEOUT     1   // Default Timeout for USB-PD Protocol negotiation in x100ms

 #define HARDWARE_MAX_WATTAGE_X10 600

@@ -165,9 +166,10 @@
 #define POWER_LIMIT_STEPS  5
 #define OP_AMP_GAIN_STAGE  536
 #define TEMP_uV_LOOKUP_S60
-#define USB_PD_VMAX              20 // Maximum voltage for PD to negotiate
+#define USB_PD_VMAX                     20  // Maximum voltage for PD to negotiate
 #define THERMAL_RUNAWAY_TIME_SEC 20
 #define THERMAL_RUNAWAY_TEMP_C   3
+#define USB_PD_TIMEOUT     1   // Default Timeout for USB-PD Protocol negotiation in x100ms

 #define HARDWARE_MAX_WATTAGE_X10 600

@@ -180,10 +182,13 @@
 #define GPIO_VIBRATION
 #define POW_PD_EXT                2
 #define USB_PD_EPR_WATTAGE        0 /*No EPR*/
+#define POW_DC
 #define DEBUG_POWER_MENU_BUTTON_B 1
 #define HAS_POWER_DEBUG_MENU
 #define TEMP_NTC
 #define I2C_SOFT_BUS_2 // For now we are doing software I2C to get around hardware chip issues
+#define I2C_PROBE_POW_PD // For now we are doing software I2C to get around hardware chip issues
+#define I2C_SOFT_BUS_1 // 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

@@ -206,6 +211,8 @@
 #define OP_AMP_GAIN_STAGE      1
 #define TEMP_uV_LOOKUP_PT1000
 #define USB_PD_VMAX       20  // Maximum voltage for PD to negotiate
+#define USB_PD_TIMEOUT     1   // Default Timeout for USB-PD Protocol negotiation in x100ms
+
 #define NO_DISPLAY_ROTATE     // Disable OLED rotation by accel
 #define MAX_TEMP_C        350 // Max soldering temp selectable °C
 #define MAX_TEMP_F        660 // Max soldering temp selectable °F
@@ -239,6 +246,44 @@
 #define MODEL_HAS_DCDC // We dont have DC/DC but have reallly fast PWM that gets us roughly the same place
 #endif                 /* T55 */

+#ifdef MODEL_S99
+#define VOLTAGE_DIV        460 // Default divider scaler
+#define CALIBRATION_OFFSET 200 // Default adc offset in uV
+#define PID_POWER_LIMIT    70  // Sets the max pwm power limit
+#define POWER_LIMIT        0   // 0 watts default limit
+#define MAX_POWER_LIMIT    70
+#define POWER_LIMIT_STEPS  5
+#define OP_AMP_GAIN_STAGE  237 // Two sequential op-amps 1st: 1+(9k29/997R)=10.31 2nd: 1+(22k/1k)=23 -> 10.31*23=237
+#define TEMP_uV_LOOKUP_S99
+#define USB_PD_VMAX        20  // Maximum voltage for PD to negotiate
+#define USB_PD_TIMEOUT     1   // Default Timeout for USB-PD Protocol negotiation in x100ms
+
+#define HARDWARE_MAX_WATTAGE_X10 1300
+
+#define TIP_THERMAL_MASS    8   // 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 THERMAL_RUNAWAY_TIME_SEC 20
+#define THERMAL_RUNAWAY_TEMP_C   10
+
+#define TIP_RESISTANCE 20 //(actually 2.5 ish but we need to be more conservative on pwm'ing watt limit) x10 ohms
+
+#define OLED_128x32
+#define GPIO_VIBRATION
+#define POW_PD_EXT                2
+#define USB_PD_EPR_WATTAGE        0 /*No EPR*/
+#define POW_DC
+#define DEBUG_POWER_MENU_BUTTON_B 1
+#define HAS_POWER_DEBUG_MENU
+#define TEMP_NTC
+#define I2C_SOFT_BUS_2 // For now we are doing software I2C to get around hardware chip issues
+#define I2C_PROBE_POW_PD // For now we are doing software I2C to get around hardware chip issues
+#define I2C_SOFT_BUS_1 // 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                 /* S99 */
+
 #define FLASH_LOGOADDR      (0x08000000 + (62 * 1024))
 #define SETTINGS_START_PAGE (0x08000000 + (63 * 1024))

--- a/source/Core/BSP/Sequre/preRTOS.cpp
+++ b/source/Core/BSP/Sequre/preRTOS.cpp
@@ -6,10 +6,14 @@
 */

 #include "BSP.h"
+#include "I2CBB1.hpp"
 #include "I2CBB2.hpp"
 #include "Pins.h"
 #include "Setup.h"
 #include <I2C_Wrapper.hpp>
+#if defined(I2C_PROBE_POW_PD) && POW_PD_EXT == 2
+#include "FS2711.hpp"
+#endif

 void preRToSInit() {
  /* Reset of all peripherals, Initializes the Flash interface and the Systick.
@@ -17,7 +21,14 @@ void preRToSInit() {
  HAL_Init();
  Setup_HAL(); // Setup all the HAL objects
  BSPInit();
+#ifdef I2C_SOFT_BUS_1
+  I2CBB1::init();
+#endif /* I2C_SOFT_BUS_1 */
 #ifdef I2C_SOFT_BUS_2
  I2CBB2::init();
-#endif
+#endif /* I2C_SOFT_BUS_2 */
+#if defined(I2C_PROBE_POW_PD) && POW_PD_EXT == 2
+  // Detect and set FS2711 I2C bus num
+  FS2711::detect_i2c_bus_num();
+#endif /* defined(I2C_PROBE_POW_PD) && POW_PD_EXT == 2 */
 }
--- a/source/Core/Drivers/FS2711.cpp
+++ b/source/Core/Drivers/FS2711.cpp
@@ -4,8 +4,10 @@
 #include "BSP.h"
 #include "FS2711.hpp"
 #include "FS2711_defines.h"
+#include "I2CBB1.hpp"
 #include "I2CBB2.hpp"
 #include "Settings.h"
+#include "Utils.h"
 #include "cmsis_os.h"
 #include <stdbool.h>
 #include <stdint.h>
@@ -15,31 +17,61 @@
 #error Max PD Voltage must be defined
 #endif

-#define PROTOCOL_TIMEOUT 100 // ms
-
 extern int32_t powerSupplyWattageLimit;

+uint8_t I2C_PORT = 2;
+
 fs2711_state_t FS2711::state;

-inline void i2c_write(uint8_t addr, uint8_t data) { I2CBB2::Mem_Write(FS2711_ADDR, addr, &data, 1); }
+void i2c_write(uint8_t addr, uint8_t data) {
+  if (I2C_PORT == 2) {
+    I2CBB2::Mem_Write(FS2711_ADDR, addr, &data, 1);
+  } else if (I2C_PORT == 1) {
+    I2CBB1::Mem_Write(FS2711_ADDR, addr, &data, 1);
+  }
+}

-inline uint8_t i2c_read(uint8_t addr) {
+uint8_t i2c_read(uint8_t addr) {
  uint8_t data = 0;
-  I2CBB2::Mem_Read(FS2711_ADDR, addr, &data, 1);
+  if (I2C_PORT == 2) {
+    I2CBB2::Mem_Read(FS2711_ADDR, addr, &data, 1);
+  } else if (I2C_PORT == 1) {
+    I2CBB1::Mem_Read(FS2711_ADDR, addr, &data, 1);
+  }
  return data;
 }

-inline bool i2c_probe(uint8_t addr) { return I2CBB2::probe(addr); }
+bool i2c_probe(uint8_t addr) {
+  bool probing_state = false;
+  if (I2C_PORT == 2) {
+    probing_state = I2CBB2::probe(addr);
+  } else if (I2C_PORT == 1) {
+    probing_state = I2CBB1::probe(addr);
+  }
+  return probing_state;
+}
+
+uint8_t FS2711::detect_i2c_bus_num() {
+  I2CBB2::probe(88);
+  I2CBB2::probe(89);
+  if (I2CBB2::probe(FS2711_ADDR)) {
+    I2C_PORT = 2;
+  } else {
+    I2C_PORT = 1;
+  }
+  return I2C_PORT;
+}

 void FS2711::start() {
  memset(&state, 0, sizeof(fs2711_state_t));
  state.req_pdo_num = 0xFF;

  enable_protocol(false);
-  osDelay(PROTOCOL_TIMEOUT);
+  // PDNegTimeout is in 100ms, so x100 for ms
+  osDelay(getSettingValue(SettingsOptions::PDNegTimeout) * 100);
  select_protocol(FS2711_PROTOCOL_PD);
  enable_protocol(true);
-  osDelay(PROTOCOL_TIMEOUT);
+  osDelay(getSettingValue(SettingsOptions::PDNegTimeout) * 100);
 }

 uint8_t FS2711::selected_protocol() { return i2c_read(FS2711_REG_SELECT_PROTOCOL); }
@@ -163,6 +195,11 @@ void FS2711::negotiate() {
  if (getSettingValue(SettingsOptions::USBPDMode) == usbpdMode_t::DEFAULT) {
    tip_resistance += 5;
  }
+#ifdef MODEL_HAS_DCDC
+  // If this device has step down DC/DC inductor to smooth out current spikes
+  // We can instead ignore resistance and go for max voltage we can accept; and rely on the DC/DC regulation to keep under current limit
+  tip_resistance = 255; // (Push to 25.5 ohms to effectively disable this check)
+#endif

  uint16_t pdo_min_mv = 0, pdo_max_mv = 0, pdo_max_curr = 0, pdo_type = 0;

@@ -228,7 +265,7 @@ bool FS2711::has_run_selection() { return state.req_pdo_num != 0xFF; }

 uint16_t FS2711::source_voltage() { return state.source_voltage / 1000; }

-// FS2711 does current in mV so it needs to be converted to x100 intead of x1000
+// FS2711 does current in mA so it needs to be converted to x100 intead of x1000
 uint16_t FS2711::source_currentx100() { return state.source_current / 10; }

 uint16_t FS2711::debug_pdo_max_voltage(uint8_t pdoid) { return state.pdo_max_volt[pdoid]; }
--- a/source/Core/Drivers/FS2711.hpp
+++ b/source/Core/Drivers/FS2711.hpp
@@ -19,6 +19,8 @@ typedef struct {

 class FS2711 {
 public:
+  static uint8_t detect_i2c_bus_num();
+  
  static bool probe();

  static void start();
--- a/source/Core/Drivers/Font.h
+++ b/source/Core/Drivers/Font.h
@@ -93,8 +93,8 @@
      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x30, 0x0C, 0x02, 0xF1, 0xF1, 0xF1, 0x02, 0x0C, 0x30, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
      0x00, 0x00, 0x00, 0xC0, 0xB0, 0x8C, 0x83, 0x80, 0x80, 0x80, 0x80, 0xB3, 0xB3, 0xB3, 0x80, 0x80, 0x80, 0x80, 0x83, 0x8C, 0xB0, 0xC0, 0x00, 0x00};
  
-  #if defined(MODEL_S60) || defined(MODEL_S60P) || defined(MODEL_TS101) || defined(MODEL_T55)
-    #if defined(MODEL_S60) || defined(MODEL_S60P) 
+  #if defined(MODEL_S60) || defined(MODEL_S60P) || defined(MODEL_TS101) || defined(MODEL_T55) || defined(MODEL_S99)
+    #if defined(MODEL_S60) || defined(MODEL_S60P) || defined(MODEL_S99)
    const uint8_t buttonA[] = {
        // width = 56
        // height = 32
--- a/source/Core/Drivers/I2CBB2.cpp
+++ b/source/Core/Drivers/I2CBB2.cpp
@@ -14,6 +14,7 @@ void              I2CBB2::init() {
  // Set GPIO's to output open drain
  GPIO_InitTypeDef GPIO_InitStruct;
  __HAL_RCC_GPIOA_CLK_ENABLE();
+  __HAL_RCC_GPIOB_CLK_ENABLE();
  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_MEDIUM;
  GPIO_InitStruct.Pin   = SDA2_Pin;
  GPIO_InitStruct.Mode  = GPIO_MODE_OUTPUT_OD;
--- a/source/Core/Src/Settings.cpp
+++ b/source/Core/Src/Settings.cpp
@@ -54,7 +54,7 @@ typedef struct {
 } SettingConstants;

 static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOptionsLength] = {
-  //{                   min,                               max,         increment,                      default}
+  //{                   min,                                                                   max,         increment,                      default}
    {            MIN_TEMP_C,                                                            MAX_TEMP_F,                 5,               SOLDERING_TEMP}, // SolderingTemp
    {            MIN_TEMP_C,                                                            MAX_TEMP_F,                 5,                          150}, // SleepTemp
    {                     0,                                                                    15,                 1,                   SLEEP_TIME}, // SleepTime
@@ -87,7 +87,7 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp
    {                     0,                                                                     9,                 1,                            0}, // AccelMissingWarningCounter
    {                     0,                                                                     9,                 1,                            0}, // PDMissingWarningCounter
    {                     0,                                                                0xFFFF,                 0,                 41431 /*EN*/}, // UILanguage
-    {                     0,                                                                    50,                 1,                           20}, // PDNegTimeout
+    {                     0,                                                                    50,                 1,               USB_PD_TIMEOUT}, // PDNegTimeout
    {                     0,                                                                     1,                 1,                            0}, // OLEDInversion
    {        MIN_BRIGHTNESS,                                                        MAX_BRIGHTNESS,   BRIGHTNESS_STEP,           DEFAULT_BRIGHTNESS}, // OLEDBrightness
    {                     0,                                                                     6,                 1,                            1}, // LOGOTime
--- a/source/Core/Src/settingsGUI.cpp
+++ b/source/Core/Src/settingsGUI.cpp
@@ -26,7 +26,7 @@ static void displayInputMinVRange(void);
 static void displayQCInputV(void);
 #endif /* POW_QC */

-#ifdef POW_PD
+#if defined(POW_PD) || POW_PD_EXT == 2
 static void displayPDNegTimeout(void);
 static void displayUSBPDMode(void);
 #endif /* POW_PD */
@@ -123,9 +123,9 @@ static bool showSolderingTipType(void);

 // Menu functions

-#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD)
+#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD) || defined(POW_PD) || POW_PD_EXT == 2
 static void displayPowerMenu(void);
-#endif /* POW_DC or POW_QC */
+#endif /* POW_DC or POW_QC or POW_PD or POD_PD_EXT 2*/

 static void displaySolderingMenu(void);
 static void displayPowerSavingMenu(void);
@@ -236,7 +236,7 @@ const menuitem rootSettingsMenu[] {
  /* ^^^^ end of menu marker. DO NOT REMOVE ^^^^ */
 };

-#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD)
+#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD) || POW_PD_EXT == 2
 const menuitem powerMenu[] = {
  /*
   * Power Source
@@ -255,7 +255,7 @@ const menuitem powerMenu[] = {
  /* Voltage input */
  {SETTINGS_DESC(SettingsItemIndex::QCMaxVoltage), nullptr, displayQCInputV, nullptr, SettingsOptions::QCIdealVoltage, SettingsItemIndex::QCMaxVoltage, 4},
 #endif
-#ifdef POW_PD
+#if defined(POW_PD) || POW_PD_EXT == 2
  /* PD timeout setup */
  {SETTINGS_DESC(SettingsItemIndex::PDNegTimeout), nullptr, displayPDNegTimeout, nullptr, SettingsOptions::PDNegTimeout, SettingsItemIndex::PDNegTimeout, 6},
  /* Toggle PPS & EPR */
@@ -451,7 +451,7 @@ const menuitem advancedMenu[] = {
 /* clang-format on */

 const menuitem *subSettingsMenus[] {
-#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD)
+#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD) || POW_PD_EXT == 2
  powerMenu,
 #endif
      solderingMenu, PowerSavingMenu, UIMenu, advancedMenu,
@@ -536,7 +536,7 @@ static void displayQCInputV(void) {

 #endif /* POW_QC */

-#ifdef POW_PD /* POW_PD */
+#if defined(POW_PD) || POW_PD_EXT == 2 /* POW_PD */

 static void displayPDNegTimeout(void) {
  auto value = getSettingValue(SettingsOptions::PDNegTimeout);
--- a/source/Core/Threads/UI/logic/OperatingModes.h
+++ b/source/Core/Threads/UI/logic/OperatingModes.h
@@ -23,6 +23,10 @@ extern "C" {
 #include "USBPD.h"
 #include "pd.h"
 #endif
+#if POW_PD_EXT == 2
+#include "FS2711.hpp"
+#include "FS2711_defines.h"
+#endif

 enum class OperatingMode {
  StartupLogo=10,        // Showing the startup logo
--- a/source/Core/Threads/UI/logic/utils/SolderingCommon.cpp
+++ b/source/Core/Threads/UI/logic/utils/SolderingCommon.cpp
@@ -63,6 +63,13 @@ int8_t getPowerSourceNumber(void) {
 #endif
      }
    }
+#endif
+#if POW_PD_EXT == 2
+    if (FS2711::has_run_selection()) {
+      poweredbyPD = true;
+      // FS2711IC has VBUS always connected
+      pdHasVBUSConnected = true;
+    }
 #endif
    if (poweredbyPD) {
      if (pdHasVBUSConnected) {
--- a/source/Makefile
+++ b/source/Makefile
@@ -6,7 +6,7 @@ ALL_MINIWARE_MODELS=TS100 TS80 TS80P TS101
 ALL_PINECIL_MODELS=Pinecil
 ALL_PINECIL_V2_MODELS=Pinecilv2
 ALL_MHP30_MODELS=MHP30
-ALL_SEQURE_MODELS=S60 S60P T55
+ALL_SEQURE_MODELS=S60 S60P T55 S99
 ALL_MODELS=$(ALL_MINIWARE_MODELS) $(ALL_PINECIL_MODELS) $(ALL_MHP30_MODELS) $(ALL_PINECIL_V2_MODELS) $(ALL_SEQURE_MODELS)

 ifneq ($(model),$(filter $(model),$(ALL_MODELS)))
@@ -145,6 +145,9 @@ flash_size=62k
 ifeq ($(model), S60P)
 bootldr_size=0x5000
 DEVICE_DFU_ADDRESS=0x08005000
+else ifeq ($(model), S99)
+bootldr_size=0x4c00
+DEVICE_DFU_ADDRESS=0x08004c00
 else 
 # S60 or T55
 bootldr_size=0x4400
--- a/source/build.sh
+++ b/source/build.sh
@@ -6,7 +6,7 @@ TRANSLATION_DIR="../Translations"
 # AVAILABLE_LANGUAGES will be calculating according to json files in $TRANSLATION_DIR
 AVAILABLE_LANGUAGES=()
 BUILD_LANGUAGES=()
-AVAILABLE_MODELS=("TS100" "TS80" "TS80P" "Pinecil" "MHP30" "Pinecilv2" "S60" "S60P" "T55" "TS101")
+AVAILABLE_MODELS=("TS100" "TS80" "TS80P" "Pinecil" "MHP30" "Pinecilv2" "S60" "S60P" "T55" "S99" "TS101")
 BUILD_MODELS=()

 builder_info() {
Author	SHA1	Message	Date
jonasius	331a278cb8	Merge `a5560ae4ea` into `40655a9501`	2025-02-25 22:01:44 +01:00
Leska	40655a9501	Updated Overall French Translations (#2085 ) Some checks failed Docs / deploy-docs (push) Has been cancelled Details CI / build (MHP30) (push) Has been cancelled Details CI / build (Pinecil) (push) Has been cancelled Details CI / build (Pinecilv2) (push) Has been cancelled Details CI / build (S60) (push) Has been cancelled Details CI / build (S60P) (push) Has been cancelled Details CI / build (T55) (push) Has been cancelled Details CI / build (TS100) (push) Has been cancelled Details CI / build (TS101) (push) Has been cancelled Details CI / build (TS80) (push) Has been cancelled Details CI / build (TS80P) (push) Has been cancelled Details CI / build_multi-lang (Pinecil) (push) Has been cancelled Details CI / build_multi-lang (Pinecilv2) (push) Has been cancelled Details CI / tests (push) Has been cancelled Details CI / check_c-cpp (push) Has been cancelled Details CI / check_python (push) Has been cancelled Details CI / check_shell (push) Has been cancelled Details CI / check_docs (push) Has been cancelled Details CI / upload_metadata (push) Has been cancelled Details * Updated French translation. * Updated * Update Translations/translation_FR.json (discip) Co-authored-by: discip <53649486+discip@users.noreply.github.com> * added missing options For some reason the following options were missing: * Cool Down Blink * Reverse Temp Change Buttons * Update translation_FR.json * Update translation_FR.json --------- Co-authored-by: discip <53649486+discip@users.noreply.github.com>	2025-02-25 18:09:15 +01:00
discip	a5560ae4ea	Merge branch 'dev' into dev	2025-01-13 22:20:48 +01:00
discip	867f1fcb0d	Merge branch 'dev' into dev	2024-12-07 00:04:31 +01:00
jonasius	02580dab2e	Add probing for unused devices for testing/timing	2024-12-06 23:51:36 +01:00
jonasius	17f15bca98	Merge branch 'Ralim:dev' into dev	2024-11-19 22:47:29 +01:00
discip	35fd2f545f	Merge branch 'dev' into dev	2024-11-08 00:09:04 +01:00
discip	b036da9dcc	Merge branch 'dev' into dev	2024-09-04 22:29:28 +02:00
discip	2679a791d9	Merge branch 'dev' into dev	2024-08-24 13:04:38 +02:00
jonasius	4b340c52bc	Add THERMAL_RUNAWAY config values for S99	2024-08-07 20:40:16 +02:00
jonasius	e667189f45	Add MODEL_S99	2024-08-07 20:39:51 +02:00
jonasius	a132d37dc6	Merge remote-tracking branch 'upstream/dev' into dev	2024-08-07 20:39:30 +02:00
jonasius	fcb1b3785f	Merge branch 'dev' of https://github.com/jonasius/IronOS into dev	2024-08-05 22:12:15 +02:00
jonasius	a2734eed9e	Fix i2c_probe function	2024-08-05 22:02:15 +02:00
jonasius	e79687e1e8	Set equal USB_PD_TIMEOUT for all Sequre irons	2024-08-05 21:59:51 +02:00
discip	ae21be2913	Merge branch 'dev' into dev	2024-07-11 22:04:43 +02:00
discip	fa3d4d49d5	Merge branch 'dev' into dev	2024-07-11 15:36:02 +02:00
jonasius	693c1a3f2f	Merge branch 'dev' into dev	2024-06-28 23:49:53 +02:00
jonasius	f21630eb79	Enable/add DC support for S60P	2024-06-28 17:54:43 +02:00
jonasius	4634fa8ba7	Fix showing displayPowerMenu for POW_PD and POW_PD_EXT 2	2024-06-28 17:47:59 +02:00
jonasius	6ad0b65bff	Correct README to Sequre S60, S60P and S99	2024-06-27 19:08:26 +02:00
jonasius	69493ba212	Add missing braces	2024-06-27 19:07:39 +02:00
jonasius	e6a3f380e1	4x faster PWM, add Timer changes from #1926	2024-06-26 00:13:23 +02:00
jonasius	56b91ac13c	Add missing __HAL_RCC_GPIOB_CLK_ENABLE	2024-06-25 23:53:07 +02:00
jonasius	0d74f773b2	Code cleanup, always init both I2C bus	2024-06-25 23:40:17 +02:00
jonasius	51e08f3992	Fix clang-format issues	2024-06-25 19:13:30 +02:00
jonasius	e9117269ef	Add experimental detection of separate USB-PD I2C bus for S99 v1.5 and S60P v1.2	2024-06-25 19:07:22 +02:00
jonasius	c776390ac3	Add pins for S99 v1.5 and probably S60P v1.2	2024-06-25 19:03:07 +02:00
jonasius	a626d5a9c1	Fix missing PD related description of menu items and messages for POW_PD_EXT	2024-06-25 17:26:14 +02:00
jonasius	c8c36d29bf	Fix clang-format code style mismatches	2024-06-19 22:24:05 +02:00
jonasius	b772e1dc26	Add S99 to overview table	2024-06-19 22:05:55 +02:00
jonasius	8514edfdea	Fix clang-format code style mismatches	2024-06-06 23:35:12 +02:00
jonasius	f5d6d8b1af	Add define for USB_PD_TIMEOUT, the default value for PDNegTimeout	2024-06-06 23:13:58 +02:00
jonasius	da28492f00	Add define for USB_PD_TIMEOUT, the default value for PDNegTimeout	2024-06-06 23:09:43 +02:00
jonasius	6ef1fbd46a	Support for S99 * Enable PD Options * Make PDNegTimeout configureable * Add default value for PDNegTimeout, also for S60 and S60P * Add basic DC detection / correct debug readings while powered via DC * Add basic ThermoModel for C245 Tips * Modify op-amp gain	2024-06-06 22:35:35 +02:00
jonasius	6e53d85b32	Rename Sequre_S60 folder to Sequre	2024-06-06 20:27:08 +02:00
jonasius	31ff398150	Correct debug menu "Tip R" to "Tip uV"	2024-06-03 22:30:07 +02:00
jonasius	a2615a57b8	Use SettingsOptions::PDNegTimeout in FS2711 driver	2024-06-02 22:53:34 +02:00
jonasius	e327be5bd8	Correct debug menu "Tip R" to "Tip uV"	2024-06-02 16:15:46 +02:00
jonasius	a306de5c37	Merge branch 'Ralim:dev' into dev	2024-06-01 14:03:50 +02:00
jonasius	2c5d2a08ed	Add whitespaces according to coding style Co-authored-by: discip <53649486+discip@users.noreply.github.com>	2024-05-26 23:09:13 +02:00
jonasius	5ea42a8bbf	Add whitespaces according to coding style Co-authored-by: discip <53649486+discip@users.noreply.github.com>	2024-05-26 23:09:06 +02:00
jonasius	a3b7abbf0e	Add Sequre S99 with correct bootloader offset	2024-05-26 21:14:11 +02:00
jonasius	1521b5ea31	Add S99	2024-05-26 21:13:41 +02:00
jonasius	653a0803e2	Add support for Sequre S99, copied S60P settings	2024-05-26 21:13:09 +02:00