Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TS100 warning fix (#1192) #1206

Merged
merged 4 commits into from
Feb 5, 2022
Merged

TS100 warning fix (#1192) #1206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c38dfb6
Dont wrap negative deltas
Ralim Feb 4, 2022
a461577
Update PIDThread.cpp
Ralim Feb 4, 2022
4f38236
Bugfix: Only change speed of pwm at end of cycle interrupt
Ralim Feb 4, 2022
89070e1
Merge branch 'master' into ts100-runaway
Ralim Feb 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions source/Core/BSP/Miniware/BSP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ static const uint8_t tempMeasureTicks = 14;
uint16_t totalPWM; // htim2.Init.Period, the full PWM cycle

static bool fastPWM;
static bool infastPWM;

void resetWatchdog() { HAL_IWDG_Refresh(&hiwdg); }
#ifdef TEMP_NTC
Expand Down Expand Up @@ -135,7 +136,7 @@ uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {

static void switchToFastPWM(void) {
// 10Hz
fastPWM = true;
infastPWM = true;
totalPWM = powerPWM + tempMeasureTicks + holdoffTicks;
htim2.Instance->ARR = totalPWM;
htim2.Instance->CCR1 = powerPWM + holdoffTicks;
Expand All @@ -144,24 +145,18 @@ static void switchToFastPWM(void) {

static void switchToSlowPWM(void) {
// 5Hz
fastPWM = false;
infastPWM = false;
totalPWM = powerPWM + tempMeasureTicks / 2 + holdoffTicks / 2;
htim2.Instance->ARR = totalPWM;
htim2.Instance->CCR1 = powerPWM + holdoffTicks / 2;
htim2.Instance->PSC = 2690 * 2;
}

void setTipPWM(const uint8_t pulse, const bool shouldUseFastModePWM) {
PWMSafetyTimer = 10; // This is decremented in the handler for PWM so that the tip pwm is
PWMSafetyTimer = 20; // This is decremented in the handler for PWM so that the tip pwm is
// disabled if the PID task is not scheduled often enough.
fastPWM = shouldUseFastModePWM;
pendingPWM = pulse;
if (fastPWM != shouldUseFastModePWM) {
if (shouldUseFastModePWM) {
switchToFastPWM();
} else {
switchToSlowPWM();
}
}
}
// These are called by the HAL after the corresponding events from the system
// timers.
Expand All @@ -182,6 +177,14 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
} else {
HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_1);
}
if (fastPWM != infastPWM) {
if (fastPWM) {
switchToFastPWM();
} else {
switchToSlowPWM();
}
}

} else if (htim->Instance == TIM1) {
// STM uses this for internal functions as a counter for timeouts
HAL_IncTick();
Expand Down
2 changes: 1 addition & 1 deletion source/Core/BSP/Miniware/configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
#define DETAILED_IDLE 0 // 0: Disable 1: Enable - Default 0

#define THERMAL_RUNAWAY_TIME_SEC 20
#define THERMAL_RUNAWAY_TEMP_C 20
#define THERMAL_RUNAWAY_TEMP_C 10

#define CUT_OUT_SETTING 0 // default to no cut-off voltage
#define RECOM_VOL_CELL 33 // Minimum voltage per cell (Recommended 3.3V (33))
Expand Down
10 changes: 5 additions & 5 deletions source/Core/Threads/PIDThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void startPIDTask(void const *argument __unused) {
uint32_t PIDTempTarget = 0;
// Pre-seed the adc filters
for (int i = 0; i < 128; i++) {
vTaskDelay(5);
osDelay(5);
TipThermoModel::getTipInC(true);
getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), 1);
}
Expand Down Expand Up @@ -148,12 +148,12 @@ void detectThermalRunaway(const int16_t currentTipTempInC, const int tError) {

// Check for thermal runaway, where it has been x seconds with negligible (y) temp rise
// While trying to actively heat

// If we are more than 20C below the setpoint
if ((tError > THERMAL_RUNAWAY_TEMP_C)) {
// Temp error is high

// If we have heated up by more than 20C since last sample point, snapshot time and tip temp
int16_t delta = (int16_t)currentTipTempInC - (int16_t)tipTempCRunawayTemp;
if (delta < 0) {
delta = -delta;
}
if (delta > THERMAL_RUNAWAY_TEMP_C) {
// We have heated up more than the threshold, reset the timer
tipTempCRunawayTemp = currentTipTempInC;
Expand Down