Skip to content

Commit

Permalink
Matter improve virtual plugins (#19918)
Browse files Browse the repository at this point in the history 
* Matter improve virtual plugins

* Disable sensor probing for virtual

* solidify
  • Loading branch information
@s-hadinger
s-hadinger authored Nov 3, 2023
1 parent 8e6a8b6 commit dcbb22a
Show file tree
Hide file tree
Showing 12 changed files with 320 additions and 285 deletions.
2 changes: 1 addition & 1 deletion lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor.be
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class Matter_Plugin_Sensor : Matter_Plugin_Device
# The device calls regularly `tasmota.read_sensors()` and converts
# it to json.
def parse_sensors(payload)
if self.tasmota_sensor_matcher
if !self.VIRTUAL && self.tasmota_sensor_matcher
var val = self.pre_value(real(self.tasmota_sensor_matcher.match(payload)))
if val != nil
if val != self.shadow_value
Expand Down
25 changes: 13 additions & 12 deletions lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_Contact.be
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,19 @@ class Matter_Plugin_Sensor_Contact : Matter_Plugin_Device
#
def update_shadow()
super(self).update_shadow()

import json
var ret = tasmota.cmd("Status 8", true)
if ret != nil
var j = json.load(ret)
if j != nil
var state = false
state = (j.find("Switch" + str(self.tasmota_switch_index)) == "ON")

if self.shadow_contact != state
self.attribute_updated(0x0045, 0x0000)
self.shadow_contact = state
if !self.VIRTUAL
import json
var ret = tasmota.cmd("Status 8", true)
if ret != nil
var j = json.load(ret)
if j != nil
var state = false
state = (j.find("Switch" + str(self.tasmota_switch_index)) == "ON")

if self.shadow_contact != state
self.attribute_updated(0x0045, 0x0000)
self.shadow_contact = state
end
end
end
end
Expand Down
18 changes: 10 additions & 8 deletions lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_Occupancy.be
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,19 @@ class Matter_Plugin_Sensor_Occupancy : Matter_Plugin_Device
#
def update_shadow()
super(self).update_shadow()
var switch_str = "Switch" + str(self.tasmota_switch_index)
if !self.VIRTUAL
var switch_str = "Switch" + str(self.tasmota_switch_index)

var j = tasmota.cmd("Status 8", true)
if j != nil j = j.find("StatusSNS") end
if j != nil && j.contains(switch_str)
var state = (j.find(switch_str) == "ON")
var j = tasmota.cmd("Status 8", true)
if j != nil j = j.find("StatusSNS") end
if j != nil && j.contains(switch_str)
var state = (j.find(switch_str) == "ON")

if (self.shadow_occupancy != state)
self.attribute_updated(0x0406, 0x0000)
if (self.shadow_occupancy != state)
self.attribute_updated(0x0406, 0x0000)
end
self.shadow_occupancy = state
end
self.shadow_occupancy = state
end
end

Expand Down
18 changes: 10 additions & 8 deletions lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_OnOff.be
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,19 @@ class Matter_Plugin_Sensor_OnOff : Matter_Plugin_Device
#
def update_shadow()
super(self).update_shadow()
var switch_str = "Switch" + str(self.tasmota_switch_index)
if !self.VIRTUAL
var switch_str = "Switch" + str(self.tasmota_switch_index)

var j = tasmota.cmd("Status 8", true)
if j != nil j = j.find("StatusSNS") end
if j != nil && j.contains(switch_str)
var state = (j.find(switch_str) == "ON")
var j = tasmota.cmd("Status 8", true)
if j != nil j = j.find("StatusSNS") end
if j != nil && j.contains(switch_str)
var state = (j.find(switch_str) == "ON")

if (self.shadow_onoff != state)
self.attribute_updated(0x0006, 0x0000)
if (self.shadow_onoff != state)
self.attribute_updated(0x0006, 0x0000)
end
self.shadow_onoff = state
end
self.shadow_onoff = state
end
end

Expand Down
10 changes: 6 additions & 4 deletions lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Shutter.be
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,12 @@ class Matter_Plugin_Shutter : Matter_Plugin_Device
# Update shadow
#
def update_shadow()
self.update_inverted()
var sp = tasmota.cmd("ShutterPosition" + str(self.tasmota_shutter_index + 1), true)
if sp
self.parse_sensors(sp)
if !self.VIRTUAL
self.update_inverted()
var sp = tasmota.cmd("ShutterPosition" + str(self.tasmota_shutter_index + 1), true)
if sp
self.parse_sensors(sp)
end
end
super(self).update_shadow()
end
Expand Down
24 changes: 14 additions & 10 deletions lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Light2.be
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,21 @@ class Matter_Plugin_Light2 : Matter_Plugin_Light1
# Update shadow
#
def update_shadow()
import light
self.update_ct_minmax()
super(self).update_shadow()
var light_status = light.get()
if light_status != nil
var ct = light_status.find('ct', nil)
if ct == nil ct = self.shadow_ct end
if ct != self.shadow_ct
self.attribute_updated(0x0300, 0x0007)
self.shadow_ct = ct
if !self.VIRTUAL
import light
self.update_ct_minmax()
super(self).update_shadow()
var light_status = light.get()
if light_status != nil
var ct = light_status.find('ct', nil)
if ct == nil ct = self.shadow_ct end
if ct != self.shadow_ct
self.attribute_updated(0x0300, 0x0007)
self.shadow_ct = ct
end
end
else
super(self).update_shadow()
end
end

Expand Down
55 changes: 29 additions & 26 deletions lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,36 +77,39 @@ be_local_closure(Matter_Plugin_Sensor_parse_sensors, /* name */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[ 5]) { /* constants */
/* K0 */ be_nested_str_weak(tasmota_sensor_matcher),
/* K1 */ be_nested_str_weak(pre_value),
/* K2 */ be_nested_str_weak(match),
/* K3 */ be_nested_str_weak(shadow_value),
/* K4 */ be_nested_str_weak(value_changed),
( &(const bvalue[ 6]) { /* constants */
/* K0 */ be_nested_str_weak(VIRTUAL),
/* K1 */ be_nested_str_weak(tasmota_sensor_matcher),
/* K2 */ be_nested_str_weak(pre_value),
/* K3 */ be_nested_str_weak(match),
/* K4 */ be_nested_str_weak(shadow_value),
/* K5 */ be_nested_str_weak(value_changed),
}),
be_str_weak(parse_sensors),
&be_const_str_solidified,
( &(const binstruction[20]) { /* code */
( &(const binstruction[22]) { /* code */
0x88080100, // 0000 GETMBR R2 R0 K0
0x780A0010, // 0001 JMPF R2 #0013
0x8C080101, // 0002 GETMET R2 R0 K1
0x6010000A, // 0003 GETGBL R4 G10
0x88140100, // 0004 GETMBR R5 R0 K0
0x8C140B02, // 0005 GETMET R5 R5 K2
0x5C1C0200, // 0006 MOVE R7 R1
0x7C140400, // 0007 CALL R5 2
0x7C100200, // 0008 CALL R4 1
0x7C080400, // 0009 CALL R2 2
0x4C0C0000, // 000A LDNIL R3
0x200C0403, // 000B NE R3 R2 R3
0x780E0005, // 000C JMPF R3 #0013
0x880C0103, // 000D GETMBR R3 R0 K3
0x200C0403, // 000E NE R3 R2 R3
0x780E0002, // 000F JMPF R3 #0013
0x8C0C0104, // 0010 GETMET R3 R0 K4
0x7C0C0200, // 0011 CALL R3 1
0x90020602, // 0012 SETMBR R0 K3 R2
0x80000000, // 0013 RET 0
0x740A0012, // 0001 JMPT R2 #0015
0x88080101, // 0002 GETMBR R2 R0 K1
0x780A0010, // 0003 JMPF R2 #0015
0x8C080102, // 0004 GETMET R2 R0 K2
0x6010000A, // 0005 GETGBL R4 G10
0x88140101, // 0006 GETMBR R5 R0 K1
0x8C140B03, // 0007 GETMET R5 R5 K3
0x5C1C0200, // 0008 MOVE R7 R1
0x7C140400, // 0009 CALL R5 2
0x7C100200, // 000A CALL R4 1
0x7C080400, // 000B CALL R2 2
0x4C0C0000, // 000C LDNIL R3
0x200C0403, // 000D NE R3 R2 R3
0x780E0005, // 000E JMPF R3 #0015
0x880C0104, // 000F GETMBR R3 R0 K4
0x200C0403, // 0010 NE R3 R2 R3
0x780E0002, // 0011 JMPF R3 #0015
0x8C0C0105, // 0012 GETMET R3 R0 K5
0x7C0C0200, // 0013 CALL R3 1
0x90020802, // 0014 SETMBR R0 K4 R2
0x80000000, // 0015 RET 0
})
)
);
Expand Down
97 changes: 50 additions & 47 deletions lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Contact.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,62 +93,65 @@ be_local_closure(Matter_Plugin_Sensor_Contact_update_shadow, /* name */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
( &(const bvalue[13]) { /* constants */
( &(const bvalue[14]) { /* constants */
/* K0 */ be_nested_str_weak(update_shadow),
/* K1 */ be_nested_str_weak(json),
/* K2 */ be_nested_str_weak(tasmota),
/* K3 */ be_nested_str_weak(cmd),
/* K4 */ be_nested_str_weak(Status_X208),
/* K5 */ be_nested_str_weak(load),
/* K6 */ be_nested_str_weak(find),
/* K7 */ be_nested_str_weak(Switch),
/* K8 */ be_nested_str_weak(tasmota_switch_index),
/* K9 */ be_nested_str_weak(ON),
/* K10 */ be_nested_str_weak(shadow_contact),
/* K11 */ be_nested_str_weak(attribute_updated),
/* K12 */ be_const_int(0),
/* K1 */ be_nested_str_weak(VIRTUAL),
/* K2 */ be_nested_str_weak(json),
/* K3 */ be_nested_str_weak(tasmota),
/* K4 */ be_nested_str_weak(cmd),
/* K5 */ be_nested_str_weak(Status_X208),
/* K6 */ be_nested_str_weak(load),
/* K7 */ be_nested_str_weak(find),
/* K8 */ be_nested_str_weak(Switch),
/* K9 */ be_nested_str_weak(tasmota_switch_index),
/* K10 */ be_nested_str_weak(ON),
/* K11 */ be_nested_str_weak(shadow_contact),
/* K12 */ be_nested_str_weak(attribute_updated),
/* K13 */ be_const_int(0),
}),
be_str_weak(update_shadow),
&be_const_str_solidified,
( &(const binstruction[38]) { /* code */
( &(const binstruction[40]) { /* code */
0x60040003, // 0000 GETGBL R1 G3
0x5C080000, // 0001 MOVE R2 R0
0x7C040200, // 0002 CALL R1 1
0x8C040300, // 0003 GETMET R1 R1 K0
0x7C040200, // 0004 CALL R1 1
0xA4060200, // 0005 IMPORT R1 K1
0xB80A0400, // 0006 GETNGBL R2 K2
0x8C080503, // 0007 GETMET R2 R2 K3
0x58100004, // 0008 LDCONST R4 K4
0x50140200, // 0009 LDBOOL R5 1 0
0x7C080600, // 000A CALL R2 3
0x4C0C0000, // 000B LDNIL R3
0x200C0403, // 000C NE R3 R2 R3
0x780E0016, // 000D JMPF R3 #0025
0x8C0C0305, // 000E GETMET R3 R1 K5
0x5C140400, // 000F MOVE R5 R2
0x7C0C0400, // 0010 CALL R3 2
0x4C100000, // 0011 LDNIL R4
0x20100604, // 0012 NE R4 R3 R4
0x78120010, // 0013 JMPF R4 #0025
0x50100000, // 0014 LDBOOL R4 0 0
0x8C140706, // 0015 GETMET R5 R3 K6
0x601C0008, // 0016 GETGBL R7 G8
0x88200108, // 0017 GETMBR R8 R0 K8
0x7C1C0200, // 0018 CALL R7 1
0x001E0E07, // 0019 ADD R7 K7 R7
0x7C140400, // 001A CALL R5 2
0x1C140B09, // 001B EQ R5 R5 K9
0x5C100A00, // 001C MOVE R4 R5
0x8814010A, // 001D GETMBR R5 R0 K10
0x20140A04, // 001E NE R5 R5 R4
0x78160004, // 001F JMPF R5 #0025
0x8C14010B, // 0020 GETMET R5 R0 K11
0x541E0044, // 0021 LDINT R7 69
0x5820000C, // 0022 LDCONST R8 K12
0x7C140600, // 0023 CALL R5 3
0x90021404, // 0024 SETMBR R0 K10 R4
0x80000000, // 0025 RET 0
0x88040101, // 0005 GETMBR R1 R0 K1
0x7406001F, // 0006 JMPT R1 #0027
0xA4060400, // 0007 IMPORT R1 K2
0xB80A0600, // 0008 GETNGBL R2 K3
0x8C080504, // 0009 GETMET R2 R2 K4
0x58100005, // 000A LDCONST R4 K5
0x50140200, // 000B LDBOOL R5 1 0
0x7C080600, // 000C CALL R2 3
0x4C0C0000, // 000D LDNIL R3
0x200C0403, // 000E NE R3 R2 R3
0x780E0016, // 000F JMPF R3 #0027
0x8C0C0306, // 0010 GETMET R3 R1 K6
0x5C140400, // 0011 MOVE R5 R2
0x7C0C0400, // 0012 CALL R3 2
0x4C100000, // 0013 LDNIL R4
0x20100604, // 0014 NE R4 R3 R4
0x78120010, // 0015 JMPF R4 #0027
0x50100000, // 0016 LDBOOL R4 0 0
0x8C140707, // 0017 GETMET R5 R3 K7
0x601C0008, // 0018 GETGBL R7 G8
0x88200109, // 0019 GETMBR R8 R0 K9
0x7C1C0200, // 001A CALL R7 1
0x001E1007, // 001B ADD R7 K8 R7
0x7C140400, // 001C CALL R5 2
0x1C140B0A, // 001D EQ R5 R5 K10
0x5C100A00, // 001E MOVE R4 R5
0x8814010B, // 001F GETMBR R5 R0 K11
0x20140A04, // 0020 NE R5 R5 R4
0x78160004, // 0021 JMPF R5 #0027
0x8C14010C, // 0022 GETMET R5 R0 K12
0x541E0044, // 0023 LDINT R7 69
0x5820000D, // 0024 LDCONST R8 K13
0x7C140600, // 0025 CALL R5 3
0x90021604, // 0026 SETMBR R0 K11 R4
0x80000000, // 0027 RET 0
})
)
);
Expand Down
Loading

0 comments on commit dcbb22a

Please sign in to comment.