Skip to content

Commit

Permalink
TEL-79-Make PIS structure for Battery Tab (#70)
Browse files Browse the repository at this point in the history 
* Refactor code to improve performance and readability

* fixed import statements

* Cross checked all battery values and updated/checked units

* Add ESLint fixes (#73)

* Add ESLint fixes

* Add ESLint fixes

* Fix ESLint check

* Fix ESLInt AGAINgit add .

* AGAIN

* FDFDSFSDF

* FDFDSFSDF

* Refactor code to improve performance and readability

* fixed import statements

* Cross checked all battery values and updated/checked units

---------

Co-authored-by: Ideen <[email protected]>
Co-authored-by: jenniferja <[email protected]>
  • Loading branch information
@alexwhelan12 @ideen1 @JenniferJa
3 people authored Feb 25, 2024
1 parent 33f295f commit eab8f06
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 351 deletions.
355 changes: 5 additions & 350 deletions app/src/renderer/code/components/tabs/BatteryTab.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import PISTransformer from "@/components/transformers/PIStransformer";
import { usePacket } from "@/contexts/PacketContext";
import Battery from "@/objects/PIS/PIS.battery";

function BatteryTab() {
const { currentPacket } = usePacket();
Expand All @@ -8,356 +10,9 @@ function BatteryTab() {
const fakeAuxBMSData = currentPacket.AuxBms;

return (
<>
<div className="flex flex-col space-y-3">
<div className="flex w-full flex-row gap-6">
<div className="basis-1/3">
<div>
<p className="text-s pt-3 font-bold">BMS Relay Status Flags</p>
</div>
<div className="flex gap-x-6">
<div className="basis-1/2">
<p
className={`text-xxs ${
fakeBatteryData["BMSRelayStatusFlags"][
"DischargeRelayEnabled"
]
? "text-black"
: "text-gray"
}`}
>
Discharge Relay Enabled
</p>
<p
className={`text-xxs ${
fakeBatteryData["BMSRelayStatusFlags"]["ChargeRelayEnabled"]
? "text-black"
: "text-gray"
}`}
>
Charge Relay Enabled
</p>
<p
className={`text-xxs ${
fakeBatteryData["BMSRelayStatusFlags"][
"ChargerSafetyEnabled"
]
? "text-black"
: "text-gray"
}`}
>
Charger Safety Enabled
</p>
<p
className={`text-xxs ${
fakeBatteryData["BMSRelayStatusFlags"][
"MultiPurposeInputSignalStatus"
]
? "text-black"
: "text-gray"
}`}
>
Multipurpose Input Signal Status
</p>
</div>
<div className="basis-1/2">
<p
className={`text-xxs ${
fakeBatteryData["BMSRelayStatusFlags"][
"IsReadySignalStatus"
]
? "text-black"
: "text-gray"
}`}
>
Is Ready
</p>
<p
className={`text-xxs ${
fakeBatteryData["BMSRelayStatusFlags"][
"IsChargingSignalStatus"
]
? "text-black"
: "text-gray"
}`}
>
Is Charging
</p>
<p
className={`text-xxs ${
fakeBatteryData["BMSRelayStatusFlags"][
"MalfunctionIndicatorActive"
]
? "text-black"
: "text-gray"
}`}
>
Malfunction Indicator Active
</p>
<p
className={`text-xxs ${
fakeBatteryData["BMSRelayStatusFlags"][
"AlwaysOnSignalStatus"
]
? "text-black"
: "text-gray"
}`}
>
Always On
</p>
</div>
</div>
</div>

<div className="basis-2/3">
<div>
<p className="text-s pt-3 font-bold">Aux BMS</p>
</div>
<div className="flex gap-x-6">
<div className="basis-1/6">
<p
className={`text-xxs ${
fakeAuxBMSData["AuxBmsAlive"] ? "text-black" : "text-gray"
}`}
>
Aux BMS Alive
</p>
<p
className={`text-xxs ${
fakeAuxBMSData["StrobeBmsLight"]
? "text-black"
: "text-gray"
}`}
>
Strobe BMS Light
</p>
<p
className={`text-xxs ${
fakeAuxBMSData["AllowCharge"] ? "text-black" : "text-gray"
}`}
>
Allow Charge
</p>
<p
className={`text-xxs ${
fakeAuxBMSData["CommonContactorError"]
? "text-black"
: "text-gray"
}`}
>
Contactor Error
</p>
</div>
<div className="basis-2/6">
<p
className={`text-xxs ${
fakeAuxBMSData["ChargeTripDueToHighCellVoltage"]
? "text-black"
: "text-gray"
}`}
>
Charge Trip Due To High Cell Voltage
</p>
<p
className={`text-xxs ${
fakeAuxBMSData["ChargeTripDueToHighTemperatureAndCurrent"]
? "text-black"
: "text-gray"
}`}
>
Charge Trip Due To High Temp & Current
</p>
<p
className={`text-xxs ${
fakeAuxBMSData["ChargeTripDueToPackCurrent"]
? "text-black"
: "text-gray"
}`}
>
Charge Trip Due To Pack Current
</p>
<p
className={`text-xxs ${
fakeAuxBMSData["DischargeTripDueToLowCellVoltage"]
? "text-black"
: "text-gray"
}`}
>
Discharge Trip Due To Low Cell Voltage
</p>
</div>
<div className="basis-2/6">
<p
className={`text-xxs ${
fakeAuxBMSData[
"DischargeTripDueToHighTemperatureAndCurrent"
]
? "text-black"
: "text-gray"
}`}
>
Discharge Trip Due To High Temp & Current
</p>
<p
className={`text-xxs ${
fakeAuxBMSData["DischargeTripDueToPackCurrent"]
? "text-black"
: "text-gray"
}`}
>
Discharge Trip Due To Pack Current
</p>
<p
className={`text-xxs ${
fakeAuxBMSData["ProtectionTrip"]
? "text-black"
: "text-gray"
}`}
>
Protection Trip
</p>
<p
className={`text-xxs ${
fakeAuxBMSData["HighVoltageEnableState"]
? "text-black"
: "text-gray"
}`}
>
High Voltage Enable
</p>
</div>
<div className="basis-2/6">
<div className="flex">
<div className="basis-1/2">
<p className="text-xxs">Aux Voltage</p>
<p className="text-xxs">Pre-Charge State</p>
</div>
<div className="basis-1/2 text-center text-pink">
<p className="text-xxs">{fakeAuxBMSData["AuxVoltage"]}V</p>
<p className="text-xxs">
{fakeAuxBMSData["PrechargeState"]}
</p>
</div>
</div>
</div>
</div>
</div>
</div>

<div className="flex flex-row">
<div className="basis-1/4">
<div>
<p className="text-s font-bold">Temperature</p>
</div>
<div className="flex">
<div className="basis-1/2">
<p className="text-xxs">Temperature</p>
<p className="text-xxs">Average Temperature</p>
<p className="text-xxs">Thermistor</p>
<p className="text-xxs">Internal Temperature</p>
</div>
<div className="basis-1/2 text-center text-pink">
<p className="text-xxs">
{fakeBatteryData["LowTemperature"]}˚C -{" "}
{fakeBatteryData["HighTemperature"]}˚C
</p>
<p className="text-xxs">
{fakeBatteryData["AverageTemperature"]}˚C
</p>
<p className="text-xxs">
{fakeBatteryData["LowThermistorId"]} -{" "}
{fakeBatteryData["HighThermistorId"]}
</p>
<p className="text-xxs">
{fakeBatteryData["InternalTemperature"]}˚C
</p>
</div>
</div>
</div>

<div className="basis-1/4">
<div>
<p className="text-s font-bold">Cell</p>
</div>
<div className="flex">
<div className="basis-1/2">
<p className="text-xxs">Cell Voltage</p>
<p className="text-xxs">Average Cell Voltage</p>
<p className="text-xxs">Cell Voltage (ID)</p>
<p className="text-xxs">Populated Cells</p>
</div>

<div className="basis-1/2 text-center text-pink">
<p className="text-xxs">
{fakeBatteryData["LowCellVoltage"]}V -{" "}
{fakeBatteryData["HighCellVoltage"]}V
</p>
<p className="text-xxs">
{fakeBatteryData["AverageCellVoltage"]}V
</p>
<p className="text-xxs">
{fakeBatteryData["LowCellVoltageId"]} -{" "}
{fakeBatteryData["HighCellVoltageId"]}
</p>
<p className="text-xxs">{fakeBatteryData["PopulatedCells"]}</p>
</div>
</div>
</div>

<div className="basis-1/4">
<div>
<p className="text-s font-bold">Pack</p>
</div>
<div className="flex">
<div className="basis-1/2">
<p className="text-xxs">Pack Current</p>
<p className="text-xxs">Pack Amphours</p>
<p className="text-xxs">Pack Depth of Discharge</p>
<p className="text-xxs">Pack Voltage</p>
<p className="text-xxs">Pack State of Charger</p>
<p className="text-xxs">12V Input Voltage</p>
</div>

<div className="basis-1/2 text-center text-pink">
<p className="text-xxs">{fakeBatteryData["PackCurrent"]}A</p>
<p className="text-xxs">{fakeBatteryData["PackAmphours"]}Ah</p>
<p className="text-xxs">
{fakeBatteryData["PackDepthOfDischarge"]}%
</p>
<p className="text-xxs">{fakeBatteryData["PackVoltage"]}V</p>
<p className="text-xxs">
{fakeBatteryData["PackStateOfCharge"]}%
</p>
<p className="text-xxs">
{fakeBatteryData["12vInputVoltage"]}V
</p>
</div>
</div>
</div>

<div className="basis-1/4">
<div>
<p className="text-s font-bold">Fan</p>
</div>
<div className="flex">
<div className="basis-1/2">
<p className="text-xxs">Fan Voltage</p>
<p className="text-xxs">Fan Speed</p>
<p className="text-xxs">Requested Fan Speed</p>
</div>

<div className="basis-1/2 text-center text-pink">
<p className="text-xxs">{fakeBatteryData["FanVoltage"]}V</p>
<p className="text-xxs">{fakeBatteryData["FanSpeed"]}</p>
<p className="text-xxs">
{fakeBatteryData["RequestedFanSpeed"]}
</p>
</div>
</div>
</div>
</div>
</div>
</>
<div>
<PISTransformer root={Battery()} />
</div>
);
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/renderer/code/objects/PIS/PIS.battery.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ const Battery = (): I_PIS => {
data: [
{
value: currentPacket?.AuxBms?.AuxVoltage,
unit: "V",
unit: "mV",
min: 0,
max: 100,
},
Expand Down

0 comments on commit eab8f06

Please sign in to comment.