Skip to content

Commit ec2874d

Browse files
committed
v11.1 updated commands and peripherals
1 parent 5c584f7 commit ec2874d

File tree

7 files changed

+44
-21
lines changed

7 files changed

+44
-21
lines changed

docs/ADC.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ Example: ADC as `Light (3)`
5050
!!! warning
5151
Careful when setting ADC as Button, if there is constant voltage on the pin it might register as a [long press](Buttons-and-Switches#long-press) and reset the device to firmware defaults
5252

53+
### Commands
54+
55+
Command|Parameters
56+
:---|:---
57+
AdcParam<x\><a class="cmnd" id="adcparam"></a>|[ADC](ADC) analog input tuning parameters. On ESP32 x is channel `1..8`<br>`<sensor>, <param1>, <param2>, <param3>, <param4>`<BR>`<sensor>` values:<br>&emsp; `2` = Temperature [Steinhart-Hart thermistor equation](https://en.wikipedia.org/wiki/Steinhart%E2%80%93Hart_equation) parameters:</li><ul>`<param1>` = NTC Voltage bridge resistor in Ohms *(default = `32000`)*<br>`<param2>` = NTC Resistance in Ohms *(default = `10000`)*<BR>`<param3>` = NTC Beta Coefficient *(default = `3350`)*</li></ul><br>&emsp; `3` = Light [Lux equation](https://www.allaboutcircuits.com/projects/design-a-luxmeter-using-a-light-dependent-resistor/) parameters:</li><ul>`<param1>` = LDR Voltage bridge resistor in Ohms *(default = `10000`)*<BR>`<param2>` = LDR Lux Scalar *(default = `12518931`)*<BR>`<param3>` = LDR Lux Exponent *(default = `-1.4050`)*</li></ul><br>&emsp; `6` = ADC linear range remapping parameters:</li><ul>`<param1>` = input range low value `adcLow` *(default = `0`)*<BR>`<param2>` = input range high value `adcHigh` *(default = `1023`)*<BR>`<param3>` = output range low value `rangeLow` *(default = `0`)*<BR>`<param4>` = output range high value `rangeHigh` *(default = `100`)*<BR>The range remapping perform the following calculation on the ADC value *[0..1023]*:<BR>`Range = ((adcHigh - ADC) / (adcHigh - adcLow)) * (rangeLow - rangeHigh) + rangeHigh`<br>*The calculation is performed in double resolution floating point but all 4 parameters as well as the range output are unsigned 16 bit integers. The calculation result must not exceed [0..65535].*<BR>Example to convert the ADC value on a D1-mini into millivolts (using the default resistor bridge of 220k/100k):<BR>`AdcParam 6, 0, 1023, 0, 3200`</li></ul><br>&emsp; `7` = CT POWER parameter adjustments:</li><ul>`<param1>` = ANALOG_CT_FLAGS (default 0 for a non-invasive current sensor). When value is `>0` its sets the `adcLow` value as base for the measurement via OpAmp differential amplifier.<BR>`<param2>` = ANALOG_CT_MULTIPLIER ( 2146 = Default settings for a (AC) 20A/1V Current Transformer.) multiplier\*100000 to convert raw ADC peak to peak range 0..1023 to RMS current in Amps. Value of 100000 corresponds to 1<BR>`<param3>` = ANALOG_CT_VOLTAGE (default 2300) to convert current in Amps to apparent power in Watts using voltage in Volts*10. Value of 2200 corresponds to AC220V. For DC its Volt/1000. Eg. 12VDC = 0.012.<BR> `AdcParam 7,406,3282,0.012`</li></ul><BR>&emsp; `9` = ANALOG_PH parameter adjustments:</li><ul>`<param1>` = ANALOG_PH_CALSOLUTION_LOW_PH (default 4.0).<BR>`<param2>` = ANALOG_PH_CALSOLUTION_LOW_ANALOG_VALUE ( default 282 )<BR>`<param3>` = ANALOG_PH_CALSOLUTION_HIGH_PH (default 9.18).<BR>`<param4>` = ANALOG_PH_CALSOLUTION_HIGH_ANALOG_VALUE (default 435).<BR><BR>To calibrate the probe, two reference solutions with known pH are required. Calibration procedure: <ol><li>Put probe in solution with lower pH value. pH value of the solution is ANALOG_PH_CALSOLUTION_LOW_PH.</li><li>Wait until analog value / RAW value stabilizes (~3 minutes)</li><li>The analog reading is ANALOG_PH_CALSOLUTION_LOW_ANALOG_VALUE</li><li>Clean probe and put in solution with higher pH value. pH value of the solution is ANALOG_PH_CALSOLUTION_HIGH_PH.</li><li>Wait until analog value / RAW value stabilizes (~3 minutes)</li><li>The analog reading is ANALOG_PH_CALSOLUTION_HIGH_ANALOG_VALUE</li></ol>Analog readings can be read by either changing the analog port configuration to "Analog Input" while calibrating, or by enabling debug logs in the console and having a look at the `RAW Value`reading instead.</li></ul><BR>&emsp; `10` = MQ-X sensors parameter adjustments:</li><ul>`<param1>` = ANALOG_MQ_TYPE (default 2) It used to specify sensor type. At the moment exists: 2, 3, 4, 5, 6, 7, 8, 9, 131, 135 (means MQ-02, MQ-03, MQ-04 ecc.).<BR>`<param2>` = ANALOG_MQ_A (default 574.25 a params for MQ-02) It is exponential regression a params<BR>`<param3>` = ANALOG_MQ_B (default -2.222 b params for MQ-02) It is exponential regression b params, generally negative<BR>`<param4>` = ANALOG_MQ_RatioMQCleanAir (default 15.0 RatioMQCleanAir params for MQ-02) NOT USED YET. It is threashold for good air in ppm for future alams arming<BR>Usage example for MQ-02, MQ-04, MQ-07 and MQ-131<BR> `AdcParam 10, 2.00, 574.25, -2.22, 9.83`<BR> `AdcParam 10, 4.00, 1012.70, -2.79, 4.40 `<BR> `AdcParam 10, 7.00, 99.04, -1.52, 27.50 `<BR> `AdcParam 10, 131.00, 23.94, -1.11, 15.00 `</li></ul><BR>
58+
5359
### Rule triggers
5460
Use these triggers in rules:
5561

docs/Commands.md

Lines changed: 16 additions & 4 deletions
Large diffs are not rendered by default.

docs/Components.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ Read more about [peripherals](Supported-Peripherals.md).
257257
| | 5729 | Option a 2 | Enable dummy energy monitor |
258258
| | 5730 | Option a 3 | Enable UDisplay universal display driver |
259259
| | 5731 | Option a 4 | Enable CCLoader using Zigbee Rx/Tx/Rst Gpios |
260+
| | | Option E 1 | USE_PWM_DIMMER as GPIO |
260261
| | | Ftc532 | FTC532 touch controller serial input |
261262
| | 6336 | ADC pH | Analog PH sensor |
262263
| | | Bs814 Clk | Bs814 Clock |

docs/Rules.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -212,21 +212,21 @@ The value of a `Var<x>` and `Mem<x>` can be:
212212
- any text
213213
- %var1% to %var16%
214214
- %mem1% to %mem16%
215+
- %color%
216+
- %deviceid%
217+
- %macaddr%
218+
- %sunrise%
219+
- %sunset%
215220
- %time%
221+
- %timer1% to %timer16%
216222
- %timestamp%
223+
- %topic%
217224
- %uptime%
218-
- %sunrise%
219-
- %sunset%
220225
- %utctime%
221-
- %topic%
222-
- %color%
223-
- %timer1% to %timer16%
224-
- %MacAddr%
225-
- %DeviceID%
226-
- %ZbDevice%
227-
- %ZbGroup%
228-
- %ZbCluster%
229-
- %ZbEndPoint%
226+
- %zbdevice%
227+
- %zbgroup%
228+
- %zbcluster%
229+
- %zbendpoint%
230230

231231
To set the value for `Var<x>` and `Mem<x>` use the command
232232

docs/Sonoff-SPM.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,4 @@ SspmIAmHere<x\><a class="cmnd" id="SspmIAmHere"></a>|Blink SPM-4Relay module err
7575
SspmLog<x\><a class="cmnd" id="SspmLog"></a>|Show relay <x\> power state change and cause
7676
SspmMap<a class="cmnd" id="SspmMap"></a>|Map scanned SPM-4Relay modules to physical location. Use unique numbers for all fields<BR>`0` = rescan modbus for SPM-4Relay modules and reset mapping to default. This takes at least 20 seconds<BR>`3,4,1,2` = map scanned module 1 to physical module 3 containing relays 9 to 12, module 2 to 4 with relays 13 to 16, module 3 to 1 with relays 1 to 4 and module 4 to 2 with relays 5 to 8
7777
SspmOverload<x\><a class="cmnd" id="SspmOverload"></a>|Set overload detection criteria for relay <x\> <BR>`0` = reset and disable overload detection to scanned module criteria<BR>`<delay>,<min_power>,<max_power>,<min_voltage>,<max_voltage>,<max_current>` = set any or all overload detection criteria<BR>`0,0.10,4400.00,0.10,240.00,20.00` = enable overload detection with default values<BR>`9,0,22.1` = enable max_power over 22.1W detection after 9 seconds<BR>`0,0,0,0,235.2` = enable immediate max_voltage over 235.2V detection
78-
SspmScan<a class="cmnd" id="SspmScan"></a>|Rescan modbus for SPM-4Relay modules. This takes at least 20 seconds
79-
80-
78+
SspmScan<a class="cmnd" id="SspmScan"></a>|Rescan modbus for SPM-4Relay modules. This takes at least 20 seconds

docs/Supported-Peripherals.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Name|Description|Connection
1717
[**BH1750**](BH1750) | Luminosity Sensor
1818
[**BMP280<BR>BMP085<BR>BMP180)**](BME280) | Pressure Sensor
1919
[**BME280**](BME280) | Temperature, Humidity and Pressure Sensor | I^2^C
20-
[**BME680**](BME680) | Temperature, Humidity, Pressure and Gas Sensor | I^2^C
20+
[**BME680**](BME680)<BR>BME688 | Temperature, Humidity, Pressure and Gas Sensor | I^2^C
2121
[**Buzzer**](Buzzer) | Audio Signalling Device | gpio
2222
[**CC2530**](CC2530) | TI CC2530 Zigbee Adapter| serial
2323
**CCS811** | Gas and Air Quality Sensor| I^2^C
@@ -29,6 +29,7 @@ Name|Description|Connection
2929
**[DS18x20](DS18x20)** | Temperature Sensor| 1-Wire
3030
**DS1624<BR>DS1621** | Temperature Sensor| 1-Wire
3131
[**DS3231**](DS3231) | Real-Time-Clock| I^2^C
32+
[**DS3502**](DS3502) | Digital potentiometer| I^2^C
3233
**[EZO](EZO)** | EZO series of chemical Sensors | I^2^C
3334
**F&F LE-01MR** | F&F LE-01MR Single Phase Modbus Energy meter
3435
[**GPS-NTP-server**](GPS-NTP-server) | GPS-NTP-server | serial
@@ -69,6 +70,7 @@ Name|Description|Connection
6970
[**MLX90640**](MLX90640) | MLX90640 Far Infrared Thermal Sensor Array| I^2^C
7071
[**MPR121**](MPR121) | Proximity Capacitive Touch Sensor Controller (I^2^C)
7172
[**MPU6050**](MPU-6050)| 3-Axis Gyroscope and 3-Axis Accelerometer Sensor (I^2^C)
73+
**MQ** | MQ Sensors (MQ-02, MQ-03, MQ-04, MQ-05, MQ-06, MQ-07, MQ-08, MQ-09, MQ-131, MQ-135) | analog
7274
[**NeoPool**](NeoPool) | Sugar Valley NeoPool Controller| serial
7375
[**NRF24L01**](NRF24L01) | NRF24L01 as BLE-bridge for Mijia BT Sensors| SPI
7476
[**OpenTherm**](OpenTherm) | OpenTherm adapter| serial
@@ -89,6 +91,7 @@ Name|Description|Connection
8991
**Eastron SDM72** | Modbus Energy Meter| serial
9092
**Eastron SDM120** | Modbus Energy Meter| serial
9193
**Eastron SDM220** | Modbus Energy Meter| serial
94+
**Eastron SDM230** | Modbus Energy Meter| serial
9295
**Eastron SDM630** | Modbus Energy Meter| serial
9396
[**SDS011<BR>SDS021**](SDS011) | Laser Dust Sensor
9497
**SGP30** | Gas and Air Quality Sensor| I^2^C

docs/index.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@ Incredibly expandable and flexible.
2323

2424
- Tasmota Web Installer improved and integrated in the [Flashing](Getting-started.md#flashing)
2525
- Support for improv when using Tasmota Web Installer
26-
- New peripherals: up to four DS3502 digital potentiometers, ADE7880 3 phase energy monitor as used in Shelly 3EM, PCF85363 RTC as used in Shelly 3EM
27-
- New commands: [`SetOption135`](Commands.md#setoption135), [`SetOption136`](Commands.md#setoption136), [`SetOption137`](Commands.md#setoption137), [`SetOption138`](Commands.md#setoption138), [`SspmMap`](Commands.md#sserialconfig), [`TcpConnect`](Commands.md#tcpconnect), [`RfTimeout`](Commands.md#rftimeout), [`IfxSensor`](Commands.md#ifxsensor), [`Sensor12`](Commands.md#sensor12), [`Sensor34`](Commands.md#sensor34), [`Wiper`](Commands.md#wiper)
26+
- New peripherals: up to four DS3502 digital potentiometers, ADE7880 3 phase energy monitor as used in Shelly 3EM, PCF85363 RTC as used in Shelly 3EM, __experimental__ Sonoff MS01 moisture sensor
27+
- New commands: [`SetOption135`](Commands.md#setoption135), [`SetOption136`](Commands.md#setoption136), [`SetOption137`](Commands.md#setoption137), [`SetOption138`](Commands.md#setoption138), [`SspmMap`](Sonoff-SPM.md#sspmmap), [`TcpConnect`](Commands.md#tcpconnect), [`RfTimeout`](Commands.md#rftimeout), [`IfxSensor`](Commands.md#ifxsensor), [`Sensor12`](Commands.md#sensor12), [`Sensor34`](Commands.md#sensor34), [`Wiper`](Commands.md#wiper) and lots of [NeoPool](NeoPool.md) commands
28+
- Shrunk `tasmota-minimal.bin` by removing all commands except Upgrade, Upload, OtaUrl, Seriallog, Weblog and Restart
29+
- Sonoff SPM increase maximum number of relays supported to 32 (8 SPM-4Relay modules)
30+
- Extend number of pulsetimers from 8 to 32
2831
- ESP32
2932
- Support for [OpenHASP](OpenHASP.md)
3033
- support for BLE Mi Scale V1

0 commit comments

Comments
 (0)