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

Fix: Ts80 Divisor links

Browse Source
This commit is contained in:
Ben V. Brown
2018-10-18 14:20:27 +11:00
parent 60a951f56f
commit d442a1d185
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workspace/TS100/src/hardware.c
View File

@@ -169,19 +169,21 @@ uint16_t getInputVoltageX10(uint16_t divisor) {
#ifdef MODEL_TS80
uint8_t QCMode = 0;
uint8_t QCTries = 0;
void seekQC(int16_t Vx10) {
void seekQC(int16_t Vx10,uint16_t divisor) {
if (QCMode == 5)
startQC();
startQC(divisor);
if (QCMode == 0)
return; // NOT connected to a QC Charger
if (Vx10 < 50)
return;
if(Vx10>130)
Vx10=130;//Cap max value at 13V
// Seek the QC to the Voltage given if this adapter supports continuous mode
// try and step towards the wanted value
// 1. Measure current voltage
int16_t vStart = getInputVoltageX10(780);
int16_t vStart = getInputVoltageX10(divisor);
int difference = Vx10 - vStart;
// 2. calculate ideal steps (0.2V changes)
@@ -243,10 +245,10 @@ void seekQC(int16_t Vx10) {
}
// Must be called after FreeRToS Starts
void startQC() {
void startQC(uint16_t divisor) {
// Pre check that the input could be >5V already, and if so, dont both
// negotiating as someone is feeding in hv
uint16_t vin = getInputVoltageX10(780);
uint16_t vin = getInputVoltageX10(divisor);
if (vin > 150)
return; // Over voltage
if (vin > 100) {
@@ -308,7 +310,7 @@ void startQC() {
// Wait for frontend ADC to stabilise
QCMode = 4;
for (uint8_t i = 0; i < 10; i++) {
if (getInputVoltageX10(195) > 80) {
if (getInputVoltageX10(divisor) > 80) {
// yay we have at least QC2.0 or QC3.0
QCMode = 3; // We have at least QC2, pray for 3
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET);

8
workspace/TS100/src/main.cpp
View File

@@ -787,7 +787,7 @@ void startGUITask(void const *argument __unused) {
if (idealQCVoltage < 90)
idealQCVoltage = calculateMaxVoltage(1,
systemSettings.cutoutSetting); // 1 means use filtered values rather than do its own
seekQC(idealQCVoltage);
seekQC(idealQCVoltage,systemSettings.voltageDiv);
#endif
gui_solderingMode(0); // enter soldering mode
buttonLockout = true;
@@ -1011,11 +1011,11 @@ void startMOVTask(void const *argument __unused) {
OLED::setRotation(false);
#ifdef MODEL_TS80
startQC();
startQC(systemSettings.voltageDiv);
while (idealQCVoltage == 0)
osDelay(20); // To ensure we return after idealQCVoltage is setup
seekQC(idealQCVoltage); // this will move the QC output to the preferred voltage to start with
seekQC(idealQCVoltage,systemSettings.voltageDiv); // this will move the QC output to the preferred voltage to start with
#else
osDelay(250); // wait for accelerometer to stabilize
@@ -1102,7 +1102,7 @@ void startMOVTask(void const *argument __unused) {
osDelay(100); // Slow down update rate
#ifdef MODEL_TS80
if (currentlyActiveTemperatureTarget) {
seekQC(idealQCVoltage); // Run the QC seek again to try and compensate for cable V drop
seekQC(idealQCVoltage,systemSettings.voltageDiv); // Run the QC seek again to try and compensate for cable V drop
}
#endif
}