jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-04-25 23:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

introduced "inverted" setting (#18607)

Browse Source 
ensure that matter support still works if the "inverted" flag is set on the shutter side
This commit is contained in:
stefanbode 2023-05-08 21:11:19 +02:00 committed by GitHub
parent aac1b08074
commit ffedb96702
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/libesp32/berry_matter/src/embedded/Matter_Plugin_Shutter.be
View File

@ -43,6 +43,7 @@ class Matter_Plugin_Shutter : Matter_Plugin_Device
var shadow_shutter_target var shadow_shutter_target
var shadow_shutter_tilt var shadow_shutter_tilt
var shadow_shutter_direction # 1=opening -1=closing 0=not moving TODO var shadow_shutter_direction # 1=opening -1=closing 0=not moving TODO
var shadow_shutter_inverted # 1=same as matter 0=matter must invert
############################################################# #############################################################
# Constructor # Constructor
@ -50,12 +51,34 @@ class Matter_Plugin_Shutter : Matter_Plugin_Device
super(self).init(device, endpoint, arguments) super(self).init(device, endpoint, arguments)
self.tasmota_shutter_index = arguments.find(self.ARG #-'relay'-#) self.tasmota_shutter_index = arguments.find(self.ARG #-'relay'-#)
if self.tasmota_shutter_index == nil self.tasmota_shutter_index = 0 end if self.tasmota_shutter_index == nil self.tasmota_shutter_index = 0 end
self.shadow_shutter_inverted = -1
end
#############################################################
# Update inverted set
#
# Update "inverted" flag from Status 13
def update_inverted()
# get the min/max tilt values
if (self.shadow_shutter_inverted == -1)
var r_st13 = tasmota.cmd("Status 13", true) # issue `Status 13`
if r_st13.contains('StatusSHT')
r_st13 = r_st13['StatusSHT'] # skip root
var d = r_st13.find("SHT"+str(self.tasmota_shutter_index), {}).find('Opt')
tasmota.log("MTR: opt: "+str(d))
if d != nil
self.shadow_shutter_inverted = int(d[size(d)-1]) # inverted is at the most right character
tasmota.log("MTR: Inverted flag: "+str(self.shadow_shutter_inverted))
end
end
end
end end
############################################################# #############################################################
# Update shadow # Update shadow
# #
def update_shadow() def update_shadow()
self.update_inverted()
var sp = tasmota.cmd("ShutterPosition" + str(self.tasmota_shutter_index + 1), true) var sp = tasmota.cmd("ShutterPosition" + str(self.tasmota_shutter_index + 1), true)
if sp if sp
self.parse_sensors(sp) self.parse_sensors(sp)
@ -71,10 +94,12 @@ class Matter_Plugin_Shutter : Matter_Plugin_Device
var TLV = matter.TLV var TLV = matter.TLV
var cluster = ctx.cluster var cluster = ctx.cluster
var attribute = ctx.attribute var attribute = ctx.attribute
var matter_position
# ==================================================================================================== # ====================================================================================================
if cluster == 0x0102 # ========== Window Covering 5.3 p.289 ========== if cluster == 0x0102 # ========== Window Covering 5.3 p.289 ==========
self.update_shadow_lazy() self.update_shadow_lazy()
self.update_inverted()
if attribute == 0x0000 # ---------- Type / enum8 ---------- if attribute == 0x0000 # ---------- Type / enum8 ----------
return TLV.create_TLV(TLV.U1, 0xFF) # 0xFF = unknown type of shutter return TLV.create_TLV(TLV.U1, 0xFF) # 0xFF = unknown type of shutter
elif attribute == 0x0005 # ---------- NumberOfActuationsLift / u16 ---------- elif attribute == 0x0005 # ---------- NumberOfActuationsLift / u16 ----------
@ -83,14 +108,23 @@ class Matter_Plugin_Shutter : Matter_Plugin_Device
return TLV.create_TLV(TLV.U1, 1 + 8) # Operational + Lift Position Aware return TLV.create_TLV(TLV.U1, 1 + 8) # Operational + Lift Position Aware
elif attribute == 0x000D # ---------- EndProductType / u8 ---------- elif attribute == 0x000D # ---------- EndProductType / u8 ----------
return TLV.create_TLV(TLV.U1, 0xFF) # 0xFF = unknown type of shutter return TLV.create_TLV(TLV.U1, 0xFF) # 0xFF = unknown type of shutter
elif attribute == 0x000E # ---------- CurrentPositionLiftPercent100ths / u16 ---------- elif attribute == 0x000E # ---------- CurrentPositionLiftPercent100ths / u16 ----------
return TLV.create_TLV(TLV.U2, (100 - self.shadow_shutter_pos) * 100) if self.shadow_shutter_inverted == 0
matter_position = (100 - self.shadow_shutter_pos) * 100
else
matter_position = self.shadow_shutter_pos * 100
end
return TLV.create_TLV(TLV.U2, matter_position)
elif attribute == 0x000A # ---------- OperationalStatus / u8 ---------- elif attribute == 0x000A # ---------- OperationalStatus / u8 ----------
var op = self.shadow_shutter_direction == 0 ? 0 : (self.shadow_shutter_direction > 0 ? 1 : 2) var op = self.shadow_shutter_direction == 0 ? 0 : (self.shadow_shutter_direction > 0 ? 1 : 2)
return TLV.create_TLV(TLV.U1, op) return TLV.create_TLV(TLV.U1, op)
elif attribute == 0x000B # ---------- TargetPositionLiftPercent100ths / u16 ---------- elif attribute == 0x000B # ---------- TargetPositionLiftPercent100ths / u16 ----------
return TLV.create_TLV(TLV.U2, (100 - self.shadow_shutter_target) * 100) if self.shadow_shutter_inverted == 0
matter_position = (100 - self.shadow_shutter_target) * 100
else
matter_position = self.shadow_shutter_target * 100
end
return TLV.create_TLV(TLV.U2, matter_position)
elif attribute == 0x0017 # ---------- Mode / u8 ---------- elif attribute == 0x0017 # ---------- Mode / u8 ----------
return TLV.create_TLV(TLV.U1, 0) # normal mode return TLV.create_TLV(TLV.U1, 0) # normal mode
@ -137,7 +171,10 @@ class Matter_Plugin_Shutter : Matter_Plugin_Device
var pos_100 = val.findsubval(0) var pos_100 = val.findsubval(0)
if pos_100 != nil if pos_100 != nil
pos_100 = pos_100 / 100 pos_100 = pos_100 / 100
tasmota.cmd("ShutterStopPosition"+str(self.tasmota_shutter_index+1) + " " + str(100 - pos_100), true) if self.shadow_shutter_inverted == 0
pos_100 = 100 - pos_100
end
tasmota.cmd("ShutterPosition"+str(self.tasmota_shutter_index+1) + " " + str(pos_100), true)
ctx.log = "pos%:"+str(pos_100) ctx.log = "pos%:"+str(pos_100)
self.update_shadow() self.update_shadow()
end end