6258 Commits

Author SHA1 Message Date
alexasf
5e9765bc9f
Merge branch 'arendst:development' into development 2022-01-28 07:20:22 +03:00
Stephan Hadinger
539c508918 Increase PWM channels to 16 (Esp32 only) 2022-01-27 21:30:05 +01:00
SteWers
001710d502 [Solax X1] no PV 2 per default
- no secondary PV per default
- the usage is described in the documentation
2022-01-27 21:11:02 +01:00
Stephan Hadinger
f4aaaa2462 Berry add limit to tcp reads 2022-01-27 18:48:57 +01:00
Max
af2fe0da3a Update en_GB.h
Dublicate removed
2022-01-27 19:42:26 +03:00
Max
79c81be364
Merge branch 'arendst:development' into clean_test 2022-01-27 16:54:27 +03:00
Max
83ab20bb11 some tiny updates 2022-01-27 16:42:58 +03:00
alexasf
076b490331
Update xdrv_10_rules.ino 2022-01-27 14:55:25 +03:00
stefanbode
bcfc6fd2cd
Move time calculation into local timezone
Switch from UTC to local time to make better predictions on wakeuptime for long deepsleep cycles. #14483
2022-01-27 12:04:59 +01:00
alexasf
72fe98cee1
Merge branch 'arendst:development' into development 2022-01-27 13:06:42 +03:00
alexasf
ac02bc8288
Update xdrv_10_rules.ino
Added %timer1% to %timer16% variables to rules
2022-01-27 13:00:49 +03:00
s-hadinger
6a9d0847a3
Merge pull request #14608 from s-hadinger/lvgl_fix_ts
Update touchscreen x/y only when touched
2022-01-26 18:49:20 +01:00
Stephan Hadinger
a0a38f638a Update touchscreen x/y only when touched 2022-01-26 16:20:48 +01:00
Theo Arends
15c3476698 Add more error checking to SPM 2022-01-26 13:59:55 +01:00
Max
22d549ca3d Update CM11 2022-01-26 15:03:21 +03:00
Max
1ef08e15f1 Squashed commit of the following:
commit 5563b50abdd70806099248bea875be63b1a8acbb
Author: Max <rekin.m@gmail.com>
Date:   Wed Jan 26 12:03:21 2022 +0300

    Update xsns_95_cm1107.ino

commit fbcfccb9732b3b47c7e5f2554e9d9f5765aad719
Merge: a7a792ff0 62458e367
Author: Max <rekin.m@gmail.com>
Date:   Wed Jan 26 09:44:09 2022 +0300

    Merge pull request #3 from arendst/development

    Add command ``SspmEnergyTotal<relay>``

commit a7a792ff026872736aad991aa23702fc53e278a2
Merge: a4199127a d7664c02a
Author: Max <rekin.m@gmail.com>
Date:   Tue Jan 25 18:48:12 2022 +0300

    Merge remote-tracking branch 'upstream/development' into CM11_sensor

commit a4199127a178265c0eefc08a07c41716ce72f7d3
Author: Max <rekin.m@gmail.com>
Date:   Tue Jan 25 18:38:35 2022 +0300

    CM11

commit ff0c88badc83ea789b217b5d400d0660573fe64c
Author: Max <rekin.m@gmail.com>
Date:   Tue Jan 25 18:37:23 2022 +0300

    Create xsns_95_cm1107.ino
