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

11520 Commits

Author SHA1 Message Date
Jason2866 fe4d314d6d
Use Arduino core 2..0..0.pre for S2 
it is based on IDF4.4 and Arduino branch master commit 371f382db7
 2021-04-10 15:00:46 +02:00
Theo Arends 4426693170
Merge pull request #11651 from hallard/teleinfo 
Rewrite Teleinfo config settings
 2021-04-10 12:25:50 +02:00
Theo Arends 9b58547059
Merge pull request #11655 from bovirus/patch-1 
Italian language update
 2021-04-10 12:19:05 +02:00
bovirus ec1065f442
Update Italian language 2021-04-10 09:54:35 +02:00
Charles 3cab37ed80 obsolated SetOption102 and SetOption108 
now teleinfo has it own bit field configuration
 2021-04-10 00:58:42 +02:00
Charles b2d2742df1 removed unneeded teleinfo from command 2021-04-10 00:49:38 +02:00
Charles 19ddda132c now settings are done with command 
Moved config to bit field
added some config option
 2021-04-09 19:45:06 +02:00
Theo Arends cccee90e52
Merge pull request #11647 from btsimonh/ibeaconUUIDMAJORMINOR 
iBeacon - detect the same UUID+MAJOR+MINOR as the same beacon
 2021-04-09 17:08:13 +02:00
Theo Arends eb3fe9c5eb Oops. Fix compile 2021-04-09 17:05:22 +02:00
Theo Arends 77cd07ab8b Fix display driver 16 support 2021-04-09 16:42:51 +02:00
Charles a10dfbc7c6 Merge remote-tracking branch 'upstream/development' into teleinfo 2021-04-09 14:28:35 +02:00
Theo Arends 60de9696d8 Refactor backlog nodelay in relation to sleep 2021-04-09 14:00:09 +02:00
Theo Arends dd7cecc064 Fix backlog nodelay when sleep is active 2021-04-09 12:49:57 +02:00
Theo Arends b8f2c97fbe Refactor GUI save settings (prt3) 2021-04-09 12:18:26 +02:00
Theo Arends 0650744ac2 Remove overtemp detection on external energy monitoring devices 
Removed overtemp detection on external energy monitoring devices (#11628)
 2021-04-09 10:04:37 +02:00
Theo Arends 740e4392ef Add command EnergyConfig for future use 2021-04-09 09:49:33 +02:00
Theo Arends 283ef76bcf
Merge pull request #11634 from barbudor/energy_config_command 
Add command EnergyConfig
 2021-04-09 09:33:18 +02:00
Simon Hailes 142b7d02aa iBeacon - detect the same UUID+MAJOR+MINOR as the same beacon even if mac changes. 
Add :minor:major to web display
 2021-04-09 08:19:43 +01:00
Barbudor e9e0d35368 command EnergyConfig 2021-04-08 22:59:44 +02:00
Theo Arends 3bb01daf7e
Merge pull request #11633 from btsimonh/iBeaconMod2 
remove endian-swap on major & minor for iBeacon - …
 2021-04-08 20:44:18 +02:00
Simon Hailes 66ec23d399 remove endian-swap on major & minor for iBeacon - in theroy to match HM10 implementation? 2021-04-08 19:08:15 +01:00
Charles 55ea5073f2 first try of command management 2021-04-08 20:02:19 +02:00
Theo Arends 2f3a3264dc
Merge pull request #11629 from btsimonh/iBeaconUpdate 
Update to iBeacon
 2021-04-08 19:36:27 +02:00
Simon Hailes 970f4652f5 Update to iBeacon to use only MAC to recognise different beacons - this brings it into line with common use. 
A further update would be nice to display major & minor in the web ui, not included here.
 2021-04-08 18:00:14 +01:00
Theo Arends 1a2addfc16 Refactor GUI save settings (prt2) 2021-04-08 17:57:37 +02:00
Theo Arends bacc07b2de Fix offset 2021-04-08 15:51:34 +02:00
Theo Arends 6d8daef8fa prepare teleinfo bit field settings (#11626) 2021-04-08 15:43:53 +02:00
Theo Arends ea64f7b9c5 Refactor timer GUI save result enabling rule trigger (#11612) 2021-04-08 14:08:20 +02:00
Theo Arends b6e77cd3d7 Change ``Backlog 1;`` into ``Backlog0`` 2021-04-07 18:22:20 +02:00
Theo Arends d08f9bc315 Refactor GUI save parameters (Prt1) 2021-04-07 18:10:34 +02:00
Theo Arends ad423d199d Add command ``Backlog 1;`` 
Add command ``Backlog 1;`` to allow execution of following commands without delay
 2021-04-07 17:55:33 +02:00
Theo Arends 403eba7a99 Add rule number to rule command JSON result 2021-04-07 15:44:29 +02:00
Theo Arends e94b997627 Fix restart Info JSON messages 2021-04-07 15:22:07 +02:00
Theo Arends 2f5c20a42f Add more rule triggers 2021-04-07 15:07:05 +02:00
Theo Arends 4c1011d0aa
Merge pull request #11616 from hallard/teleinfo 
fixed wrong display in some case
 2021-04-07 13:36:03 +02:00
Charles 2098f21775 fixed wrong display in some case 2021-04-07 13:23:31 +02:00
Theo Arends 36288037a8 Refactor energy init 2021-04-06 15:23:07 +02:00
Theo Arends f50c3f8f62 Admin USE_ENERGY_DUMMY 2021-04-06 12:08:07 +02:00
Theo Arends db4399d89b Add relay power control emulation 
Add relay power control emulation (#10640)
 2021-04-06 11:09:12 +02:00
Theo Arends aa2b6043ee
Merge pull request #11598 from Jason2866/patch-3 
IDF version related
 2021-04-06 08:40:09 +02:00
Theo Arends f348989258
Merge pull request #11602 from hallard/teleinfo 
Updated counters for standard mode depending on tariff
 2021-04-06 08:39:56 +02:00
Charles 80bbde2458 Updated counters for standard mode 2021-04-06 02:23:06 +02:00
Jason2866 5d34e3a4f8
IDF version related 
not device related
 2021-04-05 18:32:59 +02:00
Theo Arends 7abf1336c1 Remove redundant ETH lib 2021-04-05 17:39:56 +02:00
Theo Arends 1d9a2b63ab
Merge pull request #11597 from Jason2866/patch-2 
Halleffect not for ESP32-S2
 2021-04-05 17:00:57 +02:00
Jason2866 9035aace06
Halleffect not for ESP32-S2 2021-04-05 16:58:36 +02:00
Theo Arends 74537c6078 Prep Shelly Dimmer 2 native firmware upload 2021-04-05 16:57:48 +02:00
Theo Arends e40bed4b25 Add support for dummy energy monitor 
Add support for dummy energy monitor using user values set by commands ``VoltageSet``, ``CurrentSet``, ``PowerSet`` and ``FrequencySet``. Enable by selecting any GPIO as ``Option A2`` (#10640)
 2021-04-05 15:32:31 +02:00
s-hadinger a37b3ec2c3
Merge pull request #11595 from s-hadinger/berry_attrdump 
Berry fix crash when no attributes
 2021-04-05 14:39:03 +02:00
Stephan Hadinger a979136b4b Berry fix crash when no attributes 2021-04-05 14:14:32 +02:00