Ralim · jonasius · May 26, 2024 · May 26, 2024 · May 26, 2024 · May 26, 2024
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -26,6 +26,7 @@ jobs:
             "S60",
             "S60P",
             "T55",
+            "S99",
             "TS101",
           ]
       fail-fast: true

diff --git 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.
 

diff --git a/Makefile b/Makefile
@@ -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
 

diff --git a/README.md b/README.md
@@ -28,7 +28,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 | ✔️  | ❌  | ❌  | ❌  | ❌  |    ❌     |        ❌\*\*        |                                         |

diff --git 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   ",

diff --git 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"
     },
     {

diff --git 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

diff --git a/source/Core/BSP/Miniware/configuration.h b/source/Core/BSP/Miniware/configuration.h
@@ -127,6 +127,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)

diff --git 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

diff --git 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

diff --git 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; }

diff --git 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_ */
diff --git 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
+}
diff --git 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
 

diff --git 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_ */
diff --git 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