2022-01-26 14:25:10 +03:00
Theo Arends
62458e3676 Add command `SspmEnergyTotal<relay>`
Add command ``SspmEnergyTotal<relay>`` to (p)reset Sonoff SPM total energy without today's energy
2022-01-25 16:51:40 +01:00
Theo Arends
d7664c02a7 Remove zero values from SspmHistory
Remove zero values from SspmHistory (#13447)
2022-01-25 12:19:56 +01:00
Theo Arends
d09971e6d2
Merge pull request #14589 from SteWers/SML-check-free-GPIO
[SML] Check for used GPIO
2022-01-25 11:31:31 +01:00
gemu2015
dbe91e5a1a add sivat timer update 2022-01-25 10:58:22 +01:00
gemu2015
1f860deb02 web gui rework 2022-01-25 10:57:37 +01:00
Stephan Hadinger
522abfbf1f Fix compilation 2022-01-24 23:13:41 +01:00
Stephan Hadinger
8bd6a7eabc Try compiler fix 2022-01-24 23:05:29 +01:00
Stephan Hadinger
532afbaecd PWM auto-phasing for lights by default (new behavior) unless `SetOption134 1` 2022-01-24 22:48:57 +01:00
SteWers
a75b465385 [SML] Check for used GPIO
- Check for used GPIO
- more meaningful error messages
2022-01-24 20:18:07 +01:00
Theo Arends
7b16162044
Merge pull request #14548 from tcwj2008/development
set SerialDelimiter=254 to post HEX string over the serial bridge
2022-01-24 17:41:25 +01:00
Theo Arends
1bbee95a20
Merge pull request #14582 from scottjames/development
PCA9685 (driver15) - add INVERT option
2022-01-24 17:40:32 +01:00
Jason2866
9edf7efddc
fix compile missing #define D_MQ "MQ" 2022-01-24 17:14:00 +01:00
Theo Arends
6ecfc312b3
Merge pull request #14581 from francescoadriani/development
Supports for MQ analog sensor for air quality
2022-01-24 17:00:28 +01:00
Theo Arends
bb5cf22d0a Add command `SspmLog<relay> [x]`
Add command ``SspmLog<relay> [x]`` to retrieve relay power state change and cause logging
2022-01-24 15:38:58 +01:00
Theo Arends
dcfdb78935 Add/Release Sonoff SPM commands
Add/Release Sonoff SPM commands:
- Command ``SspmDisplay 1`` to display Sonoff SPM energy data in GUI for relays powered on only
- Command ``SspmHistory<relay>`` to retrieve daily energy of last six month (as defined by ARM firmware)
- Command ``SspmIAmHere<relay>`` to (faintly) blink Sonoff SPM-4Relay module error light of requested relay
- Command ``SspmScan`` to rescan Sonoff SPM modbus
2022-01-24 11:47:19 +01:00
rice103
3191ecc683 Added wiring diagram 2022-01-24 11:21:01 +01:00
Cheney
5e79ace165
set SerialDelimiter=254 to post HEX string 2022-01-24 12:01:14 +08:00
rice103
2bf3ac417b bug fix, implements filter to make average of data 2022-01-23 23:54:29 +01:00
rice103
d20aad968e Supports refresh each seconds of mq 2022-01-23 19:19:32 +01:00
Scott
fd550fd104 PCA9685 (driver15) - Allow the "ALL" virtual pin 61 for pwm values
The datasheet shows register 250 is "ALL" pins, which corresponds to
virtual pin 61 (61*4+6=250).  Pin 61 was already allowed with PWM
command for OFF and ON, but not specified pwm values.  This update
allows virtual pin 61 to be assigned pwm values for all channels.

Example usage to set all channels to 2500:

`driver15 pwm,61,2500`
2022-01-23 13:14:19 -05:00
Scott James
2cd510beb9
Merge branch 'arendst:development' into development 2022-01-23 13:00:16 -05:00
Scott
8337fba960 PCA9685 (driver15) - add INVERT option
The INVERT option makes PWM and ON/OFF values meaningful for open-drain connected lights.

  - Activate with:  driver15 invert 1
  - PWM value is inverted, so 0 is "off" and 4096 is "on"
  - INVERT is included in status and telemetry
2022-01-23 12:38:17 -05:00
rice103
d45c8d3d24 Removed unused ANALOG_BOARD 2022-01-23 18:36:53 +01:00
rice103
06617c7fcb Using FastPrecisePow instead of pow 2022-01-23 18:27:32 +01:00
Theo Arends
15943ccad6 Add command `Json {<Tasmota commands>}`
Add command ``Json {<Tasmota commands>}`` to enable input of any command as JSON tokens (#14568)
2022-01-23 17:43:17 +01:00
rice103
496de57c07 bug fix 2022-01-23 17:28:13 +01:00
rice103
37a77ef309 Merge branch 'development' of https://github.com/francescoadriani/Tasmota into development 2022-01-23 17:17:10 +01:00
rice103
e72248899e Supports for MQ analog sensor for air quality
It's support the analog sensor for quality air (also for esp-32)
-added on list of assignable pins in module
-with adcparams can choose wich mqx you have with seconds param ex: adcparam 10 4 (you have the mq-04)
2022-01-23 17:10:35 +01:00
Theo Arends
6b4dca6bc7
Merge pull request #14572 from ascillato/patch-1
Add %color% variable to rules
2022-01-23 16:46:58 +01:00
Theo Arends
33ff4fa056 Add undocumented JSON command 2022-01-23 12:29:06 +01:00
Adrian Scillato
b6aff6a41a
Added %color% variable to rules 2022-01-22 21:22:23 -03:00
Theo Arends
692b7ec8c3 Minor define change 2022-01-22 17:55:55 +01:00
Theo Arends
3e555873f8 Fix US-100 serial detection
Fix US-100 serial detection (#14197)
2022-01-22 16:56:46 +01:00
Theo Arends
10e480bfd9
Merge pull request #14485 from obrain17/development
BLE_EQ3: Fix and enhance the JSON response
2022-01-22 12:36:46 +01:00