Skip to content

Commit ef4a35a

Browse files
authored
Merge branch 'master' into patch-1
2 parents a846924 + ea09f23 commit ef4a35a

File tree

462 files changed

+3098
-4215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

462 files changed

+3098
-4215
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ jobs:
1414
python-version: 3.x
1515
- run: pip install wheel
1616
- run: pip install -r requirements.txt
17-
- run: mkdocs gh-deploy --force --strict
17+
# - run: mkdocs gh-deploy --force --strict
18+
- run: mkdocs gh-deploy --force

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"en"
44
],
55
"spellright.documentTypes": [
6-
"markdown",
76
"latex",
87
"plaintext"
98
]

docs/ADC.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The ESP8266 has a single ADC pin available. It may be used to read voltage at th
66
!!! warning
77
Check your Wi-Fi module! The ESP8266 A0 pin supports a maximum voltage of 1.0V. Many newer Wi-Fi modules have an on-board voltage divider to support a higher A0 input voltage range (typically in the range between 0 and 3.3 volts). You may need to use an external voltage divider to ensure your input voltage is in the right range.
88

9-
By default Tasmota uses the ADC pin to read voltage. The signal comes from an analog [peripheral](), or sometimes from the device itself (see [Shelly 2.5](/devices/Shelly-2.5)).
9+
By default Tasmota uses the ADC pin to read voltage. The signal comes from an analog peripheral, or sometimes from the device itself (see [Shelly 2.5](devices/Shelly-2.5.md)).
1010

1111
After wiring a peripheral to GPIO17 (A0) pin you have to configure it in **Configure Module**:
1212

