From be414d36e3cc05b34955010c657f0a86dd2d979a Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Thu, 11 Oct 2018 14:59:23 +1100 Subject: [PATCH] Fix QC3 for Ts80 vDiv --- workspace/TS100/src/hardware.c | 4 ++-- workspace/TS100/src/main.cpp | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/workspace/TS100/src/hardware.c b/workspace/TS100/src/hardware.c index d88566ea..db5a2532 100644 --- a/workspace/TS100/src/hardware.c +++ b/workspace/TS100/src/hardware.c @@ -177,7 +177,7 @@ void seekQC(int16_t Vx10) { // try and step towards the wanted value // 1. Measure current voltage - int16_t vStart = getInputVoltageX10(195); + int16_t vStart = getInputVoltageX10(780); int difference = Vx10 - vStart; // 2. calculate ideal steps (0.2V changes) @@ -242,7 +242,7 @@ void seekQC(int16_t Vx10) { void startQC() { // 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(205); + uint16_t vin = getInputVoltageX10(780); if (vin > 150) return;// Over voltage if (vin > 100) { diff --git a/workspace/TS100/src/main.cpp b/workspace/TS100/src/main.cpp index ac8a2033..475707ba 100644 --- a/workspace/TS100/src/main.cpp +++ b/workspace/TS100/src/main.cpp @@ -639,7 +639,13 @@ static void gui_solderingMode(uint8_t jumpToSleep) { static const char *HEADERS[] = { __DATE__, "Heap: ", "HWMG: ", "HWMP: ", "HWMM: ", "Time: ", "Move: ", "RTip: ", - "CTip: ", "Vin :", "THan: ", "Model: " }; + "CTip: ", "Vin :", "THan: ", "Model: ", +#ifdef MODEL_TS80 + "QCV: ", +#else + "Ralim-", +#endif + }; void showVersion(void) { uint8_t screen = 0; @@ -688,6 +694,13 @@ void showVersion(void) { case 11: OLED::printNumber(PCBVersion, 1); // Print PCB ID number break; + case 12: +#ifdef MODEL_TS80 + OLED::printNumber(idealQCVoltage,3); +#else + OLED::print("Tek.com") + #endif + break; default: break; } @@ -698,7 +711,7 @@ void showVersion(void) { return; else if (b == BUTTON_F_SHORT) { screen++; - screen = screen % 12; + screen = screen % 13; } GUIDelay(); }