Commit Graph

2926 Commits

Author SHA1 Message Date
Maxim Prokhorov
cd96f1ca6d sns: load energy from settings unconditionally
fixes #2407
avoid depending on other settings

technically, it could be another block in the snsConfigure for
magnitudes, however it also should be a new type of one-shot logic
2020-12-24 16:21:20 +03:00
Maxim Prokhorov
227d3e6620 api: allow to handle the request only once 2020-12-24 16:21:20 +03:00
Maxim Prokhorov
b0fb6b9851 api: make sure to return when GET response is done
calling request->send() multiple times does not work as expected
2020-12-24 16:21:20 +03:00
m-kozlowski
51ad030adf alexa: bump fauxmoesp to 3.1.2
As of October 2020, this project is now being maintained at https://github.com/vintlabs/fauxmoESP

Co-authored-by: mkozlowski <gitcmt@empeka.pl>
2020-12-22 15:05:05 +03:00
Maxim Prokhorov
1ed5f43980 btn: switches toggle again
- revert hardware.h changes from f497312f29 to
avoid changing existing devices.
- update hardware.h comments related to the _CONFIG and actions
2020-12-15 01:28:33 +03:00
Maxim Prokhorov
3287dbcee7 pio: small helper to use libdeps installer 2020-12-15 01:02:45 +03:00
Maxim Prokhorov
e0e5377da7 terminal: small workaround for _tempObject from API
Exchange sneaky memory leak with a squeaky wheel...
Web server will immediatly delete the request object, so not really much
point in tracking the pointer via some external means.
2020-12-06 00:33:40 +03:00
Maxim Prokhorov
cb4c1a12ff sns: log typo 2020-12-06 00:13:20 +03:00
Maxim Prokhorov
5fdbd1df5b terminal: both API implementations to use line param instead of value 2020-12-06 00:13:09 +03:00
Maxim Prokhorov
e6dc5051ba test: update terminal strings 2020-12-05 22:03:32 +03:00
Maxim Prokhorov
9f24e6a325 terminal: make sure API is loaded after the web server
New apiRegister depends on `webServer()` returning a valid object.
2020-12-05 20:32:28 +03:00
Maxim Prokhorov
9aa0bdfe0e terminal: enforce F(...) as commands
- store name+callback pairs in list instead of a hash map
  remove vector reserve() overhead
- rework callbacks to expect flash strings
- comments...

Small difference is that now there's no way to know if command already
exists. Meaning, while we do override the existing callback, comman
names list will have more than one entry.

Flash strings are quite weird. In case we finally get all `const char*`s
in PROGMEM (which is the case for ESP32?), this could use a comment-proposed
method of having handlers per-module instead of handlers per-command.
2020-12-05 20:31:55 +03:00
Max Prokhorov
8e80a7786c api: rework plain and JSON implementations (#2405)
- match paths through a custom AsyncWebHandler instead of using generic not-found fallback handler
- allow MQTT-like patterns when registering paths (`simple/path`, `path/+/something`, `path/#`)
Replaces `relay/0`, `relay/1` etc. with `relay/+`. Magnitudes are plain paths, but using `/+` in case there's more than 1 magnitude of the same type.
- restore `std::function` as callback container (no more single-byte arg nonsense). Still, limit to 1 type per handler type
- adds JSON handlers which will receive JsonObject root as both input and output. Same logic as plain - GET returns resource data, PUT updates it.
- breaking change to `apiAuthenticate(request)`, it no longer will do `request->send(403)` and expect this to be handled externally.
- allow `Api-Key` header containing the key, works for both GET & PUT plain requests. The only way to set apikey for JSON.
- add `ApiRequest::param` to retrieve both GET and PUT params (aka args), remove ApiBuffer
- remove `API_BUFFER_SIZE`. Allow custom form-data key=value pairs for requests, allow to send basic `String`.
- add `API_JSON_BUFFER_SIZE` for the JSON buffer (both input and output)
- `/apis` replaced with `/api/list`, no longer uses custom handler and is an `apiRegister` callback
- `/api/rpc` custom handler replaced with an `apiRegister` callback

WIP further down:
- no more `webLog` for API requests, unless `webAccessLog` / `WEB_ACCESS_LOG` is set to `1`. This also needs to happen to the other handlers. 
- migrate to ArduinoJson v6, since it become apparent it is actually a good upgrade :)
- actually make use of JSON endpoints more, right now it's just existing GET for sensors and relays
- fork ESPAsyncWebServer to cleanup path parsing and temporary objects attached to the request (also, fix things a lot of things based on PRs there...)
2020-12-05 14:14:38 +03:00
Maxim Prokhorov
850db61b76 pio: filter single-source files by absolute path
Specifically, this will break RFM69_SUPPORT on case insensitive
filesystems due to the RFM69.cpp from the RFM69 lib being ignored
when adding ESPurna's rfm69.cpp
2020-11-16 10:52:54 +03:00
Maxim Prokhorov
12ae9d15be sns/hlw8012: default ratios at compile time 2020-11-16 03:32:26 +03:00
Maxim Prokhorov
99cb8e0094 hw: restore sonoff-mini switch actions defaults 2020-11-16 03:31:24 +03:00
Maxim Prokhorov
f497312f29 btn: option to read default value on initialization
- provide a generic way to read default status of the pin after boot
  allows us to use switch as both on and off, independent of the position on boot
