Skip to content

Commit 05e67b2

Browse files
dhrishidhrishi
committed
Merge branch 'refactor_code' into 'main'
Refactor Common Clusters Code See merge request app-frameworks/esp-matter!1170
2 parents 882edef + afe082a commit 05e67b2

File tree

8 files changed

+140
-2967
lines changed

8 files changed

+140
-2967
lines changed

‎components/esp_matter/esp_matter_attribute.cpp‎

Lines changed: 4 additions & 686 deletions
Large diffs are not rendered by default.

‎components/esp_matter/esp_matter_attribute.h‎

Lines changed: 21 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ attribute_t *create_air_quality(cluster_t *cluster, uint8_t value);
550550
} /* attribute */
551551
} /* air_quality */
552552

553-
namespace hepa_filter_monitoring {
553+
namespace resource_monitoring {
554554
namespace attribute {
555555
attribute_t *create_condition(cluster_t *cluster, uint8_t value);
556556
attribute_t *create_degradation_direction(cluster_t *cluster, uint8_t value);
@@ -559,20 +559,18 @@ attribute_t *create_in_place_indicator(cluster_t *cluster, bool value);
559559
attribute_t *create_last_changed_time(cluster_t *cluster, nullable<uint8_t> value);
560560
attribute_t *create_replacement_product_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count);
561561
} /* attribute */
562+
} /* resource_monitoring */
563+
564+
namespace hepa_filter_monitoring {
565+
namespace attribute = resource_monitoring::attribute;
562566
} /* hepa_filter_monitoring */
563567

564568
namespace activated_carbon_filter_monitoring {
565-
namespace attribute {
566-
attribute_t *create_condition(cluster_t *cluster, uint8_t value);
567-
attribute_t *create_degradation_direction(cluster_t *cluster, uint8_t value);
568-
attribute_t *create_change_indication(cluster_t *cluster, uint8_t value);
569-
attribute_t *create_in_place_indicator(cluster_t *cluster, bool value);
570-
attribute_t *create_last_changed_time(cluster_t *cluster, nullable<uint8_t> value);
571-
attribute_t *create_replacement_product_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count);
572-
} /* attribute */
569+
namespace attribute = resource_monitoring::attribute;
573570
} /* activated_carbon_filter_monitoring */
574571

