me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
discip
2024-11-08 00:09:04 +01:00
committed by GitHub
parent b036da9dcc a0a779faba
commit 35fd2f545f
61 changed files with 1178 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/Core/BSP/Sequre/BSP.cpp
View File

@@ -6,6 +6,7 @@
#include "HUB238.hpp"
#include "I2C_Wrapper.hpp"
#include "Pins.h"
#include "Settings.h"
#include "Setup.h"
#include "TipThermoModel.h"
#include "configuration.h"
@@ -192,7 +193,11 @@ uint8_t getTipResistanceX10() {
return TIP_RESISTANCE + ((TIP_RESISTANCE * scaler) / 100000);
#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
}
bool isTipShorted() { return false; }
@@ -207,4 +212,4 @@ void showBootLogo(void) { BootLogo::handleShowingLogo((uint8_t *)FLASH_LOGOADDR)
#ifdef CUSTOM_MAX_TEMP_C
TemperatureType_t getCustomTipMaxInC() { return MAX_TEMP_C; }
#endif
#endif