From d367c20a138d90b640947194d264f8108845b207 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Mon, 8 Aug 2022 09:58:13 +0200 Subject: [PATCH] add disconnected banner to dashboard, #591 --- interface/src/project/DashboardData.tsx | 5 +++-- interface/src/project/types.ts | 1 + src/web/WebDataService.cpp | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index 0ef771e50..319e7215e 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -79,7 +79,7 @@ const DashboardData: FC = () => { const { enqueueSnackbar } = useSnackbar(); - const [coreData, setCoreData] = useState({ devices: [], active_sensors: 0, analog_enabled: false }); + const [coreData, setCoreData] = useState({ connected: true, devices: [], active_sensors: 0, analog_enabled: false }); const [deviceData, setDeviceData] = useState({ label: '', data: [] }); const [sensorData, setSensorData] = useState({ sensors: [], analogs: [] }); const [deviceValue, setDeviceValue] = useState(); @@ -640,7 +640,8 @@ const DashboardData: FC = () => { const renderCoreData = () => ( - {coreData.devices.length === 0 && } + {!coreData.connected && } + {coreData.connected && coreData.devices.length === 0 && } {(tableList: any) => ( <> diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts index 0d5a1834b..d990e7381 100644 --- a/interface/src/project/types.ts +++ b/interface/src/project/types.ts @@ -97,6 +97,7 @@ export interface SensorData { } export interface CoreData { + connected: boolean; devices: Device[]; active_sensors: number; analog_enabled: boolean; diff --git a/src/web/WebDataService.cpp b/src/web/WebDataService.cpp index fc60055dc..ea9520ed0 100644 --- a/src/web/WebDataService.cpp +++ b/src/web/WebDataService.cpp @@ -94,6 +94,7 @@ void WebDataService::core_data(AsyncWebServerRequest * request) { // sensors stuff root["active_sensors"] = EMSESP::dallassensor_.no_sensors() + (EMSESP::analogsensor_.analog_enabled() ? EMSESP::analogsensor_.no_sensors() : 0); root["analog_enabled"] = EMSESP::analogsensor_.analog_enabled(); + root["connected"] = EMSESP::bus_status() != 2; response->setLength(); request->send(response);