From 80428050baee4cec9ac34ae895e272401b987e0a Mon Sep 17 00:00:00 2001 From: csawatzky Date: Wed, 1 Oct 2025 12:11:19 -0600 Subject: [PATCH] displaying the conditioning card in cooldown now as well as drying/hydrating --- src/bin/BinConditioningCard.tsx | 15 +++++++++++++-- src/bin/BinConditioningInteraction.tsx | 8 +++----- src/bin/BinStorageConditions.tsx | 2 -- src/pages/Bin.tsx | 3 ++- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/bin/BinConditioningCard.tsx b/src/bin/BinConditioningCard.tsx index eeceb37..cf3b3aa 100644 --- a/src/bin/BinConditioningCard.tsx +++ b/src/bin/BinConditioningCard.tsx @@ -33,7 +33,7 @@ const useStyles = makeStyles((theme: Theme) => { interface Props { interactions: Interaction[]; interactionDevices: Map; - mode: pond.BinMode.BIN_MODE_DRYING | pond.BinMode.BIN_MODE_HYDRATING; + mode: pond.BinMode; plenums?: Plenum[]; ambients?: Ambient[]; heaters?: Controller[]; @@ -94,10 +94,21 @@ export default function BinConditioningCard(props: Props) { return conditioningInteractions; }; + const modeDisplay = () => { + switch(mode){ + case pond.BinMode.BIN_MODE_DRYING: + return "Drying" + case pond.BinMode.BIN_MODE_HYDRATING: + return "Hydrating" + case pond.BinMode.BIN_MODE_COOLDOWN: + return "Cooldown" + } + } + return ( - {mode === pond.BinMode.BIN_MODE_DRYING ? "Drying" : "Hydrating"} Conditions + {modeDisplay()} Conditions {conditionsDisplay()} diff --git a/src/bin/BinConditioningInteraction.tsx b/src/bin/BinConditioningInteraction.tsx index 7f5ec13..7fe8bea 100644 --- a/src/bin/BinConditioningInteraction.tsx +++ b/src/bin/BinConditioningInteraction.tsx @@ -47,8 +47,6 @@ const useStyles = makeStyles((theme: Theme) => { sliderThumb: { height: 15, width: 15, - marginTop: -6, - marginLeft: -7.5, backgroundColor: "yellow" }, sliderTrack: { @@ -60,10 +58,10 @@ const useStyles = makeStyles((theme: Theme) => { backgroundColor: "white" }, sliderValLabel: { - left: "calc(-50%)", - top: 22, + left: -20, + top: 40, + background: "transparent", "& *": { - background: "transparent", color: "#fff" } }, diff --git a/src/bin/BinStorageConditions.tsx b/src/bin/BinStorageConditions.tsx index 8feda5b..fa0e957 100644 --- a/src/bin/BinStorageConditions.tsx +++ b/src/bin/BinStorageConditions.tsx @@ -223,13 +223,11 @@ export default function BinStorageConditions(props: Props) { } } }); - console.log(nodeEMCs) cableEMCAvgs.push(avg(nodeEMCs)); } cableTempAvgs.push(avg(nodeTemps)); } }); - console.log(cableEMCAvgs) if (cableTempAvgs.length > 0) { setAverageTemp(avg(cableTempAvgs)); } diff --git a/src/pages/Bin.tsx b/src/pages/Bin.tsx index fcc1117..082a2c9 100644 --- a/src/pages/Bin.tsx +++ b/src/pages/Bin.tsx @@ -810,7 +810,8 @@ export default function Bin(props: Props) { {(bin.settings.mode === pond.BinMode.BIN_MODE_DRYING || - bin.settings.mode === pond.BinMode.BIN_MODE_HYDRATING) && ( + bin.settings.mode === pond.BinMode.BIN_MODE_HYDRATING || + bin.settings.mode === pond.BinMode.BIN_MODE_COOLDOWN) && (