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

Update QC detection to not false assume we have pd on open circuit

Browse Source
This commit is contained in:
Ben V. Brown
2020-12-17 21:08:47 +11:00
parent 3a4057e0aa
commit 831b3bbf29
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
workspace/TS100/Core/Src/QC3.cpp
View File

@@ -11,7 +11,13 @@
#include "BSP.h" #include "BSP.h"
#include "cmsis_os.h" #include "cmsis_os.h"
#include "stdint.h" #include "stdint.h"
enum QCState {
NOT_STARTED = 0, // Have not checked
QC_3 = 1,
QC_2 = 2,
NO_QC = 3,
};
void QC_Seek9V() { void QC_Seek9V() {
QC_DNegZero_Six(); QC_DNegZero_Six();
QC_DPlusThree_Three(); QC_DPlusThree_Three();
@@ -42,10 +48,10 @@ void QC_SeekContNeg() {
osDelay(10); osDelay(10);
QC_SeekContMode(); QC_SeekContMode();
} }
uint8_t QCMode = 0; QCState QCMode = QCState::NOT_STARTED;
uint8_t QCTries = 0; uint8_t QCTries = 0;
void seekQC(int16_t Vx10, uint16_t divisor) { void seekQC(int16_t Vx10, uint16_t divisor) {
if (QCMode == 0) if (QCMode == QCState::NOT_STARTED)
startQC(divisor); startQC(divisor);
if (Vx10 < 45) if (Vx10 < 45)
@@ -112,10 +118,16 @@ void seekQC(int16_t Vx10, uint16_t divisor) {
void startQC(uint16_t divisor) { void startQC(uint16_t divisor) {
// Pre check that the input could be >5V already, and if so, dont both // Pre check that the input could be >5V already, and if so, dont both
// negotiating as someone is feeding in hv // negotiating as someone is feeding in hv
QCMode=0; if (getInputVoltageX10(divisor, 1) > 85) {
if (QCTries > 10) { QCTries = 11;
QCMode = QCState::NO_QC;
return; return;
} }
if (QCTries > 10) {
QCMode = QCState::NO_QC;
return;
}
QCMode = QCState::NOT_STARTED;
QC_Init_GPIO(); QC_Init_GPIO();
// Tries to negotiate QC for 9V // Tries to negotiate QC for 9V
@@ -146,25 +158,26 @@ void startQC(uint16_t divisor) {
QC_Post_Probe_En(); QC_Post_Probe_En();
QC_Seek9V(); QC_Seek9V();
// Wait for frontend ADC to stabilise // Wait for frontend ADC to stabilise
QCMode = 4; QCMode = QCState::QC_2;
for (uint8_t i = 0; i < 10; i++) { for (uint8_t i = 0; i < 10; i++) {
if (getInputVoltageX10(divisor, 1) > 80) { if (getInputVoltageX10(divisor, 1) > 80) {
// yay we have at least QC2.0 or QC3.0 // yay we have at least QC2.0 or QC3.0
QCMode = 3; // We have at least QC2, pray for 3 QCMode = QCState::QC_3; // We have at least QC2, pray for 3
return; return;
} }
osDelay(100); // 100mS osDelay(100); // 100mS
} }
QCMode = 0; QCMode = QCState::NOT_STARTED;
QCTries++; QCTries++;
} else { } else {
// no QC // no QC
QCMode = 0; QCTries++;
QCMode = QCState::NO_QC;
} }
} }
bool hasQCNegotiated() { bool hasQCNegotiated() {
return QCMode > 0; return QCMode != QCState::NO_QC;
} }