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

2507 Commits

Author SHA1 Message Date
Theo Arends 0b4197232e Add firmware upload state message to GUI 2020-08-08 13:18:39 +02:00
Stephan Hadinger bf1d76e28f Add Zigbee add options to ``ZbSend`` ``Config`` and ``ReadCondig`` 
This allows to configure the attribute reporting of devices
 2020-08-08 12:17:37 +02:00
Theo Arends 5e064c1531
Merge pull request #9049 from Staars/hm10 
HM10: feature update, fix Flora values, add compile-time-options
 2020-08-07 15:42:58 +02:00
Staars 8a9af14fad feature update, fix Flora values 2020-08-07 15:22:53 +02:00
Theo Arends d63b8ead8c
Update xdrv_29_deepsleep.ino 2020-08-07 14:56:03 +02:00
stefanbode cdb1915fdf
Update tasmota_template_ESP32.h 
Added Deepsleep
 2020-08-07 14:49:49 +02:00
stefanbode 490569ccac
Added DeepSleep for ESP32 
First implementation of TIME based Deepsleep for ESP32 processors
 2020-08-07 14:48:59 +02:00
Theo Arends b2a86d3148 Add WDT functions 2020-08-07 14:34:18 +02:00
Adrian Scillato 365fef2547
Merge pull request #9045 from bovo-fabiano/development 
Brazilian portuguese updated
 2020-08-06 22:44:46 -03:00
bovo-fabiano 654826cb74 Brazilian portuguese updated 2020-08-06 18:43:34 -03:00
Theo Arends 497be768c8
Merge pull request #9042 from s-hadinger/zigbee_power_fix 
Fix Zigbee Power command
 2020-08-06 15:09:49 +02:00
Theo Arends 8233593559 Fix ESP32 default odroid joystick setting 2020-08-06 14:39:01 +02:00
Stephan Hadinger 642d95fc62 Fix Zigbee Power command 2020-08-06 09:55:08 +02:00
Theo Arends 7cd362a84e
Merge pull request #9039 from joba-1/development 
Fix ln(x) via taylor series for special case x = 1
 2020-08-06 09:29:13 +02:00
Theo Arends d7e8c41141
Merge pull request #9037 from gemu2015/st7789 
st7789 display driver
 2020-08-06 09:25:25 +02:00
gemu2015 649053007a fix ft5206 watch touch controller 2020-08-06 08:53:09 +02:00
joba-1 d6bcab2920
Fix ln(x) via taylor series for special case x = 1 2020-08-05 23:42:34 +02:00
Stephan Hadinger a2a61ce55a Quick fix for regression on `Power` command 2020-08-05 21:00:30 +02:00
Stephan Hadinger 28c035aabd Zigbee EZSP fixes 2020-08-05 20:49:07 +02:00
gemu2015 5d102f52f7 st7789 added 2020-08-05 20:21:21 +02:00
RemiDing fa27a0881d Merge branch 'development' of https://github.com/RemiDing/Tasmota into development 2020-08-04 22:55:05 +02:00
RemiDing 9ca5e94715 detect double click 2020-08-04 22:53:44 +02:00
Theo Arends d321b6cf68 Fix ESP32 analog indexes 2020-08-04 18:01:51 +02:00
Theo Arends ce388c799f Add ESP32 Analog input support for GPIO32 to GPIO39 2020-08-04 16:33:05 +02:00
stefanbode 35b0d671b7
Update xsns_29_mcp230xx.ino 
- Removed custom code for INTERLOCK. referenced to normal INTERLOCK groups trough POWER command.
- Compiler Options to save space
- redirect sensor29 set relay status to POWER command
 2020-08-04 08:31:50 +02:00
Theo Arends b8973d64d0
Merge pull request #9023 from stefanbode/patch-16 
Added exposure of MCP Out Pins as Relays
 2020-08-03 18:23:51 +02:00
Theo Arends a3445e5b5f Add ESP32 ADC framework 2020-08-03 18:21:34 +02:00
stefanbode d16cdb108c
Added required hooks 2020-08-03 18:08:49 +02:00
stefanbode b966a5a933
Exposed OUT Pin as Relays 2020-08-03 18:02:27 +02:00
Theo Arends 1d990ad091 Fix ESP32 PWM range 2020-08-03 11:52:25 +02:00
Staars ccdfff33dd add support for MHO-C303 2020-08-02 15:07:18 +02:00
Theo Arends e1b825ed75 Fix ESP32 PWM resolution calculation 2020-08-02 12:40:15 +02:00
Theo Arends 6185941b18 Fix display redundant power toggle 
Fix display redundant power toggle if backlight is configured as PWM
 2020-08-02 11:42:28 +02:00
gemu2015 6323e777a0 scripter display dump 2020-08-02 07:35:25 +02:00
Stephan Hadinger f1bea6b363 Add Zigbee better support for IKEA Motion Sensor 2020-08-01 18:52:04 +02:00
Theo Arends 317d4977d1 Fix masterlog_level to control master log level control 2020-07-31 16:56:42 +02:00
Theo Arends a5857ac03f Add masterlog_level to control master log level control 2020-07-31 11:53:12 +02:00
Theo Arends feb5ffc3dd Oops broke esp8266 compile. Fixed 2020-07-31 11:37:12 +02:00
Theo Arends 6aee706f01 Fix ESP32 Zigbee compilation 2020-07-31 11:35:26 +02:00
Theo Arends 753d161a57
Merge pull request #8821 from halfbakery/shutter_ha_discovery 
Shutter ha discovery
 2020-07-30 20:32:16 +02:00
Norbert Richter cd6de24f14
Fix ShutterStopToggleDir init 2020-07-30 18:10:29 +02:00
Jason2866 3b7305f20c
Add changes from https://github.com/esp8266/Arduino/commit/a6798691 
to be compatible with Arduino master.
 2020-07-30 13:41:51 +02:00
