Merge branch 'dev' into dev

source/Core/BSP/Miniware/BSP.cpp

@@ -4,6 +4,7 @@
 #include "BootLogo.h"
 #include "I2C_Wrapper.hpp"
 #include "Pins.h"
+#include "Settings.h"
 #include "Setup.h"
 #include "TipThermoModel.h"
 #include "USBPD.h"
@@ -382,9 +383,18 @@ uint8_t getTipResistanceX10() {
 #ifdef TIP_RESISTANCE_SENSE_Pin
   // Return tip resistance in x10 ohms
   // We can measure this using the op-amp
-  return lastTipResistance;
+  uint8_t user_selected_tip = getUserSelectedTipResistance();
+  if (user_selected_tip == 0) {
+    return lastTipResistance; // Auto mode
+  }
+  return user_selected_tip;
+
 #else
-  return TIP_RESISTANCE;
+  uint8_t user_selected_tip = getUserSelectedTipResistance();
+  if (user_selected_tip == 0) {
+    return TIP_RESISTANCE; // Auto mode
+  }
+  return user_selected_tip;
 #endif
 }
 #ifdef TIP_RESISTANCE_SENSE_Pin

source/Core/BSP/Miniware/configuration.h

@@ -1,6 +1,5 @@
 #ifndef CONFIGURATION_H_
 #define CONFIGURATION_H_
-#include "Settings.h"
 #include <stdint.h>
 /**
  * Configuration.h
@@ -182,6 +181,7 @@
 #define I2C_SOFT_BUS_1 1
 #define OLED_I2CBB1    1
 #define ACCEL_I2CBB1   1
+#define TIPTYPE_T12    1 // Can manually pick a T12 tip
 
 #define TEMP_TMP36
 #endif /* TS100 */
@@ -214,6 +214,8 @@
 #define TEMP_NTC             1
 #define ACCEL_I2CBB1         1
 #define POW_EPR              1
+#define AUTO_TIP_SELECTION   1 // Can auto-select the tip
+#define TIPTYPE_T12          1 // Can manually pick a T12 tip
 #define HAS_POWER_DEBUG_MENU
 #define DEBUG_POWER_MENU_BUTTON_B
 
@@ -231,6 +233,8 @@
 #define I2C_SOFT_BUS_2   1
 #define LIS_ORI_FLIP
 #define OLED_FLIP
+#define TIPTYPE_TS80 1 // Only one tip type so far
+
 #endif /* TS80(P) */
 
 #ifdef MODEL_TS80