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

formatting

Browse Source
This commit is contained in:
proddy
2025-11-17 14:35:14 +01:00
parent f85226ce55
commit bee307a91d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
interface/src/app/main/Sensors.tsx
View File

@@ -455,10 +455,14 @@ const Sensors = () => {
as.g !== GPIO_26) || as.g !== GPIO_26) ||
as.t === AnalogType.DIGITAL_IN || as.t === AnalogType.DIGITAL_IN ||
as.t === AnalogType.PULSE ? ( as.t === AnalogType.PULSE ? (
<Cell stiff>{as.g !== 99 ? as.v ? LL.ON() : LL.OFF() : ''}</Cell> <Cell stiff>
{as.g !== 99 ? (as.v ? LL.ON() : LL.OFF()) : ''}
</Cell>
) : ( ) : (
<Cell stiff> <Cell stiff>
{as.t !== AnalogType.NOTUSED && as.g !== 99 ? formatValue(as.v, as.u) : ''} {as.t !== AnalogType.NOTUSED && as.g !== 99
? formatValue(as.v, as.u)
: ''}
</Cell> </Cell>
)} )}
</Row> </Row>

2
src/core/system.cpp
View File

@@ -414,7 +414,7 @@ void System::reload_settings() {
dallas_gpio_ = 0; dallas_gpio_ = 0;
EMSESP::webSettingsService.read([&](WebSettings & settings) { EMSESP::webSettingsService.read([&](WebSettings & settings) {
version_ = settings.version; version_ = settings.version;
// first check gpios, prioriy to rx and tx // first check gpios, priority to rx and tx
rx_gpio_ = is_valid_gpio(settings.rx_gpio) ? settings.rx_gpio : 0; rx_gpio_ = is_valid_gpio(settings.rx_gpio) ? settings.rx_gpio : 0;
tx_gpio_ = is_valid_gpio(settings.tx_gpio) ? settings.tx_gpio : 0; tx_gpio_ = is_valid_gpio(settings.tx_gpio) ? settings.tx_gpio : 0;
pbutton_gpio_ = is_valid_gpio(settings.pbutton_gpio) ? settings.pbutton_gpio : 0; pbutton_gpio_ = is_valid_gpio(settings.pbutton_gpio) ? settings.pbutton_gpio : 0;