docs/AM2301.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#endif
99
```
1010

11-
AM2301 driver supports [AM2301 (DHT21)](http://www.haoyuelectronics.com/Attachment/AM2301/AM2301.pdf), [AM2302 (DHT22)](https://www.sparkfun.com/datasheets/Sensors/Temperature/DHT22.pdf), [AM2320](http://akizukidenshi.com/download/ds/aosong/AM2320.pdf) and [AM2321](http://akizukidenshi.com/download/ds/aosong/AM2321_e.pdf) temperature and humidity sensors. Introduced in Tasmota through [Sonoff AM2301](https://sonoff.tech/product/accessories/am2301) accessory for [Sonoff TH](/devices/Sonoff-TH).
11+
AM2301 driver supports [AM2301 (DHT21)](http://www.haoyuelectronics.com/Attachment/AM2301/AM2301.pdf), [AM2302 (DHT22)](https://www.sparkfun.com/datasheets/Sensors/Temperature/DHT22.pdf), [AM2320](http://akizukidenshi.com/download/ds/aosong/AM2320.pdf) and [AM2321](http://akizukidenshi.com/download/ds/aosong/AM2321_e.pdf) temperature and humidity sensors. Introduced in Tasmota through [Sonoff AM2301](https://sonoff.tech/product/accessories/am2301) accessory for [Sonoff TH](devices/Sonoff-TH.md).
1212

1313
**This driver is ONLY for _single wire_ implementations of the sensor.**
1414

docs/BUILDS.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ Note: `minimal` variant is not listed as it shouldn't be used outside of the [up
3232
| USE_SUNRISE | x | x / x | x | x | x | x |
3333
| USE_RULES | x | x / x | x | x | x | x |
3434
| USE_SCRIPT | - | - / - | - | - | - | - |
35-
| USE_EXPRESSION | - | - / - | - | - | - | - |
36-
| SUPPORT_IF_STATEMENT | - | - / - | - | - | - | - |
35+
| USE_EXPRESSION | - | - / x | - | - | - | - | Every ESP32 + ESP8266 > 1MB
36+
| SUPPORT_IF_STATEMENT | - | - / x | - | - | - | - | Every ESP32 + ESP8266 > 1MB
3737
| USE_HOTPLUG | - | - / - | - | - | - | - |
3838
| USE_PROMETHEUS | - | - / - | - | - | - | - |
3939
| USE_PING | - | - / - | - | - | - | - |
@@ -112,22 +112,28 @@ Note: `minimal` variant is not listed as it shouldn't be used outside of the [up
112112
| USE_ADS1115 | - | - / x | - | x | - | - |
113113
| USE_INA219 | - | - / x | - | x | - | - |
114114
| USE_INA226 | - | - / - | - | - | - | - |
115+
| USE_INA3221 | - | - / - | - | - | - | - |
115116
| USE_SHT3X | - | - / x | - | x | - | - |
116117
| USE_TSL2561 | - | - / - | - | - | - | - |
117118
| USE_TSL2591 | - | - / - | - | - | - | - |
118119
| USE_MGS | - | - / x | - | x | - | - |
119120
| USE_SGP30 | - | - / x | - | x | - | - |
120121
| USE_SGP40 | - | - / x | - | x | - | - |
122+
| USE_SGP4X | - | - / x | - | - | - | - |
121123
| USE_SEN5X | - | - / x | - | x | - | - |
122124
| USE_SI1145 | - | - / - | - | - | - | - |
123125
| USE_LM75AD | - | - / x | - | x | - | - |
124126
| USE_APDS9960 | - | - / - | - | - | - | - |
125127
| USE_MCP230xx | - | - / - | - | - | - | - |
128+
| USE_MCP23XXX_DRV | - | - / - | - | - | - | - |
126129
| USE_PCA9632 | - | - / - | - | - | - | - |
127130
| USE_PCA9685 | - | - / - | - | - | - | - |
131+
| USE_PCA9685_V2 | - | - / - | - | - | - | - |
128132
| USE_MPR121 | - | - / - | - | - | - | - |
129133
| USE_CCS811 | - | - / - | - | x | - | - |
130134
| USE_CCS811_V2 | - | - / x | - | - | - | - |
135+
| USE_ENS16x | - | - / - | - | - | - | - |
136+
| USE_ENS210 | - | - / - | - | - | - | - |
131137
| USE_MPU6050 | - | - / - | - | - | - | - |
132138
| USE_DS3231 | - | - / - | - | - | - | - |
133139
| USE_MGC3130 | - | - / - | - | - | - | - |
@@ -143,6 +149,11 @@ Note: `minimal` variant is not listed as it shouldn't be used outside of the [up
143149
| USE_CHIRP | - | - / - | - | - | - | - |
144150
| USE_PAJ7620 | - | - / - | - | - | - | - |
145151
| USE_PCF8574 | - | - / - | - | - | - | - |
152+
| USE_PMSA003I | - | - / - | - | - | - | - |
153+
| USE_LOX_O2 | - | - / x | - | x | - | - |
154+
| USE_GDK101 | - | - / - | - | - | - | - |
155+
| USE_TC74 | - | - / - | - | - | - | - |
156+
| USE_PCA9557 | - | - / - | - | - | - | - |
146157
| | | | | | | |
147158
| Feature or Sensor | l | t | k | s | i | d | Remarks
148159
| USE_HIH6 | - | - / x | - | x | - | - |
@@ -209,6 +220,7 @@ Note: `minimal` variant is not listed as it shouldn't be used outside of the [up
209220
| USE_PROJECTOR_CTRL | - | - / - | - | - | - | - |
210221
| USE_AS608 | - | - / - | - | - | - | - |
211222
| USE_LD2410 | - | - / - | - | - | - | - |
223+
| USE_GM861 | - | - / - | - | - | - | - |
212224
| USE_TCP_BRIDGE | - | - / - | - | - | - | - | zbbridge / zbbrdgpro
213225
| | | | | | | |
214226
| USE_NRF24 | - | - / - | - | - | - | - |
@@ -268,5 +280,6 @@ Note: `minimal` variant is not listed as it shouldn't be used outside of the [up
268280
| USE_SHELLY_PRO | | / x | | | | |
269281
| USE_DALI | | / - | | | | |
270282
| USE_DINGTIAN_RELAY | | / - | | | | |
283+
| USE_MATTER_DEVICE | | / x | | | | | See SetOption151
271284

272-
* USE_MQTT_TLS is enabled by default in every ESP32 variants
285+
* USE_MQTT_TLS is enabled by default in every ESP32 variants

docs/Berry-Cookbook.md

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,9 +649,10 @@ def netflip()
649649
end
650650
tasmota.set_timer(30000,netflip) #4
651651
```
652+
652653
1. store variable "eth" with Ethernet status - "true" if Ethernet IP exists and "false" if not
653654
2. check if wifi status is true and compare to eth status
654-
3. send command `Wifi` with parameter depending on eth variable. `..` is to concatenate a string. See Berry [manualg(https://github.com/berry-lang/berry/wiki/Chapter-3#-operator-1)
655+
3. send command `Wifi` with parameter depending on eth variable. `..` is to concatenate a string. See Berry [manual](https://github.com/berry-lang/berry/wiki/Chapter-3#-operator-1)
655656
4. set a timer to execute the netflip function 30000ms (30 seconds) after loading `autoexec.be`
656657

657658
## TMP117 Driver
@@ -753,4 +754,28 @@ def flash_to_file(filename, addr, len)
753754
end
754755
755756
flash_to_file("safe_boot_flashed.bin", 0x10000, 768320)
756-
```
757+
```
758+
759+
## Tank Sensor
760+
761+
Tank Sensor for fuel-oil volume measurement using a VL53L1X or SR04 sensor
762+
763+
[https://github.com/trlafleur/Tasmota-Tank-Sensor](https://github.com/trlafleur/Tasmota-Tank-Sensor)
764+
765+
## Home Assistant Controls for Tasmota
766+
767+
This is a Tasmota Berry Script library to greatly simplify the process of exposing Home Assistant controls (e.g. Pull-down Lists, Number Sliders, Sensors, etc.) from a Tasmota device - and handling the communication between both sides.
768+
769+
[https://github.com/fmtr/hct](https://github.com/fmtr/hct)
770+
771+
## Build MQTT topic string based on FullTopic configuration
772+
773+
This code bit illustrates how you can create a topic string in the form of the FullTopic specification. Details like whech %prefix% you want and what last level of the topic is obviously variable.
774+
775+
```berry
776+
var topic = string.replace(string.replace(
777+
tasmota.cmd('FullTopic',true)['FullTopic'],
778+
'%topic%', tasmota.cmd('Topic',true)['Topic']),
779+
'%prefix%', tasmota.cmd('Prefix',true)['Prefix3'])
780+
+ 'SENSOR'
781+
```

0 commit comments

Comments
 (0)