Skip to content

Commit

Permalink
Merge branch 'rc-6.3.0012' into stable6
Browse files Browse the repository at this point in the history
  • Loading branch information
pipiche38 committed Apr 1, 2023
2 parents 8001fbd + 7d238c5 commit e109550
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .hidden/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"branch": "stable6", "version": "6.3.011"}
{"branch": "stable6", "version": "6.3.012"}
3 changes: 2 additions & 1 deletion Classes/OTA.py
Original file line number Diff line number Diff line change
Expand Up @@ -1411,5 +1411,6 @@ def _load_json_from_url( self, url ):
time.sleep(1)
retry -= 1

logging(self, "Error", "loading_zigbee_ota_index: Unable to access %s Reason: %s" %reason)
logging(self, "Error", "loading_zigbee_ota_index: Unable to access %s Reason: %s" %(
url, reason))
return []
2 changes: 1 addition & 1 deletion Modules/domoCreate.py
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ def CreateDomoDevice(self, Devices, NWKID):
):
self.log.logging("Widget", "Debug", "CreateDomoDevice - t: %s in Colorxxxx" % (t), NWKID)
# variateur de couleur/luminosite/on-off

Subtype_ = None
if t == "ColorControlRGB":
Subtype_ = 0x02 # RGB color palette / Dimable
elif t == "ColorControlRGBWW":
Expand Down
5 changes: 4 additions & 1 deletion Modules/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,10 @@ def Decode8010(self, Devices, MsgData, MsgLQI): # Reception Firmware Version

if self.FirmwareBranch in FIRMWARE_BRANCH:
if int(self.FirmwareBranch) in ( 98, 99):
self.log.logging("Input", "Error", "Untested Zigbee adapater model, please report to the Zigbee for Domoticz team")
self.log.logging(
"Input",
"Status",
"Untested Zigbee adaptater model. If this is a Sonoff USB Dongle E that is known issue, otherwise please report to the Zigbee for Domoticz team")
self.pluginParameters["CoordinatorModel"] = FIRMWARE_BRANCH[ self.FirmwareBranch ]

elif int(self.FirmwareBranch) == 11:
Expand Down
2 changes: 1 addition & 1 deletion Modules/paramDevice.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def ias_wd_sirene_max_alarm_dureation( self, nwkid, duration):

def ias_sensitivity(self, nwkid, sensitivity):
if self.iaszonemgt:
self.iaszonemgt.ias_sensitivity(self, nwkid, sensitivity)
self.iaszonemgt.ias_sensitivity(nwkid, sensitivity)

DEVICE_PARAMETERS = {
"HueLedIndication": philips_led_indication,
Expand Down
4 changes: 2 additions & 2 deletions Modules/pluginModels.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def check_found_plugin_model( self, model, manufacturer_name=None, manufacturer_
'_TZ3000_amdymr7l', '_TZ3000_z1pnpsdo', '_TZ3000_ksw8qtmt', '_TZ3000_nzkqcvvs',
'_TZ3000_1h2x4akh', '_TZ3000_9vo5icau', '_TZ3000_cehuw1lw', '_TZ3000_ko6v90pg',
'_TZ3000_f1bapcit', '_TZ3000_cjrngdr3', '_TZ3000_zloso4jk', '_TZ3000_r6buo8ba',
'_TZ3000_iksasdbv', '_TZ3000_dd8wwzcy'],
'_TZ3000_iksasdbv', '_TZ3000_dd8wwzcy', '_TZ3000_hdopuwv6'],
"ManufId": [],
"PluginModelName": "TS011F-plug" },

Expand Down Expand Up @@ -234,4 +234,4 @@ def check_found_plugin_model( self, model, manufacturer_name=None, manufacturer_
"PluginModelName": "TS0601-_TZE200_dzuqwsyg",},


]
]
4 changes: 2 additions & 2 deletions Modules/tuyaConst.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
)

TUYA_TEMP_HUMI = (
"_TZE200_qyflbnbj"
"_TZE200_qyflbnbj",
"_TZE200_bjawzodf",
"_TZE200_bq5c8xfe",
"_TZE200_qoy0ekbd" ,
"_TZE200_qoy0ekbd",
"_TZE200_whkgqxse"
)

Expand Down
21 changes: 13 additions & 8 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,20 @@ Release Numbering
- Odd numbers --> Stable/6
- Even numbers --> Beta/6 (dev branch)

## March. 2023 - stable6 - 6.3.011 ( 2023.3 )
## April 2023 - stable6 - 6.3.012 ( 2023.4 / Easter version )

- [Hardware] - One more Tuya SMart Plug 16A EU manufacturer
- [Issue] - Fixing issue preventing creation of the Temp+Humi widget
- [Issue] - Fixing several issues

## March. 2023 - stable6 - 6.3.011 ( 2023.3 )

- [Hardware] - Heiman/Wiser SmartPlug device
- [Hardware] - Additional Tuya Thermostat devices
- [Hardware] - Tuya LCD Temp Humi device
- [Hardware] - Device Owon THS317-ET
- [Hardware] - Tuya Smart Curtain TS130F model
- [Hardware] - Wiser Water leak sensor
- [Hardware] - Wiser Water leak sensor
- [Hardware] - Wiser Micro dimmer
- [Hardware] - Wiser Micro Switch
- [Hardware] - Orvibo 3 dry switch
Expand All @@ -42,7 +48,7 @@ Release Numbering
- [WebUI] - Dashboard optimization
- [WebUI] - Dashboard display 4 battery levels

## Feb. 2023 - stable6 - 6.3.010 ( 2023.2 )
## Feb. 2023 - stable6 - 6.3.010 ( 2023.2 )

- [Hardware] - New flavor of TS011F Tuya plug
- [Hardware] - Smart Air Detector 6 in 1 manufactured by Tuya
Expand All @@ -54,12 +60,12 @@ Release Numbering
- [Hardware] - Ikea_LED1924G9
- [Hardware] - Lonsonho_QS-Zigbee-D02-TRIAC-L
- [Hardware] - Lonsonho_QS-Zigbee-D02-TRIAC-LN
- [Hardware] - LEDVANCE Ampoule LED E14 5W
- [Hardware] - LEDVANCE Ampoule LED E14 5W
- [Hardware] - Paulmann 50052 SmartHome Zigbee LED
- [Hardware] - KAIYE Tuya Smart Zigbee Ampoule LED
- [Technical] - Unclassified fixes

## Jan. 2023 - stable6 - 6.3.009 ( 2023.1 )
## Jan. 2023 - stable6 - 6.3.009 ( 2023.1 )

- [Hardware] - Managing Power state for TS0001 smart relay
- [Hardware] - Integrating Ikea Air Purifier (@rhuijben)
Expand All @@ -72,8 +78,8 @@ Release Numbering
- [Hardware] - Aqara Smoke sensor JY-GZ-01AQ
- [Hardware] - Heiman Scene controler
- [Hardware] - Tuya Motion + Lux PIR ZG-204Z
- [Hardware] - Philips LOM008
- [Hardware] - Nodon Window Covering
- [Hardware] - Philips LOM008
- [Hardware] - Nodon Window Covering

- [WebUI] - Angular15
- [WebUI] - Responsive version ( work with mobile and tablets)
Expand Down Expand Up @@ -872,4 +878,3 @@ Mainly a technical version in order to split the code in pieces.
- Bug fixing

## 8 September 2018 - 2.4.0 <https://github.com/sasu-drooz/Domoticz-Zigate/releases/tag/2.4.0>

0 comments on commit e109550

Please sign in to comment.