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

Cleanup QC Names

Browse Source
This commit is contained in:
Ben V. Brown
2020-05-30 11:46:13 +10:00
parent e422fe28ae
commit 2bcebd473e
3 changed files with 177 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
workspace/TS100/Core/BSP/BSP_QC.h
View File

@@ -7,30 +7,30 @@
#ifndef BSP_BSP_QC_H_ #ifndef BSP_BSP_QC_H_
#define BSP_BSP_QC_H_ #define BSP_BSP_QC_H_
#include "stdint.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
//Init GPIO for QC neg // Init GPIO for QC neg
void QC_Init_GPIO(); void QC_Init_GPIO();
//Set the DP pin to 0.6V // Set the DP pin to 0.6V
void DPlusZero_Six(); void QC_DPlusZero_Six();
//Set the DM pin to 0.6V // Set the DM pin to 0.6V
void DNegZero_Six(); void QC_DNegZero_Six();
//Set the DP pin to 3.3V // Set the DP pin to 3.3V
void DPlusThree_Three(); void QC_DPlusThree_Three();
//Set the DM pin to 3.3V // Set the DM pin to 3.3V
void DNegThree_Three(); void QC_DNegThree_Three();
//Turn on weak pulldown on the DM pin // Turn on weak pulldown on the DM pin
//This is used as a helper for some power banks // This is used as a helper for some power banks
void QC_DM_PullDown(); void QC_DM_PullDown();
//Turn off the pulldown // Turn off the pulldown
void QC_DM_No_PullDown(); void QC_DM_No_PullDown();
//Turn on output drivers that were initally disabled to prevent spike through QC disable mode // Turn on output drivers that were initally disabled to prevent spike through QC disable mode
void QC_Post_Probe_En(); void QC_Post_Probe_En();
//Check if DM was pulled down // Check if DM was pulled down
//1=Pulled down, 0 == pulled high // 1=Pulled down, 0 == pulled high
uint8_t QC_DM_PulledDown(); uint8_t QC_DM_PulledDown();
#ifdef __cplusplus #ifdef __cplusplus
} }

89
workspace/TS100/Core/BSP/Miniware/QC_GPIO.c
View File

@@ -7,62 +7,59 @@
#include "BSP.h" #include "BSP.h"
#include "Pins.h" #include "Pins.h"
#include "stm32f1xx_hal.h" #include "stm32f1xx_hal.h"
void DPlusZero_Six() { void QC_DPlusZero_Six() {
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET); // pull down D+ HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET); // pull down D+
} }
void DNegZero_Six() { void QC_DNegZero_Six() {
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET); HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_RESET); HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_RESET);
} }
void DPlusThree_Three() { void QC_DPlusThree_Three() {
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_SET); // pull up D+ HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_SET); // pull up D+
} }
void DNegThree_Three() { void QC_DNegThree_Three() {
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET); HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_SET); HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_SET);
} }
void QC_DM_PullDown() { void QC_DM_PullDown() {
GPIO_InitTypeDef GPIO_InitStruct; GPIO_InitTypeDef GPIO_InitStruct;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_PULLDOWN; GPIO_InitStruct.Pull = GPIO_PULLDOWN;
GPIO_InitStruct.Pin = GPIO_PIN_11; GPIO_InitStruct.Pin = GPIO_PIN_11;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
} }
void QC_DM_No_PullDown() { void QC_DM_No_PullDown() {
GPIO_InitTypeDef GPIO_InitStruct; GPIO_InitTypeDef GPIO_InitStruct;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Pin = GPIO_PIN_11; GPIO_InitStruct.Pin = GPIO_PIN_11;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
} }
void QC_Init_GPIO() { void QC_Init_GPIO() {
//Setup any GPIO into the right states for QC // Setup any GPIO into the right states for QC
GPIO_InitTypeDef GPIO_InitStruct; GPIO_InitTypeDef GPIO_InitStruct;
GPIO_InitStruct.Pin = GPIO_PIN_3; GPIO_InitStruct.Pin = GPIO_PIN_3;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
GPIO_InitStruct.Mode = GPIO_MODE_INPUT; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_10; GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_10;
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
//Turn off output mode on pins that we can // Turn off output mode on pins that we can
GPIO_InitStruct.Mode = GPIO_MODE_INPUT; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_14 | GPIO_PIN_13; GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_14 | GPIO_PIN_13;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
} }
void QC_Post_Probe_En() { void QC_Post_Probe_En() {
GPIO_InitTypeDef GPIO_InitStruct; GPIO_InitTypeDef GPIO_InitStruct;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_10; GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_10;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
} }
uint8_t QC_DM_PulledDown() { uint8_t QC_DM_PulledDown() { return HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_11) == GPIO_PIN_RESET ? 1 : 0; }
return HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_11) == GPIO_PIN_RESET ? 1 : 0;
}