- add BUTTON_DEFAULT_LOW & BUTTON_DEFAULT_BOOT (now it's not just BUTTON_DEFAULT_HIGH)
  wiki described raw numbers for some reason :/ this will break that
- clean-up 'constexpr const' and 'const' function args, both are redundant
- clean-up debounce event member defaults, put things in the header
2020-11-16 03:31:24 +03:00
Maxim Prokhorov
a62d1cdd13 pio: -latest-base -> -base for envs
Already using the "latest" stable release, no need to split things (at least for now)
2020-11-16 03:25:19 +03:00
Maxim Prokhorov
b24b0a2369 pio: fix git builds & bump current platform
- platform == platform_latest
- mcspr/toolchain-xtensa via https://github.com/platformio/platformio-core/issues/3612

Yet, this does not avoid useless warnings that platform does
not specify platformio/* prefix in the package spec :(

It should be available in the next espressif8266 version:
0859336019
2020-11-16 03:16:09 +03:00
Alex. Tircovnicu
289c8cb49c hardware: add support for Gosund P1 Power Strip (#2391) 2020-11-02 22:14:52 +03:00
aL1aL7
f6582ecd18 alexa: fix device discovery / state callback (#2388)
alexa device discovery/state calls use URL of type
/api/hash_id_key_whatever/lights

This is blocked when API is disabled and fails
also when http API is enabled because no apikey is
sent by amazon calls

Don't try to use the http api for alexa calls.
Responses for alexa are done by fauxmoesp lib,
so there's no need for the http api call.
2020-10-28 22:40:56 +03:00
Nicolas Gilles
85969e4945 hardware: add support for Benexmart GU5.3 RGBWW light (#2381)
* Add support for Benexmart GU5.3 RGBWW light

* Update arduino.h

Co-authored-by: Max Prokhorov <prokhorov.max@outlook.com>
2020-10-15 20:26:12 +03:00
tom-kaltofen
801e22a034 hardware: add support for LSC E27 10W white bulb (#2375)
* Add support for LSC E27 10W white bulb

* Add OTA config for LSC E27 10W white bulb
Add LSC E27 10W white bulb to arduino.h
2020-10-15 19:56:39 +03:00
Max Prokhorov
7a64a4a6bf btn: generate pressed & released events from switch changes (#2379)
- Add ::Released button event to be used specifically with switches, opposite of ::Pressed
- Always use default state for switches instead of ignoring it and using current pin reading as value. This allows us to boot with the switch held in the opposite state and trigger the correct event immediately
(meaning, switches now depend on the BUTTON_DEFAULT_HIGH presence to detect the default position)
- BREAKING: Fixup hardware.h. Any custom board needs manual changes.
- BREAKING: Rework MQTT button messages to send text from debug messages instead of numeric code
2020-10-15 19:55:23 +03:00
Maxim Prokhorov
aebefdf941 ntp: always use abs(offset), minus is used for positive values 2020-09-30 12:21:28 +03:00
Maxim Prokhorov
57e059a684 ntp: fix gcc-4.8.2 auto var { ... } becoming initializer_list
gcc-10.2 in the current git correctly deduces the expression :(
only tested this with the new gcc, fix the current release build
2020-09-30 11:51:06 +03:00
Maxim Prokhorov
fd9f930e71 ntp: use the actual legacy default values 2020-09-30 11:48:06 +03:00
Maxim Prokhorov
aec13cef63 ntp: clean-up
resolve #2327, #2220

- remove legacy support in the webui
- format datetime strings on the device, use NTP panel to display them both
- migrate from the old ntpOffset + ntpDST + ntpRegion to ntpTZ
2020-09-30 11:41:18 +03:00
Maxim Prokhorov
63b6f46752 Fix superfluous whitespaces and line endings
resolve #2310
2020-09-30 10:14:25 +03:00
Maxim Prokhorov
1f1d6a99d2 sns: always try to load magnitude units from settings
also, drop special builds flags in favour of sane defaults
2020-09-30 10:00:44 +03:00
Maxim Prokhorov
b0bb384bcd sns/event: event is a boolean value 2020-09-30 10:00:39 +03:00
Maxim Prokhorov
735e5c0ec2 sns/event: change counter variable only in the isr
ensure the only operation from main loop() is load
since isr handles incrementing the counter, resulting value is calculated as
offset between the current and the previous reading (always positive)
2020-09-30 10:00:38 +03:00
Alex. Tircovnicu
e859f2bbf7 hw: add support for Gosund SP111 (hardware version 1.1 16A) (#2369) 2020-09-27 05:03:32 +03:00
Max Prokhorov
0586f5d4cc ota: detect Tasmota magic numbers when booting (#2370)
- inject dummy data sequence that is expected to hold current version info
- check rtcmem markers and purge settings, since we don't want accidentally reading something as a kv
- sometimes we cannot boot b/c of certain SDK params, purge last 16KiB as well

ref. `SetOption78 1`
https://tasmota.github.io/docs/Commands/#setoptions

The original idea from Esphome:
0e59243b83/esphome/core/esphal.cpp (L275-L287)
Does not seem to be working atm. Will need to re-check with the esphome builder, c/p did not work and I tried building with gcc-10

Specific things we want to do is to have 'version' byte between 2 'marker' bytes:
217addc2bb/tasmota/settings.ino (L218-L262)       0dfa38df89/tasmota/i18n.h (L780-L782)
2020-09-27 05:01:08 +03:00
Maxim Prokhorov
1b66460638 sns: be more explicit about the copy vs. move 2020-09-27 02:56:12 +03:00
Maxim Prokhorov
723636ae21 sns/event: using cheaper isr calls, lock gpio isr when reading
Optimize isr handler once more by removing gpio -> index conversion at runtime

Drop atomics for now, since we can also make the whole operation atomic
by locking GPIO interrupts while reading and setting the counter value
And we don't have another thread / core to worry about
2020-09-27 01:50:37 +03:00
Maxim Prokhorov
e84fa98941 sns/event: only load the counter value once per reading
amend 8252f2ae18
note that platform does not implement either fetch_add or exchange

clean-up ordering once again
2020-09-26 15:42:47 +03:00
Nicolas Gilles
ca9b2fbb69 add missing lights #include for rpn rules (#2367) 2020-09-26 10:59:12 +03:00
Maxim Prokhorov
139b31287c sns: fix ci default.h overriding values in sensor.h 2020-09-26 10:57:25 +03:00
Maxim Prokhorov
8252f2ae18 sns: explicitly load before storing new counter value
resolve #2368

- Fixes "undefined reference to `__atomic_fetch_add_4'"
  Notably, std::atomic_fetch_add(&counter, 1) would also trigger this.
  std::atomic<T>::operator+= does not allow in-place change, since it
  returns T instead of T&
- Another work reduction in the isr, treat 'value' as `counter > 0`
  instead of relying on the notion that we can sometimes read the value
  with very low counter frequency
- Fix duplicated initializations
2020-09-26 10:56:08 +03:00
Max Prokhorov
da501a6bfa rpn: sleep and rtcmem ops (#2366) 2020-09-25 01:55:25 +03:00
Max Prokhorov
c7a95bf53f buttons: resistor ladder / analog buttons support (#2357)
- Buttons events source as button property instead of a global one
- Rename events source -> provider for all settings, consistent with the other things like relay and light providers
- AnalogPin to read between a certain analogRead() range
Trying to follow defaults here - analog 'press' is digital LOW, default value is HIGH, so no additional cfg entries are needed besides pin, level and changing evt source
- (debug) Refactor gpio command, add adc to show analogRead(pin)
- (debug) Add button command

Implemented based on:
https://gitter.im/tinkerman-cat/espurna?at=5f5d44c8df4af236f902e25d
https://gitter.im/tinkerman-cat/espurna?at=5f60e7f1f969413294e95370
2020-09-24 07:51:36 +03:00
Maxim Prokhorov
7dd8594a26 sns: default to SumFilter when counting values
Simplify fix for:
https://gitter.im/tinkerman-cat/espurna?at=5f6661a1f969413294f7404d

Most of the time, we care about the sum during report interval, not the
value that gets aggregated across all readings
2020-09-24 07:49:31 +03:00
Maxim Prokhorov
c0af41433a sns: clean-up EventSensor
Always do digitalRead() after ISR
Drop trigger, since we can handle this inside of reading routine
(although, pending some changes to make reading interval per-sensor)

Rework read / write through std::atomic
2020-09-24 07:49:31 +03:00
Max Prokhorov
c72ca3f1d0 sns: BME680 fixes (#2361)
- make sure we call run() before checking for errors, we will miss status update otherwise and lock the sensor class in the error state that it cannot recover from
- set error flag only when either bsec or bme680 report an error. ensure we show any issues reported by the library via the debug log
ref. https://gitter.im/tinkerman-cat/espurna?at=5f63a955c1d1a53705abcbe3
TODO: add custom error messages through virtual method?

Also, a minor fix to the sensors test when using 1m and 2m boards
2020-09-24 07:47:48 +03:00
user176176
1d895d98b8 hw: add support for Fcmila E27 7W RGB+W light bulb (#2353)
Device in question: https://www.aliexpress.com/item/32925895199.html
Named after print on the PCB.

Co-authored-by: user176176 <>
2020-09-15 23:40:37 +03:00
Max Prokhorov
21e9477d96 rpn: fix crash when calling rfb.codes 2020-09-10 01:15:32 +03:00
Max Prokhorov
d63228ef50 wifi: update to justwifi development version (#2347)
- support 32 byte hostname / ssid
- support 64 byte passphrase
- slightly reduce amount of memory allocations
- tweak initialization paths to call persistent(false) as early as possible
2020-09-10 01:05:02 +03:00
Max Prokhorov
ee1f56ad4b hw: rename zhilde eu44 -> 44eu (#2349) 2020-09-10 01:04:10 +03:00
Maxim Prokhorov
b8b8ca87b3 util: do not ignore zeroes in hex input
Provide safe fallback *only* when char is out-of-range

As it is, numeric 0 was equal to else { ... }, so 00 was never parsed.
Previously, it was assumed that we never try to parse leading / trailing zeroes,
but in turn we also ignored zeroes in the middle of the number...
2020-09-09 17:55:26 +03:00