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

6463 Commits

Author SHA1 Message Date
Javier Arigita ba3457ed96 Correct merge 2020-04-26 18:00:19 +02:00
Javier Arigita 05a9fe5c7d Correct merge 2020-04-26 17:59:36 +02:00
Javier Arigita 69eb9d2f90 Merge branch 'new_branch' of https://github.com/arijav/Tasmota into new_branch 2020-04-26 17:50:56 +02:00
Javier Arigita 795eb10da5 Correct merge 2020-04-26 17:50:45 +02:00
Javier Arigita ec94424661 Correct merge 2020-04-26 17:26:45 +02:00
Javier Arigita 9e0aa7d951 Correct merge 2020-04-26 17:23:43 +02:00
Javier Arigita 83cdd2f26f Correction overflow protection 2020-04-26 08:48:03 +02:00
Javier Arigita c577a955b0 Reduction of floats and implementation of overflow protection 2020-04-26 08:36:15 +02:00
Javier Arigita 12a3aacb98 Code activated by debug define corrected 2020-04-24 23:30:18 +02:00
Javier Arigita 65c0a92be7 Added functions for arming/disarming thermostat from web timers 2020-04-24 23:18:17 +02:00
Javier Arigita 6915346048 Fix merge 2020-04-23 22:51:13 +02:00
Javier Arigita 6225298353 Fix merge 2020-04-23 22:50:51 +02:00
Javier Arigita bbb4fbd24b Fix merge 2020-04-23 22:49:16 +02:00
Javier Arigita 7c336a1105 Fix merge 2020-04-23 22:48:44 +02:00
Javier Arigita 88e0af98db Fix merge 2020-04-23 22:47:58 +02:00
Javier Arigita 7ea961953f Fix merge 2020-04-23 22:47:18 +02:00
Javier Arigita 29ec129a05 Fix merge 2020-04-23 22:44:06 +02:00
Javier Arigita f325a436ba Fix merge 2020-04-23 22:43:20 +02:00
Javier Arigita ab04f416ad Fix merge 2020-04-23 22:41:20 +02:00
Javier Arigita 058d23fa00 Heating structure aligned and unneeded defines removed 2020-04-23 22:39:28 +02:00
Javier Arigita f24c8eeda5 Corrected merge issue 2020-04-21 00:16:20 +02:00
Javier Arigita 4c8c75c1d1 Comments aligned in the proper way 2020-04-21 00:14:39 +02:00
Javier Arigita 262ab63f6f Removed of all driver name 2020-04-20 22:51:51 +02:00
Javier Arigita 4cac6deb3d Command defines moved from i18n.h into the driver, driver name changed to thermostat 2020-04-20 22:50:53 +02:00
Javier Arigita c5b7109704 Disable debug by default 2020-04-20 21:33:32 +02:00
Javier Arigita e96eb3a62a Heating plan removed since it can be implemented via timers/rules 2020-04-20 21:29:46 +02:00
arijav 714f2d460a
Update README.md 2020-04-19 21:30:25 +02:00
arijav bade7b16b6
Update README.md 2020-04-19 20:31:23 +02:00
arijav 96a586c51f
Update README.md 2020-04-19 18:56:14 +02:00
Javier Arigita 4485184a4e Fix merge 2020-04-19 08:09:37 +02:00
Javier Arigita 95a4d6cd5d Adding debug features, disable by default 2020-04-18 21:07:08 +02:00
Javier Arigita b47785191c Adding debug features, disable by default 2020-04-18 21:05:35 +02:00
Javier Arigita 1deb92a2b1 Fix kCommandSource adding heating source 2020-04-18 20:53:28 +02:00
Javier Arigita 602a6cdd43 Merge branch 'new_branch' of https://github.com/arijav/Tasmota into new_branch 2020-04-18 20:51:33 +02:00
Javier Arigita a979136161 Fix kCommandSource adding heating source 2020-04-18 20:51:03 +02:00
Javier Arigita 5122ea6c10 Fix kCommandSource adding heating source 2020-04-18 20:49:38 +02:00
arijav 46612cddac
Correction to counter_seconds 2020-04-18 10:22:42 +02:00
Javier Arigita f937504dd5 Correction of second counter and integration into Bitfield to save 1 byte 2020-04-18 10:19:11 +02:00
Javier Arigita 68d722713f Merge branch 'new_branch' of https://github.com/arijav/Tasmota into new_branch 2020-04-18 09:47:55 +02:00
Javier Arigita ade012a2c7 Reduction of types 2020-04-18 09:44:15 +02:00
arijav f545818349
Update settings.h 2020-04-17 23:06:37 +02:00
Javier Arigita b3094aa50e New driver created for heating control. I have created initially this as a LUA script running in Domoticz on a Raspberry Pi to control floor heating valves using Qubino relays. I have ported this to a Tasmota driver embedding the functionality in the relays. This driver has been successfully tested with a shelly 1PM. The controller offers 3 controlling strategies (Hybrid, Rampup and PI) as well as time planning (3 diff. temp. each weekday). 2020-04-17 22:52:06 +02:00
Javier Arigita ba0a2ff2eb Corrections to reduce settings 2020-04-17 20:24:12 +02:00
Javier Arigita 80f364cc5a Merge branch 'development' of https://github.com/arijav/Tasmota into development 2020-04-17 20:21:50 +02:00
Theo Arends 8ada812218 Add ESP32 optional brownout disable 
Add ESP32 brownout disable for weak onboard LDO's - eventually you'll need to change the LDO to a better one.
 2020-04-17 20:14:36 +02:00