575-
namespace carbon_monoxide_concentration_measurement {
572+
573+
namespace concentration_measurement {
576574
namespace attribute {
577575
attribute_t *create_measured_value(cluster_t *cluster, nullable<float> value);
578576
attribute_t *create_min_measured_value(cluster_t *cluster, nullable<float> value);
@@ -586,150 +584,46 @@ attribute_t *create_measurement_unit(cluster_t *cluster, uint8_t value);
586584
attribute_t *create_measurement_medium(cluster_t *cluster, uint8_t value);
587585
attribute_t *create_level_value(cluster_t *cluster, uint8_t value);
588586
} /* attribute */
587+
} /* concentration_measurement */
588+
589+
namespace carbon_monoxide_concentration_measurement {
590+
namespace attribute = concentration_measurement::attribute;
589591
} /* carbon_monoxide_concentration_measurement */
590592

591593
namespace carbon_dioxide_concentration_measurement {
592-
namespace attribute {
593-
attribute_t *create_measured_value(cluster_t *cluster, nullable<float> value);
594-
attribute_t *create_min_measured_value(cluster_t *cluster, nullable<float> value);
595-
attribute_t *create_max_measured_value(cluster_t *cluster, nullable<float> value);
596-
attribute_t *create_peak_measured_value(cluster_t *cluster, nullable<float> value);
597-
attribute_t *create_peak_measured_value_window(cluster_t *cluster, uint32_t value);
598-
attribute_t *create_average_measured_value(cluster_t *cluster, nullable<float> value);
599-
attribute_t *create_average_measured_value_window(cluster_t *cluster, uint32_t value);
600-
attribute_t *create_uncertainty(cluster_t *cluster, float value);
601-
attribute_t *create_measurement_unit(cluster_t *cluster, uint8_t value);
602-
attribute_t *create_measurement_medium(cluster_t *cluster, uint8_t value);
603-
attribute_t *create_level_value(cluster_t *cluster, uint8_t value);
604-
} /* attribute */
594+
namespace attribute = concentration_measurement::attribute;
605595
} /* carbon_dioxide_concentration_measurement */
606596

607597
namespace nitrogen_dioxide_concentration_measurement {
608-
namespace attribute {
609-
attribute_t *create_measured_value(cluster_t *cluster, nullable<float> value);
610-
attribute_t *create_min_measured_value(cluster_t *cluster, nullable<float> value);
611-
attribute_t *create_max_measured_value(cluster_t *cluster, nullable<float> value);
612-
attribute_t *create_peak_measured_value(cluster_t *cluster, nullable<float> value);
613-
attribute_t *create_peak_measured_value_window(cluster_t *cluster, uint32_t value);
614-
attribute_t *create_average_measured_value(cluster_t *cluster, nullable<float> value);
615-
attribute_t *create_average_measured_value_window(cluster_t *cluster, uint32_t value);
616-
attribute_t *create_uncertainty(cluster_t *cluster, float value);
617-
attribute_t *create_measurement_unit(cluster_t *cluster, uint8_t value);
618-
attribute_t *create_measurement_medium(cluster_t *cluster, uint8_t value);
619-
attribute_t *create_level_value(cluster_t *cluster, uint8_t value);
620-
} /* attribute */
598+
namespace attribute = concentration_measurement::attribute;
621599
} /* nitrogen_dioxide_concentration_measurement */
622600

623601
namespace ozone_concentration_measurement {
624-
namespace attribute {
625-
attribute_t *create_measured_value(cluster_t *cluster, nullable<float> value);
626-
attribute_t *create_min_measured_value(cluster_t *cluster, nullable<float> value);
627-
attribute_t *create_max_measured_value(cluster_t *cluster, nullable<float> value);
628-
attribute_t *create_peak_measured_value(cluster_t *cluster, nullable<float> value);
629-
attribute_t *create_peak_measured_value_window(cluster_t *cluster, uint32_t value);
630-
attribute_t *create_average_measured_value(cluster_t *cluster, nullable<float> value);
631-
attribute_t *create_average_measured_value_window(cluster_t *cluster, uint32_t value);
632-
attribute_t *create_uncertainty(cluster_t *cluster, float value);
633-
attribute_t *create_measurement_unit(cluster_t *cluster, uint8_t value);
634-
attribute_t *create_measurement_medium(cluster_t *cluster, uint8_t value);
635-
attribute_t *create_level_value(cluster_t *cluster, uint8_t value);
636-
} /* attribute */
602+
namespace attribute = concentration_measurement::attribute;
637603
} /* ozone_concentration_measurement */
638604

639605
namespace formaldehyde_concentration_measurement {
640-
namespace attribute {
641-
attribute_t *create_measured_value(cluster_t *cluster, nullable<float> value);
642-
attribute_t *create_min_measured_value(cluster_t *cluster, nullable<float> value);
643-
attribute_t *create_max_measured_value(cluster_t *cluster, nullable<float> value);
644-
attribute_t *create_peak_measured_value(cluster_t *cluster, nullable<float> value);
645-
attribute_t *create_peak_measured_value_window(cluster_t *cluster, uint32_t value);
646-
attribute_t *create_average_measured_value(cluster_t *cluster, nullable<float> value);
647-
attribute_t *create_average_measured_value_window(cluster_t *cluster, uint32_t value);
648-
attribute_t *create_uncertainty(cluster_t *cluster, float value);
649-
attribute_t *create_measurement_unit(cluster_t *cluster, uint8_t value);
650-
attribute_t *create_measurement_medium(cluster_t *cluster, uint8_t value);
651-
attribute_t *create_level_value(cluster_t *cluster, uint8_t value);
652-
} /* attribute */
606+
namespace attribute = concentration_measurement::attribute;
653607
} /* formaldehyde_concentration_measurement */
654608

655609
namespace pm1_concentration_measurement {
656-
namespace attribute {
657-
attribute_t *create_measured_value(cluster_t *cluster, nullable<float> value);
658-
attribute_t *create_min_measured_value(cluster_t *cluster, nullable<float> value);
659-
attribute_t *create_max_measured_value(cluster_t *cluster, nullable<float> value);
660-
attribute_t *create_peak_measured_value(cluster_t *cluster, nullable<float> value);
661-
attribute_t *create_peak_measured_value_window(cluster_t *cluster, uint32_t value);
662-
attribute_t *create_average_measured_value(cluster_t *cluster, nullable<float> value);
663-
attribute_t *create_average_measured_value_window(cluster_t *cluster, uint32_t value);
664-
attribute_t *create_uncertainty(cluster_t *cluster, float value);
665-
attribute_t *create_measurement_unit(cluster_t *cluster, uint8_t value);
666-
attribute_t *create_measurement_medium(cluster_t *cluster, uint8_t value);
667-
attribute_t *create_level_value(cluster_t *cluster, uint8_t value);
668-
} /* attribute */
610+
namespace attribute = concentration_measurement::attribute;
669611
} /* pm1_concentration_measurement */
670612

671613
namespace pm25_concentration_measurement {
672-
namespace attribute {
673-
attribute_t *create_measured_value(cluster_t *cluster, nullable<float> value);
674-
attribute_t *create_min_measured_value(cluster_t *cluster, nullable<float> value);
675-
attribute_t *create_max_measured_value(cluster_t *cluster, nullable<float> value);
676-
attribute_t *create_peak_measured_value(cluster_t *cluster, nullable<float> value);
677-
attribute_t *create_peak_measured_value_window(cluster_t *cluster, uint32_t value);
678-
attribute_t *create_average_measured_value(cluster_t *cluster, nullable<float> value);
679-
attribute_t *create_average_measured_value_window(cluster_t *cluster, uint32_t value);
680-
attribute_t *create_uncertainty(cluster_t *cluster, float value);
681-
attribute_t *create_measurement_unit(cluster_t *cluster, uint8_t value);
682-
attribute_t *create_measurement_medium(cluster_t *cluster, uint8_t value);
683-
attribute_t *create_level_value(cluster_t *cluster, uint8_t value);
684-
} /* attribute */
614+
namespace attribute = concentration_measurement::attribute;
685615
} /* pm25_concentration_measurement */
686616

687617
namespace pm10_concentration_measurement {
688-
namespace attribute {
689-
attribute_t *create_measured_value(cluster_t *cluster, nullable<float> value);
690-
attribute_t *create_min_measured_value(cluster_t *cluster, nullable<float> value);
691-
attribute_t *create_max_measured_value(cluster_t *cluster, nullable<float> value);
692-
attribute_t *create_peak_measured_value(cluster_t *cluster, nullable<float> value);
693-
attribute_t *create_peak_measured_value_window(cluster_t *cluster, uint32_t value);
694-
attribute_t *create_average_measured_value(cluster_t *cluster, nullable<float> value);
695-
attribute_t *create_average_measured_value_window(cluster_t *cluster, uint32_t value);
696-
attribute_t *create_uncertainty(cluster_t *cluster, float value);
697-
attribute_t *create_measurement_unit(cluster_t *cluster, uint8_t value);
698-
attribute_t *create_measurement_medium(cluster_t *cluster, uint8_t value);
699-
attribute_t *create_level_value(cluster_t *cluster, uint8_t value);
700-
} /* attribute */
618+
namespace attribute = concentration_measurement::attribute;
701619
} /* pm10_concentration_measurement */
702620

703621
namespace radon_concentration_measurement {
704-
namespace attribute {
705-
attribute_t *create_measured_value(cluster_t *cluster, nullable<float> value);
706-
attribute_t *create_min_measured_value(cluster_t *cluster, nullable<float> value);
707-
attribute_t *create_max_measured_value(cluster_t *cluster, nullable<float> value);
708-
attribute_t *create_peak_measured_value(cluster_t *cluster, nullable<float> value);
709-
attribute_t *create_peak_measured_value_window(cluster_t *cluster, uint32_t value);
710-
attribute_t *create_average_measured_value(cluster_t *cluster, nullable<float> value);
711-
attribute_t *create_average_measured_value_window(cluster_t *cluster, uint32_t value);
712-
attribute_t *create_uncertainty(cluster_t *cluster, float value);
713-
attribute_t *create_measurement_unit(cluster_t *cluster, uint8_t value);
714-
attribute_t *create_measurement_medium(cluster_t *cluster, uint8_t value);
715-
attribute_t *create_level_value(cluster_t *cluster, uint8_t value);
716-
} /* attribute */
622+
namespace attribute = concentration_measurement::attribute;
717623
} /* radon_concentration_measurement */
718624

719625
namespace total_volatile_organic_compounds_concentration_measurement {
720-
namespace attribute {
721-
attribute_t *create_measured_value(cluster_t *cluster, nullable<float> value);
722-
attribute_t *create_min_measured_value(cluster_t *cluster, nullable<float> value);
723-
attribute_t *create_max_measured_value(cluster_t *cluster, nullable<float> value);
724-
attribute_t *create_peak_measured_value(cluster_t *cluster, nullable<float> value);
725-
attribute_t *create_peak_measured_value_window(cluster_t *cluster, uint32_t value);
726-
attribute_t *create_average_measured_value(cluster_t *cluster, nullable<float> value);
727-
attribute_t *create_average_measured_value_window(cluster_t *cluster, uint32_t value);
728-
attribute_t *create_uncertainty(cluster_t *cluster, float value);
729-
attribute_t *create_measurement_unit(cluster_t *cluster, uint8_t value);
730-
attribute_t *create_measurement_medium(cluster_t *cluster, uint8_t value);
731-
attribute_t *create_level_value(cluster_t *cluster, uint8_t value);
732-
} /* attribute */
626+
namespace attribute = concentration_measurement::attribute;
733627
} /* total_volatile_organic_compounds_concentration_measurement */
734628

735629
namespace operational_state {

0 commit comments

Comments
 (0)