Skip to content

Commit

Permalink
Update FaultsView and images
Browse files Browse the repository at this point in the history
Update existing faults and add new faults to FaultsView. Also, the
images used by this component have been updated to reflect the changes
to FaultsView. Additionally, this commit introduces a bug fix to the
_checkBooleanData() function. Since boolean nominal ranges are 0-1 in
the data format, strict comparisons between the nominal and actual
values don't work correctly, so the comparison in the function has to
allow type coercion.
  • Loading branch information
jackwherry authored and jrvollmer committed Jul 23, 2023
1 parent 824f2f9 commit 3ff26f4
Show file tree
Hide file tree
Showing 28 changed files with 617 additions and 220 deletions.
789 changes: 581 additions & 208 deletions Frontend/src/Components/Faults/FaultsView.js

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Frontend/src/Components/Faults/Images/BMS Input Voltage Dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Frontend/src/Components/Faults/Images/BMS Input Voltage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Frontend/src/Components/Faults/Images/BPS Fault.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Frontend/src/Components/Faults/Images/Door Dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Frontend/src/Components/Faults/Images/Door.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Frontend/src/Components/Faults/Images/IMD Status Dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Frontend/src/Components/Faults/Images/IMD Status.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 36 additions & 12 deletions Frontend/src/Components/Faults/Images/Images.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import BPSFaultImage from "./BPS Fault.png";
import EStopImage from "./E-Stop.png";

import BPSFaultImageLight from "./BPS Fault.png";
import CellGroupVoltageImageLight from "./Cell Group Voltage.png";
import DischargeEnableLight from "./Discharge Enable.png";
import MPPTContactorImageLight from "./MPPT Contactor.png";
import LowContactorImageLight from "./Low Contactor.png";
import MotorControllerContactorImageLight from "./Motor Controller Contactor.png";
import DoorImageLight from "./Door.png";
import BatteryFailsafeImageLight from "./Battery Failsafe.png";
import BMSFailuresImageLight from "./BMS Failures.png";
import IMDStatusImageLight from "./IMD Status.png";
import CrashImageLight from "./Crash.png";
import HighCurrentImageLight from "./High Current.png";
Expand All @@ -14,15 +17,22 @@ import LowVoltageImageLight from "./Low Voltage.png";
import LowBatteryImageLight from "./Low Battery.png";
import MCUCheckImageLight from "./MCU Check.png";
import MPPTCurrentImageLight from "./MPPT Current.png";
import MCStatusImageLight from "./MC Status.png";
import BMSInputVoltageImageLight from "./BMS Input Voltage.png";
import PhysicalConnectionImageLight from "./Physical Connection Lost.png";
import WirelessCommsLostImageLight from "./Wireless Comms Lost.png";
import HighTemperatureImageLight from "./High Temperature.png";
import TemperatureImageLight from "./Temperature.png";
import PackPowerImageLight from "./Pack Power.png";
import PowerWarningsImageLight from "./Power Warnings.png";

import BPSFaultImageDark from "./BPS Fault Dark.png";
import CellGroupVoltageImageDark from "./Cell Group Voltage Dark.png";
import DischargeEnableDark from "./Discharge Enable Dark.png";
import MPPTContactorImageDark from "./MPPT Contactor Dark.png";
import LowContactorImageDark from "./Low Contactor Dark.png";
import MotorControllerContactorImageDark from "./Motor Controller Contactor Dark.png";
import DoorImageDark from "./Door Dark.png";
import BatteryFailsafeImageDark from "./Battery Failsafe Dark.png";
import BMSFailuresImageDark from "./BMS Failures Dark.png";
import IMDStatusImageDark from "./IMD Status Dark.png";
import CrashImageDark from "./Crash Dark.png";
import HighCurrentImageDark from "./High Current Dark.png";
Expand All @@ -32,20 +42,26 @@ import LowVoltageImageDark from "./Low Voltage Dark.png";
import LowBatteryImageDark from "./Low Battery Dark.png";
import MCUCheckImageDark from "./MCU Check Dark.png";
import MPPTCurrentImageDark from "./MPPT Current Dark.png";
import MCStatusImageDark from "./MC Status Dark.png";
import BMSInputVoltageImageDark from "./BMS Input Voltage Dark.png";
import PhysicalConnectionImageDark from "./Physical Connection Lost Dark.png";
import WirelessCommsLostImageDark from "./Wireless Comms Lost Dark.png";
import HighTemperatureImageDark from "./High Temperature Dark.png";
import TemperatureImageDark from "./Temperature Dark.png";
import PackPowerImageDark from "./Pack Power Dark.png";
import PowerWarningsImageDark from "./Power Warnings Dark.png";


const FaultsViewImages = {
"light": {
"BPSFault": BPSFaultImage,
"BPSFault": BPSFaultImageLight,
"CellGroupVoltage": CellGroupVoltageImageLight,
"DischargeEnable": DischargeEnableLight,
"EStop": EStopImage,
"MPPTContactor": MPPTContactorImageLight,
"LowContactor": LowContactorImageLight,
"MotorControllerContactor": MotorControllerContactorImageLight,
"Door": DoorImageLight,
"BatteryFailsafe": BatteryFailsafeImageLight,
"BMSFailures": BMSFailuresImageLight,
"IMDStatus": IMDStatusImageLight,
"Crash": CrashImageLight,
"HighCurrent": HighCurrentImageLight,
Expand All @@ -55,19 +71,24 @@ const FaultsViewImages = {
"LowBattery": LowBatteryImageLight,
"MCUCheck": MCUCheckImageLight,
"MPPTCurrent": MPPTCurrentImageLight,
"MCStatus": MCStatusImageLight,
"BMSInputVoltage": BMSInputVoltageImageLight,
"PhysicalConnection": PhysicalConnectionImageLight,
"WirelessCommsLost": WirelessCommsLostImageLight,
"HighTemperature": HighTemperatureImageLight
"Temperature": TemperatureImageLight,
"PackPower": PackPowerImageLight,
"PowerWarnings": PowerWarningsImageLight
},
"dark": {
"BPSFault": BPSFaultImage,
"BPSFault": BPSFaultImageDark,
"CellGroupVoltage": CellGroupVoltageImageDark,
"DischargeEnable": DischargeEnableDark,
"EStop": EStopImage,
"MPPTContactor": MPPTContactorImageDark,
"LowContactor": LowContactorImageDark,
"MotorControllerContactor": MotorControllerContactorImageDark,
"Door": DoorImageDark,
"BatteryFailsafe": BatteryFailsafeImageDark,
"BMSFailures": BMSFailuresImageDark,
"IMDStatus": IMDStatusImageDark,
"Crash": CrashImageDark,
"HighCurrent": HighCurrentImageDark,
Expand All @@ -77,11 +98,14 @@ const FaultsViewImages = {
"LowBattery": LowBatteryImageDark,
"MCUCheck": MCUCheckImageDark,
"MPPTCurrent": MPPTCurrentImageDark,
"MCStatus": MCStatusImageDark,
"BMSInputVoltage": BMSInputVoltageImageDark,
"PhysicalConnection": PhysicalConnectionImageDark,
"WirelessCommsLost": WirelessCommsLostImageDark,
"HighTemperature": HighTemperatureImageDark
"Temperature": TemperatureImageDark,
"PackPower": PackPowerImageDark,
"PowerWarnings": PowerWarningsImageDark
}
}
};

export { FaultsViewImages };
Binary file modified Frontend/src/Components/Faults/Images/Low Battery Dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Frontend/src/Components/Faults/Images/Low Battery.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3ff26f4

Please sign in to comment.