Merge pull request #994 from VaZso/master

USB PD timeout added as an option for improved QC3 compatibility

Translations/translation_BG.json

@@ -223,6 +223,13 @@
 			],
 			"desc": "Мощност на избраното захранване"
 		},
+                "PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Лимит на",

Translations/translation_CS.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Výkon použítého napájecího adaptéru ve wattech."
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Omezení",

Translations/translation_DA.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Power",

Translations/translation_DE.json

@@ -223,6 +223,13 @@
 			],
 			"desc": "Maximal zulässige Spannung der verwendeten Spannungsversorgung (V=Volt)"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Leistungs-",

Translations/translation_EN.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Max QC voltage the iron should negotiate for"
 		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+		},
 		"PowerLimit": {
 			"text2": [
 				"Power",

Translations/translation_ES.json

@@ -223,6 +223,13 @@
 			],
 			"desc": "Potencia en vatios del adaptador de corriente utilizado."
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Ajustar la",

Translations/translation_FI.json

@@ -221,6 +221,13 @@
 			],
 			"desc": "Ensisijainen maksimi QC jännite"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Tehon-",

Translations/translation_FR.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Tension maximale désirée avec une alimentation QC"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Limite de",

Translations/translation_HR.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Snaga modula za napajanje"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Power",

Translations/translation_HU.json

@@ -225,6 +225,13 @@
 			],
 			"desc": "Maximális USB feszültség (QuickCharge)"
 		},
+                "PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "időtúllépés"
+                        ],
+                        "desc": "PD egyeztetési leidőzítés 100ms lépésekben megadva néhány QC töltővel való kompatibilitás érdekében (0: kikapcsolva)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Teljesítmény",

Translations/translation_IT.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Imposta il massimo voltaggio negoziabile con un alimentatore Quick Charge"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Limite",

Translations/translation_JA_JP.json

@@ -154,6 +154,13 @@
 			"text2": "QC電圧",
 			"desc": "QC電源使用時に要求する目標電圧"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": "電力制限",
 			"desc": "はんだ付てが使用できる最大電力を制限する <W=ワット>"

Translations/translation_LT.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Maksimali QC maitinimo bloko įtampa"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Galios",

Translations/translation_NL.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Wattage van de gebruikte voeding"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Vermogen",

Translations/translation_NL_BE.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Vermogen van de adapter"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Power",

Translations/translation_NO.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Power",

Translations/translation_PL.json

@@ -223,6 +223,13 @@
 			],
 			"desc": "Moc używanego zasilacza w (W)"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Ogr.",

Translations/translation_PT.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Potência da fonte usada (Watt)"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Power",

Translations/translation_RU.json

@@ -223,6 +223,13 @@
 			],
 			"desc": "Мощность используемого источника питания"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Предел",

Translations/translation_SK.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Obmedzenie výkonu podľa použitého zdroja"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Obmedzenie",

Translations/translation_SL.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Moč napajalnega vira v vatih [W]"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Meja",

Translations/translation_SR_CYRL.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Снага напајања у ватима."
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Power",

Translations/translation_SR_LATN.json

@@ -222,6 +222,13 @@
 			],
 			"desc": "Snaga napajanja u vatima."
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Power",

Translations/translation_SV.json

@@ -216,6 +216,13 @@
 			],
 			"desc": "Maximal QC-spänning enheten skall efterfråga"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Max-",

Translations/translation_TR.json

@@ -232,6 +232,13 @@
 			],
 			"desc": "Desired max QC Voltage negotiated for"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerInput": {
 			"text2": [
 				"Güç",

Translations/translation_UK.json

@@ -223,6 +223,13 @@
 			],
 			"desc": "Потужність джерела живлення в Ватах"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": [
 				"Макс.",

Translations/translation_YUE_HK.json

@@ -154,6 +154,13 @@
 			"text2": "QC電壓",
 			"desc": "使用QC電源時請求嘅最高目標電壓"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": "功率限制",
 			"desc": "限制辣雞可用嘅最大功率 <W=watt（火）>"

Translations/translation_ZH_CN.json

@@ -154,6 +154,13 @@
 			"text2": "QC电压",
 			"desc": "使用QC电源时请求的最高目标电压"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": "功率限制",
 			"desc": "限制铬铁可用的最大功率 <W=watt（瓦特）>"

Translations/translation_ZH_TW.json

@@ -154,6 +154,13 @@
 			"text2": "QC電壓",
 			"desc": "使用QC電源時請求的最高目標電壓"
 		},
