mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-07 08:19:52 +03:00
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into idf4
This commit is contained in:
@@ -56,7 +56,8 @@ const WiFiSettingsForm: FC = () => {
|
||||
enableIPv6: false,
|
||||
bandwidth20: false,
|
||||
tx_power: 20,
|
||||
nosleep: false
|
||||
nosleep: false,
|
||||
enableMDNS: true
|
||||
});
|
||||
}
|
||||
setInitialized(true);
|
||||
@@ -153,6 +154,11 @@ const WiFiSettingsForm: FC = () => {
|
||||
label="Use Lower WiFi Bandwidth"
|
||||
/>
|
||||
|
||||
<BlockFormControlLabel
|
||||
control={<Checkbox name="enableMDNS" checked={data.enableMDNS} onChange={updateFormValue} />}
|
||||
label="Enable mDNS Service"
|
||||
/>
|
||||
|
||||
<Typography sx={{ pt: 2 }} variant="h6" color="primary">
|
||||
General
|
||||
</Typography>
|
||||
|
||||
@@ -402,10 +402,27 @@ const SettingsApplication: FC = () => {
|
||||
Formatting Options
|
||||
</Typography>
|
||||
<Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
|
||||
<Grid item xs={6}>
|
||||
<Grid item xs={4}>
|
||||
<ValidatedTextField
|
||||
name="bool_dashboard"
|
||||
label="Boolean Format Dashboard"
|
||||
value={data.bool_dashboard}
|
||||
fullWidth
|
||||
variant="outlined"
|
||||
onChange={updateFormValue}
|
||||
margin="normal"
|
||||
select
|
||||
>
|
||||
<MenuItem value={1}>on/off</MenuItem>
|
||||
<MenuItem value={2}>ON/OFF</MenuItem>
|
||||
<MenuItem value={3}>true/false</MenuItem>
|
||||
<MenuItem value={5}>1/0</MenuItem>
|
||||
</ValidatedTextField>
|
||||
</Grid>
|
||||
<Grid item xs={4}>
|
||||
<ValidatedTextField
|
||||
name="bool_format"
|
||||
label="Boolean Format"
|
||||
label="Boolean Format API/MQTT"
|
||||
value={data.bool_format}
|
||||
fullWidth
|
||||
variant="outlined"
|
||||
@@ -421,10 +438,10 @@ const SettingsApplication: FC = () => {
|
||||
<MenuItem value={6}>1/0</MenuItem>
|
||||
</ValidatedTextField>
|
||||
</Grid>
|
||||
<Grid item xs={6}>
|
||||
<Grid item xs={4}>
|
||||
<ValidatedTextField
|
||||
name="enum_format"
|
||||
label="Enum Format"
|
||||
label="Enum Format API/MQTT"
|
||||
value={data.enum_format}
|
||||
fullWidth
|
||||
variant="outlined"
|
||||
|
||||
@@ -26,6 +26,7 @@ export interface Settings {
|
||||
trace_raw: boolean;
|
||||
board_profile: string;
|
||||
bool_format: number;
|
||||
bool_dashboard: number;
|
||||
enum_format: number;
|
||||
fahrenheit: boolean;
|
||||
phy_type: number;
|
||||
|
||||
@@ -47,6 +47,7 @@ export interface NetworkSettings {
|
||||
subnet_mask?: string;
|
||||
dns_ip_1?: string;
|
||||
dns_ip_2?: string;
|
||||
enableMDNS: boolean;
|
||||
}
|
||||
|
||||
export interface WiFiNetworkList {
|
||||
|
||||
Reference in New Issue
Block a user