mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-06 07:49:52 +03:00
remove scan
This commit is contained in:
@@ -50,9 +50,6 @@ export const writeAnalogSensor = (as: WriteAnalogSensor) =>
|
|||||||
// Activity
|
// Activity
|
||||||
export const readActivity = () => alovaInstance.Get<Activity>('/rest/activity');
|
export const readActivity = () => alovaInstance.Get<Activity>('/rest/activity');
|
||||||
|
|
||||||
// Scan devices
|
|
||||||
export const scanDevices = () => alovaInstance.Post('/rest/scanDevices');
|
|
||||||
|
|
||||||
// API, used in HelpInformation
|
// API, used in HelpInformation
|
||||||
export const API = (apiCall: APIcall) => alovaInstance.Post('/api', apiCall);
|
export const API = (apiCall: APIcall) => alovaInstance.Post('/api', apiCall);
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ const SystemActivity: FC = () => {
|
|||||||
|
|
||||||
const { LL } = useI18nContext();
|
const { LL } = useI18nContext();
|
||||||
|
|
||||||
useLayoutTitle(LL.EMS_BUS_STATUS());
|
useLayoutTitle(LL.DATA_TRAFFIC());
|
||||||
|
|
||||||
const stats_theme = tableTheme({
|
const stats_theme = tableTheme({
|
||||||
Table: `
|
Table: `
|
||||||
|
|||||||
@@ -56,7 +56,6 @@ const SystemStatus: FC = () => {
|
|||||||
const { me } = useContext(AuthenticatedContext);
|
const { me } = useContext(AuthenticatedContext);
|
||||||
|
|
||||||
const [confirmRestart, setConfirmRestart] = useState<boolean>(false);
|
const [confirmRestart, setConfirmRestart] = useState<boolean>(false);
|
||||||
const [confirmScan, setConfirmScan] = useState<boolean>(false);
|
|
||||||
const [processing, setProcessing] = useState<boolean>(false);
|
const [processing, setProcessing] = useState<boolean>(false);
|
||||||
const [restarting, setRestarting] = useState<boolean>();
|
const [restarting, setRestarting] = useState<boolean>();
|
||||||
|
|
||||||
@@ -74,10 +73,6 @@ const SystemStatus: FC = () => {
|
|||||||
error
|
error
|
||||||
} = useRequest(SystemApi.readSystemStatus, { force: true });
|
} = useRequest(SystemApi.readSystemStatus, { force: true });
|
||||||
|
|
||||||
const { send: scanDevices } = useRequest(EMSESP.scanDevices, {
|
|
||||||
immediate: false
|
|
||||||
});
|
|
||||||
|
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
|
|
||||||
const formatDurationSec = (duration_sec: number) => {
|
const formatDurationSec = (duration_sec: number) => {
|
||||||
@@ -108,14 +103,20 @@ const SystemStatus: FC = () => {
|
|||||||
if (data) {
|
if (data) {
|
||||||
switch (data.status) {
|
switch (data.status) {
|
||||||
case busConnectionStatus.BUS_STATUS_CONNECTED:
|
case busConnectionStatus.BUS_STATUS_CONNECTED:
|
||||||
return LL.CONNECTED(0) + ' (' + formatDurationSec(data.bus_uptime) + ')';
|
return (
|
||||||
|
'EMS ' +
|
||||||
|
LL.CONNECTED(0) +
|
||||||
|
' (' +
|
||||||
|
formatDurationSec(data.bus_uptime) +
|
||||||
|
')'
|
||||||
|
);
|
||||||
case busConnectionStatus.BUS_STATUS_TX_ERRORS:
|
case busConnectionStatus.BUS_STATUS_TX_ERRORS:
|
||||||
return LL.TX_ISSUES();
|
return 'EMS ' + LL.TX_ISSUES();
|
||||||
case busConnectionStatus.BUS_STATUS_OFFLINE:
|
case busConnectionStatus.BUS_STATUS_OFFLINE:
|
||||||
return LL.DISCONNECTED();
|
return 'EMS ' + LL.DISCONNECTED();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 'Unknown';
|
return 'EMS state unknown';
|
||||||
};
|
};
|
||||||
|
|
||||||
const busStatusHighlight = () => {
|
const busStatusHighlight = () => {
|
||||||
@@ -200,46 +201,6 @@ const SystemStatus: FC = () => {
|
|||||||
const activeHighlight = (value: boolean) =>
|
const activeHighlight = (value: boolean) =>
|
||||||
value ? theme.palette.success.main : theme.palette.info.main;
|
value ? theme.palette.success.main : theme.palette.info.main;
|
||||||
|
|
||||||
const scan = async () => {
|
|
||||||
await scanDevices()
|
|
||||||
.then(() => {
|
|
||||||
toast.info(LL.SCANNING() + '...');
|
|
||||||
})
|
|
||||||
.catch((error: Error) => {
|
|
||||||
toast.error(error.message);
|
|
||||||
});
|
|
||||||
setConfirmScan(false);
|
|
||||||
};
|
|
||||||
|
|
||||||
const renderScanDialog = () => (
|
|
||||||
<Dialog
|
|
||||||
sx={dialogStyle}
|
|
||||||
open={confirmScan}
|
|
||||||
onClose={() => setConfirmScan(false)}
|
|
||||||
>
|
|
||||||
<DialogTitle>{LL.SCAN_DEVICES()}</DialogTitle>
|
|
||||||
<DialogContent dividers>{LL.EMS_SCAN()}</DialogContent>
|
|
||||||
<DialogActions>
|
|
||||||
<Button
|
|
||||||
startIcon={<CancelIcon />}
|
|
||||||
variant="outlined"
|
|
||||||
onClick={() => setConfirmScan(false)}
|
|
||||||
color="secondary"
|
|
||||||
>
|
|
||||||
{LL.CANCEL()}
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
startIcon={<PermScanWifiIcon />}
|
|
||||||
variant="outlined"
|
|
||||||
onClick={scan}
|
|
||||||
color="primary"
|
|
||||||
>
|
|
||||||
{LL.SCAN()}
|
|
||||||
</Button>
|
|
||||||
</DialogActions>
|
|
||||||
</Dialog>
|
|
||||||
);
|
|
||||||
|
|
||||||
const restart = async () => {
|
const restart = async () => {
|
||||||
setProcessing(true);
|
setProcessing(true);
|
||||||
await restartCommand()
|
await restartCommand()
|
||||||
@@ -318,56 +279,6 @@ const SystemStatus: FC = () => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<List sx={{ borderRadius: 3, border: '2px solid grey' }}>
|
<List sx={{ borderRadius: 3, border: '2px solid grey' }}>
|
||||||
<ListItem>
|
|
||||||
<ListItemAvatar>
|
|
||||||
<Avatar sx={{ bgcolor: '#c5572c', color: 'white' }}>
|
|
||||||
<TimerIcon />
|
|
||||||
</Avatar>
|
|
||||||
</ListItemAvatar>
|
|
||||||
<ListItemText
|
|
||||||
primary={LL.UPTIME()}
|
|
||||||
secondary={formatDurationSec(data.uptime)}
|
|
||||||
/>
|
|
||||||
{me.admin && (
|
|
||||||
<Button
|
|
||||||
startIcon={<PowerSettingsNewIcon />}
|
|
||||||
variant="outlined"
|
|
||||||
color="error"
|
|
||||||
onClick={() => setConfirmRestart(true)}
|
|
||||||
>
|
|
||||||
{LL.RESTART()}
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</ListItem>
|
|
||||||
|
|
||||||
<ListItem>
|
|
||||||
<ListItemAvatar>
|
|
||||||
<Avatar sx={{ bgcolor: '#5d89f7', color: 'white' }}>
|
|
||||||
<DeviceHubIcon />
|
|
||||||
</Avatar>
|
|
||||||
</ListItemAvatar>
|
|
||||||
<ListItemText
|
|
||||||
primary={LL.ACTIVE_DEVICES()}
|
|
||||||
secondary={
|
|
||||||
LL.NUM_DEVICES({ num: data.num_devices }) +
|
|
||||||
', ' +
|
|
||||||
LL.NUM_TEMP_SENSORS({ num: data.num_sensors }) +
|
|
||||||
', ' +
|
|
||||||
LL.NUM_ANALOG_SENSORS({ num: data.num_analogs })
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
{me.admin && (
|
|
||||||
<Button
|
|
||||||
startIcon={<PermScanWifiIcon />}
|
|
||||||
variant="outlined"
|
|
||||||
color="primary"
|
|
||||||
onClick={() => setConfirmScan(true)}
|
|
||||||
>
|
|
||||||
{LL.SCAN_DEVICES()}
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</ListItem>
|
|
||||||
|
|
||||||
<ListItem>
|
<ListItem>
|
||||||
<ListItemAvatar>
|
<ListItemAvatar>
|
||||||
<Avatar sx={{ bgcolor: '#134ba2', color: 'white' }}>
|
<Avatar sx={{ bgcolor: '#134ba2', color: 'white' }}>
|
||||||
@@ -390,11 +301,33 @@ const SystemStatus: FC = () => {
|
|||||||
)}
|
)}
|
||||||
</ListItem>
|
</ListItem>
|
||||||
|
|
||||||
|
<ListItem>
|
||||||
|
<ListItemAvatar>
|
||||||
|
<Avatar sx={{ bgcolor: '#c5572c', color: 'white' }}>
|
||||||
|
<TimerIcon />
|
||||||
|
</Avatar>
|
||||||
|
</ListItemAvatar>
|
||||||
|
<ListItemText
|
||||||
|
primary={LL.UPTIME()}
|
||||||
|
secondary={formatDurationSec(data.uptime)}
|
||||||
|
/>
|
||||||
|
{me.admin && (
|
||||||
|
<Button
|
||||||
|
startIcon={<PowerSettingsNewIcon />}
|
||||||
|
variant="outlined"
|
||||||
|
color="error"
|
||||||
|
onClick={() => setConfirmRestart(true)}
|
||||||
|
>
|
||||||
|
{LL.RESTART()}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</ListItem>
|
||||||
|
|
||||||
<ListMenuItem
|
<ListMenuItem
|
||||||
disabled={!me.admin}
|
disabled={!me.admin}
|
||||||
icon={DirectionsBusIcon}
|
icon={DirectionsBusIcon}
|
||||||
bgcolor={busStatusHighlight()}
|
bgcolor={busStatusHighlight()}
|
||||||
label={LL.EMS_BUS_STATUS()}
|
label={LL.DATA_TRAFFIC()}
|
||||||
text={busStatus()}
|
text={busStatus()}
|
||||||
to="/status/activity"
|
to="/status/activity"
|
||||||
/>
|
/>
|
||||||
@@ -458,7 +391,6 @@ const SystemStatus: FC = () => {
|
|||||||
/>
|
/>
|
||||||
</List>
|
</List>
|
||||||
|
|
||||||
{renderScanDialog()}
|
|
||||||
{renderRestartDialog()}
|
{renderRestartDialog()}
|
||||||
|
|
||||||
<Box mt={2} display="flex" flexWrap="wrap">
|
<Box mt={2} display="flex" flexWrap="wrap">
|
||||||
|
|||||||
@@ -71,13 +71,11 @@ const de: Translation = {
|
|||||||
TX_ISSUES: 'Tx-Probleme - versuchen Sie einen anderen Tx-Modus',
|
TX_ISSUES: 'Tx-Probleme - versuchen Sie einen anderen Tx-Modus',
|
||||||
DISCONNECTED: 'Getrennt',
|
DISCONNECTED: 'Getrennt',
|
||||||
EMS_SCAN: 'Möchten Sie wirklich eine vollständige Gerätesuche des EMS-Busses starten?',
|
EMS_SCAN: 'Möchten Sie wirklich eine vollständige Gerätesuche des EMS-Busses starten?',
|
||||||
EMS_BUS_STATUS: 'EMS-Busstatus',
|
DATA_TRAFFIC: 'Data Traffic', // TODO Translate
|
||||||
ACTIVE_DEVICES: 'Aktive Geräte und Sensoren',
|
|
||||||
EMS_DEVICE: 'EMS Gerät',
|
EMS_DEVICE: 'EMS Gerät',
|
||||||
SUCCESS: 'ERFOLG',
|
SUCCESS: 'ERFOLG',
|
||||||
FAIL: 'FEHLER',
|
FAIL: 'FEHLER',
|
||||||
QUALITY: 'QUALITÄT',
|
QUALITY: 'QUALITÄT',
|
||||||
SCAN_DEVICES: 'Nach neuen Geräten suchen',
|
|
||||||
SCAN: 'Suche',
|
SCAN: 'Suche',
|
||||||
STATUS_NAMES: [
|
STATUS_NAMES: [
|
||||||
'EMS-Telegramme empfangen (Rx)',
|
'EMS-Telegramme empfangen (Rx)',
|
||||||
@@ -89,9 +87,6 @@ const de: Translation = {
|
|||||||
'API-Aufrufe',
|
'API-Aufrufe',
|
||||||
'Syslog-Mitteilungen'
|
'Syslog-Mitteilungen'
|
||||||
],
|
],
|
||||||
NUM_DEVICES: '{num} Gerät{{e}}',
|
|
||||||
NUM_TEMP_SENSORS: '{num} Temperatursensor{{en}}',
|
|
||||||
NUM_ANALOG_SENSORS: '{num} Analogsensor{{en}}',
|
|
||||||
NUM_DAYS: '{num} Tag{{e}}',
|
NUM_DAYS: '{num} Tag{{e}}',
|
||||||
NUM_SECONDS: '{num} Sekunde{{n}}',
|
NUM_SECONDS: '{num} Sekunde{{n}}',
|
||||||
NUM_HOURS: '{num} Stunde{{n}}',
|
NUM_HOURS: '{num} Stunde{{n}}',
|
||||||
|
|||||||
@@ -71,13 +71,11 @@ const en: Translation = {
|
|||||||
TX_ISSUES: 'Tx issues - check Tx Mode',
|
TX_ISSUES: 'Tx issues - check Tx Mode',
|
||||||
DISCONNECTED: 'Disconnected',
|
DISCONNECTED: 'Disconnected',
|
||||||
EMS_SCAN: 'Are you sure you want to initiate a full device scan of the EMS bus?',
|
EMS_SCAN: 'Are you sure you want to initiate a full device scan of the EMS bus?',
|
||||||
EMS_BUS_STATUS: 'EMS Bus Status',
|
DATA_TRAFFIC: 'Data Traffic',
|
||||||
ACTIVE_DEVICES: 'Active Devices & Sensors',
|
|
||||||
EMS_DEVICE: 'EMS Device',
|
EMS_DEVICE: 'EMS Device',
|
||||||
SUCCESS: 'SUCCESS',
|
SUCCESS: 'SUCCESS',
|
||||||
FAIL: 'FAIL',
|
FAIL: 'FAIL',
|
||||||
QUALITY: 'QUALITY',
|
QUALITY: 'QUALITY',
|
||||||
SCAN_DEVICES: 'Scan for new devices',
|
|
||||||
SCAN: 'Scan',
|
SCAN: 'Scan',
|
||||||
STATUS_NAMES: [
|
STATUS_NAMES: [
|
||||||
'EMS Telegrams Received (Rx)',
|
'EMS Telegrams Received (Rx)',
|
||||||
@@ -89,9 +87,6 @@ const en: Translation = {
|
|||||||
'API Calls',
|
'API Calls',
|
||||||
'Syslog Messages'
|
'Syslog Messages'
|
||||||
],
|
],
|
||||||
NUM_DEVICES: '{num} Device{{s}}',
|
|
||||||
NUM_TEMP_SENSORS: '{num} Temperature Sensor{{s}}',
|
|
||||||
NUM_ANALOG_SENSORS: '{num} Analog Sensor{{s}}',
|
|
||||||
NUM_DAYS: '{num} day{{s}}',
|
NUM_DAYS: '{num} day{{s}}',
|
||||||
NUM_SECONDS: '{num} second{{s}}',
|
NUM_SECONDS: '{num} second{{s}}',
|
||||||
NUM_HOURS: '{num} hour{{s}}',
|
NUM_HOURS: '{num} hour{{s}}',
|
||||||
|
|||||||
@@ -71,13 +71,11 @@ const fr: Translation = {
|
|||||||
TX_ISSUES: 'Problèmes de transmission (Tx) - Essayez un autre mode Tx',
|
TX_ISSUES: 'Problèmes de transmission (Tx) - Essayez un autre mode Tx',
|
||||||
DISCONNECTED: 'Déconnecté',
|
DISCONNECTED: 'Déconnecté',
|
||||||
EMS_SCAN: 'Etes-vous sûr de vouloir lancer un scan complet du bus EMS ?',
|
EMS_SCAN: 'Etes-vous sûr de vouloir lancer un scan complet du bus EMS ?',
|
||||||
EMS_BUS_STATUS: 'Statut du bus EMS',
|
DATA_TRAFFIC: 'Data Traffic', // TODO Translate
|
||||||
ACTIVE_DEVICES: 'Appareils et capteurs actifs',
|
|
||||||
EMS_DEVICE: 'Appareils EMS',
|
EMS_DEVICE: 'Appareils EMS',
|
||||||
SUCCESS: 'SUCCÈS',
|
SUCCESS: 'SUCCÈS',
|
||||||
FAIL: 'ÉCHEC',
|
FAIL: 'ÉCHEC',
|
||||||
QUALITY: 'QUALITÉ',
|
QUALITY: 'QUALITÉ',
|
||||||
SCAN_DEVICES: 'Rechercher de nouveaux appareils',
|
|
||||||
SCAN: 'Scan',
|
SCAN: 'Scan',
|
||||||
STATUS_NAMES: [
|
STATUS_NAMES: [
|
||||||
'Télégrammes EMS reçus (Rx)',
|
'Télégrammes EMS reçus (Rx)',
|
||||||
@@ -89,9 +87,6 @@ const fr: Translation = {
|
|||||||
"Appels à l'API",
|
"Appels à l'API",
|
||||||
'Messages Syslog'
|
'Messages Syslog'
|
||||||
],
|
],
|
||||||
NUM_DEVICES: '{num} Appareil{{s}}',
|
|
||||||
NUM_TEMP_SENSORS: '{num} Capteur{{s}} de température',
|
|
||||||
NUM_ANALOG_SENSORS: '{num} Capteur{{s}} analogique{{s}}',
|
|
||||||
NUM_DAYS: '{num} jour{{s}}',
|
NUM_DAYS: '{num} jour{{s}}',
|
||||||
NUM_SECONDS: '{num} seconde{{s}}',
|
NUM_SECONDS: '{num} seconde{{s}}',
|
||||||
NUM_HOURS: '{num} heure{{s}}',
|
NUM_HOURS: '{num} heure{{s}}',
|
||||||
|
|||||||
@@ -71,13 +71,11 @@ const it: Translation = {
|
|||||||
TX_ISSUES: 'Problema di Tx - prova una modalità differente',
|
TX_ISSUES: 'Problema di Tx - prova una modalità differente',
|
||||||
DISCONNECTED: 'Disconnesso',
|
DISCONNECTED: 'Disconnesso',
|
||||||
EMS_SCAN: 'Sei sicuro di voler iniziare una scansione completa del bus EMS ?',
|
EMS_SCAN: 'Sei sicuro di voler iniziare una scansione completa del bus EMS ?',
|
||||||
EMS_BUS_STATUS: 'Stato Bus EMS',
|
DATA_TRAFFIC: 'Data Traffic', // TODO Translate
|
||||||
ACTIVE_DEVICES: 'Dispositivi & sensori attivi',
|
|
||||||
EMS_DEVICE: 'Dispositivo EMS ',
|
EMS_DEVICE: 'Dispositivo EMS ',
|
||||||
SUCCESS: 'SUCCESSO',
|
SUCCESS: 'SUCCESSO',
|
||||||
FAIL: 'FALLITO',
|
FAIL: 'FALLITO',
|
||||||
QUALITY: 'QUALITÂ',
|
QUALITY: 'QUALITÂ',
|
||||||
SCAN_DEVICES: 'Scansione per nuovi dispositivi',
|
|
||||||
SCAN: 'Scansione',
|
SCAN: 'Scansione',
|
||||||
STATUS_NAMES: [
|
STATUS_NAMES: [
|
||||||
'Telegrammi EMS Ricevuti (Rx)',
|
'Telegrammi EMS Ricevuti (Rx)',
|
||||||
@@ -89,9 +87,6 @@ const it: Translation = {
|
|||||||
'Chiamate API',
|
'Chiamate API',
|
||||||
'Messaggi Syslog'
|
'Messaggi Syslog'
|
||||||
],
|
],
|
||||||
NUM_DEVICES: '{num} Dispositivi {{s}}',
|
|
||||||
NUM_TEMP_SENSORS: '{num} Sensori Temperatura {{s}}',
|
|
||||||
NUM_ANALOG_SENSORS: '{num} Sensori Analogici {{s}}',
|
|
||||||
NUM_DAYS: '{num} giorni {{s}}',
|
NUM_DAYS: '{num} giorni {{s}}',
|
||||||
NUM_SECONDS: '{num} secondi {{s}}',
|
NUM_SECONDS: '{num} secondi {{s}}',
|
||||||
NUM_HOURS: '{num} ore {{s}}',
|
NUM_HOURS: '{num} ore {{s}}',
|
||||||
|
|||||||
@@ -71,13 +71,11 @@ const nl: Translation = {
|
|||||||
TX_ISSUES: 'Tx bus probleem. Probeer een andere Tx verzendmodus',
|
TX_ISSUES: 'Tx bus probleem. Probeer een andere Tx verzendmodus',
|
||||||
DISCONNECTED: 'Niet verbonden',
|
DISCONNECTED: 'Niet verbonden',
|
||||||
EMS_SCAN: 'Weet je zeker dat je een volledige EMS bus scan uit wilt voeren?',
|
EMS_SCAN: 'Weet je zeker dat je een volledige EMS bus scan uit wilt voeren?',
|
||||||
EMS_BUS_STATUS: 'EMS busstatus',
|
DATA_TRAFFIC: 'Data Traffic', // TODO Translate
|
||||||
ACTIVE_DEVICES: 'Actieve Apparaten & Sensoren',
|
|
||||||
EMS_DEVICE: 'EMS Apparaat',
|
EMS_DEVICE: 'EMS Apparaat',
|
||||||
SUCCESS: 'SUCCESS',
|
SUCCESS: 'SUCCESS',
|
||||||
FAIL: 'MISLUKT',
|
FAIL: 'MISLUKT',
|
||||||
QUALITY: 'QUALITEIT',
|
QUALITY: 'QUALITEIT',
|
||||||
SCAN_DEVICES: 'Scannen naar nieuwe apparaten',
|
|
||||||
SCAN: 'Scan',
|
SCAN: 'Scan',
|
||||||
STATUS_NAMES: [
|
STATUS_NAMES: [
|
||||||
'EMS Telegrammen ontvangen (Rx)',
|
'EMS Telegrammen ontvangen (Rx)',
|
||||||
@@ -89,9 +87,6 @@ const nl: Translation = {
|
|||||||
'API calls',
|
'API calls',
|
||||||
'Syslog berichten'
|
'Syslog berichten'
|
||||||
],
|
],
|
||||||
NUM_DEVICES: '{num} Apparaat{{en}}',
|
|
||||||
NUM_TEMP_SENSORS: '{num} Temperatuursensor{{en}}',
|
|
||||||
NUM_ANALOG_SENSORS: '{num} Analoge sensor{{en}}',
|
|
||||||
NUM_DAYS: '{num} dag{{en}}',
|
NUM_DAYS: '{num} dag{{en}}',
|
||||||
NUM_SECONDS: '{num} second{{en}}',
|
NUM_SECONDS: '{num} second{{en}}',
|
||||||
NUM_HOURS: '{num} {{uur|uren}}',
|
NUM_HOURS: '{num} {{uur|uren}}',
|
||||||
|
|||||||
@@ -71,13 +71,11 @@ const no: Translation = {
|
|||||||
TX_ISSUES: 'Tx problemer - prøv en annen Tx Modus',
|
TX_ISSUES: 'Tx problemer - prøv en annen Tx Modus',
|
||||||
DISCONNECTED: 'Frakoblet',
|
DISCONNECTED: 'Frakoblet',
|
||||||
EMS_SCAN: 'Er du sikker på du vil starte full søking av EMS bussen?',
|
EMS_SCAN: 'Er du sikker på du vil starte full søking av EMS bussen?',
|
||||||
EMS_BUS_STATUS: 'EMS Buss Status',
|
DATA_TRAFFIC: 'Data Traffic', // TODO Translate
|
||||||
ACTIVE_DEVICES: 'Aktive Enheter og Sensorer',
|
|
||||||
EMS_DEVICE: 'EMS Enhet',
|
EMS_DEVICE: 'EMS Enhet',
|
||||||
SUCCESS: 'VELLYKKET',
|
SUCCESS: 'VELLYKKET',
|
||||||
FAIL: 'MISLYKKET',
|
FAIL: 'MISLYKKET',
|
||||||
QUALITY: 'KVALITET',
|
QUALITY: 'KVALITET',
|
||||||
SCAN_DEVICES: 'Søk etter nye enheter',
|
|
||||||
SCAN: 'Søk',
|
SCAN: 'Søk',
|
||||||
STATUS_NAMES: [
|
STATUS_NAMES: [
|
||||||
'EMS Telegrammer Mottatt (Rx)',
|
'EMS Telegrammer Mottatt (Rx)',
|
||||||
@@ -89,9 +87,6 @@ const no: Translation = {
|
|||||||
'API Anrop',
|
'API Anrop',
|
||||||
'Syslog Meldinger'
|
'Syslog Meldinger'
|
||||||
],
|
],
|
||||||
NUM_DEVICES: '{num} Enhet{{er}}',
|
|
||||||
NUM_TEMP_SENSORS: '{num} Temperatursensor{{er}}',
|
|
||||||
NUM_ANALOG_SENSORS: '{num} Analogsensor{{er}}',
|
|
||||||
NUM_DAYS: '{num} Dag{{er}}',
|
NUM_DAYS: '{num} Dag{{er}}',
|
||||||
NUM_SECONDS: '{num} Sekund{{er}}',
|
NUM_SECONDS: '{num} Sekund{{er}}',
|
||||||
NUM_HOURS: '{num} Time{{r}}',
|
NUM_HOURS: '{num} Time{{r}}',
|
||||||
|
|||||||
@@ -71,13 +71,11 @@ const pl: BaseTranslation = {
|
|||||||
TX_ISSUES: 'problem z zapisem na magistralę EMS, spróbuj wybrać inny "Tryb transmisji (Tx)"',
|
TX_ISSUES: 'problem z zapisem na magistralę EMS, spróbuj wybrać inny "Tryb transmisji (Tx)"',
|
||||||
DISCONNECTED: 'brak połączenia',
|
DISCONNECTED: 'brak połączenia',
|
||||||
EMS_SCAN: 'Czy na pewno wykonać pełne skanowanie magistrali EMS?',
|
EMS_SCAN: 'Czy na pewno wykonać pełne skanowanie magistrali EMS?',
|
||||||
EMS_BUS_STATUS: 'Status magistrali EMS',
|
DATA_TRAFFIC: 'Data Traffic', // TODO Translate
|
||||||
ACTIVE_DEVICES: 'Aktywne urządzenia i czujniki',
|
|
||||||
EMS_DEVICE: 'Urządzenie EMS',
|
EMS_DEVICE: 'Urządzenie EMS',
|
||||||
SUCCESS: 'Udane',
|
SUCCESS: 'Udane',
|
||||||
FAIL: 'Nieudane',
|
FAIL: 'Nieudane',
|
||||||
QUALITY: 'Jakość',
|
QUALITY: 'Jakość',
|
||||||
SCAN_DEVICES: 'Wyszukiwanie nowych urządzeń',
|
|
||||||
SCAN: 'Skanuj',
|
SCAN: 'Skanuj',
|
||||||
STATUS_NAMES: [
|
STATUS_NAMES: [
|
||||||
'EMS, telegramy odebrane (Rx)',
|
'EMS, telegramy odebrane (Rx)',
|
||||||
@@ -89,9 +87,6 @@ const pl: BaseTranslation = {
|
|||||||
'Wywołania API',
|
'Wywołania API',
|
||||||
'Wpisy w SysLog'
|
'Wpisy w SysLog'
|
||||||
],
|
],
|
||||||
NUM_DEVICES: '{num} urządze{{ń|nie|nia|nia|ń}} EMS',
|
|
||||||
NUM_TEMP_SENSORS: '{num} czujni{{ków|k|ki|ki|ków}} temperatury',
|
|
||||||
NUM_ANALOG_SENSORS: '{num} inn{{ych|e|e|e|ych}} urządze{{ń|nie|nia(two)|nia|ń}} podłączon{{ych|e|e|e|ych}} do EMS-ESP',
|
|
||||||
NUM_DAYS: '{num} d{{ni|zień|ni|ni|ni}}',
|
NUM_DAYS: '{num} d{{ni|zień|ni|ni|ni}}',
|
||||||
NUM_SECONDS: '{num} sekun{{d|da|dy|dy|d}}',
|
NUM_SECONDS: '{num} sekun{{d|da|dy|dy|d}}',
|
||||||
NUM_HOURS: '{num} godzi{{n|na|ny|ny|n}}',
|
NUM_HOURS: '{num} godzi{{n|na|ny|ny|n}}',
|
||||||
|
|||||||
@@ -71,13 +71,11 @@ const sk: Translation = {
|
|||||||
TX_ISSUES: 'Problémy s Tx – skontrolujte Tx režim',
|
TX_ISSUES: 'Problémy s Tx – skontrolujte Tx režim',
|
||||||
DISCONNECTED: 'Odpojené',
|
DISCONNECTED: 'Odpojené',
|
||||||
EMS_SCAN: 'Naozaj chcete spustiť úplnú kontrolu zariadenia zbernice EMS?',
|
EMS_SCAN: 'Naozaj chcete spustiť úplnú kontrolu zariadenia zbernice EMS?',
|
||||||
EMS_BUS_STATUS: 'Stav zbernice EMS',
|
DATA_TRAFFIC: 'Data Traffic', // TODO Translate
|
||||||
ACTIVE_DEVICES: 'Aktívne zariadenia a snímače',
|
|
||||||
EMS_DEVICE: 'EMS zariadenie',
|
EMS_DEVICE: 'EMS zariadenie',
|
||||||
SUCCESS: 'ÚSPEŠNÉ',
|
SUCCESS: 'ÚSPEŠNÉ',
|
||||||
FAIL: 'ZLÝHANIE',
|
FAIL: 'ZLÝHANIE',
|
||||||
QUALITY: 'KVALITA',
|
QUALITY: 'KVALITA',
|
||||||
SCAN_DEVICES: 'Scan pre nové zariadenia',
|
|
||||||
SCAN: 'Scan',
|
SCAN: 'Scan',
|
||||||
STATUS_NAMES: [
|
STATUS_NAMES: [
|
||||||
'EMS Telegramy prijaté (Rx)',
|
'EMS Telegramy prijaté (Rx)',
|
||||||
@@ -89,9 +87,6 @@ const sk: Translation = {
|
|||||||
'Externé API volania',
|
'Externé API volania',
|
||||||
'Syslog správy'
|
'Syslog správy'
|
||||||
],
|
],
|
||||||
NUM_DEVICES: '{num} Zariaden{{í|ie|ia|ia|í|í}}',
|
|
||||||
NUM_TEMP_SENSORS: '{num} Teplotn{{ých|ý|é|é|ých|ých}} sníma{{čov|č|če|če|čov|čov}}',
|
|
||||||
NUM_ANALOG_SENSORS: '{num} Analogov{{ých|ý|é|é|ých|ých}} sníma{{čov|č|če|če|čov|čov}}',
|
|
||||||
NUM_DAYS: '{num} d{{ní|eň|ní|ní|ní|ní}}',
|
NUM_DAYS: '{num} d{{ní|eň|ní|ní|ní|ní}}',
|
||||||
NUM_SECONDS: '{num} sek{{únd|unda|undy|undy|únd|únd}}',
|
NUM_SECONDS: '{num} sek{{únd|unda|undy|undy|únd|únd}}',
|
||||||
NUM_HOURS: '{num} hod{{ín|ina|iny|iny|ín|ín}}',
|
NUM_HOURS: '{num} hod{{ín|ina|iny|iny|ín|ín}}',
|
||||||
|
|||||||
@@ -71,13 +71,11 @@ const sv: Translation = {
|
|||||||
TX_ISSUES: 'Sändfel - Prova ett annat TX-läge',
|
TX_ISSUES: 'Sändfel - Prova ett annat TX-läge',
|
||||||
DISCONNECTED: 'Nedkopplad',
|
DISCONNECTED: 'Nedkopplad',
|
||||||
EMS_SCAN: 'Är du säker att du vill initiera en full genomsökning av EMS-bussen?',
|
EMS_SCAN: 'Är du säker att du vill initiera en full genomsökning av EMS-bussen?',
|
||||||
EMS_BUS_STATUS: 'Status',
|
DATA_TRAFFIC: 'Data Traffic', // TODO Translate
|
||||||
ACTIVE_DEVICES: 'Aktiva Enheter',
|
|
||||||
EMS_DEVICE: 'EMS Enhet',
|
EMS_DEVICE: 'EMS Enhet',
|
||||||
SUCCESS: 'Lyckades',
|
SUCCESS: 'Lyckades',
|
||||||
FAIL: 'Misslyckades',
|
FAIL: 'Misslyckades',
|
||||||
QUALITY: 'Kvalitet',
|
QUALITY: 'Kvalitet',
|
||||||
SCAN_DEVICES: 'Sök efter nya enheter',
|
|
||||||
SCAN: 'Sök',
|
SCAN: 'Sök',
|
||||||
STATUS_NAMES: [
|
STATUS_NAMES: [
|
||||||
'EMS-telegram (Rx)',
|
'EMS-telegram (Rx)',
|
||||||
@@ -89,9 +87,6 @@ const sv: Translation = {
|
|||||||
'API-anrop',
|
'API-anrop',
|
||||||
'Syslog-meddelanden'
|
'Syslog-meddelanden'
|
||||||
],
|
],
|
||||||
NUM_DEVICES: '{num} Enhet{{er}}',
|
|
||||||
NUM_TEMP_SENSORS: '{num} Temperatur-sensor{{er}}',
|
|
||||||
NUM_ANALOG_SENSORS: '{num} Analoga Sensor{{er}}',
|
|
||||||
NUM_DAYS: '{num} dag{{ar}}',
|
NUM_DAYS: '{num} dag{{ar}}',
|
||||||
NUM_SECONDS: '{num} sekund{{er}}',
|
NUM_SECONDS: '{num} sekund{{er}}',
|
||||||
NUM_HOURS: '{num} timmar',
|
NUM_HOURS: '{num} timmar',
|
||||||
|
|||||||
@@ -71,13 +71,11 @@ const tr: Translation = {
|
|||||||
TX_ISSUES: 'Tx sorunu - başka bir Tx Modu deneyin',
|
TX_ISSUES: 'Tx sorunu - başka bir Tx Modu deneyin',
|
||||||
DISCONNECTED: 'Bağlantı kesildi',
|
DISCONNECTED: 'Bağlantı kesildi',
|
||||||
EMS_SCAN: 'EMS Hattında tam bir cihaz taraması başlatmak istediğinizden emin misiniz?',
|
EMS_SCAN: 'EMS Hattında tam bir cihaz taraması başlatmak istediğinizden emin misiniz?',
|
||||||
EMS_BUS_STATUS: 'EMS Hattı Durumu',
|
DATA_TRAFFIC: 'Data Traffic', // TODO Translate
|
||||||
ACTIVE_DEVICES: 'Aktif Cihazlar ve Sensörler',
|
|
||||||
EMS_DEVICE: 'EMS Cihazı',
|
EMS_DEVICE: 'EMS Cihazı',
|
||||||
SUCCESS: 'BAŞARILI',
|
SUCCESS: 'BAŞARILI',
|
||||||
FAIL: 'HATA',
|
FAIL: 'HATA',
|
||||||
QUALITY: 'KALİTE',
|
QUALITY: 'KALİTE',
|
||||||
SCAN_DEVICES: 'Yeni cihaz taraması',
|
|
||||||
SCAN: 'Tara',
|
SCAN: 'Tara',
|
||||||
STATUS_NAMES: [
|
STATUS_NAMES: [
|
||||||
'EMS Telegramlar Alındı (Rx)',
|
'EMS Telegramlar Alındı (Rx)',
|
||||||
@@ -89,9 +87,6 @@ const tr: Translation = {
|
|||||||
'API Aramaları',
|
'API Aramaları',
|
||||||
'Sistem Kayıt Mesajları'
|
'Sistem Kayıt Mesajları'
|
||||||
],
|
],
|
||||||
NUM_DEVICES: '{num} Cihaz{{ları}}',
|
|
||||||
NUM_TEMP_SENSORS: '{num} Sıcaklık Sensör{{leri}}',
|
|
||||||
NUM_ANALOG_SENSORS: '{num} Analog Sensör{{ler}}',
|
|
||||||
NUM_DAYS: '{num} gün{{ler}}',
|
NUM_DAYS: '{num} gün{{ler}}',
|
||||||
NUM_SECONDS: '{num} saniye{{ler}}',
|
NUM_SECONDS: '{num} saniye{{ler}}',
|
||||||
NUM_HOURS: '{num} saat{{ler}}',
|
NUM_HOURS: '{num} saat{{ler}}',
|
||||||
|
|||||||
@@ -425,7 +425,6 @@ const EMSESP_SETTINGS_ENDPOINT = REST_ENDPOINT_ROOT + 'settings';
|
|||||||
const EMSESP_CORE_DATA_ENDPOINT = REST_ENDPOINT_ROOT + 'coreData';
|
const EMSESP_CORE_DATA_ENDPOINT = REST_ENDPOINT_ROOT + 'coreData';
|
||||||
const EMSESP_SENSOR_DATA_ENDPOINT = REST_ENDPOINT_ROOT + 'sensorData';
|
const EMSESP_SENSOR_DATA_ENDPOINT = REST_ENDPOINT_ROOT + 'sensorData';
|
||||||
const EMSESP_DEVICES_ENDPOINT = REST_ENDPOINT_ROOT + 'devices';
|
const EMSESP_DEVICES_ENDPOINT = REST_ENDPOINT_ROOT + 'devices';
|
||||||
const EMSESP_SCANDEVICES_ENDPOINT = REST_ENDPOINT_ROOT + 'scanDevices';
|
|
||||||
|
|
||||||
const EMSESP_DEVICEDATA_ENDPOINT1 = REST_ENDPOINT_ROOT + 'deviceData';
|
const EMSESP_DEVICEDATA_ENDPOINT1 = REST_ENDPOINT_ROOT + 'deviceData';
|
||||||
const EMSESP_DEVICEDATA_ENDPOINT2 = REST_ENDPOINT_ROOT + 'deviceData/:id?';
|
const EMSESP_DEVICEDATA_ENDPOINT2 = REST_ENDPOINT_ROOT + 'deviceData/:id?';
|
||||||
@@ -4325,8 +4324,6 @@ router
|
|||||||
return { devices: sorted_devices };
|
return { devices: sorted_devices };
|
||||||
|
|
||||||
})
|
})
|
||||||
.post(EMSESP_SCANDEVICES_ENDPOINT, () => status(200))
|
|
||||||
|
|
||||||
.get(EMSESP_DEVICEDATA_ENDPOINT1, (request) =>
|
.get(EMSESP_DEVICEDATA_ENDPOINT1, (request) =>
|
||||||
request.query.id ? deviceData(Number(request.query.id)) : status(404)
|
request.query.id ? deviceData(Number(request.query.id)) : status(404)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -43,18 +43,6 @@ WebDataService::WebDataService(AsyncWebServer * server, SecurityManager * securi
|
|||||||
server->on(SENSOR_DATA_SERVICE_PATH,
|
server->on(SENSOR_DATA_SERVICE_PATH,
|
||||||
HTTP_GET,
|
HTTP_GET,
|
||||||
securityManager->wrapRequest([this](AsyncWebServerRequest * request) { sensor_data(request); }, AuthenticationPredicates::IS_AUTHENTICATED));
|
securityManager->wrapRequest([this](AsyncWebServerRequest * request) { sensor_data(request); }, AuthenticationPredicates::IS_AUTHENTICATED));
|
||||||
|
|
||||||
// POST's
|
|
||||||
server->on(SCAN_DEVICES_SERVICE_PATH,
|
|
||||||
HTTP_POST,
|
|
||||||
securityManager->wrapRequest([this](AsyncWebServerRequest * request) { scan_devices(request); }, AuthenticationPredicates::IS_ADMIN));
|
|
||||||
}
|
|
||||||
|
|
||||||
// scan devices service
|
|
||||||
void WebDataService::scan_devices(AsyncWebServerRequest * request) {
|
|
||||||
EMSESP::logger().info("Scanning devices...");
|
|
||||||
EMSESP::scan_devices();
|
|
||||||
request->send(200);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// this is used in the dashboard and contains all ems device information
|
// this is used in the dashboard and contains all ems device information
|
||||||
|
|||||||
@@ -28,7 +28,6 @@
|
|||||||
#define WRITE_DEVICE_VALUE_SERVICE_PATH "/rest/writeDeviceValue"
|
#define WRITE_DEVICE_VALUE_SERVICE_PATH "/rest/writeDeviceValue"
|
||||||
#define WRITE_TEMPERATURE_SENSOR_SERVICE_PATH "/rest/writeTemperatureSensor"
|
#define WRITE_TEMPERATURE_SENSOR_SERVICE_PATH "/rest/writeTemperatureSensor"
|
||||||
#define WRITE_ANALOG_SENSOR_SERVICE_PATH "/rest/writeAnalogSensor"
|
#define WRITE_ANALOG_SENSOR_SERVICE_PATH "/rest/writeAnalogSensor"
|
||||||
#define SCAN_DEVICES_SERVICE_PATH "/rest/scanDevices"
|
|
||||||
|
|
||||||
namespace emsesp {
|
namespace emsesp {
|
||||||
|
|
||||||
@@ -50,7 +49,6 @@ class WebDataService {
|
|||||||
void write_device_value(AsyncWebServerRequest * request, JsonVariant json);
|
void write_device_value(AsyncWebServerRequest * request, JsonVariant json);
|
||||||
void write_temperature_sensor(AsyncWebServerRequest * request, JsonVariant json);
|
void write_temperature_sensor(AsyncWebServerRequest * request, JsonVariant json);
|
||||||
void write_analog_sensor(AsyncWebServerRequest * request, JsonVariant json);
|
void write_analog_sensor(AsyncWebServerRequest * request, JsonVariant json);
|
||||||
void scan_devices(AsyncWebServerRequest * request); // command
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace emsesp
|
} // namespace emsesp
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
|
|
||||||
namespace emsesp {
|
namespace emsesp {
|
||||||
|
|
||||||
|
// /rest/ESPSystemStatus
|
||||||
WebStatusService::WebStatusService(AsyncWebServer * server, SecurityManager * securityManager) {
|
WebStatusService::WebStatusService(AsyncWebServer * server, SecurityManager * securityManager) {
|
||||||
server->on(ESPSYSTEM_STATUS_SERVICE_PATH, HTTP_GET, [this](AsyncWebServerRequest * request) { ESPsystemStatus(request); });
|
server->on(ESPSYSTEM_STATUS_SERVICE_PATH, HTTP_GET, [this](AsyncWebServerRequest * request) { ESPsystemStatus(request); });
|
||||||
server->on(SYSTEM_STATUS_SERVICE_PATH, HTTP_GET, [this](AsyncWebServerRequest * request) { systemStatus(request); });
|
server->on(SYSTEM_STATUS_SERVICE_PATH, HTTP_GET, [this](AsyncWebServerRequest * request) { systemStatus(request); });
|
||||||
|
|||||||
Reference in New Issue
Block a user