Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[hal] Fix PDP Energy Calculation (#2672)

Browse Source 
Fixes #2642
This commit is contained in:
sciencewhiz
2020-08-31 00:31:30 -07:00
committed by GitHub
parent 947ff655c5
commit ad6c8b882e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hal/src/main/native/athena/PDP.cpp
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2016-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -438,7 +438,7 @@ double HAL_GetPDPTotalEnergy(HAL_PDPHandle handle, int32_t* status) {
energyJoules *=
pdpStatus.bits
.TmeasMs_likelywillbe20ms_; /* multiplied by TmeasMs = joules */
return 0.125 * raw;
return energyJoules;
}
void HAL_ResetPDPTotalEnergy(HAL_PDPHandle handle, int32_t* status) {