Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Matter show event name in logs #21649

Merged
merged 3 commits into from
Jun 16, 2024
Merged

Matter show event name in logs #21649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15d5c41
Matter show event name in logs
s-hadinger Jun 16, 2024
5ab6146
Optimize logging
s-hadinger Jun 16, 2024
c28bdf4
Human readable version
s-hadinger Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions lib/libesp32/berry_matter/generate/be_matter_events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*********************************************************************************\
* Compact form for events
*
\*********************************************************************************/
#include <stddef.h>
#include <stdint.h>

typedef struct {
uint16_t cluster;
uint8_t event;
const char* name;
} matter_event_t;

// Must be sorted, cluster first, then attribute

const matter_event_t matter_Events[] = {
// 0x001F Access Control Cluster
{ 0x001F, 0x00, "AccessControlEntryChanged" },
{ 0x001F, 0x00, "AccessControlExtensionChanged" },
// 0x0025 Actions Cluster
{ 0x0025, 0x00, "StateChanged" },
{ 0x0025, 0x01, "ActionFailed" },
// 0x0028 Basic Information Cluster
{ 0x0028, 0x00, "StartUp" },
{ 0x0028, 0x01, "ShutDown" },
{ 0x0028, 0x02, "Leave" },
{ 0x0028, 0x03, "ReachableChanged" },
// 0x002F Power Source Cluster
{ 0x002F, 0x00, "WiredFaultChange" },
{ 0x002F, 0x01, "BatFaultChange" },
{ 0x002F, 0x02, "BatChargeFaultChange" },
// 0x0033 General Diagnostics Cluster
{ 0x0033, 0x00, "HardwareFaultChange" },
{ 0x0033, 0x01, "RadioFaultChange" },
{ 0x0033, 0x02, "NetworkFaultChange" },
{ 0x0033, 0x03, "BootReason" },
// 0x0034 Software Diagnostics Cluster
{ 0x0034, 0x00, "SoftwareFault" },
// 0x0035 Thread Network Diagnostics Cluster
// { 0x0035, 0x00, "ConnectionStatus" },
// { 0x0035, 0x01, "NetworkFaultChange" },
// 0x0036 Wi-Fi Network Diagnostics Cluster
{ 0x0036, 0x00, "Disconnection" },
{ 0x0036, 0x01, "AssociationFailure" },
{ 0x0036, 0x02, "ConnectionStatus" },
// 0x0038 Time Synchronization Cluster
{ 0x0038, 0x00, "DSTTableEmpty" },
{ 0x0038, 0x01, "DSTStatus" },
{ 0x0038, 0x02, "TimeZoneStatus" },
{ 0x0038, 0x03, "TimeFailure" },
{ 0x0038, 0x04, "MissingTrustedTimeSource" },
// 0x0039 Bridged Device Basic Information Cluster
{ 0x0039, 0x00, "StartUp" },
{ 0x0039, 0x01, "ShutDown" },
{ 0x0039, 0x02, "Leave" },
{ 0x0039, 0x03, "ReachableChanged" },
{ 0xFFFF, 0xFF, NULL }
};
12 changes: 12 additions & 0 deletions lib/libesp32/berry_matter/src/be_matter_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ extern const bclass be_class_Matter_QRCode;
#include "solidify/solidified_Matter_Module.h"

#include "../generate/be_matter_clusters.h"
#include "../generate/be_matter_events.h"
#include "../generate/be_matter_opcodes.h"
#include "../generate/be_matter_vendors.h"

Expand Down Expand Up @@ -188,6 +189,16 @@ const char* matter_get_command_name(uint16_t cluster, uint16_t command) {
}
BE_FUNC_CTYPE_DECLARE(matter_get_command_name, "s", "ii")

const char* matter_get_event_name(uint16_t cluster, uint8_t event) {
for (const matter_event_t * ev = matter_Events; ev->cluster != 0xFFFF; ev++) {
if (ev->cluster == cluster && ev->event == event) {
return ev->name;
}
}
return NULL;
}
BE_FUNC_CTYPE_DECLARE(matter_get_event_name, "s", "ii")