+		"PDNegTimeout": {
+                        "text2": [
+                                "PD",
+                                "timeout"
+                        ],
+                        "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+                },
 		"PowerLimit": {
 			"text2": "功率限制",
 			"desc": "限制鉻鐵可用的最大功率 <W=watt（瓦特）>"

Translations/translations_def.js

@@ -280,6 +280,12 @@ var def =
 			"maxLen": 8,
 			"maxLen2": 16
 		},
+		{
+			"id": "PDNegTimeout",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+
 		{
 			"id": "PowerLimit",
 			"maxLen": 5,

source/Core/BSP/MHP30/Power.cpp

@@ -16,7 +16,7 @@ void power_check() {
   if (FUSB302_present) {
     PolicyEngine::PPSTimerCallback();
     // Cant start QC until either PD works or fails
-    if (PolicyEngine::setupCompleteOrTimedOut() == false) {
+    if (PolicyEngine::setupCompleteOrTimedOut(systemSettings.PDNegTimeout) == false) {
       return;
     }
     if (PolicyEngine::pdHasNegotiated()) {

source/Core/BSP/Miniware/Power.cpp

@@ -16,7 +16,7 @@ void power_check() {
   if (FUSB302_present) {
     PolicyEngine::PPSTimerCallback();
     // Cant start QC until either PD works or fails
-    if (PolicyEngine::setupCompleteOrTimedOut() == false) {
+    if (PolicyEngine::setupCompleteOrTimedOut(systemSettings.PDNegTimeout) == false) {
       return;
     }
     if (PolicyEngine::pdHasNegotiated()) {

source/Core/BSP/Pine64/Power.cpp

@@ -16,7 +16,7 @@ void power_check() {
   if (FUSB302_present) {
     PolicyEngine::PPSTimerCallback();
     // Cant start QC until either PD works or fails
-    if (PolicyEngine::setupCompleteOrTimedOut() == false) {
+    if (PolicyEngine::setupCompleteOrTimedOut(systemSettings.PDNegTimeout) == false) {
       return;
     }
     if (PolicyEngine::pdHasNegotiated()) {
@@ -43,7 +43,7 @@ uint8_t usb_pd_detect() {
 
 bool getIsPoweredByDCIN() {
   // We return false until we are sure we are not using PD
-  if (PolicyEngine::setupCompleteOrTimedOut() == false) {
+  if (PolicyEngine::setupCompleteOrTimedOut(systemSettings.PDNegTimeout) == false) {
     return false;
   }
   if (PolicyEngine::pdHasNegotiated()) {

source/Core/Drivers/FUSB302/policy_engine.cpp

@@ -21,6 +21,7 @@
 #include "int_n.h"
 #include <pd.h>
 #include <stdbool.h>
+
 bool                              PolicyEngine::pdNegotiationComplete;
 int                               PolicyEngine::current_voltage_mv;
 int                               PolicyEngine::_requested_voltage;
@@ -617,6 +618,19 @@ void PolicyEngine::PPSTimerCallback() {
   }
 }
 
+bool PolicyEngine::NegotiationTimeoutReached(uint8_t timeout) {
+  if (timeout == 0) {
+    return false;
+  }
+
+  if (xTaskGetTickCount() > (TICKS_100MS * timeout)) {
+    state = PESinkSourceUnresponsive;
+    return true;
+  }
+
+  return false;
+}
+
 EventBits_t PolicyEngine::pushMessage(union pd_msg *msg) {
   if (PD_MSGTYPE_GET(msg) == PD_MSGTYPE_SOFT_RESET && PD_NUMOBJ_GET(msg) == 0) {
     /* Clear MessageIDCounter */

source/Core/Drivers/FUSB302/policy_engine.h

@@ -33,9 +33,11 @@ public:
   static void handleMessage(union pd_msg *msg);
   // Returns true if headers indicate PD3.0 compliant
   static bool isPD3_0();
-  static bool setupCompleteOrTimedOut() {
+  static bool setupCompleteOrTimedOut(uint8_t timeout) {
     if (pdNegotiationComplete)
       return true;
+    if (PolicyEngine::NegotiationTimeoutReached(timeout))
+      return true;
     if (state == policy_engine_state::PESinkSourceUnresponsive)
       return true;
     if (state == policy_engine_state::PESinkReady)
@@ -51,6 +53,8 @@ public:
   // Call this periodically, at least once every second
   static void PPSTimerCallback();
 
+  static bool NegotiationTimeoutReached(uint8_t timeout);
+
   enum class Notifications {
     PDB_EVT_PE_RESET          = EVENT_MASK(0),
     PDB_EVT_PE_MSG_RX         = EVENT_MASK(1),

source/Core/Inc/Settings.h

@@ -61,6 +61,8 @@ typedef struct {
   uint8_t  pdMissingWarningCounter;        // Counter of how many times we have warned we cannot detect the pd interface
   char     uiLanguage[8];                  // Selected UI Language code, null-terminated *only if* the length is less than 8 chars
 
+  uint8_t PDNegTimeout; // PD timeout in 100ms steps
+
   uint32_t padding; // This is here for in case we are not an even divisor so
                     // that nothing gets cut off
                     // MUST BE LAST

source/Core/Inc/Translation.h

@@ -45,6 +45,7 @@ enum class SettingsItemIndex : uint8_t {
   AdvancedSoldering,
   ScrollingSpeed,
   QCMaxVoltage,
+  PDNegTimeout,
   PowerLimit,
   ReverseButtonTempChange,
   TempChangeShortStep,

source/Core/Src/Settings.cpp

@@ -57,6 +57,7 @@ void resetSettings() {
   systemSettings.minDCVoltageCells              = CUT_OUT_SETTING;              // default to no cut-off voltage
   systemSettings.minVoltageCells                = RECOM_VOL_CELL;               // Minimum voltage per cell (Recommended 3.3V (33))
   systemSettings.QCIdealVoltage                 = 0;                            // Default to 9V for QC3.0 Voltage
+  systemSettings.PDNegTimeout                   = 0;                            // Default for PD timout to 0
   systemSettings.version                        = SETTINGSVERSION;              // Store the version number to allow for easier upgrades
   systemSettings.detailedSoldering              = DETAILED_SOLDERING;           // Detailed soldering screen
   systemSettings.detailedIDLE                   = DETAILED_IDLE;                // Detailed idle screen (off for first time users)

source/Core/Src/gui.cpp

@@ -26,7 +26,10 @@ static bool settings_displayInputMinVRange(void);
 static bool settings_setQCInputV(void);
 static bool settings_displayQCInputV(void);
 #endif
-
+#ifdef POW_PD
+static bool settings_setPDNegTimeout(void);
+static bool settings_displayPDNegTimeout(void);
+#endif
 #ifndef NO_SLEEP_MODE
 static bool settings_setSleepTemp(void);
 static bool settings_displaySleepTemp(void);
@@ -162,7 +165,7 @@ const menuitem rootSettingsMenu[] {
   } // end of menu marker. DO NOT REMOVE
 };
 
-#if defined(POW_DC) || defined(POW_QC)
+#if defined(POW_DC) || defined(POW_QC) || defined(POW_PD)
 const menuitem powerMenu[] = {
 /*
  * Power Source
@@ -173,6 +176,9 @@ const menuitem powerMenu[] = {
 #endif
 #ifdef POW_QC
     {SETTINGS_DESC(SettingsItemIndex::QCMaxVoltage), settings_setQCInputV, settings_displayQCInputV}, /*Voltage input*/
+#endif
+#ifdef POW_PD
+    {SETTINGS_DESC(SettingsItemIndex::PDNegTimeout), settings_setPDNegTimeout, settings_displayPDNegTimeout}, /*PD timeout setup*/
 #endif
     {0, nullptr, nullptr} // end of menu marker. DO NOT REMOVE
 };
@@ -350,6 +356,7 @@ static bool settings_displayInputMinVRange(void) {
 static bool settings_setQCInputV(void) {
 #ifdef POW_QC_20V
   systemSettings.QCIdealVoltage = (systemSettings.QCIdealVoltage + 1) % 3;
+
   return systemSettings.QCIdealVoltage == 2;
 #else
   systemSettings.QCIdealVoltage = (systemSettings.QCIdealVoltage + 1) % 2;
@@ -382,6 +389,21 @@ static bool settings_displayQCInputV(void) {
 
 #endif
 
+#ifdef POW_PD
+static bool settings_setPDNegTimeout(void) {
+  systemSettings.PDNegTimeout = (systemSettings.PDNegTimeout + 1) % 50;
+
+  return systemSettings.PDNegTimeout == 49;
+}
+
+static bool settings_displayPDNegTimeout(void) {
+  printShortDescription(SettingsItemIndex::PDNegTimeout, 5);
+  OLED::printNumber(systemSettings.PDNegTimeout, 2, FontStyle::LARGE);
+
+  return systemSettings.PDNegTimeout == 49;
+}
+#endif
+
 #ifndef NO_SLEEP_MODE
 static bool settings_setSleepTemp(void) {
   // If in C, 10 deg, if in F 20 deg