Stephan Hadinger 3f9fdc09ce Remove warning/errors when compiling Zigbee for ESP32 2020-04-17 20:14:36 +02:00
Jason2866 fa51f9f4ad Add the possibility to add Custom env 
to build special Tasmota versions with Compiler switches defined in [env:tasmota-xyz] in `platformio_tasmota_cenv.ini` to control
user_config_override.h
Example:
"[env:tasmota-zigbee]
build_flags = ${common.build_flags} -DHANS_CONFIG_ZIGBEE=true"
which referrs to in user_config_override.h
```#ifdef HANS_CONFIG_ZIGBEE  // ******************************************************************

#undef CODE_IMAGE_STR
#define CODE_IMAGE_STR "ZIGBEE"

#define USE_WEBSERVER                            // Enable web server and Wifi Manager (+66k code, +8k mem)
  #define USE_JAVASCRIPT_ES6                     // Enable ECMAScript6 syntax using less JavaScript code bytes (fails on IE11)
//  #define USE_WEBSEND_RESPONSE                   // Enable command WebSend response message (+1k code)

//#define USE_RULES                                // Add support for rules (+4k4 code)
//  #define USE_EXPRESSION                         // Add support for expression evaluation in rules (+3k2 code, +64 bytes mem)
//    #define SUPPORT_IF_STATEMENT                 // Add support for IF statement in rules (+4k2 code, -332 bytes mem)
//  #define SUPPORT_MQTT_EVENT                     // Support trigger event with MQTT subscriptions (+3k5 code)

//#define USE_SCRIPT                               // Add support for script
//  #define USE_SCRIPT_FATFS 4                     // Add support for script storage on SD card (+12k code, +4k mem)
//  #define USE_SCRIPT_WEB_DISPLAY


#define USE_ADC_VCC                              // Display Vcc in Power status. Disable for use as Analog input on selected devices


// -- Zigbee interface ----------------------------
#define USE_ZIGBEE                               // Enable serial communication with Zigbee CC2530 flashed with ZNP (+35k code, +3.2k mem)
  #define USE_ZIGBEE_PANID  0x1A63                // arbitrary PAN ID for Zigbee network, must be unique in the home
  #define USE_ZIGBEE_EXTPANID 0xCCCCCCCCCCCCCCCCL // arbitrary extended PAN ID
  #define USE_ZIGBEE_CHANNEL  11                  // Zigbee Channel (11-26)
  #define USE_ZIGBEE_PRECFGKEY_L 0x0F0D0B0907050301L  // note: changing requires to re-pair all devices
  #define USE_ZIGBEE_PRECFGKEY_H 0x0D0C0A0806040200L  // note: changing requires to re-pair all devices
  #define USE_ZIGBEE_PERMIT_JOIN false           // don't allow joining by default
  #define USE_ZIGBEE_COALESCE_ATTR_TIMER 350     // timer to coalesce attribute values (in ms)


#endif ```
 2020-04-17 20:14:35 +02:00
Stephan Hadinger 36c9a44512 Fix Zigbee DimmerUp/DimmerDown malformed 2020-04-17 20:14:35 +02:00
Jason2866 22e05c2e27 No Map file is generated for ESP32 
Fix error for ESP32. Scripts checks if exists and generates only in target folder if there
 2020-04-17 20:14:35 +02:00
Theo Arends ee98151834 Provide ESP32 base module support 2020-04-17 20:14:35 +02:00