mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,827 Commits 12 Branches 111 Tags 1.1 GiB
Commit Graph

10827 Commits

Author SHA1 Message Date
Ajith Vasudevan 9eafb7c040 Merge branch 'development' of github.com:arendst/Tasmota into pr2_tm1637 2021-02-15 15:11:51 +05:30
Ajith Vasudevan dad81769e3 Resolved conflicts 2021-02-15 15:11:39 +05:30
Theo Arends 034bc8beeb
Merge pull request #10971 from emontnemery/patch-5 
Update xdrv_04_light.ino
 2021-02-15 09:41:33 +01:00
Erik Montnemery 5459adc5b8
Update xdrv_04_light.ino 2021-02-15 09:06:52 +01:00
Robert Klauco be537285f5
Added Xiaomi Miija door/window bluetooth sensor 
Sensor displays Button value.
Needs atc unlocking first.
 2021-02-14 22:40:27 +01:00
s-hadinger 95352f8f89
Merge pull request #10966 from s-hadinger/berry_lib_esp322 
Move Berry lib to libesp32 folder
 2021-02-14 20:11:28 +01:00
s-hadinger 0e1ce79741
Merge pull request #10965 from s-hadinger/zigbee_escape_html 
Zigbee ensure HTML encoding
 2021-02-14 20:11:14 +01:00
Stephan Hadinger ba9e31a351 Move Berry lib to libesp32 folder 2021-02-14 19:41:34 +01:00
s-hadinger 71d855cb9f
Merge pull request #10964 from s-hadinger/berry_yield 
Berry add `yield` and `delay` commands
 2021-02-14 19:31:43 +01:00
Stephan Hadinger cfb979aafd Zigbee ensure HTML encoding 2021-02-14 19:30:28 +01:00
Stephan Hadinger ecb2e99462 Berry add `yield` and `delay` commands 2021-02-14 18:50:43 +01:00
s-hadinger 8a849f83b6
Merge pull request #10959 from s-hadinger/hue_discover 
Fix wrong HUE XML #10950
 2021-02-14 18:36:32 +01:00
s-hadinger 70066066b8
Merge pull request #10958 from s-hadinger/zigbee_fix_B_crash 
Zigbee fix crash in case of bad framed received from MCU
 2021-02-14 18:33:11 +01:00
Stephan Hadinger 5a00334ae3 Fix wrong HUE XML #10950 2021-02-14 18:11:47 +01:00
Stephan Hadinger bdbb66155f Zigbee fix crash in case of bad framed receveid from MCU 2021-02-14 18:03:23 +01:00
Theo Arends 74e14ee808
Merge pull request #10956 from Jason2866/patch-3 
Delete ESP32README.md
 2021-02-14 18:02:01 +01:00
Jason2866 f887bf29fc
Delete ESP32README.md 
since it is outdated
 2021-02-14 17:23:49 +01:00
Theo Arends e22635d5fc
Merge pull request #10954 from Jason2866/patch-1 
Platformio: change LDF mode to chain and strict
 2021-02-14 17:17:13 +01:00
