Improve history views: remove warnings on console when collapsed, and remove limit

Author: GuLinux

src/powermonitor.cpp

@@ -28,10 +28,13 @@ void APB::PowerMonitor::setup(Scheduler &scheduler) {
     if(d->status.initialised) {
         Log.infoln("Powermonitor initialised: INA219 with address 0x%x", APB_INA1219_ADDRESS);
 
+        
+        bool gainValid = d->ina219.setGain(APB_POWER_INA219_GAIN);
+        bool voltageRangeValid = d->ina219.setBusVoltageRange(APB_POWER_INA219_VOLTAGE_RANGE);
         bool shuntValid = d->ina219.setMaxCurrentShunt(APB_POWER_MAX_CURRENT_AMPS, APB_POWER_SHUNT_OHMS);
 
         Log.infoln("Powermonitor settings: valid=%d, %d milliamp max (%d amps), shunt resistor: %d milliohms",
-            shuntValid,
+            shuntValid && voltageRangeValid && gainValid,
             static_cast<int>(d->ina219.getMaxCurrent() * 1000.0),
             static_cast<int>(d->ina219.getMaxCurrent()),
             static_cast<int>(d->ina219.getShunt() * 1000.0)
@@ -42,6 +45,9 @@ void APB::PowerMonitor::setup(Scheduler &scheduler) {
             d->status.current = d->ina219.getCurrent();
             d->status.power = d->ina219.getPower();
             d->status.shuntVoltage = d->ina219.getShuntVoltage();
+            if(d->status.power == 0 || d->status.current == 0) {
+                Log.warningln("Powermonitor: Reporting power as 0. INA status: %d", d->ina219.isConnected());
+            }
         });
         scheduler.addTask(d->loopTask);
         d->loopTask.enable();

web/src/features/app/api.js

@@ -1,6 +1,6 @@
 const fetchJson = async (path, init) => {
     let url = path;
-    console.log(process.env)
+    // console.log(process.env)
     if(process.env.NODE_ENV === 'development' && 'REACT_APP_ASTROPOWERBOX_API_HOST' in process.env) {
         url = `${process.env.REACT_APP_ASTROPOWERBOX_API_HOST}${path}`;
     }

web/src/features/sensors/ambient/Ambient.js

@@ -29,6 +29,7 @@ const AmbientChart = ({}) => {
 }
 export const Ambient = () => {
     const { dewpoint, humidity, temperature } = useSelector(selectAmbient);
+    const [historyVisible, setHistoryVisible] = useState(false);
     return <>
     <Table>
             <tbody>
@@ -49,8 +50,8 @@ export const Ambient = () => {
         <Accordion>
             <Accordion.Item eventKey='0'>
                 <Accordion.Header>History</Accordion.Header>
-                <Accordion.Body>
-                    <AmbientChart />
+                <Accordion.Body onEnter={() => setHistoryVisible(true)} onExited={() => setHistoryVisible(false)}>
+                    {historyVisible && <AmbientChart /> }
                 </Accordion.Body>
             </Accordion.Item>
         </Accordion>

web/src/features/sensors/ambient/ambientSlice.js

@@ -21,7 +21,7 @@ export const ambientSlice = createSlice({
         state.dewpoint = dewpoint;
         state.humidity = humidity;
         state.temperature = temperature;
-        state.history = [...state.history, { timestamp: new Date().getTime(), temperature, humidity, dewpoint}].slice(-1000)
+        state.history = [...state.history, { timestamp: new Date().getTime(), temperature, humidity, dewpoint}]
     },
   },
   extraReducers: (builder) => {

web/src/features/sensors/heaters/Heaters.js

@@ -176,6 +176,7 @@ const Heater = ({heater, index}) => {
 
 export const Heaters = () => {
     const heaters = useSelector(selectHeaters);
+    const [historyVisible, setHistoryVisible] = useState(false);
     return <>
         <Table>
             <thead>
@@ -195,8 +196,8 @@ export const Heaters = () => {
         <Accordion>
             <Accordion.Item eventKey='0'>
                 <Accordion.Header>History</Accordion.Header>
-                <Accordion.Body>
-                    <HeatersChart/>
+                <Accordion.Body onEnter={() => setHistoryVisible(true)} onExited={() => setHistoryVisible(false)}>
+                    { historyVisible && <HeatersChart/> }
                 </Accordion.Body>
             </Accordion.Item>
         </Accordion>

web/src/features/sensors/heaters/heatersSlice.js

@@ -22,7 +22,7 @@ const transformDuty = heater => {
   return {...heater, duty: heater.active ? heater.duty : 0}
 }
 const addHeatersToHistory = (state) => {
-  state.history = [...state.history, { timestamp: new Date().getTime(), heaters: state.heaters.map(transformDuty) }].slice(-1000)
+  state.history = [...state.history, { timestamp: new Date().getTime(), heaters: state.heaters.map(transformDuty) }]
 }
 const onHeatersReceived = (state, payload) => {
   state.heaters = payload;
@@ -57,7 +57,6 @@ export const heatersSlice = createSlice({
       .addCase(getHeatersAsync.fulfilled, (state, action) => onHeatersReceived(state, action.payload))
       .addCase(setHeaterAsync.fulfilled, (state, action) => onHeatersReceived(state, action.payload))
       .addCase(getHistoryAsync.fulfilled, (state, { payload }) => {
-        console.log(payload)
         if(!payload) {
           return;
         }

web/src/features/sensors/power/Power.js

@@ -32,6 +32,7 @@ const PowerChart= ({}) => {
 
 export const Power = () => {
     const { busVoltage, current, power } = useSelector(selectPower);
+    const [historyVisible, setHistoryVisible] = useState(false);
     return <>
         <Table>
             <tbody>
@@ -52,8 +53,8 @@ export const Power = () => {
         <Accordion>
             <Accordion.Item eventKey='0'>
                 <Accordion.Header>History</Accordion.Header>
-                <Accordion.Body>
-                    <PowerChart />
+                <Accordion.Body onEnter={() => setHistoryVisible(true)} onExited={() => setHistoryVisible(false)}>
+                    { historyVisible && <PowerChart /> }
                 </Accordion.Body>
             </Accordion.Item>
         </Accordion>

web/src/features/sensors/power/powerSlice.js

@@ -23,7 +23,7 @@ export const powerSlice = createSlice({
         state.current = current;
         state.power = power;
         state.shuntVoltage = shuntVoltage;
-        state.history = [...state.history, { timestamp: new Date().getTime(), busVoltage, current, power}].slice(-1000)
+        state.history = [...state.history, { timestamp: new Date().getTime(), busVoltage, current, power}]
     },
   },
   extraReducers: (builder) => {