Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into development

This commit is contained in:
Gennaro Tortone 2018-06-09 11:03:50 +02:00
commit 143dfc5abc
5 changed files with 19 additions and 13 deletions

View File

@ -6,24 +6,27 @@ about: Create a report to help us improve
**Describe the bug** **Describe the bug**
A clear and concise description of what the bug is. _A clear and concise description of what the bug is._
Also, make sure these boxes are checked [x] before submitting your issue - Thank you! Also, make sure these boxes are checked [x] before submitting your issue - Thank you!
- [ ] Searched the problem in issues and in the wiki - [ ] Searched the problem in issues and in the wiki
- [ ] Hardware used : - [ ] Hardware used :
- [ ] Provide the output of command ``status 0`` : - [ ] Provide the output of command ``status 0`` :
```
STATUS 0 OUTPUT HERE
```
**To Reproduce** **To Reproduce**
Steps to reproduce the behavior: _Steps to reproduce the behavior:_
**Expected behavior** **Expected behavior**
A clear and concise description of what you expected to happen. _A clear and concise description of what you expected to happen._
**Screenshots** **Screenshots**
If applicable, add screenshots to help explain your problem. _If applicable, add screenshots to help explain your problem._
**Additional context** **Additional context**
Add any other context about the problem here. _Add any other context about the problem here._
**(Please, remember to close the issue when the problem has been addressed)** **(Please, remember to close the issue when the problem has been addressed)**

View File

@ -12,5 +12,8 @@ Make sure these boxes are checked [x] before submitting your issue - Thank you!
- [ ] Searched the problem in the discussion group (https://groups.google.com/d/forum/sonoffusers) - [ ] Searched the problem in the discussion group (https://groups.google.com/d/forum/sonoffusers)
- [ ] Hardware used : - [ ] Hardware used :
- [ ] Provide the output of command ``status 0`` : - [ ] Provide the output of command ``status 0`` :
```
STATUS 0 OUTPUT HERE
```
**(Please, remember to close the issue when the problem has been addressed)** **(Please, remember to close the issue when the problem has been addressed)**

View File

@ -6,15 +6,15 @@ about: Suggest an idea for this project
**Have you look for this feature in other issues and in the wiki?** **Have you look for this feature in other issues and in the wiki?**
**Is your feature request related to a problem? Please describe.** **Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. _A clear and concise description of what the problem is._
**Describe the solution you'd like** **Describe the solution you'd like**
A clear and concise description of what you want to happen. _A clear and concise description of what you want to happen._
**Describe alternatives you've considered** **Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered. _A clear and concise description of any alternative solutions or features you've considered._
**Additional context** **Additional context**
Add any other context or screenshots about the feature request here. _Add any other context or screenshots about the feature request here._
**(Please, remember to close the issue when the problem has been addressed)** **(Please, remember to close the issue when the problem has been addressed)**

4
.github/stale.yml vendored
View File

@ -1,9 +1,9 @@
# Number of days of inactivity before an Issue or Pull Request becomes stale # Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 120 daysUntilStale: 45
# Number of days of inactivity before a stale Issue or Pull Request is closed. # Number of days of inactivity before a stale Issue or Pull Request is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale. # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 14 daysUntilClose: 15
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels: exemptLabels:

View File

@ -566,7 +566,7 @@ void KNX_CB_Action(message_t const &msg, void *arg)
knx.answer_1bit(msg.received_on, chan->last_state); knx.answer_1bit(msg.received_on, chan->last_state);
} }
} }
else if (chan->type = KNX_TEMPERATURE) // Reply Temperature else if (chan->type == KNX_TEMPERATURE) // Reply Temperature
{ {
knx.answer_2byte_float(msg.received_on, last_temp); knx.answer_2byte_float(msg.received_on, last_temp);
if (Settings.flag.knx_enable_enhancement) { if (Settings.flag.knx_enable_enhancement) {
@ -574,7 +574,7 @@ void KNX_CB_Action(message_t const &msg, void *arg)
knx.answer_2byte_float(msg.received_on, last_temp); knx.answer_2byte_float(msg.received_on, last_temp);
} }
} }
else if (chan->type = KNX_HUMIDITY) // Reply Humidity else if (chan->type == KNX_HUMIDITY) // Reply Humidity
{ {
knx.answer_2byte_float(msg.received_on, last_hum); knx.answer_2byte_float(msg.received_on, last_hum);
if (Settings.flag.knx_enable_enhancement) { if (Settings.flag.knx_enable_enhancement) {