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

Hold PD negotiation until detection is done for tip res

Browse Source
This commit is contained in:
Ben V. Brown
2022-07-01 20:01:59 +10:00
parent 1b43f71a2e
commit 0d248a601b
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/Core/BSP/Magic/BSP.cpp
View File

@@ -226,7 +226,7 @@ void setStatusLED(const enum StatusLED state) {
// Dont have one
}
uint8_t lastTipResistance = 85; // default safe
uint8_t lastTipResistance = 0; // default to unknown
uint32_t lastTipReadinguV = 0;
uint8_t getTipResitanceX10() {
// Return tip resistance in x10 ohms
@@ -269,8 +269,7 @@ void FinishMeasureTipResistance() {
}
lastTipResistance = newRes;
}
volatile bool tipMeasurementOccuring = false;
volatile uint8_t tipSenseResistancex10Ohms = 0;
volatile bool tipMeasurementOccuring = false;
void performTipMeasurementStep(bool start) {
static TickType_t lastMeas = 0;
@@ -280,14 +279,14 @@ void performTipMeasurementStep(bool start) {
// We want to perform our startup measurements of the tip resistance until we detect one fitted
// Step 1; if not setup, we turn on pullup and then wait
if (tipMeasurementOccuring == false && (start || tipSenseResistancex10Ohms == 0 || lastMeas == 0)) {
if (tipMeasurementOccuring == false && (start || lastTipResistance == 0 || lastMeas == 0)) {
// Block starting if tip removed
if (isTipDisconnected()) {
return;
}
tipMeasurementOccuring = true;
tipSenseResistancex10Ohms = 0;
lastMeas = xTaskGetTickCount();
tipMeasurementOccuring = true;
lastTipResistance = 0;
lastMeas = xTaskGetTickCount();
startMeasureTipResistance();
return;
}
@@ -308,6 +307,7 @@ uint8_t preStartChecks() {
performTipMeasurementStep(false);
return tipMeasurementOccuring ? 1 : 0;
}
uint8_t preStartChecksDone() { return (lastTipResistance == 0 || tipMeasurementOccuring) ? 0 : 1; }
// Return hardware unique ID if possible
uint64_t getDeviceID() {