Cleanup QC Names

workspace/TS100/Core/BSP/BSP_QC.h

@@ -7,7 +7,7 @@
 
 #ifndef BSP_BSP_QC_H_
 #define BSP_BSP_QC_H_
-
+#include "stdint.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -15,13 +15,13 @@ extern "C" {
 // Init GPIO for QC neg
 void QC_Init_GPIO();
 // Set the DP pin to 0.6V
-void DPlusZero_Six();
+void QC_DPlusZero_Six();
 // Set the DM pin to 0.6V
-void DNegZero_Six();
+void QC_DNegZero_Six();
 // Set the DP pin to 3.3V
-void DPlusThree_Three();
+void QC_DPlusThree_Three();
 // Set the DM pin to 3.3V
-void DNegThree_Three();
+void QC_DNegThree_Three();
 // Turn on weak pulldown on the DM pin
 // This is used as a helper for some power banks
 void QC_DM_PullDown();

workspace/TS100/Core/BSP/Miniware/QC_GPIO.c

@@ -7,17 +7,17 @@
 #include "BSP.h"
 #include "Pins.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+
 }
-void DNegZero_Six() {
+void QC_DNegZero_Six() {
     HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
     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+
 }
-void DNegThree_Three() {
+void QC_DNegThree_Three() {
     HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
     HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_SET);
 }
@@ -36,7 +36,6 @@ void QC_DM_No_PullDown() {
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Pin = GPIO_PIN_11;
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
 }
 void QC_Init_GPIO() {
     // Setup any GPIO into the right states for QC
@@ -63,6 +62,4 @@ void QC_Post_Probe_En() {
     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;
-}

workspace/TS100/Core/Src/QC3.c

@@ -7,25 +7,26 @@
 
 // Quick charge 3.0 supporting functions
 #include "QC3.h"
-#include "stdint.h"
+
 #include "BSP.h"
 #include "cmsis_os.h"
+#include "stdint.h"
 
 void QC_Seek9V() {
-	DNegZero_Six();
+    QC_DNegZero_Six();
-	DPlusThree_Three();
+    QC_DPlusThree_Three();
 }
 void QC_Seek12V() {
-	DNegZero_Six();
+    QC_DNegZero_Six();
-	DPlusZero_Six();
+    QC_DPlusZero_Six();
 }
 void QC_Seek20V() {
-	DNegThree_Three();
+    QC_DNegThree_Three();
-	DPlusThree_Three();
+    QC_DPlusThree_Three();
 }
 void QC_SeekContMode() {
-	DNegThree_Three();
+    QC_DNegThree_Three();
-	DPlusZero_Six();
+    QC_DPlusZero_Six();
 }
 void QC_SeekContPlus() {
     QC_SeekContMode();
@@ -44,17 +45,12 @@ void QC_SeekContNeg() {
 uint8_t QCMode = 0;
 uint8_t QCTries = 0;
 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;
-	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
 
@@ -66,8 +62,7 @@ void seekQC(int16_t Vx10, uint16_t divisor) {
 
     int steps = difference / 2;
     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) {
             QC_SeekContNeg();
             vTaskDelay(3);
@@ -84,8 +79,7 @@ void seekQC(int16_t Vx10, uint16_t divisor) {
     // Re-measure
     /* Disabled due to nothing to test and code space of around 1k*/
     steps = vStart - getInputVoltageX10(divisor, 1);
-	if (steps < 0)
+    if (steps < 0) steps = -steps;
-		steps = -steps;
     if (steps > 4) {
         // No continuous mode, so QC2
         QCMode = 2;
@@ -119,7 +113,7 @@ void startQC(uint16_t divisor) {
     // 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
     // D-
-	DPlusZero_Six();
+    QC_DPlusZero_Six();
 
     // Delay 1.25 seconds
     uint8_t enteredQC = 0;
@@ -159,7 +153,5 @@ void startQC(uint16_t divisor) {
         // no QC
         QCMode = 0;
     }
-	if (QCTries > 10)
+    if (QCTries > 10) QCMode = 0;
-		QCMode = 0;
 }
-