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

6407 Commits

Author SHA1 Message Date
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
Theo Arends 49652598de Prep ESP32 template 2020-04-17 20:14:35 +02:00
Javier Arigita bba829883b Update 2020-04-17 20:14:35 +02:00
Javier Arigita e347c26eff Revert "Update i18n.h" 
This reverts commit 56788a339f0cd7b013182eaa815b2d32aeabd3bd.
 2020-04-17 20:14:35 +02:00
Javier Arigita 72ca178154 Revert "Update settings.ino" 
This reverts commit 431ad4256545abd953589c1455a90164dcde5b8a.
 2020-04-17 20:14:35 +02:00
arijav 2f2f3bf33d
Merge branch 'development' into development 2020-04-17 14:25:09 +02:00
Theo Arends 2a471c2614
Merge pull request #8202 from s-hadinger/zigbee_disarm_occupancy 
Disarm Zigbee timer for Occupancy:0
 2020-04-17 14:01:52 +02:00
Javier Arigita 79657014b8 no message 2020-04-17 13:50:39 +02:00
Javier Arigita 5c19a01cec Merge commit '431ad4256545abd953589c1455a90164dcde5b8a' into Heating 2020-04-17 13:46:18 +02:00
Theo Arends a82b87aaea Fix compile warning 2020-04-17 13:45:10 +02:00
Theo Arends 1e1a2c1807 Add config version tag 
- Add config version tag
- Bump version 8.2.0.4
 2020-04-17 13:45:10 +02:00
Stephan Hadinger 318cfe2681 Disarm timer for Occupancy:0 2020-04-17 12:27:36 +02:00
Theo Arends e5a78deaa3 Fix compile warning 2020-04-17 12:08:43 +02:00
Theo Arends d3b2f8c489 Add config version tag 
- Add config version tag
- Bump version 8.2.0.4
 2020-04-17 11:57:09 +02:00
Javier Arigita ee47415579 Was not propertly committed 2020-04-17 10:35:26 +02:00
Javier Arigita 31d0268df4 Heating controller added. Created by myself initially in LUA running as a Domoticz (running on a raspberry pi) script and controlling Qubino relays for floor heating. Ported to tasmota to get the logic within the relay itself and be less dependent on Domoticz. 
The controller supports several working modes. From off (no action) to manual (following input), automatic (hybrid, rampup or pi controller) and timeplan (automatic following predefined schedule with 3 temperatures for each weekday). It is fully configured via commands, it will include in the future diagnostics and will be extended to more outputs (will be tested on sonoff 4CH Pro).

The controller has been tested successfully with a Shelly 1PM device and works as the original LUA domoticz script.
 2020-04-17 10:31:53 +02:00
Theo Arends bb54c870f7
Merge pull request #8201 from s-hadinger/zigbee_prepare_type 
Added Zigbee attribute types
 2020-04-17 09:56:12 +02:00
Stephan Hadinger 4551c5f91a Adding type for Aqara_FF05 2020-04-17 09:22:47 +02:00
Stephan Hadinger e43f0e36a2 Removed unsupported types 2020-04-17 09:16:08 +02:00
Stephan Hadinger 5507ad889a Added types for AqaraVibration sensor 2020-04-17 09:11:27 +02:00
Theo Arends 95661fa65c
Merge pull request #8199 from Jason2866/patch-1 
Install only one and latest Esptool.py
 2020-04-16 21:48:00 +02:00
Jason2866 f6863484c3
Install only one and latest esptool 
ESP32 still uses as default the outdated esptool 2.6. 
Since esptool 2.8 is already used for ESP8266 use it for ESP32 too and prevent install of version 2.6
 2020-04-16 20:54:35 +02:00
Theo Arends 7ca9659d3d
Merge pull request #8198 from Jason2866/patch-1 
Minor fixes and optimizations in PlatformIO
 2020-04-16 20:01:22 +02:00
Jason2866 fa51c6147b
Update platformio_tasmota_env.ini 2020-04-16 19:52:57 +02:00
Jason2866 bfead88b7d
irremote full for esp8266 and esp32 2020-04-16 19:48:01 +02:00
Jason2866 8035590e95
Defaults for ESP82xx and ESP32 2020-04-16 19:46:26 +02:00
Jason2866 85d04dbc53
Fix minor errors 2020-04-16 19:44:13 +02:00
Stephan Hadinger 618ac9ab14 Added Zigbee attribute types 2020-04-16 19:36:14 +02:00
Theo Arends 367658b75b More ESP32 compatibility 2020-04-16 18:33:26 +02:00
Theo Arends 538dfbef2e More ESP32 compatibility 2020-04-16 16:29:33 +02:00
Theo Arends d2b7b4012f More ESP32 compatibility 
More ESP32 compatibility (breaks current ESP32 configuration again!)
 2020-04-16 14:59:01 +02:00
Theo Arends 5c43f4c4c2 Fix ESP32 compile error 
Fix ESP32 compile error (#8195)
 2020-04-16 11:00:56 +02:00
Theo Arends ef3cb10dc7
Merge pull request #8195 from s-hadinger/dimmerrange_ct 
Don't apply DimmerRange to CT PWM
 2020-04-15 19:45:51 +02:00
Theo Arends 615c2dd3a1
Merge pull request #8193 from s-hadinger/ping_reentrant 
Improved and simplified Ping
 2020-04-15 19:45:24 +02:00
Stephan Hadinger ba20008cd9 Don't apply DimmerRange to CT PWM 2020-04-15 19:42:50 +02:00
Stephan Hadinger 49ef6598fc Update size of Ping 2020-04-15 18:55:04 +02:00
Stephan Hadinger 71717c3f4e Improved and simplified Ping 2020-04-15 18:54:20 +02:00
Theo Arends 54149497b9
Merge pull request #8185 from gemu2015/scripter-update 
Scripter update
 2020-04-15 17:42:03 +02:00
Theo Arends 908b1113b9
Merge pull request #8191 from pcdiem/device-groups-7 
Add DevGroupStatus command, Include member add/remove logging
 2020-04-15 17:41:06 +02:00
Theo Arends 3a4cf26aba Enable single PIN mode for SR04 sensor 
Enable single PIN mode for SR04 sensor (#8189)
 2020-04-15 16:22:20 +02:00
Paul C Diem a4b3e61ed0 Merge branch 'development' of https://github.com/pcdiem/Tasmota into device-groups-7 2020-04-15 08:42:32 -05:00
Paul C Diem b7454d7bd8 Add DevGroupStatus command, Include member add/remove logging 2020-04-15 08:40:18 -05:00
Theo Arends 97abf68612 Fix HTTP authorization response code 
Fix HTTP authorization response code (#8170)
 2020-04-15 10:14:16 +02:00
Theo Arends 57f836cc9e Remove possible Webserver naming ambuigity 2020-04-15 09:58:38 +02:00
Theo Arends 4f33d76669
Merge pull request #8182 from effelle/development 
Fix Setption13 on Buttons V2
 2020-04-15 08:34:56 +02:00
gemu2015 7d85ccb793 Update xdrv_10_scripter.ino 2020-04-15 08:21:43 +02:00