mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,913 Commits 9 Branches 110 Tags 1.2 GiB
Commit Graph

6913 Commits

Author SHA1 Message Date
Jason2866 2f954b22c3
Merge pull request #59 from arendst/development 
Update
 2020-05-07 20:35:19 +02:00
Stephan Hadinger 9dfc8f8785 Shrink the Sunrise/Sunset code 2020-05-07 19:48:43 +02:00
Theo Arends 2a6de09396 Change ESP32 GUI GPIO index display 2020-05-07 18:10:54 +02:00
Theo Arends 5bbcc4f969
Merge pull request #8383 from effelle/development 
Hass Discovery: fix missing trigger for toggle
 2020-05-07 18:03:13 +02:00
Federico Leoni 4e2edb83d2
Hass Discovery: fix wrong trigger state 2020-05-07 12:58:39 -03:00
Theo Arends 900c212476
Merge pull request #8380 from Jason2866/patch-1 
Revert changes from #8375 in platformio.ini
 2020-05-07 17:17:37 +02:00
Jason2866 4db23b1c02
Revert changes from #8375 in platformio.ini 2020-05-07 17:15:08 +02:00
Theo Arends 2c40be95ab
Merge pull request #8212 from arijav/new_branch 
Thermostat Controller
 2020-05-07 17:02:43 +02:00
Theo Arends 19d8592978
Merge branch 'development' into new_branch 2020-05-07 17:02:22 +02:00
Theo Arends dbd0020033 Add webcam 2020-05-07 16:55:26 +02:00
Theo Arends 247bd0b44e Merge branch 'development' of https://github.com/arendst/Tasmota into development 2020-05-07 16:54:09 +02:00
Theo Arends 2fbad7b389 Change webcam driver number 
Change webcam driver number as ESP32 driver only starting now from 81.
 2020-05-07 16:53:56 +02:00
Theo Arends 0ffd28bf21
Merge pull request #8375 from gemu2015/scripter-tasks 
Scripter tasks
 2020-05-07 16:50:41 +02:00
gemu2015 72b49a5f2d Update platformio.ini 2020-05-07 16:23:05 +02:00
gemu2015 eb758d49d3 scripter tasks 2020-05-07 16:16:46 +02:00
Theo Arends 0ca5bf4e41
Merge pull request #8243 from ctc/development 
Restore tilt of venetian blinds after movement
 2020-05-07 16:12:50 +02:00
Theo Arends d78ca09c30 Integrate OpenTherm and WindMeter 2020-05-07 16:03:27 +02:00
Theo Arends 40d71e7ad9
Merge pull request #8283 from malbinola/new-windmeter-sensor 
New windmeter sensor
 2020-05-07 15:00:57 +02:00
Theo Arends cb1b7739b6
Merge branch 'development' into new-windmeter-sensor 2020-05-07 14:58:23 +02:00
Theo Arends 27be030e46
Merge pull request #8373 from yury-sannikov/8.2.0_dev_ot 
OpenTherm sensor implementation
 2020-05-07 14:44:30 +02:00
Theo Arends 6da16b5665
Update my_user_config.h 2020-05-07 14:43:55 +02:00
Yury Sannikov cc1fffe7c4 fix ESP32 build 2020-05-07 12:43:47 +03:00
Yury Sannikov 9e6a809ba2 adapt to the latest development branch changes 2020-05-07 11:58:17 +03:00
Yury Sannikov 049ddad17b update languages 2020-05-07 11:54:29 +03:00
Yury Sannikov af98b26ef1 Porting OT implementation from my personal repo 2020-05-07 11:40:03 +03:00
Yury Sannikov 1332325a5b Adding Igor's libraries with his permission 2020-05-07 11:39:08 +03:00
Theo Arends 88dbc8f120
Merge pull request #8370 from effelle/development 
New HAss Discovery (4/4): RELAYS/LIGHTS
 2020-05-07 09:20:26 +02:00
Theo Arends 171c584529
Merge pull request #8369 from Theosakamg/integration_core 
APDS-9960 - Custom configuration tntegration on core
 2020-05-07 09:19:48 +02:00
Theo Arends 88186946f1
Merge pull request #8368 from gemu2015/scripter-update 
scripter fix
 2020-05-07 09:17:44 +02:00
