wirenboard / wb-mqtt-serial / 2

Committed 29 Dec 2025 12:28PM UTC coverage: 76.817% (+4.0%) from 72.836%

Build # 2

Build Type

Pull #1045

github

Specific Base 54aa0c

Committed by

pgasheev

Commit Message

up changelog

Pull Request Pull Request #1045: Fix firmware version in WB-M1W2 template

Run Details

6873 of 9161 branches covered (75.02%)

12966 of 16879 relevant lines covered (76.82%)

1651.61 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

15.38

/src/confed_schema_generator.cpp

#include "confed_schema_generator.h"

#include <wblib/wbmqtt.h>

#include "json_common.h"

namespace
{
    //  {
    //      "type": "string",
    //      "enum": [ VALUE ],
    //      "default": VALUE,
    //      "options": { "hidden": true }
    //  }
    Json::Value MakeHiddenProperty(const std::string& value)
    {
        Json::Value res;
        res["type"] = "string";
        res["default"] = value;
        MakeArray("enum", res).append(value);
        res["options"]["hidden"] = true;
        return res;
    }

    //  {
    //      "properties": {
    //          "protocol": {
    //              "type": "string",
    //              "options": {
    //                  "hidden": true
    //              }
    //          }
    //      }
    //  }
    Json::Value MakeProtocolProperty()
    {
        Json::Value r;
        r["properties"]["protocol"]["type"] = "string";
        r["properties"]["protocol"]["options"]["hidden"] = true;
        return r;
    }

    //  {
    //      "allOf": [
    //          { "$ref": PROTOCOL_PARAMETERS }
    //      ],
    //      "format": "groups",
    //      "device": DEVICE_TEMPLATE,
    //      "properties": {
    //          "device_type": DEVICE_TYPE
    //      },
    //      "required": ["device_type", "slave_id"]
    //  }
    Json::Value MakeDeviceWithGroupsTemplateSchema(TDeviceTemplate& deviceTemplate,
                                                   TSerialDeviceFactory& deviceFactory,
                                                   const Json::Value& commonDeviceSchema)
    {
        auto protocol = GetProtocolName(deviceTemplate.GetTemplate());
        auto res = commonDeviceSchema;
        if (!deviceFactory.GetProtocol(protocol)->SupportsBroadcast()) {
            res["required"].append("slave_id");
        }

        auto& allOf = MakeArray("allOf", res);
        Append(allOf)["$ref"] = deviceFactory.GetCommonDeviceSchemaRef(protocol);
        allOf.append(MakeProtocolProperty());

        res["format"] = "groups";
        res["device"] = deviceTemplate.GetTemplate();
        res["properties"]["device_type"] = MakeHiddenProperty(deviceTemplate.Type);
        return res;
    }

}

void AddUnitTypes(Json::Value& schema)
{
    auto& values = MakeArray("enum_values", schema["definitions"]["units"]["options"]);
    for (const auto& unit: WBMQTT::TControl::GetUnitTypes()) {
        values.append(unit);
    }
}

void AddTranslations(Json::Value& translations, const Json::Value& deviceSchema)
{
    const auto& tr = deviceSchema["translations"];
    for (auto it = tr.begin(); it != tr.end(); ++it) {
        for (auto msgIt = it->begin(); msgIt != it->end(); ++msgIt) {
            translations[it.name()][msgIt.name()] = *msgIt;
        }
    }
}

Json::Value GenerateSchemaForConfed(TDeviceTemplate& deviceTemplate,
                                    TSerialDeviceFactory& deviceFactory,
                                    const Json::Value& commonDeviceSchema)
{
    auto schema = deviceTemplate.WithSubdevices()
                      ? Json::Value(Json::objectValue)
                      : MakeDeviceWithGroupsTemplateSchema(deviceTemplate, deviceFactory, commonDeviceSchema);
    AddUnitTypes(schema);
    return schema;
}

1	#include "confed_schema_generator.h"
2
3	#include <wblib/wbmqtt.h>
4
5	#include "json_common.h"
6
7	namespace
8	{
9	// {
10	// "type": "string",
11	// "enum": [ VALUE ],
12	// "default": VALUE,
13	// "options": { "hidden": true }
14	// }
15	Json::Value MakeHiddenProperty(const std::string& value)	×
16	{
17	Json::Value res;	×
18	res["type"] = "string";	×
19	res["default"] = value;	×
20	MakeArray("enum", res).append(value);	×
21	res["options"]["hidden"] = true;	×
22	return res;	×
23	}
24
25	// {
26	// "properties": {
27	// "protocol": {
28	// "type": "string",
29	// "options": {
30	// "hidden": true
31	// }
32	// }
33	// }
34	// }
35	Json::Value MakeProtocolProperty()	×
36	{
37	Json::Value r;	×
38	r["properties"]["protocol"]["type"] = "string";	×
39	r["properties"]["protocol"]["options"]["hidden"] = true;	×
40	return r;	×
41	}
42
43	// {
44	// "allOf": [
45	// { "$ref": PROTOCOL_PARAMETERS }
46	// ],
47	// "format": "groups",
48	// "device": DEVICE_TEMPLATE,
49	// "properties": {
50	// "device_type": DEVICE_TYPE
51	// },
52	// "required": ["device_type", "slave_id"]
53	// }
54	Json::Value MakeDeviceWithGroupsTemplateSchema(TDeviceTemplate& deviceTemplate,	×
55	TSerialDeviceFactory& deviceFactory,
56	const Json::Value& commonDeviceSchema)
57	{
58	auto protocol = GetProtocolName(deviceTemplate.GetTemplate());	×
59	auto res = commonDeviceSchema;	×
60	if (!deviceFactory.GetProtocol(protocol)->SupportsBroadcast()) {	×
61	res["required"].append("slave_id");	×
62	}
63
64	auto& allOf = MakeArray("allOf", res);	×
65	Append(allOf)["$ref"] = deviceFactory.GetCommonDeviceSchemaRef(protocol);	×
66	allOf.append(MakeProtocolProperty());	×
67
68	res["format"] = "groups";	×
69	res["device"] = deviceTemplate.GetTemplate();	×
70	res["properties"]["device_type"] = MakeHiddenProperty(deviceTemplate.Type);	×
71	return res;	×
72	}
73
74	}
75
76	void AddUnitTypes(Json::Value& schema)	×
77	{
78	auto& values = MakeArray("enum_values", schema["definitions"]["units"]["options"]);	×
79	for (const auto& unit: WBMQTT::TControl::GetUnitTypes()) {	×
80	values.append(unit);	×
81	}
82	}
83
84	void AddTranslations(Json::Value& translations, const Json::Value& deviceSchema)	118✔
85	{
86	const auto& tr = deviceSchema["translations"];	118✔
87	for (auto it = tr.begin(); it != tr.end(); ++it) {	354✔
88	for (auto msgIt = it->begin(); msgIt != it->end(); ++msgIt) {	19,588✔
89	translations[it.name()][msgIt.name()] = *msgIt;	19,352✔
90	}
91	}
92	}	118✔
93
94	Json::Value GenerateSchemaForConfed(TDeviceTemplate& deviceTemplate,	×
95	TSerialDeviceFactory& deviceFactory,
96	const Json::Value& commonDeviceSchema)
97	{
98	auto schema = deviceTemplate.WithSubdevices()	×
99	? Json::Value(Json::objectValue)
100	: MakeDeviceWithGroupsTemplateSchema(deviceTemplate, deviceFactory, commonDeviceSchema);	×
101	AddUnitTypes(schema);	×
102	return schema;	×
103	}

wirenboard / wb-mqtt-serial / 2

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous