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

USB PD timeout added

Browse Source
This commit is contained in:
Varga Zsolt
2021-06-06 18:45:00 +02:00
parent 9ed1c1fc04
commit 81de60e1e4
36 changed files with 252 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Translations/translation_BG.json
View File

@@ -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": [
"Лимит на",

7
Translations/translation_CS.json
View File

@@ -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í",

7
Translations/translation_DA.json
View File

@@ -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",

7
Translations/translation_DE.json
View File

@@ -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-",

7
Translations/translation_EN.json
View File

@@ -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",

7
Translations/translation_ES.json
View File

@@ -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",

7
Translations/translation_FI.json
View File

@@ -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-",

7
Translations/translation_FR.json
View File

@@ -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",

7
Translations/translation_HR.json
View File

@@ -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",

7
Translations/translation_HU.json
View File

@@ -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",

7
Translations/translation_IT.json
View File

@@ -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",

7
Translations/translation_JA_JP.json
View File

@@ -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=ワット>"

7
Translations/translation_LT.json
View File

@@ -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",

7
Translations/translation_NL.json
View File

@@ -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",

7
Translations/translation_NL_BE.json
View File

@@ -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",

7
Translations/translation_NO.json
View File

@@ -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",

7
Translations/translation_PL.json
View File

@@ -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.",

7
Translations/translation_PT.json
View File

@@ -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",

7
Translations/translation_RU.json
View File

@@ -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": [
"Предел",

7
Translations/translation_SK.json
View File

@@ -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",

7
Translations/translation_SL.json
View File

@@ -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",

7
Translations/translation_SR_CYRL.json
View File

@@ -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",

7
Translations/translation_SR_LATN.json
View File

@@ -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",

7
Translations/translation_SV.json
View File

@@ -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-",

7
Translations/translation_TR.json
View File

@@ -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üç",

7
Translations/translation_UK.json
View File

@@ -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": [
"Макс.",

7
Translations/translation_YUE_HK.json
View File

@@ -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（火）>"

7
Translations/translation_ZH_CN.json
View File

@@ -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（瓦特）>"

7
Translations/translation_ZH_TW.json
View File

@@ -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（瓦特）>"

6
Translations/translations_def.js
View File

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

14
source/Core/Drivers/FUSB302/policy_engine.cpp
View File

@@ -21,6 +21,8 @@
#include "int_n.h"
#include <pd.h>
#include <stdbool.h>
#include "Settings.h"
bool PolicyEngine::pdNegotiationComplete;
int PolicyEngine::current_voltage_mv;
int PolicyEngine::_requested_voltage;
@@ -617,6 +619,18 @@ void PolicyEngine::PPSTimerCallback() {
}
}
bool PolicyEngine::NegotiationTimeoutReached() {
if (systemSettings.PDNegTimeout == 0){
return false;
}
if (xTaskGetTickCount() > (TICKS_SECOND/10 * systemSettings.PDNegTimeout)) {
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 */

8
source/Core/Drivers/FUSB302/policy_engine.h
View File

@@ -36,6 +36,8 @@ public:
static bool setupCompleteOrTimedOut() {
if (pdNegotiationComplete)
return true;
if (PolicyEngine::NegotiationTimeoutReached())
return true;
if (state == policy_engine_state::PESinkSourceUnresponsive)
return true;
if (state == policy_engine_state::PESinkReady)
@@ -46,11 +48,17 @@ public:
static bool pdHasNegotiated() {
if (state == policy_engine_state::PESinkSourceUnresponsive)
return false;
if (pdNegotiationComplete)
return true;
if (PolicyEngine::NegotiationTimeoutReached())
return false;
return true;
}
// Call this periodically, at least once every second
static void PPSTimerCallback();
static bool NegotiationTimeoutReached();
enum class Notifications {
PDB_EVT_PE_RESET = EVENT_MASK(0),
PDB_EVT_PE_MSG_RX = EVENT_MASK(1),

1
source/Core/Inc/Settings.h
View File

@@ -27,6 +27,7 @@ typedef struct {
uint8_t minDCVoltageCells; // The voltage we cut out at for under voltage when powered by DC jack
uint8_t minVoltageCells; // Minimum allowed voltage per cell <3S - 3.0V (30)> <4S - 2.4V (24)> <...> (Minimum recommended 2.7V)
uint8_t QCIdealVoltage; // Desired QC3.0 voltage (9,12,20V)
uint8_t PDNegTimeout; // PD timeout in 100ms steps
uint8_t OrientationMode : 2; // Selects between Auto,Right and left handed layouts
uint8_t sensitivity : 4; // Sensitivity of accelerometer (5 bits)
uint8_t animationLoop : 1; // Animation loop switch

1
source/Core/Inc/Translation.h
View File

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

1
source/Core/Src/Settings.cpp
View File

@@ -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)

18
source/Core/Src/gui.cpp
View File

@@ -27,6 +27,9 @@ static bool settings_setQCInputV(void);
static bool settings_displayQCInputV(void);
#endif
static bool settings_setPDNegTimeout(void);
static bool settings_displayPDNegTimeout(void);
#ifndef NO_SLEEP_MODE
static bool settings_setSleepTemp(void);
static bool settings_displaySleepTemp(void);
@@ -174,6 +177,7 @@ const menuitem powerMenu[] = {
#ifdef POW_QC
{SETTINGS_DESC(SettingsItemIndex::QCMaxVoltage), settings_setQCInputV, settings_displayQCInputV}, /*Voltage input*/
#endif
{SETTINGS_DESC(SettingsItemIndex::PDNegTimeout), settings_setPDNegTimeout, settings_displayPDNegTimeout}, /*PD timeout setup*/
{0, nullptr, nullptr} // end of menu marker. DO NOT REMOVE
};
#endif
@@ -350,6 +354,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 +387,19 @@ static bool settings_displayQCInputV(void) {
#endif
static bool settings_setPDNegTimeout(void) {
systemSettings.PDNegTimeout = (systemSettings.PDNegTimeout + 1) % 50;
return systemSettings.QCIdealVoltage == 49;
}
static bool settings_displayPDNegTimeout(void){
printShortDescription(SettingsItemIndex::PDNegTimeout, 5);
OLED::printNumber(systemSettings.PDNegTimeout, 2, FontStyle::LARGE);
return systemSettings.QCIdealVoltage == 49;
}
#ifndef NO_SLEEP_MODE
static bool settings_setSleepTemp(void) {
// If in C, 10 deg, if in F 20 deg