// Convert an IP address from string to raw bytes
extern const void* matter_get_ip_bytes(const char* ip_str, size_t* ret_len);
BE_FUNC_CTYPE_DECLARE(matter_get_ip_bytes, "&", "s")
Expand Down Expand Up @@ -330,6 +341,7 @@ module matter (scope: global, strings: weak) {
is_attribute_writable, ctype_func(matter_is_attribute_writable)
is_attribute_reportable, ctype_func(matter_is_attribute_reportable)
get_command_name, ctype_func(matter_get_command_name)
get_event_name, ctype_func(matter_get_event_name)
get_opcode_name, ctype_func(matter_get_opcode_name)
TLV, class(be_class_Matter_TLV)
sort, closure(module_matter_sort_closure)
Expand Down
18 changes: 15 additions & 3 deletions lib/libesp32/berry_matter/src/embedded/Matter_Plugin_0.be
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,21 @@ class Matter_Plugin
event_ib.epoch_timestamp = tasmota.rtc('utc')
if (event_ib.epoch_timestamp < 1700000000) event_ib.epoch_timestamp = nil end # no valid time
event_ib.data = data
var priority_str = (priority == 2) ? "CRIT " : (priority == 1) ? "INFO " : "DEBUG "
log(f"MTR: +Add_Event ({priority_str}) [{event_path.endpoint:02X}]{event_path.cluster:04X}/{event_path.event:04X} ({event_ib.event_number:5i}) - {event_ib.data}", 2)
log(f"MTR: Publishing event {event_ib}", 4)
if tasmota.loglevel(3)
var data_str = str(event_ib.data)
if (cluster == 0x0028) && (event == 0x00)
# put the software version in a readable format
var val = event_ib.data.val
data_str = format("%i.%i.%i.%i", (val >> 24) & 0xFF, (val >> 16) & 0xFF, (val >> 8) & 0xFF, val & 0xFF)
end
var priority_str = (priority == 2) ? "CRIT " : (priority == 1) ? "INFO " : "DEBUG "
var event_name = matter.get_event_name(cluster, event)
event_name = (event_name != nil) ? "(" + event_name + ") " : ""
log(f"MTR: +Add_Event ({priority_str}{event_ib.event_number:8s}) [{event_path.endpoint:02X}]{event_path.cluster:04X}/{event_path.event:02X} {event_name}- {data_str}", 2)
end
if tasmota.loglevel(4)
log(f"MTR: Publishing event {event_ib}", 4)
end

self.device.events.queue_event(event_ib)
end
Expand Down
153 changes: 107 additions & 46 deletions lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,15 +286,15 @@ be_local_closure(class_Matter_Plugin_every_250ms, /* name */
extern const bclass be_class_Matter_Plugin;
be_local_closure(class_Matter_Plugin_publish_event, /* name */
be_nested_proto(
17, /* nstack */
20, /* nstack */
5, /* argc */
2, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
&be_class_Matter_Plugin,
1, /* has constants */
( &(const bvalue[27]) { /* constants */
( &(const bvalue[36]) { /* constants */
/* K0 */ be_nested_str_weak(matter),
/* K1 */ be_nested_str_weak(EventDataIB),
/* K2 */ be_nested_str_weak(EventPathIB),
Expand All @@ -313,19 +313,28 @@ be_local_closure(class_Matter_Plugin_publish_event, /* name */
/* K15 */ be_nested_str_weak(utc),
/* K16 */ be_const_int(1700000000),
/* K17 */ be_nested_str_weak(data),
/* K18 */ be_const_int(2),
/* K19 */ be_nested_str_weak(CRIT_X20_X20),
/* K20 */ be_const_int(1),
/* K21 */ be_nested_str_weak(INFO_X20_X20),
/* K22 */ be_nested_str_weak(DEBUG_X20),
/* K23 */ be_nested_str_weak(log),
/* K24 */ be_nested_str_weak(MTR_X3A_X20_X2BAdd_Event_X20_X28_X25s_X29_X20_X5B_X2502X_X5D_X2504X_X2F_X2504X_X20_X28_X255i_X29_X20_X2D_X20_X25s),
/* K25 */ be_nested_str_weak(MTR_X3A_X20Publishing_X20event_X20_X25s),
/* K26 */ be_nested_str_weak(queue_event),
/* K18 */ be_nested_str_weak(loglevel),
/* K19 */ be_const_int(3),
/* K20 */ be_const_int(0),
/* K21 */ be_nested_str_weak(val),
/* K22 */ be_nested_str_weak(_X25i_X2E_X25i_X2E_X25i_X2E_X25i),
/* K23 */ be_const_int(2),
/* K24 */ be_nested_str_weak(CRIT_X20_X20),
/* K25 */ be_const_int(1),
/* K26 */ be_nested_str_weak(INFO_X20_X20),
/* K27 */ be_nested_str_weak(DEBUG_X20),
/* K28 */ be_nested_str_weak(get_event_name),
/* K29 */ be_nested_str_weak(_X28),
/* K30 */ be_nested_str_weak(_X29_X20),
/* K31 */ be_nested_str_weak(),
/* K32 */ be_nested_str_weak(log),
/* K33 */ be_nested_str_weak(MTR_X3A_X20_X2BAdd_Event_X20_X28_X25s_X258s_X29_X20_X5B_X2502X_X5D_X2504X_X2F_X2502X_X20_X25s_X2D_X20_X25s),
/* K34 */ be_nested_str_weak(MTR_X3A_X20Publishing_X20event_X20_X25s),
/* K35 */ be_nested_str_weak(queue_event),
}),
be_str_weak(publish_event),
&be_const_str_solidified,
( &(const binstruction[62]) { /* code */
( &(const binstruction[114]) { /* code */
0xB8160000, // 0000 GETNGBL R5 K0
0x8C140B01, // 0001 GETMET R5 R5 K1
0x7C140200, // 0002 CALL R5 1
Expand Down Expand Up @@ -354,40 +363,92 @@ be_local_closure(class_Matter_Plugin_publish_event, /* name */
0x4C1C0000, // 0019 LDNIL R7
0x90161807, // 001A SETMBR R5 K12 R7
0x90162204, // 001B SETMBR R5 K17 R4
0x1C1C0712, // 001C EQ R7 R3 K18
0x781E0001, // 001D JMPF R7 #0020
0x581C0013, // 001E LDCONST R7 K19
0x70020004, // 001F JMP #0025
0x1C1C0714, // 0020 EQ R7 R3 K20
0x781E0001, // 0021 JMPF R7 #0024
0x581C0015, // 0022 LDCONST R7 K21
0x70020000, // 0023 JMP #0025
0x581C0016, // 0024 LDCONST R7 K22
0xB8222E00, // 0025 GETNGBL R8 K23
0x60240018, // 0026 GETGBL R9 G24
0x58280018, // 0027 LDCONST R10 K24
0x5C2C0E00, // 0028 MOVE R11 R7
0x88300D03, // 0029 GETMBR R12 R6 K3
0x88340D04, // 002A GETMBR R13 R6 K4
0x88380D05, // 002B GETMBR R14 R6 K5
0x883C0B08, // 002C GETMBR R15 R5 K8
0x88400B11, // 002D GETMBR R16 R5 K17
0x7C240E00, // 002E CALL R9 7
0x58280012, // 002F LDCONST R10 K18
0x7C200400, // 0030 CALL R8 2
0xB8222E00, // 0031 GETNGBL R8 K23
0x60240018, // 0032 GETGBL R9 G24
0x58280019, // 0033 LDCONST R10 K25
0x5C2C0A00, // 0034 MOVE R11 R5
0x7C240400, // 0035 CALL R9 2
0x542A0003, // 0036 LDINT R10 4
0x7C200400, // 0037 CALL R8 2
0x88200109, // 0038 GETMBR R8 R0 K9
0x8820110A, // 0039 GETMBR R8 R8 K10
0x8C20111A, // 003A GETMET R8 R8 K26
0x5C280A00, // 003B MOVE R10 R5
0x7C200400, // 003C CALL R8 2
0x80000000, // 003D RET 0
0xB81E1A00, // 001C GETNGBL R7 K13
0x8C1C0F12, // 001D GETMET R7 R7 K18
0x58240013, // 001E LDCONST R9 K19
0x7C1C0400, // 001F CALL R7 2
0x781E003E, // 0020 JMPF R7 #0060
0x601C0008, // 0021 GETGBL R7 G8
0x88200B11, // 0022 GETMBR R8 R5 K17
0x7C1C0200, // 0023 CALL R7 1
0x54220027, // 0024 LDINT R8 40
0x1C200208, // 0025 EQ R8 R1 R8
0x78220015, // 0026 JMPF R8 #003D
0x1C200514, // 0027 EQ R8 R2 K20
0x78220013, // 0028 JMPF R8 #003D
0x88200B11, // 0029 GETMBR R8 R5 K17
0x88201115, // 002A GETMBR R8 R8 K21
0x60240018, // 002B GETGBL R9 G24
0x58280016, // 002C LDCONST R10 K22
0x542E0017, // 002D LDINT R11 24
0x3C2C100B, // 002E SHR R11 R8 R11
0x543200FE, // 002F LDINT R12 255
0x2C2C160C, // 0030 AND R11 R11 R12
0x5432000F, // 0031 LDINT R12 16
0x3C30100C, // 0032 SHR R12 R8 R12
0x543600FE, // 0033 LDINT R13 255
0x2C30180D, // 0034 AND R12 R12 R13
0x54360007, // 0035 LDINT R13 8
0x3C34100D, // 0036 SHR R13 R8 R13
0x543A00FE, // 0037 LDINT R14 255
0x2C341A0E, // 0038 AND R13 R13 R14
0x543A00FE, // 0039 LDINT R14 255
0x2C38100E, // 003A AND R14 R8 R14
0x7C240A00, // 003B CALL R9 5
0x5C1C1200, // 003C MOVE R7 R9
0x1C200717, // 003D EQ R8 R3 K23
0x78220001, // 003E JMPF R8 #0041
0x58200018, // 003F LDCONST R8 K24
0x70020004, // 0040 JMP #0046
0x1C200719, // 0041 EQ R8 R3 K25
0x78220001, // 0042 JMPF R8 #0045
0x5820001A, // 0043 LDCONST R8 K26
0x70020000, // 0044 JMP #0046
0x5820001B, // 0045 LDCONST R8 K27
0xB8260000, // 0046 GETNGBL R9 K0
0x8C24131C, // 0047 GETMET R9 R9 K28
0x5C2C0200, // 0048 MOVE R11 R1
0x5C300400, // 0049 MOVE R12 R2
0x7C240600, // 004A CALL R9 3
0x4C280000, // 004B LDNIL R10
0x2028120A, // 004C NE R10 R9 R10
0x782A0002, // 004D JMPF R10 #0051
0x002A3A09, // 004E ADD R10 K29 R9
0x0028151E, // 004F ADD R10 R10 K30
0x70020000, // 0050 JMP #0052
0x5828001F, // 0051 LDCONST R10 K31
0x5C241400, // 0052 MOVE R9 R10
0xB82A4000, // 0053 GETNGBL R10 K32
0x602C0018, // 0054 GETGBL R11 G24
0x58300021, // 0055 LDCONST R12 K33
0x5C341000, // 0056 MOVE R13 R8
0x88380B08, // 0057 GETMBR R14 R5 K8
0x883C0D03, // 0058 GETMBR R15 R6 K3
0x88400D04, // 0059 GETMBR R16 R6 K4
0x88440D05, // 005A GETMBR R17 R6 K5
0x5C481200, // 005B MOVE R18 R9
0x5C4C0E00, // 005C MOVE R19 R7
0x7C2C1000, // 005D CALL R11 8
0x58300017, // 005E LDCONST R12 K23
0x7C280400, // 005F CALL R10 2
0xB81E1A00, // 0060 GETNGBL R7 K13
0x8C1C0F12, // 0061 GETMET R7 R7 K18
0x54260003, // 0062 LDINT R9 4
0x7C1C0400, // 0063 CALL R7 2
0x781E0006, // 0064 JMPF R7 #006C
0xB81E4000, // 0065 GETNGBL R7 K32
0x60200018, // 0066 GETGBL R8 G24
0x58240022, // 0067 LDCONST R9 K34
0x5C280A00, // 0068 MOVE R10 R5
0x7C200400, // 0069 CALL R8 2
0x54260003, // 006A LDINT R9 4
0x7C1C0400, // 006B CALL R7 2
0x881C0109, // 006C GETMBR R7 R0 K9
0x881C0F0A, // 006D GETMBR R7 R7 K10
0x8C1C0F23, // 006E GETMET R7 R7 K35
0x5C240A00, // 006F MOVE R9 R5
0x7C1C0400, // 0070 CALL R7 2
0x80000000, // 0071 RET 0
})
)
);
Expand Down