andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 08:19:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev

Browse Source
This commit is contained in:
MichaelDvP
2025-11-17 13:29:20 +01:00
parent ea75a34c82 07d0de0151
commit 5df82b7e2c
8 changed files with 98 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
interface/src/app/main/SensorsAnalogDialog.tsx
View File

@@ -14,7 +14,6 @@ import {
Grid,
InputAdornment,
MenuItem,
TextField,
Typography
} from '@mui/material';
@@ -193,12 +192,11 @@ const SensorsAnalogDialog = ({
label={LL.NAME(0)}
value={editItem.n}
fullWidth
variant="outlined"
onChange={updateFormValue}
/>
</Grid>
<Grid>
<TextField
<ValidatedTextField
name="t"
label={LL.TYPE(0)}
value={editItem.t}
@@ -208,11 +206,11 @@ const SensorsAnalogDialog = ({
disabled={editItem.s}
>
{analogTypeMenuItems}
</TextField>
</ValidatedTextField>
</Grid>
{(isCounterOrRate || isFreqType) && (
<Grid>
<TextField
<ValidatedTextField
name="u"
label={LL.UNIT()}
value={editItem.u}
@@ -222,18 +220,17 @@ const SensorsAnalogDialog = ({
disabled={editItem.s}
>
{uomMenuItems}
</TextField>
</ValidatedTextField>
</Grid>
)}
{editItem.t === AnalogType.ADC && (
<Grid>
<TextField
<ValidatedTextField
name="o"
label={LL.OFFSET()}
value={numberValue(editItem.o)}
type="number"
sx={{ width: '11ch' }}
variant="outlined"
onChange={updateFormValue}
disabled={editItem.s}
slotProps={{
@@ -249,13 +246,12 @@ const SensorsAnalogDialog = ({
)}
{editItem.t === AnalogType.NTC && (
<Grid>
<TextField
<ValidatedTextField
name="o"
label={LL.OFFSET()}
value={numberValue(editItem.o)}
sx={{ width: '11ch' }}
type="number"
variant="outlined"
onChange={updateFormValue}
disabled={editItem.s}
slotProps={{
@@ -271,13 +267,12 @@ const SensorsAnalogDialog = ({
)}
{editItem.t === AnalogType.COUNTER && (
<Grid>
<TextField
<ValidatedTextField
name="o"
label={LL.STARTVALUE()}
value={numberValue(editItem.o)}
type="number"
sx={{ width: '11ch' }}
variant="outlined"
onChange={updateFormValue}
disabled={editItem.s}
slotProps={{
@@ -288,13 +283,12 @@ const SensorsAnalogDialog = ({
)}
{editItem.t === AnalogType.RGB && (
<Grid>
<TextField
<ValidatedTextField
name="o"
label={'RGB ' + LL.VALUE(0)}
value={numberValue(editItem.o)}
type="number"
sx={{ width: '11ch' }}
variant="outlined"
onChange={updateFormValue}
disabled={editItem.s}
/>
@@ -302,13 +296,12 @@ const SensorsAnalogDialog = ({
)}
{isCounterOrRate && (
<Grid>
<TextField
<ValidatedTextField
name="f"
label={LL.FACTOR()}
value={numberValue(editItem.f)}
sx={{ width: '14ch' }}
type="number"
variant="outlined"
onChange={updateFormValue}
disabled={editItem.s}
slotProps={{
@@ -319,13 +312,12 @@ const SensorsAnalogDialog = ({
)}
{isDigitalOutGPIO && (
<Grid>
<TextField
<ValidatedTextField
name="o"
label={LL.VALUE(0)}
value={numberValue(editItem.o)}
sx={{ width: '11ch' }}
type="number"
variant="outlined"
onChange={updateFormValue}
disabled={editItem.s}
slotProps={{
@@ -337,21 +329,20 @@ const SensorsAnalogDialog = ({
{isDigitalOutNonGPIO && (
<>
<Grid>
<TextField
<ValidatedTextField
name="o"
label={LL.VALUE(0)}
value={numberValue(editItem.o)}
select
variant="outlined"
onChange={updateFormValue}
disabled={editItem.s}
>
<MenuItem value={0}>{LL.OFF()}</MenuItem>
<MenuItem value={1}>{LL.ON()}</MenuItem>
</TextField>
</ValidatedTextField>
</Grid>
<Grid>
<TextField
<ValidatedTextField
name="f"
label={LL.POLARITY()}
value={editItem.f}
@@ -362,10 +353,10 @@ const SensorsAnalogDialog = ({
>
<MenuItem value={1}>{LL.ACTIVEHIGH()}</MenuItem>
<MenuItem value={-1}>{LL.ACTIVELOW()}</MenuItem>
</TextField>
</ValidatedTextField>
</Grid>
<Grid>
<TextField
<ValidatedTextField
name="u"
label={LL.STARTVALUE()}
sx={{ width: '15ch' }}
@@ -381,19 +372,18 @@ const SensorsAnalogDialog = ({
<MenuItem value={2}>
{LL.ALWAYS()}&nbsp;{LL.ON()}
</MenuItem>
</TextField>
</ValidatedTextField>
</Grid>
</>
)}
{isPWM && (
<>
<Grid>
<TextField
<ValidatedTextField
name="f"
label={LL.FREQ()}
value={numberValue(editItem.f)}
type="number"
variant="outlined"
sx={{ width: '11ch' }}
onChange={updateFormValue}
disabled={editItem.s}
@@ -408,13 +398,12 @@ const SensorsAnalogDialog = ({
/>
</Grid>
<Grid>
<TextField
<ValidatedTextField
name="o"
label={LL.DUTY_CYCLE()}
value={numberValue(editItem.o)}
type="number"
sx={{ width: '11ch' }}
variant="outlined"
onChange={updateFormValue}
disabled={editItem.s}
slotProps={{
@@ -432,7 +421,7 @@ const SensorsAnalogDialog = ({
{editItem.t === AnalogType.PULSE && (
<>
<Grid>
<TextField
<ValidatedTextField
name="o"
label={LL.POLARITY()}
value={editItem.o}
@@ -443,16 +432,15 @@ const SensorsAnalogDialog = ({
>
<MenuItem value={0}>{LL.ACTIVEHIGH()}</MenuItem>
<MenuItem value={1}>{LL.ACTIVELOW()}</MenuItem>
</TextField>
</ValidatedTextField>
</Grid>
<Grid>
<TextField
<ValidatedTextField
name="f"
label="Pulse"
value={numberValue(editItem.f)}
type="number"
sx={{ width: '15ch' }}
variant="outlined"
onChange={updateFormValue}
disabled={editItem.s}
slotProps={{

47
interface/src/app/settings/MqttSettings.tsx
View File

@@ -1,8 +1,11 @@
import { useCallback, useMemo, useState } from 'react';
import { toast } from 'react-toastify';
import CancelIcon from '@mui/icons-material/Cancel';
import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
import WarningIcon from '@mui/icons-material/Warning';
import {
Box,
Button,
Checkbox,
Grid,
@@ -30,6 +33,8 @@ import type { MqttSettingsType } from 'types';
import { numberValue, updateValueDirty, useRest } from 'utils';
import { createMqttSettingsValidator, validate } from 'validators';
import { callAction } from '../../api/app';
const MqttSettings = () => {
const {
loadData,
@@ -52,6 +57,16 @@ const MqttSettings = () => {
const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
const sendResetMQTT = useCallback(() => {
void callAction({ action: 'resetMQTT' })
.then(() => {
toast.success('MQTT ' + LL.REFRESH() + ' successful');
})
.catch((error) => {
toast.error(String(error.error?.message || 'An error occurred'));
});
}, []);
const updateFormValue = useMemo(
() =>
updateValueDirty(
@@ -114,16 +129,28 @@ const MqttSettings = () => {
<SectionContent>
{blocker ? <BlockNavigation blocker={blocker} /> : null}
<>
<BlockFormControlLabel
control={
<Checkbox
name="enabled"
checked={data.enabled}
onChange={updateFormValue}
/>
}
label={LL.ENABLE_MQTT()}
/>
<Box display="flex" gap={2} mb={1}>
<BlockFormControlLabel
control={
<Checkbox
name="enabled"
checked={data.enabled}
onChange={updateFormValue}
/>
}
label={LL.ENABLE_MQTT()}
/>
{data.enabled && (
<Button
startIcon={<SettingsBackupRestoreIcon />}
color="secondary"
variant="outlined"
onClick={sendResetMQTT}
>
{LL.REFRESH() + ' MQTT'}
</Button>
)}
</Box>
<Grid container spacing={2} rowSpacing={0}>
<Grid>
<ValidatedTextField