diff --git a/interface/src/project/EMSESPStatusForm.tsx b/interface/src/project/EMSESPStatusForm.tsx index b9acfcc89..0f32be4b5 100644 --- a/interface/src/project/EMSESPStatusForm.tsx +++ b/interface/src/project/EMSESPStatusForm.tsx @@ -4,8 +4,6 @@ import { WithTheme, withTheme, withStyles, Theme, createStyles } from "@material import { TableContainer, Table, - Box, - Typography, TableBody, TableCell, TableHead, @@ -38,7 +36,7 @@ import { import { EMSESPStatus } from "./EMSESPtypes"; function formatNumber(num: number) { - return new Intl.NumberFormat().format(num); + return new Intl.NumberFormat().format(num); } type EMSESPStatusFormProps = RestFormProps & WithTheme & WithWidthProps; @@ -57,10 +55,6 @@ const StyledTableCell = withStyles((theme: Theme) => class EMSESPStatusForm extends Component { - rxErrors = () => { - return this.props.data.crc_errors !== 0; - } - createListItems() { const { data, theme, width } = this.props; return ( @@ -91,33 +85,24 @@ class EMSESPStatusForm extends Component { - (Rx) Incomplete telegrams + (Rx) Quality - {formatNumber(data.crc_errors)} + {formatNumber(data.rx_quality)}% - (Tx) Successfully sent telegrams + (Tx) Sent telegrams {formatNumber(data.tx_sent)} - (Tx) Send Errors + (Tx) Quality - {formatNumber(data.tx_errors)} + {formatNumber(data.tx_quality)}% - - {this.rxErrors() && ( - - - Note: Having a small number of incomplete Rx telegrams is normal and often caused by noise on the EMS line. - - - )} - )} diff --git a/interface/src/project/EMSESPtypes.ts b/interface/src/project/EMSESPtypes.ts index 39b1fcae4..93f921671 100644 --- a/interface/src/project/EMSESPtypes.ts +++ b/interface/src/project/EMSESPtypes.ts @@ -28,8 +28,8 @@ export interface EMSESPStatus { status: busConnectionStatus; rx_received: number; tx_sent: number; - crc_errors: number; - tx_errors: number; + rx_quality: number; + tx_quality: number; } export interface Device { @@ -53,8 +53,8 @@ export interface EMSESPDevices { } export interface DeviceData { - name: string; - value: string; + n: string; + v: string; } export interface EMSESPDeviceData { diff --git a/src/EMSESPStatusService.cpp b/src/EMSESPStatusService.cpp index ca54c0393..1bbb08b3c 100644 --- a/src/EMSESPStatusService.cpp +++ b/src/EMSESPStatusService.cpp @@ -63,8 +63,8 @@ void EMSESPStatusService::emsespStatusService(AsyncWebServerRequest * request) { root["status"] = EMSESP::bus_status(); // 0, 1 or 2 root["rx_received"] = EMSESP::rxservice_.telegram_count(); root["tx_sent"] = EMSESP::txservice_.telegram_read_count() + EMSESP::txservice_.telegram_write_count(); - root["crc_errors"] = EMSESP::rxservice_.telegram_error_count(); - root["tx_errors"] = EMSESP::txservice_.telegram_fail_count(); + root["rx_quality"] = EMSESP::rxservice_.quality(); + root["tx_quality"] = EMSESP::txservice_.quality(); response->setLength(); request->send(response);