sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Regin the rested voltage to be 9 or 12

Browse Source
This commit is contained in:
Ben V. Brown
2019-12-31 22:44:47 +11:00
parent 7683ad155d
commit d98b1aa76d
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
workspace/TS100/Core/Src/main.cpp
View File

@@ -16,7 +16,7 @@ uint8_t PCBVersion = 0;
// File local variables // File local variables
uint32_t currentTempTargetDegC = 0; // Current temperature target in C uint32_t currentTempTargetDegC = 0; // Current temperature target in C
uint32_t lastMovementTime = 0; uint32_t lastMovementTime = 0;
int16_t idealQCVoltage = 0;
bool settingsWereReset = false; bool settingsWereReset = false;
// FreeRTOS variables // FreeRTOS variables
@@ -112,9 +112,6 @@ void startPIDTask(void const *argument __unused) {
* control PWM. * control PWM.
*/ */
setTipX10Watts(0); // disable the output driver if the output is set to be off setTipX10Watts(0); // disable the output driver if the output is set to be off
#ifdef MODEL_TS80
idealQCVoltage = calculateMaxVoltage(systemSettings.cutoutSetting);
#endif
#ifdef MODEL_TS80 #ifdef MODEL_TS80
//Set power management code to the tip resistance in ohms * 10 //Set power management code to the tip resistance in ohms * 10
@@ -182,12 +179,13 @@ void startPIDTask(void const *argument __unused) {
} }
#ifdef MODEL_TS80 #ifdef MODEL_TS80
//If its a TS80, we want to have the option of using an occasional pulse to keep the power bank on //If its a TS80, we want to have the option of using an occasional pulse to keep the power bank on
if (((xTaskGetTickCount() - lastPowerPulse) > maxPowerIdleTicks) && if (((xTaskGetTickCount() - lastPowerPulse) > maxPowerIdleTicks)
(x10WattsOut < x10PowerPulseWatts)) { && (x10WattsOut < x10PowerPulseWatts)) {
x10WattsOut = x10PowerPulseWatts; x10WattsOut = x10PowerPulseWatts;
} }
if (((xTaskGetTickCount() - lastPowerPulse) > (maxPowerIdleTicks + powerPulseTicks)) && if (((xTaskGetTickCount() - lastPowerPulse)
(x10WattsOut >= x10PowerPulseWatts)) { > (maxPowerIdleTicks + powerPulseTicks))
&& (x10WattsOut >= x10PowerPulseWatts)) {
lastPowerPulse = xTaskGetTickCount(); lastPowerPulse = xTaskGetTickCount();
} }
#endif #endif
@@ -212,7 +210,8 @@ void startMOVTask(void const *argument __unused) {
while (pidTaskNotification == 0) while (pidTaskNotification == 0)
osDelay(30); // To ensure we return after idealQCVoltage/tip resistance osDelay(30); // To ensure we return after idealQCVoltage/tip resistance
seekQC(idealQCVoltage, systemSettings.voltageDiv); // this will move the QC output to the preferred voltage to start with seekQC((systemSettings.cutoutSetting) ? 120 : 90,
systemSettings.voltageDiv); // this will move the QC output to the preferred voltage to start with
#else #else
osDelay(250); // wait for accelerometer to stabilize osDelay(250); // wait for accelerometer to stabilize
@@ -275,9 +274,8 @@ void startMOVTask(void const *argument __unused) {
osDelay(100); // Slow down update rate osDelay(100); // Slow down update rate
#ifdef MODEL_TS80 #ifdef MODEL_TS80
// if (currentlyActiveTemperatureTarget) { seekQC((systemSettings.cutoutSetting) ? 120 : 90,
// seekQC(idealQCVoltage, systemSettings.voltageDiv); // Run the QC seek again to try and compensate for cable V drop systemSettings.voltageDiv); // Run the QC seek again if we have drifted too much
// }
#endif #endif
} }
} }