Theo Arends 70c7f38a1f Release 8.4.0 2020-07-29 16:58:07 +02:00
Theo Arends ba3856d900 Change IRRemoteESP8266 library 
Change IRRemoteESP8266 library from v2.7.6 to v2.7.8.10, fixing Samsung and Pioneer protocols (#8938)
 2020-07-29 14:44:45 +02:00
Stephan Hadinger e83351864e Change IRRemoteESP8266 IR lib to pre-2.7.9, fixing Samsung and Pioneer protocols (#8938) 2020-07-29 13:57:44 +02:00
Theo Arends 69e252b7d7 Prep release 8.4.0 2020-07-29 10:31:38 +02:00
Stephan Hadinger c47d8d03a5 Change Zigbee randomizing of parameters at first run or after Reset 2020-07-29 10:02:04 +02:00
Theo Arends 0abe6c6a2b Zigbee EFR32 xmodem upload 
Zigbee EFR32 xmodem upload (#8583)
- Now checks for upload complete
- Add optional define ZIGBEE_BOOTLOADER_SOFTWARE_RESET_FIRST for software reset first
 2020-07-27 18:31:14 +02:00
Theo Arends 2012eaccf4 POC3 Zigbee EFR32 xmodem upload 
POC3 Zigbee EFR32 xmodem upload (#8583)
- Extend ACK timeout after EOT
 2020-07-27 15:43:24 +02:00
Theo Arends e8beeba651 Remove obsolete debug info 2020-07-27 11:05:44 +02:00
Theo Arends a6fe5f859b POC2 Zigbee EFR32 xmodem upload 
POC2 Zigbee EFR32 xmodem upload (#8583)
- Swap reset states
- Speed up XMODEM upload by changing current loop sleep
- Add more debug messages
 2020-07-27 11:01:20 +02:00
Theo Arends 30d0f050c7 POC Zigbee EFR32 xmodem upload 
POC Zigbee EFR32 xmodem upload (#8583)
 2020-07-26 18:55:31 +02:00
Stephan Hadinger 267a49b140 Fix compilation error for Zigbee ZNP 2020-07-26 13:54:24 +02:00
Theo Arends 806a862cac Add EFR32 upload framework 2020-07-25 18:25:06 +02:00
Theo Arends 520558d381 Fix no sensor issue 2020-07-25 17:08:11 +02:00
Stephan Hadinger 781cb4d9c7 Zigbee EZSP improvements and reduced logging 2020-07-25 15:40:42 +02:00
Theo Arends 38179062ae Refactor TuyaMcu year 2020-07-25 14:52:37 +02:00
bettman66 0467ffc62a millennium error 2020-07-25 09:21:56 +02:00
Theo Arends 3acae81fc0 Change Domoticz commands prefix from ``Domoticz`` to ``Dz`` 
- Change Domoticz commands prefix from ``Domoticz`` to ``Dz``
- Add command ``DzSend<type> <index>,<value1(;value2)|state>`` to send values or state to Domoticz
 2020-07-24 15:30:21 +02:00
Jason2866 959a8bb234
disable serial log and enable I2C 2020-07-24 12:17:19 +02:00
bovirus 8883ad4c29
Update Italian language 2020-07-24 06:38:44 +02:00
Theo Arends 5f386cc164 Fix MCP230xx telemetry JSON message 
Fix MCP230xx telemetry JSON message (#8965)
 2020-07-23 14:52:29 +02:00
Norbert Richter 51b9740a5d
Add script usage flags 2020-07-23 13:23:16 +02:00
Theo Arends 85ccdda569 Fix MPU6050 temperature 
Fix MPU6050 temperature (#8964)
 2020-07-23 13:06:07 +02:00
Theo Arends 85755ea3dc Enforce correct module for ZBBridge 2020-07-23 12:43:56 +02:00
Theo Arends d2d134a7fe
Merge pull request #8963 from Jason2866/patch-1 
Add firmware variant ZigbeeBridge
 2020-07-23 11:40:31 +02:00
Theo Arends 9adc4b4202 Add new module 75 supporting Sonoff Zigbee Bridge 
Add new module 75 supporting Sonoff Zigbee Bridge (#8583)
 2020-07-23 11:39:51 +02:00
Jason2866 6f9715c0da
needed undef added 2020-07-23 09:26:10 +02:00
Jason2866 785289234f
Lights support needed for HUE Emulation 2020-07-22 21:25:20 +02:00
Jason2866 246dcea2d1
new build variant ZigbeeBridge 2020-07-22 21:07:40 +02:00
Stephan Hadinger eec6869a0a EZSP flow control 2020-07-22 19:29:16 +02:00
Theo Arends 6f320780a0 Change zigbee reset using new GPIO 2020-07-22 10:12:24 +02:00
Theo Arends d8c4240656 Prep Zigbee reset GPIO 2020-07-22 10:07:07 +02:00
Theo Arends 0fc41f302e Update xdrv_40_telegram.ino 2020-07-22 09:36:18 +02:00
Theo Arends a1fc5d4890 Fix telegram restart loop 
Fix telegram restart loop (#8619)
 2020-07-22 09:34:35 +02:00
Stephan Hadinger 6d34813f45 Zigbee CC2530 more robust reset 2020-07-21 22:39:39 +02:00
Theo Arends 6f106ce0ae
Merge pull request #8954 from bovirus/patch-1 
Update Italian language
 2020-07-21 22:21:10 +02:00
Stephan Hadinger 93b36d5c46 Change ``Ping`` now reports the hostname instead of IP address (#8948) 2020-07-21 19:16:38 +02:00
bovirus bdcc630886
Update Italian language 2020-07-21 18:46:52 +02:00
Theo Arends 72e3765a55 Add command (``S``)``SerialSend6`` \<comma seperated values\> 
Add command (``S``)``SerialSend6`` \<comma seperated values\> (#8937)
 2020-07-21 12:42:18 +02:00
Theo Arends ac780d5e9a
Merge pull request #8937 from grob6000/serialsend6 
Serialsend6 - comma-separated decimal send as binary
 2020-07-21 12:23:53 +02:00
Theo Arends 4584effbce Change all timer references from ``Arm`` to ``Enable`` 
Change all timer references from ``Arm`` to ``Enable`` in GUI, ``Timer`` command and JSON message
 2020-07-21 10:44:45 +02:00
Norbert Richter f0177f3c48
Add ShutterToggleDir/ShutterStopToggleDir 
same function as ShutterToggle/ShutterStopToggle but based on last movement direction, not on current position (< or > 50%)
 2020-07-21 07:25:02 +02:00
Stephan Hadinger 2da8f3c393 Added `SO101 1` to suffix commands with source endpoint 2020-07-20 19:30:32 +02:00
Theo Arends a84ebe552a Refactor rules processing 2020-07-20 17:24:51 +02:00
Antonio Fernandez bc3efb5696
Updated the D_TIMER_ARM variable to say "Enable" 
Arm has been a bit of a confusing term. I think it would help new users out to rename this to "Enable". It will make the button more intuitive.
 2020-07-20 10:57:38 -04:00
Theo Arends 59f50d04f2 Allow rules on energy margins 
Allow rules on energy margins (#8935)
 2020-07-20 16:41:05 +02:00
Theo Arends 0a64625e9a Allow rules on energy margins 
Allow rules on energy margins (#8935)
 2020-07-20 16:26:32 +02:00
Theo Arends eeed6768d0 Third try to fix counter interrupt storm 2020-07-20 11:20:58 +02:00
Platformio BUILD ecf5ad0232 Merge remote-tracking branch 'Tasmota/development' 2020-07-20 06:51:59 +00:00
Staars 1b380b5bc9 update MQTT presentation 2020-07-20 08:51:17 +02:00
George 2ced749e4d serialsend6 - more fixes 
oops
 2020-07-20 10:14:01 +10:00
George 8a4a0d67ff serialsend6 - fixes 
Forgot to fix top condition
 2020-07-20 10:08:20 +10:00
Theo Arends 23da6285c1 Add command ``SetOption100 0/1`` 
Add command ``SetOption100 0/1`` to remove ``ZbReceived`` value from ``{"ZbReceived":{xxx:yyy}}`` JSON message
 2020-07-19 15:57:37 +02:00
Theo Arends 528fe5333d Shrink minimal a bit 2020-07-19 13:33:57 +02:00
George 63242de249 Serialsend6 
* Adds serialsend6, allowing sending of binary data with comma-delimited string of decimal numbers.
 2020-07-19 20:34:43 +10:00
Theo Arends 2c6198f27c Fix spelling 
Fix spelling (#3410)
 2020-07-18 18:51:13 +02:00
Theo Arends d2198ad8b6 Fix esp32 compile error 2020-07-17 18:40:06 +02:00
Theo Arends 8dbe3c90da Second try to fix counter interrupt storm 
Second try to fix counter interrupt storm during OTA (#8928)
 2020-07-17 16:18:07 +02:00
Theo Arends 25dcf447f3 First try to fix counter interrupt storm 
First try to fix counter interrupt storm during OTA (#8928)
 2020-07-17 12:49:42 +02:00
Theo Arends a9b05b0884 Change to attachInterruptArg() 
Change to attachInterruptArg() saving 76 bytes
 2020-07-17 12:37:21 +02:00
Theo Arends 934ca43463 Remove Arduino ESP8266 Core support before 2.7.1 
Remove Arduino ESP8266 Core support for versions before 2.7.1
 2020-07-17 11:49:56 +02:00
Theo Arends 6b0870343b Change to limited support of Arduino IDE 
Change to limited support of Arduino IDE as an increasing amount of features cannot be compiled with Arduino IDE
 2020-07-16 18:21:19 +02:00
Theo Arends 2705c8eb8b Fix GCC 10.1 warnings 2020-07-16 18:02:39 +02:00
Theo Arends 29e73b4291 Fix GCC 10.1 warning 2020-07-16 17:50:26 +02:00
Theo Arends 031b04fb53 Add check for valid time 2020-07-16 17:28:47 +02:00
Theo Arends 344c091f83
Merge pull request #8927 from gemu2015/scripter-fix 
scripter add event result
 2020-07-16 17:24:47 +02:00
Theo Arends 15a1c881ad
Merge pull request #8926 from Bettman66/development 
issues #8866
 2020-07-16 17:16:02 +02:00
gemu2015 2ad758117d scripter add event result 2020-07-16 17:15:12 +02:00
Walter Zengel 8813827376
issues #8866 2020-07-16 17:13:19 +02:00
Theo Arends 66b3dc1cf2 Increase TLS fingerprint security 2020-07-16 16:46:30 +02:00
Walter Zengel 858d150398
issues #8866 
update tuyatime every 60sec
 2020-07-16 16:42:06 +02:00
bovirus 9d69c36355
Update Italian language 2020-07-16 14:24:41 +02:00
Theo Arends e6a3b675e3
Merge pull request #8916 from Staars/mi32 
MI-ESP32: add MHO-C401
 2020-07-15 18:20:52 +02:00
Staars f6f208e65c add MHO-C401 2020-07-15 17:41:12 +02:00
Theo Arends 06c06705dd Fix minimal binary fast reboot issue 2020-07-15 16:09:32 +02:00
Theo Arends 6f52b0f7cc Reset version 2020-07-15 14:35:30 +02:00
Theo Arends c66e5a4381 Fix GCC 10.1 warnings 2020-07-15 14:11:41 +02:00
Theo Arends 608d05f0bb Fix GCC 10.1 warnings 2020-07-15 11:04:29 +02:00
Theo Arends 214b227942 Better fix GCC 10.1 warnings 2020-07-15 10:50:54 +02:00
gemu2015 e43d1828f6 some gcc fixes, etc 2020-07-15 09:44:52 +02:00
Theo Arends 1dcf2df5ee
Merge pull request #8907 from SODAIS69/development 
Added translations for zh_TW
 2020-07-14 22:27:59 +02:00
SODAIS69 837458577f Merge branch 'development' of https://github.com/SODAIS69/Tasmota into development 2020-07-15 01:06:58 +08:00
SODAIS69 7cd8696946 Remove redundant quotes that causes cl fails. 2020-07-15 01:06:45 +08:00
Theo Arends 58a4a12b22 Fix GCC 10.1 warning 2020-07-14 18:35:29 +02:00
Theo Arends 2fe5326821 Fix buffer overflow 2020-07-14 18:34:59 +02:00
Theo Arends 35e570ca97 Fix GCC 10.1 error 2020-07-14 18:30:23 +02:00
Theo Arends d86fb6f584 Fix GCC 10.1 warnings 2020-07-14 18:19:13 +02:00
SODAIS 9bbba04925
Update zh_TW.h 
Removing string accidentally added
 2020-07-15 00:05:13 +08:00
SODAIS69 151dc5f6b8 Add translations for zh_TW 2020-07-14 23:58:10 +08:00
Theo Arends 6843f58a91 Add support for Schneider Electric iEM3000 
Add support for Schneider Electric iEM3000 series Modbus energy meter by Marius Bezuidenhout
 2020-07-14 17:37:14 +02:00
Theo Arends 02c8e4d9cf
Merge pull request #8904 from sametflo/patch-1 
ESP32 port: JSON error
 2020-07-14 17:10:58 +02:00
Theo Arends 7e03cbedda Fix GCC 10.1 errors and warnings 2020-07-14 16:57:49 +02:00
Theo Arends f3c391b160 Fix GCC 10.1 errors and warnings 2020-07-14 16:21:11 +02:00
Sammy BAUER b7c7943b00
ESP32 port: JSON error 
A double quote is missing in the JSON response of the status command, so the result is not valid for ESP32.
 2020-07-14 16:07:35 +02:00
Theo Arends cd6e23757c Refactor rotary encoder 2020-07-14 15:01:41 +02:00
Theo Arends 5e4554e927
Merge pull request #8900 from tthk/development 
Add support for 0.56" 7-Segment LED Backpack with floating point and raw segment addressing
 2020-07-14 11:58:39 +02:00
Theo Arends c62679c3c8 Prep for more NRG drivers 2020-07-14 11:57:10 +02:00
Theo Arends 73f565aa8c
Merge pull request #8899 from SODAIS69/development 
Optimizations for zh_TW translations
 2020-07-14 11:53:16 +02:00
Theo Arends fde82d8bdb
Merge pull request #8890 from mbezuidenhout/iem3000-feature 
Schneider iEM3xxx Modbus feature
 2020-07-14 11:43:52 +02:00
Platformio BUILD 8619e8513a Merge remote-tracking branch 'Tasmota/development' 2020-07-14 09:36:32 +00:00
Khoa Ton 414982603b Fix error in example comment 2020-07-14 02:35:49 -07:00
Theo Arends 7507d51ab9
Merge pull request #8895 from arijav/development 
Bugfix local temperature sensor in fahrenheit for Thermostat driver
 2020-07-14 11:27:40 +02:00
Theo Arends 6d99e057b9
Merge pull request #8885 from d0m1n1qu3/MI32_rssi 
read the rssi from the BLE sensors
 2020-07-14 11:26:45 +02:00
gui 30a0e66589 Optimizations for zh_TW translations 2020-07-14 17:06:50 +08:00
Khoa Ton a82b18e778 Merge branch 'development' of github.com:tthk/Tasmota into development 2020-07-14 01:42:50 -07:00
Khoa Ton 60584d9423 Add 0.56" sevenseg support, floating point, raw output 2020-07-14 01:42:41 -07:00
d0m1n1qu3 032c87c7a9 fix that firmware is send everytime since commit 39705a2e05 2020-07-13 21:24:38 +02:00
d0m1n1qu3 3640372fd0 fix that firmware is send everytime since commit 39705a2e05 2020-07-13 21:08:10 +02:00
Javier Arigita e0f075afb1 Bugfix local temperature sensor in fahrenheit 2020-07-13 20:22:37 +02:00
d0m1n1qu3 e468f941db using D_RSSI instead of new String 2020-07-13 17:57:30 +02:00
Theo Arends 8dbcf481c7
Merge pull request #8894 from Staars/nrf24 
MI-NRF24: add MHO-C401
 2020-07-13 15:13:30 +02:00
Theo Arends 84ee6393a5 Add second rotary support 
Add second rotary support default used for CW light control when first rotary is used for RGB light control (#8864)
 2020-07-13 15:10:23 +02:00
d0m1n1qu3 4f10a15a65 shift the init or the variable firmware to FLORA only because of changes from Staars 2020-07-12 21:19:40 +02:00
Staars 41d0f3117f add MHO-C401 2020-07-12 21:12:42 +02:00
d0m1n1qu3 51b3d67ca9 try to merge remote 
Merge remote-tracking branch 'upstream/development' into MI32_rssi
 2020-07-12 21:01:36 +02:00
Theo Arends 96d37ec535 Add Rotary features 
Add On/Off functionality to rotary dial (#8263)
 2020-07-12 18:53:57 +02:00
Staars 39705a2e05 add lights, yeerc, decryption and more 2020-07-12 18:17:27 +02:00
Marius Bezuidenhout 277df060dd Schneider iEM3xxx Modbus feature 
Feature to read modbus data from Schneider Electric iEM energy monitor devices
 2020-07-12 17:52:24 +02:00
Theo Arends 202326c5f3 Update changelog 2020-07-12 15:34:02 +02:00
Theo Arends e3fd1b7850 Fix DS18S20 temp calculation 
Fix DS18S20 temp calculation  (#8777)
 2020-07-12 15:24:42 +02:00
Khoa Ton 3462c7f31b Fix mispelling in comment 2020-07-12 00:02:39 -07:00
Khoa Ton 7de43e6233 Added comments on multiple sevenseg display layout 2020-07-11 23:33:25 -07:00
Khoa Ton 833f47fd15 Support up to 8 I2C Seven Segment Displays 2020-07-11 23:16:29 -07:00
d0m1n1qu3 5a2e7c5aa7 add some checks is rssi is available and init variables at object creation 2020-07-11 22:09:26 +02:00
Stephan Hadinger 2dd3e0e0a0 Zigbee EZSP better support for groups 2020-07-10 20:15:12 +02:00
d0m1n1qu3 55653f0c33 read the rssi from the sensor 
sometimes it is hard to find out why a sensor sends no data
with the rssi you got a value of the BLE signal strenght
and can optimize the location of the sensor or the ESP32

if the rssi got worse over time the battery could be the problem

rssi monitoring is a must have feature for radio signals :-)
 2020-07-10 18:03:07 +02:00
d0m1n1qu3 115ed56424 send firmware version only via mqtt not shown on GUI anymore 2020-07-10 17:00:45 +02:00
d0m1n1qu3 151686d2e1 read firmware verion for FLORA devices 
the FLORA sensors send the firmware version number while they send the
battery info so we parse it and send it via mqtt (json) and also
present it in the webinterface
 2020-07-10 13:16:01 +02:00
d0m1n1qu3 881cd5e580 repair float int problems for MI Flora moisture and fertility 2020-07-09 20:47:01 +02:00
stefanbode 90f29695bb
Update xsns_01_counter.ino 2020-07-07 16:31:35 +02:00
stefanbode ce7070b0a5
Update xsns_01_counter.ino 2020-07-07 16:26:44 +02:00
stefanbode 7c2d9673a1
Update xsns_01_counter.ino 2020-07-07 16:22:55 +02:00
stefanbode debd2b7562
Update xdrv_04_light.ino 2020-07-07 16:19:26 +02:00
stefanbode f2e686ab26
Fixes some reboots on change the dimmer 2020-07-07 16:17:43 +02:00
Staars 7fe99a5e04 minimal API-changes, tweak scan process 2020-07-06 20:10:43 +02:00
Theo Arends d612d2b62e
Merge pull request #8862 from s-hadinger/zigbee_july_5 
Zigbee EZSP support for bindings and groups
 2020-07-05 21:21:44 +02:00
Theo Arends 41e72328fd
Merge pull request #8861 from Staars/nrf24 
NRF24: add night lights and yee-rc, refactoring
 2020-07-05 21:20:38 +02:00
Stephan Hadinger 5384c0190b Zigbee EZSP support for bindings and groups 2020-07-05 21:01:26 +02:00
Staars d56f5ebbdf add lights and yeerc 2020-07-05 19:48:47 +02:00
Theo Arends bd302f9a64 Prep ESP32 zigbee support 2020-07-05 15:13:57 +02:00
Theo Arends d4f8234780 Prep ESP32 zigbee support 2020-07-05 14:51:55 +02:00
Theo Arends acee1e5686 Fix Zigbee reset pin 2020-07-05 12:35:54 +02:00
Theo Arends 299b9a7194 Update support_features.ino 2020-07-05 12:15:26 +02:00
bovirus 997e85b54a
Update Italian language 
Fix some typos (space between words or uppercase/lowercase)
Tuining text strings.
 2020-07-05 09:57:10 +02:00
gemu2015 876505a2c3 Update xsns_53_sml.ino 2020-07-05 08:59:42 +02:00
gemu2015 afa20ca1f7 fix ed300l bug, fix esp32 set bd bug 2020-07-05 08:55:34 +02:00
Stephan Hadinger 173a6d917b Zigbee EZSP minor improvements 2020-07-04 19:59:59 +02:00
Theo Arends 407d36c055 Update support_features.ino 2020-07-04 18:34:23 +02:00
Theo Arends 046b43b967
Merge pull request #8848 from ryancdotorg/nothing-up-my-sleeve 
Transparent default value for MqttFingerprint2
 2020-07-04 16:19:29 +02:00
Theo Arends 0315ef3a3c Add some comments to led commands 2020-07-04 15:40:38 +02:00
Theo Arends c3a056a78f Minor refactor 2020-07-04 14:29:15 +02:00
Norbert Richter e7cd96689f
Shutter reactivate rule trigger during move 2020-07-04 13:23:35 +02:00
Norbert Richter 46542e4cbb
Shutter change loglevels+1 2020-07-04 13:20:53 +02:00
Ryan Castellucci c0c19ea3da Transparent default value for MqttFingerprint2 
I was unable to find any information on where the existing default
MqttFingerprint2 value came from, and can't be sure that someone
doesn't have a key matching it.

For transparency, this patch replaces the default MqttFingerprint2 value
with the result of SHA1("Tasmota") as a "nothing-up-my-sleeve number".
 2020-07-04 11:56:05 +01:00
Theo Arends 642fa216c2 Merge branch 'development' into pre-release 2020-07-04 12:04:41 +02:00
Norbert Richter 0cebf9a28f
Fix shutter target == 255 on close 2020-07-04 10:43:02 +02:00
Theo Arends e5127d8e8e Fix possible watchdog/exception 
Fix possible watchdog/exception (#8828)
 2020-07-03 17:17:57 +02:00
Theo Arends a6dcffab9b Fix PROGMEM related exceptions 
Fix PROGMEM related exceptions (#8828)
 2020-07-03 12:30:09 +02:00
Theo Arends 911dc64e99
Merge pull request #8833 from stefanbode/patch-14 
Add support for AC Dimmer #8789
 2020-07-03 10:48:14 +02:00
stefanbode 22fec3202a
Update core_esp8266_wiring_pwm.cpp 2020-07-03 09:07:43 +02:00
stefanbode 041be8882e
Update core_esp8266_wiring_pwm.cpp 2020-07-03 09:04:14 +02:00
stefanbode d3a9413a7c
Update tasmota_globals.h 2020-07-03 09:01:53 +02:00
stefanbode 6bd4edcdae
Update xsns_01_counter.ino 2020-07-03 09:01:02 +02:00
stefanbode fa4680bb61
Delete Arduino.h 2020-07-03 08:59:48 +02:00
Stephan Hadinger 8bfd753334 Zigbee EZSP milestone 4 2020-07-02 22:56:37 +02:00
Theo Arends cc301e9395
Merge pull request #8837 from gemu2015/scripter-update 
Scripter update
 2020-07-02 18:18:41 +02:00
Theo Arends 0cc1dd957b Add SO98 to control user rotary support 2020-07-02 18:13:14 +02:00
stefanbode 0509eee6a5
Update xsns_01_counter.ino 2020-07-02 08:42:43 +02:00
stefanbode 862262c349
Update Arduino.h 2020-07-02 08:37:32 +02:00
gemu2015 67b3702b0b Update tasmota.ino 2020-07-02 06:48:07 +02:00
gemu2015 64bd9f1974 scripter fixes 2020-07-02 06:46:04 +02:00
stefanbode 533f314277
Update Arduino.h 2020-07-01 18:45:36 +02:00
stefanbode e3c19205b6
Add files via upload 2020-07-01 17:46:53 +02:00
stefanbode c11e948b81
Update xsns_01_counter.ino 2020-07-01 17:46:13 +02:00
stefanbode 2d3d4863b4
Update core_esp8266_wiring_pwm.cpp 2020-07-01 17:38:49 +02:00
stefanbode 4fe216f3c7
Support for AC Dimmer 2020-07-01 17:37:32 +02:00
Justifiably dcb57d11e3 Spurious low LMT01 pulse are sometimes seen, ignore them. 2020-07-01 13:58:31 +01:00
Theo Arends 618d86078c Rotary experiments 2020-07-01 10:34:39 +02:00
Theo Arends 767eba7e8c Rotary experiments 2020-07-01 10:27:04 +02:00
Theo Arends 83b6665c39 Rotary experiments 2020-07-01 10:24:46 +02:00
Theo Arends 9ac4502c78 Rotary experiments 2020-07-01 10:22:20 +02:00
Theo Arends 8ff609b371 Add comment 2020-06-30 18:13:38 +02:00
Theo Arends 24669bb674 Fix rule mem events 
Fix rule mem events (#8826)
 2020-06-30 18:09:18 +02:00
Theo Arends b6495598de Tune rotary encoder color control 2020-06-30 18:00:14 +02:00
Theo Arends 828a64815b Add rotary encoder color control 
Add rotary encoder color control when button pressed and postpone flash writes while turning rotary.
 2020-06-30 17:48:38 +02:00
Theo Arends e52961b3b4 Add rotary encoder support 
- Add rotary encoder support for light dimmer and optional color temperature if button1 still pressed (#8670)
- Fix Mi Desk Lamp brightness control (#8748)
 2020-06-30 16:58:36 +02:00
Theo Arends 6853926948 Fix array index 
Fix array index (#8823)
 2020-06-30 15:05:07 +02:00
Stephan Hadinger fc40a0945d Zigbee EZSP milestone 3 2020-06-29 22:21:32 +02:00
halfbakery 50a9258eac Home Assistant shutter autodiscovery 2020-06-29 19:44:26 +02:00
halfbakery 95bed62bd1 Do not announce shutter controlling relays to Home Assistant 2020-06-29 19:38:50 +02:00
Theo Arends 074bef9f70 Try to fix Mi Desk Lamp 
Try to fix Mi Desk Lamp (#8748)
 2020-06-29 17:35:02 +02:00
Theo Arends acc0562422 Try to fix Mi Desk Lamp 
Try to fix Mi Desk Lamp (#8748)
 2020-06-29 16:34:35 +02:00
Federico Leoni 03db100197 TuyaMCU baud rate 2020-06-29 11:01:55 -03:00
Theo Arends 8afba31107 Add some comments 2020-06-29 14:43:43 +02:00
Theo Arends 2a58730219 Shrink ajax package 2020-06-29 13:52:24 +02:00
Theo Arends a63604bd10 Add Battery status to Zigbee GUI 
Add Battery status to Zigbee GUI
 2020-06-29 11:53:31 +02:00
gemu2015 bc1f91041c fix scripter USE_SCRIPT_GLOBVARS without USE_DEVICE_GROUPS 2020-06-29 10:48:24 +02:00
Theo Arends 04dca1e61f
Merge pull request #8816 from gemu2015/scripter-string_array 
scripter support for string array
 2020-06-29 08:42:45 +02:00
gemu2015 df125f2c07 scripter support for string array 2020-06-29 07:06:08 +02:00
Mark Hansen c9f3a2d563 Add tasmota_flash_writes_total to Prometheus 
Follows prometheus naming best practices for unitless accumulating counts:
https://prometheus.io/docs/practices/naming/#metric-names

(cf http_requests_total).
 2020-06-29 10:35:27 +10:00
Stephan Hadinger 908fca70ab Relax detection of Aqara Cuve 2020-06-28 18:06:25 +02:00
Stephan Hadinger ac80807c4e Removed the x2 to battery percentage 2020-06-28 18:04:36 +02:00
Stephan Hadinger 4af6b7d540 Moved LQI to Zigbee devices 2020-06-28 17:53:59 +02:00
Theo Arends 609b0309fa Try to fix mi desk lamp 
Try to fix mi desk lamp (#8748)
 2020-06-28 12:54:44 +02:00
Theo Arends 7dafeb280e Rename global temp and pressure 
- Rename global temp and pressure (#8808, #8810)
- Fix SGP30 calculation (#8808)
 2020-06-28 12:23:18 +02:00
Mark Hansen e9f88af959 Add WiFi metrics to prometheus exporter 2020-06-28 11:43:29 +10:00
Theo Arends a212b3ca7d Change zigbee LQ to LQI 2020-06-27 22:20:32 +02:00
Theo Arends a05e939be9 Add some zigbee webinfo 2020-06-27 18:17:40 +02:00
Theo Arends 5fe75496f9
Merge pull request #8801 from s-hadinger/zigbee_june_20 
Minor Zigbee changes
 2020-06-27 15:06:58 +02:00
Stephan Hadinger 2e50cc507d Minor Zigbee changes 2020-06-27 14:55:55 +02:00
Mark Hansen 76c61e85b3 Add tasmota_info prometheus psuedo-metric. 
Exports version, image type, and build timestamp.

It's common to export something like this to show version numbers across the fleet.

For example, the golang exporter exposes version:
```
go_info{version="go1.14.4"} 1
```

And prometheus exposes:
```
prometheus_build_info{branch="HEAD",goversion="go1.14.4",revision="eba3fdcbf0d378b66600281903e3aab515732b39",version="2.19.1"} 1
```
 2020-06-27 21:21:11 +10:00
Theo Arends 1866938cbd Integrate prometheus 2020-06-27 11:52:44 +02:00
Theo Arends 74a3be49a4
Merge pull request #8796 from mhansen/boot_count 
Add tasmota_boot_count prometheus metric
 2020-06-27 10:34:26 +02:00
Mark Hansen f741f43262 Add tasmota_boot_count prometheus metric 2020-06-27 12:10:00 +10:00
Mark Hansen b802d34c42 Move #define USE_PROMETHEUS to my_user_config.h 
This is where all the other #defines live.

This should make it easier to find the #define for enabling prometheus.
 2020-06-27 12:04:32 +10:00
gemu2015 6553a775f4 scripter update 
fix unishox define conflict
fix for next loop exit bugs
add full pagewebserver (also support for jpg, html and txt files from filesystem)
 2020-06-26 09:22:57 +02:00
Theo Arends c8bdf11f80
Merge pull request #8787 from Jason2866/patch-1 
Updated instructions
 2020-06-26 08:57:10 +02:00
Theo Arends 169d444532
Merge pull request #8786 from mhansen/uptime-prometheus 
Add uptime metric to prometheus exporter
 2020-06-26 08:56:36 +02:00
Jason2866 f5fb209e9d
Updated instructions 2020-06-26 08:03:11 +02:00
Jason2866 b0cebcbef8
Shrink tasmota-ir 
Disable Counter and DHT and DS18x20 sensors. Use ADC_VCC
 2020-06-25 15:36:25 +02:00
Mark Hansen 956e6f5a5c Add uptime metric to prometheus exporter 
I'm following the naming practices:
https://prometheus.io/docs/practices/naming/
- an application prefix (tasmota_)
- a unit suffix in plural form

Tested building and flashing: looks like

```
tasmota_uptime_seconds 78
```
 2020-06-25 20:33:54 +10:00
gemu2015 1cbfbc697a fix sml counter irq mode 2020-06-25 07:34:00 +02:00
Theo Arends 14fe92f13c
Merge pull request #8780 from s-hadinger/ir_278 
Change IRremoteESP8266 library updated to v2.7.8
 2020-06-24 22:12:25 +02:00
Stephan Hadinger 4503cd44ed Change IRremoteESP8266 library updated to v2.7.8 2020-06-24 21:48:33 +02:00
Stephan Hadinger 4a69bb2a13 Fix wrong CT range when Alexa mode #8694 2020-06-24 21:41:04 +02:00
Theo Arends a55ada039f
Merge pull request #8776 from Staars/development 
fix BEARSSL-decryption, remove MBEDTLS, prepare night light sensors for NRF24 driver
 2020-06-24 16:38:33 +02:00
Theo Arends faecd38006 Add compile time User Template 
Add compile time User Template (#8766)
 2020-06-24 16:37:02 +02:00
Platformio BUILD 606f675a33 Merge remote-tracking branch 'Tasmota/development' 2020-06-24 14:21:45 +00:00
Staars 80729a85ad fix BEARSSL-decryption, remove MBEDTLS, prepare night light sensors 2020-06-24 16:21:09 +02:00
Staars 6363e2fa96 remove legacy code 2020-06-24 16:20:07 +02:00
Theo Arends ff327106be Refactor ESP32 support 2020-06-24 15:58:56 +02:00
Theo Arends 7600a81c8e Add ESP32 counter support 2020-06-24 15:50:14 +02:00
Theo Arends 5631415acd Add ESP32 inverted buzzer support 2020-06-24 15:49:18 +02:00
Theo Arends f4adce5fb1 Add ESP32 DHT support 
Add ESP32 DHT support (#8503)
 2020-06-24 15:36:54 +02:00
Alain Turbide 076d1521e3 - switched to strcasecmp for compare 
- removed ifdef/endif
 2020-06-24 07:09:22 -04:00
Alain Turbide 0c02d1ae3e add missing irsend_active flag to block ir receive during send 2020-06-23 20:13:09 -04:00
Alain Turbide 2b1d251b85 - Added case insensitivity for GC/gc 
- Added repeat support
- removed debug messages
 2020-06-23 19:46:55 -04:00
Alain Turbide 100805ff26 Add support for GlobalCache codes using the same format as irsend<x> 
raw.  Use irsend<x> gc,xxx,xxx
 2020-06-23 18:09:44 -04:00
Jason2866 526593d9c9
Update core_esp8266_wiring_pwm.cpp 2020-06-23 20:03:41 +02:00
Jason2866 5322238d56
Update core_esp8266_wiring_digital.cpp 2020-06-23 20:02:55 +02:00
Jason2866 e893f8d97d
Update core_esp8266_waveform.cpp 2020-06-23 20:02:15 +02:00
Jason2866 bcc9145a91
Update core_esp8266_waveform.h 2020-06-23 20:01:26 +02:00
Jason2866 ee2fea9e25
Add files via upload 2020-06-23 19:39:14 +02:00
Jason2866 e7c6f4645f
Use PWM files from Arduino PR 7022 2020-06-23 19:21:48 +02:00
Jason2866 a987a60c50
Delete core_esp8266_wiring_pwm.cpp 2020-06-23 19:17:50 +02:00
Jason2866 187809300b
Delete core_esp8266_wiring_digital.cpp 2020-06-23 19:17:37 +02:00
Jason2866 454e09f575
Delete core_esp8266_waveform.cpp 2020-06-23 19:16:30 +02:00
Theo Arends 1f80336ae4 Fix shutter watchdogs 
Fix shutter watchdogs (#8721)
 2020-06-23 17:30:06 +02:00
Theo Arends 6e8928b8a1 Fix PWM software watchdogs 
Fix PWM software watchdogs by correctly initializing variables (#8721)
 2020-06-23 17:28:15 +02:00
Theo Arends 7784156376 Fix TasmotaClient exception 
Fix TasmotaClient exception (#8734)
 2020-06-22 22:52:25 +02:00
Theo Arends 7c8b06ce16 Add compile time interlock parameters 
Add compile time interlock parameters (#8759)
 2020-06-22 22:36:54 +02:00
Theo Arends c8e08d7f8a Add rule busy friendly loop 2020-06-22 22:08:03 +02:00
Theo Arends 610f1cef00 Fix rules related exception or watchdog 
Fix rules related exception or watchdog by adding a rules mutex solving possible rule loops as in case of Var/Mem/Add/Sub/Mult and Scale (#8757)
 2020-06-22 21:47:40 +02:00
Jason2866 230d88c124
Fix warning redefine in driver xsns_52 2020-06-22 20:33:53 +02:00
Theo Arends b2d2226d5d Fix compile error 
Fix compile error (#8758)
 2020-06-22 17:54:42 +02:00
Theo Arends 04ec0832fc Fix ILI9341 hardware scroll 2020-06-22 17:36:39 +02:00
stefanbode fba98d9839
Update xdrv_27_shutter.ino 2020-06-22 13:24:36 +02:00
stefanbode 252100704c
8.3 fixes for Shutters (Stepper Motors) #8721 
PWM control has changed in SDK. CHanged shutter functionality  takes into consideration that physically the PWM frequency is minimum 40Hz
 2020-06-22 13:21:13 +02:00
Theo Arends fb39378960
Merge pull request #8754 from Staars/nrf24 
NRF24: use BEARSSL for decryption, make it optional
 2020-06-22 11:49:13 +02:00
Staars 7a01aee0c3 NRF: use BEARSSL for decryption, make it optional 2020-06-22 11:23:06 +02:00
Theo Arends 9d70a194d9 Change delay(2) to delayMicroseconds(2000) 
Change delay(2) to delayMicroseconds(2000) and see if it helps (#7468)
 2020-06-22 11:14:12 +02:00
Theo Arends 58435fb0c9 Revert "Change delay(2) to delayMicroseconds(2000)" 
This reverts commit 252dddef7c.
 2020-06-22 11:13:31 +02:00
Theo Arends 252dddef7c Change delay(2) to delayMicroseconds(2000) 
Change delay(2) to delayMicroseconds(2000) and see if it helps (#7568)
 2020-06-22 11:12:46 +02:00
Theo Arends 428b6dd4ec
Merge pull request #8749 from gemu2015/ibeacon-fix 
ibeacon json path
 2020-06-21 21:36:02 +02:00
halfbakery 2e43715343 SwitchDebounce flags should be added to every valid imeout values 2020-06-21 20:46:37 +02:00
gemu2015 279715c85e ibeacon json path 2020-06-21 16:20:14 +02:00
Theo Arends bb30044ae6 Add more user control over ILI9341 2020-06-21 12:11:40 +02:00
gemu2015 898646a07c fixed global vars upd[x], use own udp instance 2020-06-21 09:13:51 +02:00
Theo Arends b5f45aa295 Fix ESP32 SPI config 2020-06-20 17:58:21 +02:00
Theo Arends b6e0ac5a87
Merge pull request #8741 from effelle/development 
HAss Discovery: ESP32 fix
 2020-06-20 16:08:39 +02:00
Federico Leoni 0e2104c4ad
ESP32 fix 2020-06-20 10:38:17 -03:00
Theo Arends 54e8e633e9 Fix ESP32 ILI9341 using hardware SPI 2020-06-20 13:18:33 +02:00
Theo Arends 37886f33c8 Fix ESP32 wESP32 template 
Fix ESP32 wESP32 template (#8503)
 2020-06-20 12:00:40 +02:00
Charles 9c20fd78e7 Merge branch 'development' of https://github.com/arendst/Tasmota into teleinfo 2020-06-19 22:31:12 +02:00
Stephan Hadinger ca38d81b22 EZSP milestone 2 2020-06-19 20:54:37 +02:00
Theo Arends 39ee974f72 Fix ILI9341 system crash 2020-06-19 18:29:15 +02:00
Norbert Richter 9b44a369d8
Fix some json unescapes 2020-06-19 12:33:31 +02:00
Adrian Scillato 09871f8668
Fix bug on rule variable %topic% 2020-06-19 02:12:05 -03:00
Charles 5d4328a1a7 Merge branch 'teleinfo-dev' into teleinfo 2020-06-19 02:40:00 +02:00
Charles 51c1cd3148 Added Teleinfo template 2020-06-19 02:38:15 +02:00
Charles 8f3821d862 Merge branch 'development' into teleinfo-dev 2020-06-19 02:37:11 +02:00
Charles 2cf1abff83 Updated ESP32 template 2020-06-19 02:28:09 +02:00
Charles 01e3198524 Sync from upstream 2020-06-19 02:13:17 +02:00
Theo Arends 47c27481f2
Merge pull request #8729 from Staars/nrf24 
Adding payload decryption to the xsns_61_MI_NRF24.ino-driver
 2020-06-18 21:41:50 +02:00
Theo Arends 11ee93eaa1
Merge pull request #8728 from ascillato/patch-1 
KNX: Add Scene Support
 2020-06-18 20:58:51 +02:00
ascillato e48d47233d Merge branch 'patch-1' of https://github.com/ascillato/Tasmota_KNX into patch-1 2020-06-18 15:26:49 -03:00
ascillato 98798d4c11 KNX: Add Scene Translation Keys 2020-06-18 15:25:59 -03:00
Adrian Scillato bd011493e5
KNX: Add Scenes Slot 2020-06-18 15:23:58 -03:00
Adrian Scillato ae1bb588bc
KNX: Add Scenes Support 2020-06-18 15:07:01 -03:00
Federico Leoni 0d6aaa64b5 Discovery Update 2020-06-18 14:43:18 -03:00
Theo Arends f9c03648a4
Merge pull request #8722 from hallard/teleinfo 
Added new features to Teleinfo
 2020-06-18 19:13:07 +02:00
Theo Arends bb9facda4e
Merge pull request #8723 from curzon01/development 
Add info display Ssid escape
 2020-06-18 19:11:05 +02:00
Norbert Richter fc3d38bbe7
Add info display Ssid escape 2020-06-18 18:16:16 +02:00
Charles 5bb51f3807 Merge branch 'teleinfo-dev' into teleinfo 2020-06-18 18:14:36 +02:00
Charles 6da439c67c ESP32 template 65504 -> 1 2020-06-18 18:14:06 +02:00
Staars b71a5ae9e4 add decryption to xsns_61_MI_NRF24.ino 2020-06-18 17:57:16 +02:00
Theo Arends da87918d51 Fix ESP32 ethernet hostname 2020-06-18 17:47:29 +02:00
Charles dc745fc56b Merge branch 'teleinfo-dev' into teleinfo 2020-06-18 17:12:43 +02:00
Charles c9c98a8ce3 Added Load on Telemetry 2020-06-18 17:12:23 +02:00
Charles a3a78d08af Merge branch 'teleinfo-dev' into teleinfo 2020-06-18 16:21:29 +02:00
Charles 0c48aa3de3 Used ISOUSC for power contract 2020-06-18 16:10:48 +02:00
Theo Arends c533eb1186 BLM certify part 2 
- Change define USE_TASMOTA_SLAVE into USE_TASMOTA_CLIENT
- Change commands ``SlaveSend`` and ``SlaveReset`` into ``ClientSend`` and ``ClientReset``
 2020-06-18 16:05:55 +02:00
Theo Arends 4e3b547657 BLM certify part 1 2020-06-18 14:24:15 +02:00
Theo Arends 2af506e48b Change ESP32 USER GPIO template representation decreasing template message size 
Change ESP32 USER GPIO template representation decreasing template message size
 2020-06-18 12:55:10 +02:00
Charles dd6574520f Merge branch 'teleinfo-dev' into teleinfo 2020-06-18 10:59:39 +02:00
Theo Arends 63f8a2aafd Fix ESP32 network checks 
Fix ESP32 network checks (#8503)
 2020-06-18 10:18:49 +02:00
Charles 748196dcd9 massive use of GetTextIndexed, avoid long also 2020-06-17 19:54:40 +02:00
Theo Arends 8414f73bf4 ESP32 check ethernet GPIO defined 2020-06-17 18:31:31 +02:00
Theo Arends 7853d8c8c4 ESP32 add support for ethernet phy IP101 
ESP32 add support for ethernet phy IP101 (#8503)
 2020-06-17 18:14:50 +02:00