Commit Graph

5128 Commits

Author SHA1 Message Date
Michael Hanselmann 1b96833d6a prometheus: Use utility functions to format metrics
Format strings for Prometheus metrics were written manually and the
`# TYPE` lines needed to be kept in sync with actual metrics. As
indicated by the previous commit it wasn't always as consistent as
desired. In addition there was a lot of repetition among the strings
which couldn't be reduced at build time.

With this change utility functions are introduced which eliminate the
need for specifying the same metric name more than once. At the same
time the proper escaping for label values, initially added in commit
16b5f2fe9, is now applied for all labels.

The size of the program shrinks slightly by 212 bytes on ESP8266 in the
"tasmota" configuration with Prometheus enabled and 412 bytes on ESP32
with the "tasmota32" configuration.

Signed-off-by: Michael Hanselmann <public@hansmi.ch>
2021-07-19 13:35:46 +02:00
Michael Hanselmann 7d15e15d8a prometheus: Fix wrong format on ESP32, incorrect names in types
When built for ESP32 the memory fragmentation metric was incorrectly
terminated (likely a typo). The type information for
"tasmota_global_humidity_percentage" didn't include the "_percentage"
and "tasmota_sensors" wsa incorrect too.

Signed-off-by: Michael Hanselmann <public@hansmi.ch>
2021-07-19 13:35:27 +02:00
gemu2015 f6b527d189 fix =d mode 2021-07-19 09:55:43 +02:00
Jason2866 3ab4a2a3e0
New framework LITTLEFS -> LittleFS 2021-07-18 23:14:10 +02:00
Stephan Hadinger f0f70ce1df Fix compilation for ESP8266 2021-07-18 19:52:50 +02:00
Stephan Hadinger 1682582bea Disable PSRAM on unsupported hardware
Either ESP32 rev1/2 that needs special fixes
`-DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -lc-psram-workaround -lm-psram-workaround`
or ESP32-PICO-V3-02 that requires esp-idf 4.4
2021-07-18 19:43:33 +02:00
Stephan Hadinger 1bbf7b826a Mark GPIOs 16 and 17 as read on ESP32, as they are used for PSRAM 2021-07-18 15:00:11 +02:00
Theo Arends 4173340c6a Add support for CAN bus and Freedom Won Battery Management System by Marius Bezuidenhout (#12651) 2021-07-17 15:16:48 +02:00
Theo Arends de2e86f022
Merge pull request #12651 from mbezuidenhout/feature/can-bus
Feature/can bus
2021-07-17 14:52:12 +02:00
Theo Arends 8162abd9d3 Fix Tasmesh special case packet size 2021-07-17 14:34:11 +02:00
Theo Arends 3d7c1091a7
Merge pull request #12659 from emontnemery/hass_white_tweak
Improve color light integration with HomeAssistant for so19 1
2021-07-16 13:41:05 +02:00
Stephan Hadinger 9d8626e9ca Fix AXP192 lcd voltage for M5Stack Core2 2021-07-15 22:07:37 +02:00
Erik 978f2e3d5d Use explicit color mode for RGBWW lights 2021-07-15 18:16:59 +02:00
Erik c3d757ca95 Use hs color instead of rgb color 2021-07-15 17:51:40 +02:00
Erik 02de85efa7 Only enable white mode for RGBW lights 2021-07-15 16:16:51 +02:00
Erik 3c6471d5de Improve RGBW light integration with HomeAssistant for so19 1 2021-07-15 16:07:30 +02:00
Theo Arends e357513a49 Fix regression in adcparam restore 2021-07-15 14:28:52 +02:00
Theo Arends d74929c3af Fix regression ESP8266 compilation 2021-07-14 18:28:05 +02:00
Theo Arends 6cd9a7d899 Add command ``SetSensor1..127 0|1`` to globally disable individual sensor driver 2021-07-14 14:20:50 +02:00
Marius Bezuidenhout 5fec3b0ac7 Moved entries to end of list 2021-07-14 11:54:54 +02:00
Marius Bezuidenhout f52ef2787a
Merge branch 'arendst:development' into feature/can-bus 2021-07-14 11:44:10 +02:00
Marius Bezuidenhout 425eb72305 Changed sensor number to 90 2021-07-14 11:43:26 +02:00
Theo Arends 0851549b10 Add support ESP32-C3 internal temperature sensor 2021-07-14 11:39:59 +02:00
Marius Bezuidenhout 33ae473906
Merge branch 'arendst:development' into feature/can-bus 2021-07-14 11:32:43 +02:00
Theo Arends 0282943d46 ESP32 internal sensor driver id moved from 87 to 127 2021-07-14 11:24:36 +02:00
Marius Bezuidenhout 7bbc858f09
Merge branch 'arendst:development' into feature/can-bus 2021-07-14 11:17:59 +02:00
Theo Arends 7e1565dee6 Move ESP32 temperature sensor to the end of the list 2021-07-14 10:57:05 +02:00
Marius Bezuidenhout 44e8b838cf Added missing translations 2021-07-13 20:18:11 +02:00
Marius Bezuidenhout 8e7a314d29 Merge branch 'feature/can-bus' of github.com:mbezuidenhout/Tasmota-PetProjects into feature/can-bus 2021-07-13 17:11:59 +02:00
Marius Bezuidenhout ef6b79a450
Merge branch 'arendst:development' into feature/can-bus 2021-07-13 17:11:43 +02:00
Marius Bezuidenhout ad8b557bec First working version 2021-07-13 16:49:40 +02:00
Theo Arends 5abadbf221 Fix ESP32 do not use chip temperature sensor as global temperature if external temperature sensor is used (#12630) 2021-07-13 16:44:28 +02:00
Theo Arends a7297892ab Update T67XX default configs 2021-07-13 12:01:46 +02:00
Theo Arends 499134e1bc Release of Tasmota WebInstaller 2021-07-13 11:40:13 +02:00
Theo Arends 49e68eb473
Merge pull request #12573 from hk2k2/patch-4
Update xsns_35_tx20.ino - Supporting Technoline WS2300-15 Anemometer
2021-07-13 11:22:34 +02:00
Theo Arends f7439ad1c4
Merge pull request #12618 from dizel-by/t67xx
Telaire T67XX CO2 sensor support
2021-07-13 11:20:07 +02:00
Theo Arends 3712aba031
Merge pull request #12624 from hansmi/prometheusdevicename1
Prometheus: Fix typos, improve documentation, expose device name
2021-07-13 11:12:46 +02:00
s-hadinger 76a0635491
LVGL add all callbacks (#12636)
* LVGL add all callbacks

* LVGL allow nil argument for init()

* Final touch
2021-07-12 22:53:31 +02:00
Marius Bezuidenhout f14f86f6fe Receiving SOC, SOH and Product name 2021-07-12 17:47:04 +02:00
Marius Bezuidenhout 024cc0b9b6 Added MCP2515 library and Freedom Won BMS sensor 2021-07-12 12:32:27 +02:00
mikep1998 5a5843b5ab
Until we provide a way to have our own modifiable copy tasmota_lv_conf.h I would like LV_USE_THEME_MONO defined. (#12625)
* Update xdrv_54_lvgl.ino

Fix compile error with LVGL define and without USE_BERRY defined

* Update xdrv_54_lvgl.ino

Fix compile error without Berry define.

* GPIO_XPT2046_CS is not specific to ILI9341

GPIO_XPT2046_CS is not specific to ILI9341 it is also used with ILI9488

* Update tasmota_lv_conf.h
2021-07-11 21:21:04 +02:00
Michael Hanselmann 16b5f2fe92 prometheus: Expose device name as part of device info
The device name can be useful to identify a particular instance in
Prometheus.

Example:

```
tasmota_info{...,devicename="livingroom"} 1
```

Signed-off-by: Michael Hanselmann <public@hansmi.ch>
2021-07-11 20:16:50 +02:00
Michael Hanselmann 9e441630f1 prometheus: Add comment with link to exposition format
Signed-off-by: Michael Hanselmann <public@hansmi.ch>
2021-07-11 20:16:37 +02:00
Michael Hanselmann 56ed94db42 prometheus: Fix typos in comments
Signed-off-by: Michael Hanselmann <public@hansmi.ch>
2021-07-11 20:16:37 +02:00
hk2k2 11ffd24d75
Update tasmota_template.h 2021-07-11 16:46:20 +02:00
hk2k2 a268e11680
Update support_features.ino 2021-07-11 16:44:56 +02:00
hk2k2 ec17bfff05
Merge branch 'arendst:development' into patch-4 2021-07-11 16:41:23 +02:00
mikep1998 c76b336545
Fix compile error with Berry defined. (#12616)
* Update xdrv_54_lvgl.ino

Fix compile error with LVGL define and without USE_BERRY defined

* Update xdrv_54_lvgl.ino

Fix compile error without Berry define.

* GPIO_XPT2046_CS is not specific to ILI9341

GPIO_XPT2046_CS is not specific to ILI9341 it is also used with ILI9488
2021-07-11 09:38:41 +02:00
Alexander Savchenko edd6839e48 Telaire T67XX CO2 sensor support 2021-07-11 02:42:09 +03:00
Adrian Scillato bb8e787947
Initial Wi-Fi Config: Fix Bug with SAVEDATA
In some conditions, if the save button is pressed more than once, or the page is refreshed several times, the Wi-Fi credentials checking routine was disabling SAVEDATA in flash. This Fixs that condition.
2021-07-09 13:27:47 -03:00
Stephan Hadinger da6846207c Moving defines post-config 2021-07-09 12:24:00 +02:00
Theo Arends d44fc80cd3 Fix exception 28 when unable to send MQTT message
Fix exception 28 when unable to send MQTT message and a topic name without a slash '/' (#12555)
2021-07-06 11:28:33 +02:00
mikep1998 9fd3ed597f
Update xdrv_54_lvgl.ino (#12574)
Fix compile error with LVGL define and without USE_BERRY defined
2021-07-06 08:23:38 +02:00
hk2k2 fa8643012d
Update xsns_35_tx20.ino
Extended tx20.ino for supporting Technoline WS2300-15 Anemometer.
This Model is very similar to TX20 - but use a slightly different Datagram.

use it with #ifdef USE_WS2300_WIND_SENSOR -> choose only one of them (TX20 || TX23 || WS2300-15)

Usage is the same as TX20/23, values are proofed with original Weather Station from Technoline.

Sorry for my Code.. was try and error some hours to get it working with the #ifdef stuff..

Documentation Update follows soon..
2021-07-06 00:07:09 +02:00
Adrian Scillato fb9a34ccbd
Merge pull request #12566 from ascillato/Initial_WiFi_Config_Fix_11n
Wi-Fi Initial Setup: Workaround for 11n Only Routers
2021-07-05 17:32:08 -03:00
Theo Arends 60fabf65a7 Fix regression ESP8266 setting hostname 2021-07-05 17:11:03 +02:00
Adrian Scillato fb4aac574e
Wi-Fi Initial Setup: Workaround for 11n Only Routers
Workaround for the hardware limitation of ESP8266. In STA+AP mode it only supports 11b/g. In STA only mode it supports 11b/g/n.
2021-07-05 10:00:10 -03:00
Theo Arends 512d912b77 Change setting hostname to fixing ArduinoESP32 core 2.0.0 2021-07-05 14:50:33 +02:00
Stephan Hadinger 1c15552210 Command ``SetOption127 1`` to force Wifi in no-sleep mode even if ``Sleep 0`` is not enabled 2021-07-05 13:43:41 +02:00
Theo Arends d5585adbb2 Disable wifi modem sleep on ESP32-C3 if possible 2021-07-05 12:32:58 +02:00
s-hadinger d362b494b8
Merge pull request #12561 from s-hadinger/fix_ping
Fix ping on Esp32
2021-07-04 22:23:33 +02:00
Stephan Hadinger dec1dc0c18 Fix ping on Esp32 2021-07-04 22:04:34 +02:00
Theo Arends 377b34409f Changed ESP32 Ethernet Phy Type information to IDF v3+ 2021-07-04 14:53:58 +02:00
Theo Arends e94a253cec Fix AM2320 value reporting (#12552) 2021-07-04 11:39:05 +02:00
Adrian Scillato 2100553085
MQTT UI: Add password length restriction
https://github.com/arendst/Tasmota/issues/12513
2021-07-03 20:19:36 -03:00
Theo Arends 164d0cb083
Merge pull request #12546 from s-hadinger/Ping-esp32c3
Fix compilaion for Esp32c3
2021-07-03 17:55:07 +02:00
Stephan Hadinger 25bdff6658 Fix compilaion for Esp32c3 2021-07-03 17:19:12 +02:00
Stephan Hadinger b8d831baf5 Fix Hue angle encoding for Zigbee 2021-07-03 15:21:57 +02:00
Stephan Hadinger 4e57083f52 Fix compilation 2021-07-03 10:54:14 +02:00
Stephan Hadinger 3e2cd4f67d LVGL ctypes implemented 2021-07-03 10:40:08 +02:00
Theo Arends e7425f5b3b
Merge pull request #12539 from Jason2866/patch-6
Enable Ping and rules features for env not 1M
2021-07-02 17:49:37 +02:00
gemu2015 0552bf8261 some fixes 2021-07-02 17:29:35 +02:00
Jason2866 2b3f516424
Enable use of Rules for Core2 2021-07-02 16:50:37 +02:00
Jason2866 aa1b0d3e0c
Enable Ping and rules features for env not 1M 2021-07-02 16:47:06 +02:00
Theo Arends 1ff2b8abe9 Add optional TasMesh define 2021-07-02 14:12:49 +02:00
Theo Arends 0a04ed0082
Merge pull request #12536 from Jason2866/patch-5
Silence scripter info "universal file system used"
2021-07-02 14:08:37 +02:00
Theo Arends 16f6f26aba Add initial support for Tasmota Mesh
Add initial support for Tasmota Mesh (TasMesh) providing node/broker communication using ESP-NOW (#11939)
2021-07-02 14:08:06 +02:00
Jason2866 717771eec6
Silence info universal file system used
because it is default enabled fs
2021-07-02 13:27:50 +02:00
Theo Arends f62f86aeb7 Update support_esp.ino 2021-07-02 10:20:26 +02:00
Theo Arends 8c1605e06c Add comments 2021-07-02 09:46:19 +02:00
Theo Arends 213746f50f Prep MQTT file upload/download for TasMesh 2021-07-01 15:28:18 +02:00
Theo Arends b7519b9c90 Fix ESP32-C3 Settings backup and restore 2021-07-01 15:19:35 +02:00
Theo Arends 4fe8f6bc16
Merge pull request #12518 from ascillato/patch-1
AP Mode: Allow buttons to work as in Normal Mode
2021-07-01 08:51:10 +02:00
gemu2015 e0e49df57c fix mqtt errors 2021-07-01 08:27:47 +02:00
Stephan Hadinger 490412ebdc Berry fix button handlers 2021-06-30 22:36:51 +02:00
Adrian Scillato 757ccaffbc
AP Mode: Allow buttons to work as in Normal Mode 2021-06-30 09:36:15 -03:00
Theo Arends 18cb3da940 Add ESP32-C3 restart season info 2021-06-29 18:15:22 +02:00
Theo Arends 0de0834bb6 Fix ESP32-C3 valid GPIO list 2021-06-29 17:38:46 +02:00
Theo Arends 30c77a28c8 Fix MQTT retain when MI32Option6 is enabled (#12494) 2021-06-29 15:45:48 +02:00
Stephan Hadinger 1a39656ff0 LVGL Prepare last phase custom types 2021-06-29 13:24:11 +02:00
Theo Arends 6b05b62099 Save some bytes 2021-06-29 10:46:56 +02:00
Theo Arends 744b83dae2
Merge pull request #12496 from barbudor/event_json
EVENT support JSON payload
2021-06-29 10:36:18 +02:00
Barbudor 51744bf645 event support JSON payload 2021-06-27 18:58:40 +02:00
Stephan Hadinger 831dc4fb79 TLS Remove obsolete Letsencrypt CA 2021-06-27 15:24:03 +02:00
Theo Arends 94992f0597 Revert changes DHT11 timing 2021-06-27 14:20:00 +02:00
Theo Arends 464ab2cb6b Add support for AM2320 Temperature and Humidity Sensor by Lars Wessels (#12485) 2021-06-27 13:53:19 +02:00
Theo Arends cf7da3dab2
Merge pull request #12485 from nightphobos/2287_am2320_support
add optional support for am2320 temperature/humidity sensor
2021-06-27 13:32:55 +02:00
Theo Arends c2026623d0
Update xsns_88_am2320.ino 2021-06-27 13:32:33 +02:00
Theo Arends 7d161ad8c6
Update my_user_config.h 2021-06-27 13:31:12 +02:00
Theo Arends 83518a9c38 Update timing DHT11, AM2301 (DHT21, DHT22, AM2302, AM2321), SI7021 (#12488) 2021-06-27 13:25:26 +02:00
Theo Arends 70a2e98d58
Merge pull request #12488 from amunra68/patch-1
Update xsns_06_dht.ino
2021-06-27 12:43:07 +02:00
Theo Arends d1805246f9 Enable UFILESYS, GUI_TRASH_FILE and GUI_EDIT_FILE for any device compiled with more than 1M flash size 2021-06-27 11:36:05 +02:00
amunra68 5c329713fe
Update xsns_06_dht.ino
the DHT22/AM2301 did not work on Sonoff S20 and NodeMCU (possibly microsecond delay not exact enough??) and gave only "null" values for temperature and humidity.
So I changed the way to determine if a bit is "0" or "1" by measuring the time in microseconds until state changes. If time > 50 usec (in data sheet it should be 80 usec), it is recognized as "1", otherwise (a "0" should be 26-28 usec by specs from data sheet) it is treated as "0". 
Also, the old version omitted the first bit (by waiting the sequence 0 - 1 - 0, I have changed it to the only first "0" 
This change has been tested on Sonoff S20 (on GPIO 3) and on NodeMCU (GPIO 2) on Tasmota version 9.3.1.4 (on version 9.5. it should make no difference) with a DHT22 with included pull-up resistor
2021-06-27 08:45:57 +02:00
Adrian Scillato c0207d04a0
AM2320 fix internal SNS driver number 2021-06-26 15:52:12 -03:00
Alexander d7dae7a7fa add optional support for am2320 temperature/humidity sensor 2021-06-26 19:38:31 +03:00
Theo Arends e02b58a6ed Refactor ShowFreeMem 2021-06-25 17:09:53 +02:00
Theo Arends ef508c629f Fixed Telegram response decoding stopped working after 20210621
Fixed Telegram response decoding stopped working after 20210621 and exception on long result message (#12451)
2021-06-24 18:29:12 +02:00
Theo Arends 8d2728b94a QuickFix for Telegram (#12451) 2021-06-24 10:14:07 +02:00
Theo Arends 684852b81c
Merge pull request #12464 from curzon01/development
Fix NeoPool compile error on DEBUG_TASMOTA_SENSOR
2021-06-24 09:32:40 +02:00
Stephan Hadinger ee2b6d7f74 Add Esp32 Partition Manager as a Berry component 2021-06-23 22:02:44 +02:00
Norbert Richter 0122f4659e
Fix NeoPool compile error on DEBUG_TASMOTA_SENSOR 2021-06-23 20:09:56 +02:00
Theo Arends 841df72580 Remove redundant code 2021-06-22 17:30:45 +02:00
Theo Arends 540574fe49 Fix NO VALID JSON regression from may 4th
Fix NO VALID JSON regression from may 4th (#12440)
2021-06-22 16:54:47 +02:00
Theo Arends 096f5606b6 Add ESP-NOW hooks 2021-06-22 14:12:05 +02:00
Stephan Hadinger 32b6f7d4b2 Berry simplify Driver class 2021-06-21 19:44:00 +02:00
Stephan Hadinger 09b6ca0c3a Remove unwanted files 2021-06-21 13:55:27 +02:00
Stephan Hadinger 28da131932 Simplified configuration for ir-full, tasmota-ircustom no more needed 2021-06-21 13:49:56 +02:00
Stephan Hadinger b70c8620b2 Fix compilation when USE_UFILESYS is not defined 2021-06-20 22:04:32 +02:00
Theo Arends 4187cc7818 Remove ProgramFlashSize from ESP32 Gui 2021-06-20 17:20:20 +02:00
Theo Arends 0d18174bd9 Fix DDS238-2 wrong reactive power value (#12283) 2021-06-20 11:36:34 +02:00
Theo Arends 4c97948428
Merge pull request #12416 from s-hadinger/partition_manager_v0
Partition manager v1
2021-06-19 17:13:32 +02:00
Stephan Hadinger e78396f95e Update 2021-06-19 16:41:56 +02:00
Theo Arends 99d303c191 Fix ESP32 Webcam add boundary marker before sending mjpeg image (#12376) 2021-06-19 16:40:32 +02:00
Theo Arends 37d6548fd2 Speed up initial GUI console refresh 2021-06-19 15:22:17 +02:00
Stephan Hadinger 032ca2f56c Added features 2021-06-19 12:05:54 +02:00
Stephan Hadinger 247db4f360 Add Partition Manager v0 in Berry 2021-06-18 22:50:24 +02:00
Stephan Hadinger 236c17d896 Updated MPUxxx driver 2021-06-18 18:36:32 +02:00
Stephan Hadinger cf81127193 Berry added I2C_Driver class and patches 2021-06-18 18:30:58 +02:00
Theo Arends 6767a9809a Fix GUI console initial update time 2021-06-18 16:47:14 +02:00
Theo Arends 21dc6d020d
Merge pull request #12408 from Jason2866/patch-2
#define USE_WS2812 for lvgl build
2021-06-18 16:44:12 +02:00
Theo Arends e91f4fe883
Merge pull request #12406 from jansenarruda/development
Update pt_BR.h
2021-06-18 16:16:55 +02:00
Jason2866 7895086d5e
#define USE_WS2812 for lvgl build 2021-06-18 16:16:08 +02:00
Jansen Arruda 346f488f8c
Update pt_BR.h
Update labels (Translate new ones and correct some old ones). Adjust to brazilian portuguese
2021-06-18 10:15:49 -03:00
Serge 1aa7331088
Update xsns_05_ds18x20_esp32.ino 2021-06-17 23:50:53 +03:00
Barbudor 2fdfae799f fix RO translation file 2021-06-17 19:41:40 +02:00
Barbudor 8523b50d4e FSMan: add file deletion confirmation 2021-06-17 19:02:58 +02:00
Theo Arends 52d31f2250
Merge pull request #12383 from Jason2866/build_lvgl
add build variant Tasmota32-lvgl (merge after release 9.5!)
2021-06-17 17:44:10 +02:00
Theo Arends a87ff67010 Force ESP32 defines Force ESP32 defines USE_UFILESYS, GUI_TRASH_FILE and #define GUI_EDIT_FILE 2021-06-17 17:29:44 +02:00
Theo Arends e0faa0399a Bump version 9.5.0.1 2021-06-17 11:30:44 +02:00
Theo Arends 542074ec69
Merge pull request #12384 from s-hadinger/ble_no_exceptions
Remove exceptions from BLE
2021-06-17 09:36:18 +02:00
Theo Arends 87592582c5
Merge pull request #12380 from emontnemery/color2_tweak
Improve behavior of color2 for unlinked RGBW and RGBWW lights
2021-06-17 09:34:13 +02:00
Stephan Hadinger 2c5809bee2 Remove exceptions from BLE 2021-06-16 21:55:45 +02:00
Jason2866 c70990572d
LVGL
* tasmota32-lvgl.bin
2021-06-16 17:45:44 +02:00
Erik f2fd0750d5 Improve behavior of color2 for unlinked RGBW and RGBWW lights 2021-06-16 13:37:33 +02:00
Stephan Hadinger e0b0c1fae1 Fix Berry documentation link 2021-06-16 08:37:28 +02:00
Adrian Scillato 35c0e991b6
Allow Captive Portal to be optional 2021-06-15 20:39:49 -03:00
Stephan Hadinger 7988e68d8b Fix NEO_RGBW 2021-06-15 21:14:01 +02:00
Theo Arends bd87afeabf Add command ``MqttWifiTimeout 100..20000``
Add command ``MqttWifiTimeout 100..20000`` to control MQTT Wi-Fi connection timeout default set to 200 mS (#12222)
2021-06-15 10:15:36 +02:00
Theo Arends 51def9790f
Merge pull request #12366 from s-hadinger/esp32c3_fix_template
Esp32c3 fix template command and Web UI
2021-06-15 08:16:35 +02:00
Theo Arends f519332411
Merge pull request #12365 from s-hadinger/esp32c3_fix_baudrate
Esp32c3 fix wrong baudrate
2021-06-15 08:16:17 +02:00