Jason2866 e067c18847 remove redundant cc1101 entry 2021-02-14 16:30:34 +01:00
Theo Arends 541443f0aa Refactor pin test 2021-02-14 16:07:35 +01:00
Jason2866 fde257a267 Merge remote-tracking branch 'Tasmota/development' into patch-1 2021-02-14 16:05:34 +01:00
Jason2866 0e0275cf43
Patch 2 (#173) 
* ili9341 update

* update ili9341

* Update support_tasmota.ino

* fix scripter bug

* Deep+

* Update ILI9341_2.cpp

Fix invert display

* Update xdsp_04_ili9341.ino

Fix display modes

* fix ili9341 m5stack

* Refactor DHT negative temps

* Standardize on unconnected pin being -1

* Back to chain+

* Strict

* strict

* Update platformio_tasmota32.ini

* Fix renderer

* Change NeoPixelBus library from v2.6.0 to v2.6.1.4

* display batch

* Update xdrv_13_display.ino

* ldf strict

Co-authored-by: gemu2015 <gmutz2010@googlemail.com>
Co-authored-by: Theo Arends <11044339+arendst@users.noreply.github.com>
 2021-02-14 16:04:03 +01:00
Theo Arends 68464c5ebd
Merge pull request #10951 from gemu2015/display_batch 
display batch
 2021-02-14 15:55:46 +01:00
gemu2015 61c67ea170 Update xdrv_13_display.ino 2021-02-14 15:33:58 +01:00
Ajith Vasudevan 0659138c0f Merge branch 'development' of github.com:arendst/Tasmota into pr2_tm1637 2021-02-14 19:33:23 +05:30
gemu2015 6b4b0ae7f4 display batch 2021-02-14 15:00:57 +01:00
Theo Arends e59174c6a8 Change NeoPixelBus library from v2.6.0 to v2.6.1.4 2021-02-14 14:59:38 +01:00
Theo Arends 6fd337a381 Fix renderer 2021-02-14 14:35:10 +01:00
Theo Arends e6bff6bf9e Standardize on unconnected pin being -1 2021-02-14 13:06:19 +01:00
Ajith Vasudevan 9bcb8ccb36 Merged changes 2021-02-14 17:26:20 +05:30
Ajith Vasudevan 25759879ed Moved lib from lib_div to lib_display 2021-02-14 16:54:54 +05:30
Ajith Vasudevan aa55a0f730 Merge branch 'pr2_tm1637' of github.com:ajithvasudevan/Tasmota into pr2_tm1637 2021-02-14 16:52:46 +05:30
Ajith Vasudevan bc57e68b7e Merged latest changes to TM1637 code 2021-02-14 16:52:08 +05:30
Ajith Vasudevan bf76f6e552 Merged from dev 2021-02-14 16:47:16 +05:30
Ajith Vasudevan ab904dcb4d Initial changes 2021-02-14 16:42:32 +05:30
Theo Arends 7cb17713d7 Refactor DHT negative temps 2021-02-14 12:03:49 +01:00
Theo Arends 5f334dba53
Merge pull request #10943 from gemu2015/ili9341 
Ili9341 update
 2021-02-14 10:05:55 +01:00
gemu2015 1f9645fc77 fix ili9341 m5stack 2021-02-14 09:42:43 +01:00
Theo Arends 638492db92
Update xdsp_04_ili9341.ino 
Fix display modes
 2021-02-13 18:35:29 +01:00
Theo Arends 8d4fc1ec05
Update ILI9341_2.cpp 
Fix invert display
 2021-02-13 18:34:02 +01:00
gemu2015 5fabf3c138 fix scripter bug 2021-02-13 18:14:27 +01:00
Theo Arends d3d4a49e7f
Merge pull request #10946 from Jason2866/patch-1 
monitor speed is 115200 for ESP32
 2021-02-13 17:07:00 +01:00
Jason2866 98544a81f5
monitor speed is 115200 for ESP32 2021-02-13 16:50:28 +01:00
Theo Arends df18218660
Merge pull request #10945 from s-hadinger/ir_2715 
IRremoteESP8266 library from v2.7.14 to v2.7.15
 2021-02-13 16:49:04 +01:00
Stephan Hadinger 9e0df6ce75 IRremoteESP8266 library from v2.7.14 to v2.7.15 2021-02-13 14:51:52 +01:00
s-hadinger 25e5e7c713
Merge pull request #10944 from s-hadinger/berry_phase2 
Berry language improved Tasmota integration
 2021-02-13 12:15:38 +01:00
Stephan Hadinger 2220b2d3e3 Berry language improved Tasmota integration 2021-02-13 12:01:45 +01:00
gemu2015 c5df7ed1ae Update support_tasmota.ino 2021-02-13 07:52:21 +01:00
gemu2015 74912e7cc2 update ili9341 2021-02-13 07:48:20 +01:00
gemu2015 3f4fda44a4 ili9341 update 2021-02-13 07:43:59 +01:00