From ec039a8390736fca765bd1184ffcd7dbda2da89f Mon Sep 17 00:00:00 2001 From: s-hadinger <49731213+s-hadinger@users.noreply.github.com> Date: Fri, 3 Nov 2023 14:21:13 +0100 Subject: [PATCH] Matter update hierarchy of plugins (#19915) --- lib/libesp32/berry_matter/src/be_matter_module.c | 12 ++++++------ ...2_Aggregator.be => Matter_Plugin_1_Aggregator.be} | 0 ..._Contact.be => Matter_Plugin_2_Sensor_Contact.be} | 0 ...upancy.be => Matter_Plugin_2_Sensor_Occupancy.be} | 0 ...nsor_OnOff.be => Matter_Plugin_2_Sensor_OnOff.be} | 0 ...t.be => Matter_Plugin_3_Bridge_Sensor_Contact.be} | 0 ...be => Matter_Plugin_3_Bridge_Sensor_Occupancy.be} | 0 ...tor.h => solidified_Matter_Plugin_1_Aggregator.h} | 2 +- ...h => solidified_Matter_Plugin_2_Sensor_Contact.h} | 2 +- ...=> solidified_Matter_Plugin_2_Sensor_Occupancy.h} | 2 +- ...f.h => solidified_Matter_Plugin_2_Sensor_OnOff.h} | 2 +- ...lidified_Matter_Plugin_3_Bridge_Sensor_Contact.h} | 2 +- ...dified_Matter_Plugin_3_Bridge_Sensor_Occupancy.h} | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename lib/libesp32/berry_matter/src/embedded/{Matter_Plugin_2_Aggregator.be => Matter_Plugin_1_Aggregator.be} (100%) rename lib/libesp32/berry_matter/src/embedded/{Matter_Plugin_3_Sensor_Contact.be => Matter_Plugin_2_Sensor_Contact.be} (100%) rename lib/libesp32/berry_matter/src/embedded/{Matter_Plugin_3_Sensor_Occupancy.be => Matter_Plugin_2_Sensor_Occupancy.be} (100%) rename lib/libesp32/berry_matter/src/embedded/{Matter_Plugin_3_Sensor_OnOff.be => Matter_Plugin_2_Sensor_OnOff.be} (100%) rename lib/libesp32/berry_matter/src/embedded/{Matter_Plugin_4_Bridge_Sensor_Contact.be => Matter_Plugin_3_Bridge_Sensor_Contact.be} (100%) rename lib/libesp32/berry_matter/src/embedded/{Matter_Plugin_4_Bridge_Sensor_Occupancy.be => Matter_Plugin_3_Bridge_Sensor_Occupancy.be} (100%) rename lib/libesp32/berry_matter/src/solidify/{solidified_Matter_Plugin_2_Aggregator.h => solidified_Matter_Plugin_1_Aggregator.h} (99%) rename lib/libesp32/berry_matter/src/solidify/{solidified_Matter_Plugin_3_Sensor_Contact.h => solidified_Matter_Plugin_2_Sensor_Contact.h} (99%) rename lib/libesp32/berry_matter/src/solidify/{solidified_Matter_Plugin_3_Sensor_Occupancy.h => solidified_Matter_Plugin_2_Sensor_Occupancy.h} (99%) rename lib/libesp32/berry_matter/src/solidify/{solidified_Matter_Plugin_3_Sensor_OnOff.h => solidified_Matter_Plugin_2_Sensor_OnOff.h} (99%) rename lib/libesp32/berry_matter/src/solidify/{solidified_Matter_Plugin_4_Bridge_Sensor_Contact.h => solidified_Matter_Plugin_3_Bridge_Sensor_Contact.h} (99%) rename lib/libesp32/berry_matter/src/solidify/{solidified_Matter_Plugin_4_Bridge_Sensor_Occupancy.h => solidified_Matter_Plugin_3_Bridge_Sensor_Occupancy.h} (99%) diff --git a/lib/libesp32/berry_matter/src/be_matter_module.c b/lib/libesp32/berry_matter/src/be_matter_module.c index 9e9412854..41f66e3f4 100644 --- a/lib/libesp32/berry_matter/src/be_matter_module.c +++ b/lib/libesp32/berry_matter/src/be_matter_module.c @@ -210,7 +210,7 @@ extern const bclass be_class_Matter_TLV; // need to declare it upfront because #include "../generate/be_matter_certs.h" #include "solidify/solidified_Matter_Plugin_1_Root.h" -#include "solidify/solidified_Matter_Plugin_2_Aggregator.h" +#include "solidify/solidified_Matter_Plugin_1_Aggregator.h" #include "solidify/solidified_Matter_Plugin_1_Device.h" #include "solidify/solidified_Matter_Plugin_2_OnOff.h" #include "solidify/solidified_Matter_Plugin_9_Virt_OnOff.h" @@ -235,9 +235,9 @@ extern const bclass be_class_Matter_TLV; // need to declare it upfront because #include "solidify/solidified_Matter_Plugin_9_Virt_Sensor_Illuminance.h" #include "solidify/solidified_Matter_Plugin_3_Sensor_Humidity.h" #include "solidify/solidified_Matter_Plugin_9_Virt_Sensor_Humidity.h" -#include "solidify/solidified_Matter_Plugin_3_Sensor_Occupancy.h" -#include "solidify/solidified_Matter_Plugin_3_Sensor_OnOff.h" -#include "solidify/solidified_Matter_Plugin_3_Sensor_Contact.h" +#include "solidify/solidified_Matter_Plugin_2_Sensor_Occupancy.h" +#include "solidify/solidified_Matter_Plugin_2_Sensor_OnOff.h" +#include "solidify/solidified_Matter_Plugin_2_Sensor_Contact.h" #include "solidify/solidified_Matter_Plugin_9_Virt_Sensor_Contact.h" #include "solidify/solidified_Matter_Plugin_9_Virt_Sensor_Occupancy.h" #include "solidify/solidified_Matter_Plugin_2_Bridge_HTTP.h" @@ -251,8 +251,8 @@ extern const bclass be_class_Matter_TLV; // need to declare it upfront because #include "solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Temp.h" #include "solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Illuminance.h" #include "solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Humidity.h" -#include "solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Occupancy.h" -#include "solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Contact.h" +#include "solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Occupancy.h" +#include "solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Contact.h" #include "solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Flow.h" /*********************************************************************************************\ diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Aggregator.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_1_Aggregator.be similarity index 100% rename from lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Aggregator.be rename to lib/libesp32/berry_matter/src/embedded/Matter_Plugin_1_Aggregator.be diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_Contact.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_Contact.be similarity index 100% rename from lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_Contact.be rename to lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_Contact.be diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_Occupancy.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_Occupancy.be similarity index 100% rename from lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_Occupancy.be rename to lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_Occupancy.be diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_OnOff.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_OnOff.be similarity index 100% rename from lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_OnOff.be rename to lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_OnOff.be diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_4_Bridge_Sensor_Contact.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Bridge_Sensor_Contact.be similarity index 100% rename from lib/libesp32/berry_matter/src/embedded/Matter_Plugin_4_Bridge_Sensor_Contact.be rename to lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Bridge_Sensor_Contact.be diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_4_Bridge_Sensor_Occupancy.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Bridge_Sensor_Occupancy.be similarity index 100% rename from lib/libesp32/berry_matter/src/embedded/Matter_Plugin_4_Bridge_Sensor_Occupancy.be rename to lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Bridge_Sensor_Occupancy.be diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Aggregator.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Aggregator.h similarity index 99% rename from lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Aggregator.h rename to lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Aggregator.h index af4ea7333..c9c2db74a 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Aggregator.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Aggregator.h @@ -1,4 +1,4 @@ -/* Solidification of Matter_Plugin_2_Aggregator.h */ +/* Solidification of Matter_Plugin_1_Aggregator.h */ /********************************************************************\ * Generated code, don't edit * \********************************************************************/ diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Contact.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Contact.h similarity index 99% rename from lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Contact.h rename to lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Contact.h index 7a33f6a30..2b98ba814 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Contact.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Contact.h @@ -1,4 +1,4 @@ -/* Solidification of Matter_Plugin_3_Sensor_Contact.h */ +/* Solidification of Matter_Plugin_2_Sensor_Contact.h */ /********************************************************************\ * Generated code, don't edit * \********************************************************************/ diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Occupancy.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Occupancy.h similarity index 99% rename from lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Occupancy.h rename to lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Occupancy.h index a2585b7a0..60c934fd1 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Occupancy.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Occupancy.h @@ -1,4 +1,4 @@ -/* Solidification of Matter_Plugin_3_Sensor_Occupancy.h */ +/* Solidification of Matter_Plugin_2_Sensor_Occupancy.h */ /********************************************************************\ * Generated code, don't edit * \********************************************************************/ diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_OnOff.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_OnOff.h similarity index 99% rename from lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_OnOff.h rename to lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_OnOff.h index 4bb8243a0..498676bf4 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_OnOff.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_OnOff.h @@ -1,4 +1,4 @@ -/* Solidification of Matter_Plugin_3_Sensor_OnOff.h */ +/* Solidification of Matter_Plugin_2_Sensor_OnOff.h */ /********************************************************************\ * Generated code, don't edit * \********************************************************************/ diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Contact.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Contact.h similarity index 99% rename from lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Contact.h rename to lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Contact.h index ded960e54..5f072e844 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Contact.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Contact.h @@ -1,4 +1,4 @@ -/* Solidification of Matter_Plugin_4_Bridge_Sensor_Contact.h */ +/* Solidification of Matter_Plugin_3_Bridge_Sensor_Contact.h */ /********************************************************************\ * Generated code, don't edit * \********************************************************************/ diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Occupancy.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Occupancy.h similarity index 99% rename from lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Occupancy.h rename to lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Occupancy.h index b19d193b9..f79147599 100644 --- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Occupancy.h +++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Occupancy.h @@ -1,4 +1,4 @@ -/* Solidification of Matter_Plugin_4_Bridge_Sensor_Occupancy.h */ +/* Solidification of Matter_Plugin_3_Bridge_Sensor_Occupancy.h */ /********************************************************************\ * Generated code, don't edit * \********************************************************************/