Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

USBPDDebug: Check whether VPDO is EPR or PPS #1600

Merged
merged 11 commits into from
Apr 1, 2023
Merged

USBPDDebug: Check whether VPDO is EPR or PPS #1600

Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d38d18b
Merge pull request #1 from Ralim/dev
Samuelrmlink Feb 19, 2023
e6b0e5b
Merge pull request #2 from Samuelrmlink/PPSctrl
Samuelrmlink Feb 20, 2023
6bf3488
Merge pull request #3 from Ralim/dev
Samuelrmlink Feb 20, 2023
d692cd4
Merge pull request #4 from Ralim/dev
Samuelrmlink Feb 27, 2023
925800d
USBPDDebug: Check whether VPDO is EPR or PPS.
Samuelrmlink Feb 27, 2023
9a16eb8
USBPDDebug - Allow trailing zeros after a decimal point.
Samuelrmlink Mar 6, 2023
1513d88
Merge branch 'dev' into dev
discip Mar 11, 2023
e7b2b92
Merge branch 'dev' into dev
discip Mar 13, 2023
40651f8
Merge branch 'dev' into dev
discip Mar 14, 2023
4f53c15
Merge branch 'dev' into dev
discip Mar 14, 2023
175d34a
Merge branch 'dev' into dev
discip Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions source/Core/Threads/OperatingModes/USBPDDebug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ void showPDDebug(void) {
if ((lastCaps[screen - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_FIXED) {
voltage_mv = PD_PDV2MV(PD_PDO_SRC_FIXED_VOLTAGE_GET(lastCaps[screen - 1])); // voltage in mV units
current_a_x100 = PD_PDO_SRC_FIXED_CURRENT_GET(lastCaps[screen - 1]); // current in 10mA units
} else if ((lastCaps[screen - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED) {
} else if (((lastCaps[screen - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED) && ((lastCaps[screen - 1] & PD_APDO_TYPE) == PD_APDO_TYPE_AVS)) {
voltage_mv = PD_PAV2MV(PD_APDO_AVS_MAX_VOLTAGE_GET(lastCaps[screen - 1]));
min_voltage = PD_PAV2MV(PD_APDO_PPS_MIN_VOLTAGE_GET(lastCaps[screen - 1]));
// Last value is wattage
wattage = PD_APDO_AVS_MAX_POWER_GET(lastCaps[screen - 1]);
} else {
} else if (((lastCaps[screen - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED) && ((lastCaps[screen - 1] & PD_APDO_TYPE) == PD_APDO_TYPE_PPS)) {
voltage_mv = PD_PAV2MV(PD_APDO_PPS_MAX_VOLTAGE_GET(lastCaps[screen - 1]));
min_voltage = PD_PAV2MV(PD_APDO_PPS_MIN_VOLTAGE_GET(lastCaps[screen - 1]));
current_a_x100 = PD_PAI2CA(PD_APDO_PPS_CURRENT_GET(lastCaps[screen - 1])); // max current in 10mA units
Expand Down Expand Up @@ -90,4 +90,4 @@ void showPDDebug(void) {
}
}
#endif
#endif
#endif