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 24d7742df2 into 05158321ba

Browse Source
This commit is contained in:
Tomás Rojas C
2025-02-24 15:41:09 -05:00
committed by GitHub
parent 05158321ba 24d7742df2
commit bccead5d0b
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/Core/BSP/MHP30/configuration.h
View File

@@ -165,6 +165,14 @@
#define ACCEL_EXITS_ON_MOVEMENT #define ACCEL_EXITS_ON_MOVEMENT
#define NEEDS_VBUS_PROBE 0 #define NEEDS_VBUS_PROBE 0
#define CANT_DIRECT_READ_SETTINGS // We cant memcpy settings due to flash cache
#define TIP_CONTROL_PID // We use PID rather than integrator
#define TIP_PID_KP 22 //40 // Reasonable compromise for most tips so far
#define TIP_PID_KI 300 //6 // About as high for stability across tips
#define TIP_PID_KD 600 //200 // Helps dampen smaller tips; ~= nothing for larger tips
#define FILTER_DISPLAYED_TIP_TEMP 8 // Filtering for GUI display
#define HARDWARE_MAX_WATTAGE_X10 650 #define HARDWARE_MAX_WATTAGE_X10 650
#define TIP_THERMAL_MASS 65 // TODO, needs refinement #define TIP_THERMAL_MASS 65 // TODO, needs refinement
#define TIP_RESISTANCE 60 // x10 ohms, ~6 typical #define TIP_RESISTANCE 60 // x10 ohms, ~6 typical

6
source/Core/BSP/MHP30/stm32f1xx_hal_msp.c
View File

@@ -57,16 +57,16 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc) {
PB1 ------> ADC2_IN9 PB1 ------> ADC2_IN9
*/ */
GPIO_InitStruct.Pin = TIP_TEMP_Pin; GPIO_InitStruct.Pin = TIP_TEMP_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
HAL_GPIO_Init(TIP_TEMP_GPIO_Port, &GPIO_InitStruct); HAL_GPIO_Init(TIP_TEMP_GPIO_Port, &GPIO_InitStruct);
GPIO_InitStruct.Pin = TMP36_INPUT_Pin; GPIO_InitStruct.Pin = TMP36_INPUT_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
HAL_GPIO_Init(TMP36_INPUT_GPIO_Port, &GPIO_InitStruct); HAL_GPIO_Init(TMP36_INPUT_GPIO_Port, &GPIO_InitStruct);
GPIO_InitStruct.Pin = VIN_Pin; GPIO_InitStruct.Pin = VIN_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
HAL_GPIO_Init(VIN_GPIO_Port, &GPIO_InitStruct); HAL_GPIO_Init(VIN_GPIO_Port, &GPIO_InitStruct);
GPIO_InitStruct.Pin = PLATE_SENSOR_Pin; GPIO_InitStruct.Pin = PLATE_SENSOR_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
HAL_GPIO_Init(PLATE_SENSOR_GPIO_Port, &GPIO_InitStruct); HAL_GPIO_Init(PLATE_SENSOR_GPIO_Port, &GPIO_InitStruct);
/* ADC2 interrupt Init */ /* ADC2 interrupt Init */

12
source/Core/Threads/UI/logic/Soldering.cpp
View File

@@ -161,11 +161,11 @@ OperatingMode gui_solderingMode(const ButtonState buttons, guiContext *cxt) {
return OperatingMode::Sleeping; return OperatingMode::Sleeping;
} }
if (heaterThermalRunaway) { // if (heaterThermalRunaway) {
currentTempTargetDegC = 0; // heater control off // currentTempTargetDegC = 0; // heater control off
heaterThermalRunaway = false; // heaterThermalRunaway = false;
cxt->transitionMode = TransitionAnimation::Right; // cxt->transitionMode = TransitionAnimation::Right;
return OperatingMode::ThermalRunaway; // return OperatingMode::ThermalRunaway;
} // }
return handleSolderingButtons(buttons, cxt); return handleSolderingButtons(buttons, cxt);
} }