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

4173 Commits

Author SHA1 Message Date
Theo Arends c44765d37f Reduce TasmotaSerial iRam usage 
Reduce TasmotaSerial iRam usage for core stage and Pre-2.6 (#6373)
 2019-09-08 17:38:13 +02:00
Tim Leuschner 2345828b39 Merge branch 'A4988_Stepper' of https://github.com/Leuselator/Sonoff-Tasmota into A4988_Stepper 2019-09-08 17:31:35 +02:00
Tim Leuschner fafb837120 removed my changes to platformio&my_user_config, removed the unnessesary digitalwrites in adjustMicrosteps() 2019-09-08 17:30:17 +02:00
Theo Arends 612654ffca Refactor energy driver selection 
Refactor energy driver selection
 2019-09-08 17:21:26 +02:00
Theo Arends 75abfc5fd9 Refactor energy driver detection 
Refactor energy driver detection and function call
 2019-09-08 16:57:56 +02:00
Stephan Hadinger 1d58501c49 Change Improve reliability of TasmotaSerial at 115200 bauds and reduce IRAM usage for Stage/pre-2.6 2019-09-08 16:41:31 +02:00
Theo Arends cea6592945 Remove Total Reactive from SDM120 
Remove Total Reactive from SDM120 (#6282)
 2019-09-08 15:14:48 +02:00
Theo Arends 17a0049fa2 Use SDM120 Import Active as Total 
Use SDM120 Import Active as Total Energy when available (#6282)
 2019-09-08 15:07:28 +02:00
Theo Arends da35643f63 Revert "Merge pull request #6373 from s-hadinger/serial_115200" 
This reverts commit a59dea5a74, reversing
changes made to e0b07391c9.
 2019-09-08 12:59:32 +02:00
Theo Arends a59dea5a74
Merge pull request #6373 from s-hadinger/serial_115200 
TasmotaSerial: Reduce IRAM usage by 280 bytes and improve reliability at 115200 bauds
 2019-09-08 12:50:48 +02:00
Theo Arends 1d39db76b3
Merge branch 'development' into serial_115200 2019-09-08 12:49:21 +02:00
Theo Arends e0b07391c9
Merge pull request #6372 from gemu2015/scripter-update 
scripter update
 2019-09-08 12:38:27 +02:00
gemu2015 c2f560312d sml individual decimal precision on insertion, comments in >W and >J 2019-09-08 12:14:28 +02:00
Stephan Hadinger 7dda2fba0e Change Improve reliability of TasmotaSerial at 115200 bauds and reduce IRAM usage for Stage/pre-2.6 2019-09-08 12:07:51 +02:00
Tim Leuschner ff3701e1ce
Merge branch 'development' into A4988_Stepper 2019-09-08 11:49:15 +02:00
Theo Arends 3d9a73f826 Add support for up to 4 INA226 Voltage and Current sensors 
Add support for up to 4 INA226 Voltage and Current sensors by Steve Rogers (#6342)
 2019-09-08 11:26:54 +02:00
Theo Arends 9aceadc217
Merge pull request #6342 from hwstar/development 
Add ina226 driver to Tasmota
 2019-09-08 10:48:13 +02:00
Tim Leuschner 4533039c9f removed my user-settings 2019-09-08 04:02:47 +02:00
Tim Leuschner e0a17cda55 this compiles... 2019-09-08 04:01:02 +02:00
Tim Leuschner 4e1480d0f0 works fine... 2019-09-08 03:28:19 +02:00
srodgers 27ecd09e9d Update from testing branch 2019-09-07 15:30:51 -07:00
srodgers 4a41c13738 Merged from upstream 2019-09-07 14:38:57 -07:00
srodgers 0a9166dde7 Update files 2019-09-07 14:28:08 -07:00
Tim Leuschner e516262904 ..to be tested 2019-09-07 21:37:01 +02:00
Tim Leuschner 179d74ab08 it compiles... 2019-09-07 20:38:06 +02:00
Theo Arends 2e9f06f8bf Bump version to 6.6.0.11 
Change Settings crc calculation allowing short term backward compatibility
 2019-09-07 18:32:11 +02:00
Theo Arends fc2be92478 Move SDM120 modbus updates out of ticker interrupt 
Move SDM120 modbus updates out of ticker interrupt (#6282)
 2019-09-07 16:31:39 +02:00
Theo Arends 4837e8e6d8
Merge pull request #6367 from effelle/development 
Update for IT and PT-BR translations
 2019-09-07 16:26:56 +02:00
Federico Leoni 299a14fed4
Update pt-BR.h 2019-09-07 11:25:53 -03:00
Federico Leoni 5eb09495c2
Update it-IT.h 2019-09-07 11:24:57 -03:00
Tim Leuschner 549fd7d84c . 2019-09-07 14:11:17 +02:00
Tim Leuschner 8350be64a0 . 2019-09-07 14:09:44 +02:00
Tim Leuschner 5eac2dd939 Support Stepper-motors connected to A4988-stepper-driver-circuit 2019-09-07 14:03:07 +02:00
Federico Leoni 0c8ac27b54
Update pt-BR.h 2019-09-06 20:30:49 -03:00
Federico Leoni 8b15fe8c0b
Update it-IT.h 2019-09-06 20:03:42 -03:00
Theo Arends 53235a3382 Redesign Energy Total calculation 
* Redesign Energy Total calculation
* Increase SDM120 modbus interval time to 200mS (#6282)
 2019-09-06 18:02:31 +02:00
Theo Arends 2fa583392a Change command Time 1/2/3 for legacy reason 
Change command Time 1/2/3 to select JSON time format ISO, ISO + Epoch or Epoch for legacy reason
 2019-09-06 15:46:40 +02:00
Theo Arends 1d4fac0128
Merge pull request #6360 from gemu2015/display-update 
touch button update, fix display settings font and size
 2019-09-06 11:26:36 +02:00
Theo Arends 2691690fd9
Merge pull request #6361 from curzon01/development 
decode-config.py: adapt settings
 2019-09-06 11:26:20 +02:00
Norbert Richter 7306bb3638 decode-config.py: adapt settings 
- add Time (time_format)
- add TuyaMCU (tuya_fnid_map)
- add cfg_timestamp/cfg_crc32
- remove SetOption65 (tuya_disable_dimmer)
 2019-09-06 10:42:39 +02:00
gemu2015 c671eaecb9 touch button update, fix display settings font and size 2019-09-06 10:11:50 +02:00
Theo Arends a1e9c2d2ac Fix SDM120 modbus dump and Domoticz Energy Consumed or Produced 
Fix SDM120 modbus dump exception and Domoticz Energy Consumed or Produced (#6282)
 2019-09-05 18:02:36 +02:00
Theo Arends ab89bb53a9 Oops 
Oops
 2019-09-05 17:45:43 +02:00
srodgers e620f75785 Remove extra space 2019-09-05 08:25:03 -07:00
srodgers 553c5e4a9c Sync to testing branch 2019-09-05 08:20:40 -07:00
Theo Arends ea0fb65845 Refactor Sendmail 
Refactor Sendmail
 2019-09-05 17:19:19 +02:00
Theo Arends aaf542bf97
Merge pull request #6352 from gemu2015/sendmail 
sendmail support
 2019-09-05 16:56:30 +02:00
Theo Arends a01de9a9b2 Remove obsolete Tuya code 
Remove obsolete Tuya code
 2019-09-05 16:56:02 +02:00
Theo Arends db51e516b6 Fix core 2.3.0 compilation error due to missing std::swap 
Fix core 2.3.0 compilation error due to missing std::swap (#6356)
 2019-09-05 16:34:03 +02:00
Theo Arends c9df1d6942
Merge pull request #6355 from shantur/tuya-mcu 
TuyaMCU: Cleanup unused tuya_disable_dimmer
 2019-09-05 12:58:10 +02:00