Matteo Albinola a3455f235b Merge branch 'development' into new-windmeter-sensor 
# Conflicts:
#	tasmota/language/bg_BG.h
#	tasmota/language/cs_CZ.h
#	tasmota/language/de_DE.h
#	tasmota/language/el_GR.h
#	tasmota/language/en_GB.h
#	tasmota/language/es_ES.h
#	tasmota/language/fr_FR.h
#	tasmota/language/he_HE.h
#	tasmota/language/hu_HU.h
#	tasmota/language/it_IT.h
#	tasmota/language/ko_KO.h
#	tasmota/language/nl_NL.h
#	tasmota/language/pl_PL.h
#	tasmota/language/pt_BR.h
#	tasmota/language/pt_PT.h
#	tasmota/language/ro_RO.h
#	tasmota/language/ru_RU.h
#	tasmota/language/sk_SK.h
#	tasmota/language/sv_SE.h
#	tasmota/language/tr_TR.h
#	tasmota/language/uk_UA.h
#	tasmota/language/zh_CN.h
#	tasmota/language/zh_TW.h
 2020-05-06 21:33:07 +02:00
Mickael Gaillard d54dcec303 Custom configuration tntegration on core 
Signed-off-by: Mickael Gaillard <mick.gaillard@gmail.com>
 2020-05-06 21:30:36 +02:00
gemu2015 1c44481b41 scripter fix 
add pheap and core to scripter
allow coexistence of scripter with webcam cmd
 2020-05-06 20:37:05 +02:00
Federico Leoni 1e8277eccd New HAss Discovery (4/4): RELAYS/LIGHTS 2020-05-06 14:52:08 -03:00
Theo Arends f2c445b139
Merge pull request #8365 from s-hadinger/optim_settings 
Reduce code size of SettingsDefaultSet2()
 2020-05-06 19:39:46 +02:00
Stephan Hadinger f9d775089e Reduce code size of SettingsDefaultSet2() 2020-05-06 19:21:04 +02:00
Theo Arends 87f89f0a7d Change max number of supported PCF8574 to four 
Change max number of supported PCF8574 to four (#8355)
 2020-05-06 17:44:44 +02:00
Theo Arends 73a153f265
Merge pull request #8364 from bovirus/patch-1 
Update Italian language
 2020-05-06 17:28:22 +02:00
Theo Arends 0d19fd4654 Fix unwanted Domoticz messages 
Fix unwanted Domoticz messages (#8355)
 2020-05-06 17:23:14 +02:00
bovirus 80877b25ba
Update Italian language 2020-05-06 17:20:29 +02:00
Theo Arends 2c140174fd
Merge pull request #8363 from Jason2866/patch-1 
Enable user_config_override.h by default in Platformio.ini
 2020-05-06 16:46:06 +02:00
Jason2866 02c304f9e5
Add files via upload 2020-05-06 16:23:29 +02:00
Jason2866 82ec017b3b
enable user_config_override.h by default 2020-05-06 16:22:27 +02:00
Jason2866 f8600c048d
Create override_copy.py 2020-05-06 16:18:29 +02:00
Theo Arends 4abf498041
Merge pull request #8357 from Theosakamg/default_mode 
APDS-9960 - Add default startup mode
 2020-05-06 10:34:02 +02:00
Theo Arends 4a43f56e27
Merge pull request #8360 from Jason2866/patch-1 
Link Badges to CI workflows
 2020-05-06 10:03:44 +02:00
Jason2866 065366afb7
Link Badges to CI workflows 2020-05-06 09:49:02 +02:00
Theo Arends 4f7551aa09
Merge pull request #8354 from s-hadinger/pmem_align_1 
Don't align PSTR on 4 bytes boundaries
 2020-05-06 09:44:07 +02:00
Theo Arends f5b0d0de78
Merge pull request #8358 from pcdiem/patch-1 
Update README.md
 2020-05-06 09:30:42 +02:00
Theo Arends 77177392dc
Merge pull request #8359 from s-hadinger/minor_size_opt 
Minor size optimizations
 2020-05-06 09:29:54 +02:00
Stephan Hadinger 646f76e459 Minor size optimizations 2020-05-06 08:56:09 +02:00