244
workspace/TS100/Core/Src/QC3.c
View File

@@ -5,161 +5,153 @@
* Author: Ralim * Author: Ralim
*/ */
//Quick charge 3.0 supporting functions // Quick charge 3.0 supporting functions
#include "QC3.h" #include "QC3.h"
#include "stdint.h"
#include "BSP.h" #include "BSP.h"
#include "cmsis_os.h" #include "cmsis_os.h"
#include "stdint.h"
void QC_Seek9V() { void QC_Seek9V() {
DNegZero_Six(); QC_DNegZero_Six();
DPlusThree_Three(); QC_DPlusThree_Three();
} }
void QC_Seek12V() { void QC_Seek12V() {
DNegZero_Six(); QC_DNegZero_Six();
DPlusZero_Six(); QC_DPlusZero_Six();
} }
void QC_Seek20V() { void QC_Seek20V() {
DNegThree_Three(); QC_DNegThree_Three();
DPlusThree_Three(); QC_DPlusThree_Three();
} }
void QC_SeekContMode() { void QC_SeekContMode() {
DNegThree_Three(); QC_DNegThree_Three();
DPlusZero_Six(); QC_DPlusZero_Six();
} }
void QC_SeekContPlus() { void QC_SeekContPlus() {
QC_SeekContMode(); QC_SeekContMode();
vTaskDelay(3); vTaskDelay(3);
QC_Seek20V(); QC_Seek20V();
vTaskDelay(1); vTaskDelay(1);
QC_SeekContMode(); QC_SeekContMode();
} }
void QC_SeekContNeg() { void QC_SeekContNeg() {
QC_SeekContMode(); QC_SeekContMode();
vTaskDelay(3); vTaskDelay(3);
QC_Seek12V(); QC_Seek12V();
vTaskDelay(1); vTaskDelay(1);
QC_SeekContMode(); QC_SeekContMode();
} }
uint8_t QCMode = 0; uint8_t QCMode = 0;
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 == 5) if (QCMode == 5) startQC(divisor);
startQC(divisor); if (QCMode == 0) return; // NOT connected to a QC Charger
if (QCMode == 0)
return; // NOT connected to a QC Charger
if (Vx10 < 45) if (Vx10 < 45) return;
return; if (xTaskGetTickCount() < 100) return;
if (xTaskGetTickCount() < 100) if (Vx10 > 130) Vx10 = 130; // Cap max value at 13V
return; // Seek the QC to the Voltage given if this adapter supports continuous mode
if (Vx10 > 130) // try and step towards the wanted value
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 // 1. Measure current voltage
int16_t vStart = getInputVoltageX10(divisor, 1); int16_t vStart = getInputVoltageX10(divisor, 1);
int difference = Vx10 - vStart; int difference = Vx10 - vStart;
// 2. calculate ideal steps (0.2V changes) // 2. calculate ideal steps (0.2V changes)
int steps = difference / 2; int steps = difference / 2;
if (QCMode == 3) { if (QCMode == 3) {
if (steps > -2 && steps < 2) if (steps > -2 && steps < 2) return; // dont bother with small steps
return; // dont bother with small steps while (steps < 0) {
while (steps < 0) { QC_SeekContNeg();
QC_SeekContNeg(); vTaskDelay(3);
vTaskDelay(3); steps++;
steps++; }
} while (steps > 0) {
while (steps > 0) { QC_SeekContPlus();
QC_SeekContPlus(); vTaskDelay(3);
vTaskDelay(3); steps--;
steps--; }
} vTaskDelay(10);
vTaskDelay(10); }
}
#ifdef ENABLE_QC2 #ifdef ENABLE_QC2
// Re-measure // Re-measure
/* Disabled due to nothing to test and code space of around 1k*/ /* Disabled due to nothing to test and code space of around 1k*/
steps = vStart - getInputVoltageX10(divisor, 1); steps = vStart - getInputVoltageX10(divisor, 1);
if (steps < 0) if (steps < 0) steps = -steps;
steps = -steps; if (steps > 4) {
if (steps > 4) { // No continuous mode, so QC2
// No continuous mode, so QC2 QCMode = 2;
QCMode = 2; // Goto nearest
// Goto nearest if (Vx10 > 110) {
if (Vx10 > 110) { // request 12V
// request 12V // D- = 0.6V, D+ = 0.6V
// D- = 0.6V, D+ = 0.6V // Clamp PB3
// Clamp PB3 QC_Seek12V();
QC_Seek12V();
} else { } else {
// request 9V // request 9V
QC_Seek9V(); QC_Seek9V();
} }
} }
#endif #endif
} }
// Must be called after FreeRToS Starts // Must be called after FreeRToS Starts
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
uint16_t vin = getInputVoltageX10(divisor, 1); uint16_t vin = getInputVoltageX10(divisor, 1);
if (vin > 100) { if (vin > 100) {
QCMode = 1; // Already at 12V, user has probably over-ridden this QCMode = 1; // Already at 12V, user has probably over-ridden this
return; return;
} }
QC_Init_GPIO(); QC_Init_GPIO();
// Tries to negotiate QC for 9V // Tries to negotiate QC for 9V
// This is a multiple step process. // This is a multiple step process.
// 1. Set around 0.6V on D+ for 1.25 Seconds or so // 1. Set around 0.6V on D+ for 1.25 Seconds or so
// 2. After this It should un-short D+->D- and instead add a 20k pulldown on // 2. After this It should un-short D+->D- and instead add a 20k pulldown on
// D- // D-
DPlusZero_Six(); QC_DPlusZero_Six();
// Delay 1.25 seconds // Delay 1.25 seconds
uint8_t enteredQC = 0; uint8_t enteredQC = 0;
for (uint16_t i = 0; i < 200 && enteredQC == 0; i++) { for (uint16_t i = 0; i < 200 && enteredQC == 0; i++) {
vTaskDelay(1); //10mS pause vTaskDelay(1); // 10mS pause
if (i > 130) { if (i > 130) {
if (QC_DM_PulledDown()) { if (QC_DM_PulledDown()) {
enteredQC = 1; enteredQC = 1;
} }
if (i == 140) { if (i == 140) {
//For some marginal QC chargers, we try adding a pulldown // For some marginal QC chargers, we try adding a pulldown
QC_DM_PullDown(); QC_DM_PullDown();
} }
} }
} }
QC_DM_No_PullDown(); QC_DM_No_PullDown();
if (enteredQC) { if (enteredQC) {
// We have a QC capable charger // We have a QC capable charger
QC_Seek9V(); QC_Seek9V();
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 = 4;
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 = 3; // We have at least QC2, pray for 3
return; return;
} }
vTaskDelay(10); // 100mS vTaskDelay(10); // 100mS
} }
QCMode = 5; QCMode = 5;
QCTries++; QCTries++;
if (QCTries > 10) // 10 goes to get it going if (QCTries > 10) // 10 goes to get it going
QCMode = 0; QCMode = 0;
} else { } else {
// no QC // no QC
QCMode = 0; QCMode = 0;
} }
if (QCTries > 10) if (QCTries > 10) QCMode = 0;
QCMode = 0;
} }