Skip to content

Commit cafb516

Browse files
per1234per1234
authored
Merge pull request #267 from per1234/platform-pluggable-discovery
Add support for platform properties introduced for pluggable discovery
2 parents 882b13f + cc2887c commit cafb516

File tree

43 files changed

+2776
-409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2776
-409
lines changed

‎etc/schemas/arduino-boards-txt-definitions-schema.json

+70-75
Original file line numberDiff line numberDiff line change
@@ -145,29 +145,29 @@
145145
},
146146
"serial.disableRTS": {
147147
"$ref": "#/definitions/propertiesObjects/boardIDSerialDisableRTS/permissive/object"
148+
}
149+
}
150+
},
151+
{
152+
"patternProperties": {
153+
"^upload.tool(\\..+)?$": {
154+
"$ref": "#/definitions/propertiesObjects/boardIDUploadTool/permissive/object"
148155
},
149156
"upload.maximum_size": {
150157
"$ref": "#/definitions/propertiesObjects/boardIDUploadMaximumSize/permissive/object"
151158
},
152159
"upload.maximum_data_size": {
153160
"$ref": "#/definitions/propertiesObjects/boardIDUploadMaximumDataSize/permissive/object"
154161
},
155-
"upload.protocol": {
162+
"upload(\\..+)?\\.protocol": {
156163
"$ref": "#/definitions/propertiesObjects/boardIDUploadProtocol/permissive/object"
157164
},
158-
"upload.tool": {
159-
"$ref": "#/definitions/propertiesObjects/boardIDUploadTool/permissive/object"
160-
},
161-
"upload.use_1200bps_touch": {
165+
"upload(\\..+)?\\.use_1200bps_touch": {
162166
"$ref": "#/definitions/propertiesObjects/boardIDUploadUse1200bpsTouch/permissive/object"
163167
},
164-
"upload.wait_for_upload_port": {
168+
"upload(\\..+)?\\.wait_for_upload_port": {
165169
"$ref": "#/definitions/propertiesObjects/boardIDUploadWaitForUploadPort/permissive/object"
166-
}
167-
}
168-
},
169-
{
170-
"patternProperties": {
170+
},
171171
"^[vp]id\\.[0-9]+$": {
172172
"$ref": "#/definitions/propertiesObjects/boardIDXidN/permissive/object"
173173
}
@@ -210,29 +210,29 @@
210210
},
211211
"serial.disableRTS": {
212212
"$ref": "#/definitions/propertiesObjects/boardIDSerialDisableRTS/specification/object"
213+
}
214+
}
215+
},
216+
{
217+
"patternProperties": {
218+
"^upload.tool(\\..+)?$": {
219+
"$ref": "#/definitions/propertiesObjects/boardIDUploadTool/specification/object"
213220
},
214221
"upload.maximum_size": {
215222
"$ref": "#/definitions/propertiesObjects/boardIDUploadMaximumSize/specification/object"
216223
},
217224
"upload.maximum_data_size": {
218225
"$ref": "#/definitions/propertiesObjects/boardIDUploadMaximumDataSize/specification/object"
219226
},
220-
"upload.protocol": {
227+
"upload(\\..+)?\\.protocol": {
221228
"$ref": "#/definitions/propertiesObjects/boardIDUploadProtocol/specification/object"
222229
},
223-
"upload.tool": {
224-
"$ref": "#/definitions/propertiesObjects/boardIDUploadTool/specification/object"
225-
},
226-
"upload.use_1200bps_touch": {
230+
"upload(\\..+)?\\.use_1200bps_touch": {
227231
"$ref": "#/definitions/propertiesObjects/boardIDUploadUse1200bpsTouch/specification/object"
228232
},
229-
"upload.wait_for_upload_port": {
233+
"upload(\\..+)?\\.wait_for_upload_port": {
230234
"$ref": "#/definitions/propertiesObjects/boardIDUploadWaitForUploadPort/specification/object"
231-
}
232-
}
233-
},
234-
{
235-
"patternProperties": {
235+
},
236236
"^[vp]id\\.[0-9]+$": {
237237
"$ref": "#/definitions/propertiesObjects/boardIDXidN/specification/object"
238238
}
@@ -275,29 +275,29 @@
275275
},
276276
"serial.disableRTS": {
277277
"$ref": "#/definitions/propertiesObjects/boardIDSerialDisableRTS/strict/object"
278+
}
279+
}
280+
},
281+
{
282+
"patternProperties": {
283+
"^upload.tool(\\..+)?$": {
284+
"$ref": "#/definitions/propertiesObjects/boardIDUploadTool/strict/object"
278285
},
279286
"upload.maximum_size": {
280287
"$ref": "#/definitions/propertiesObjects/boardIDUploadMaximumSize/strict/object"
281288
},
282289
"upload.maximum_data_size": {
283290
"$ref": "#/definitions/propertiesObjects/boardIDUploadMaximumDataSize/strict/object"
284291
},
285-
"upload.protocol": {
292+
"upload(\\..+)?\\.protocol": {
286293
"$ref": "#/definitions/propertiesObjects/boardIDUploadProtocol/strict/object"
287294
},
288-
"upload.tool": {
289-
"$ref": "#/definitions/propertiesObjects/boardIDUploadTool/strict/object"
290-
},
291-
"upload.use_1200bps_touch": {
295+
"upload(\\..+)?\\.use_1200bps_touch": {
292296
"$ref": "#/definitions/propertiesObjects/boardIDUploadUse1200bpsTouch/strict/object"
293297
},
294-
"upload.wait_for_upload_port": {
298+
"upload(\\..+)?\\.wait_for_upload_port": {
295299
"$ref": "#/definitions/propertiesObjects/boardIDUploadWaitForUploadPort/strict/object"
296-
}
297-
}
298-
},
299-
{
300-
"patternProperties": {
300+
},
301301
"^[vp]id\\.[0-9]+$": {
302302
"$ref": "#/definitions/propertiesObjects/boardIDXidN/strict/object"
303303
}
@@ -624,29 +624,29 @@
624624
},
625625
"serial.disableRTS": {
626626
"$ref": "#/definitions/propertiesObjects/boardIDSerialDisableRTS/permissive/object"
627+
}
628+
}
629+
},
630+
{
631+
"patternProperties": {
632+
"^upload.tool(\\..+)?$": {
633+
"$ref": "#/definitions/propertiesObjects/boardIDUploadTool/permissive/object"
627634
},
628635
"upload.maximum_size": {
629636
"$ref": "#/definitions/propertiesObjects/boardIDUploadMaximumSize/permissive/object"
630637
},
631638
"upload.maximum_data_size": {
632639
"$ref": "#/definitions/propertiesObjects/boardIDUploadMaximumDataSize/permissive/object"
633640
},
634-
"upload.protocol": {
641+
"upload(\\..+)?\\.protocol": {
635642
"$ref": "#/definitions/propertiesObjects/boardIDUploadProtocol/permissive/object"
636643
},
637-
"upload.tool": {
638-
"$ref": "#/definitions/propertiesObjects/boardIDUploadTool/permissive/object"
639-
},
640-
"upload.use_1200bps_touch": {
644+
"upload(\\..+)?\\.use_1200bps_touch": {
641645
"$ref": "#/definitions/propertiesObjects/boardIDUploadUse1200bpsTouch/permissive/object"
642646
},
643-
"upload.wait_for_upload_port": {
647+
"upload(\\..+)?\\.wait_for_upload_port": {
644648
"$ref": "#/definitions/propertiesObjects/boardIDUploadWaitForUploadPort/permissive/object"
645-
}
646-
}
647-
},
648-
{
649-
"patternProperties": {
649+
},
650650
"^[vp]id\\.[0-9]+$": {
651651
"$ref": "#/definitions/propertiesObjects/boardIDXidN/permissive/object"
652652
}
@@ -677,29 +677,29 @@
677677
},
678678
"serial.disableRTS": {
679679
"$ref": "#/definitions/propertiesObjects/boardIDSerialDisableRTS/specification/object"
680+
}
681+
}
682+
},
683+
{
684+
"patternProperties": {
685+
"^upload.tool(\\..+)?$": {
686+
"$ref": "#/definitions/propertiesObjects/boardIDUploadTool/specification/object"
680687
},
681688
"upload.maximum_size": {
682689
"$ref": "#/definitions/propertiesObjects/boardIDUploadMaximumSize/specification/object"
683690
},
684691
"upload.maximum_data_size": {
685692
"$ref": "#/definitions/propertiesObjects/boardIDUploadMaximumDataSize/specification/object"
686693
},
687-
"upload.protocol": {
694+
"upload(\\..+)?\\.protocol": {
688695
"$ref": "#/definitions/propertiesObjects/boardIDUploadProtocol/specification/object"
689696
},
690-
"upload.tool": {
691-
"$ref": "#/definitions/propertiesObjects/boardIDUploadTool/specification/object"
692-
},
693-
"upload.use_1200bps_touch": {
697+
"upload(\\..+)?\\.use_1200bps_touch": {
694698
"$ref": "#/definitions/propertiesObjects/boardIDUploadUse1200bpsTouch/specification/object"
695699
},
696-
"upload.wait_for_upload_port": {
700+
"upload(\\..+)?\\.wait_for_upload_port": {
697701
"$ref": "#/definitions/propertiesObjects/boardIDUploadWaitForUploadPort/specification/object"
698-
}
699-
}
700-
},
701-
{
702-
"patternProperties": {
702+
},
703703
"^[vp]id\\.[0-9]+$": {
704704
"$ref": "#/definitions/propertiesObjects/boardIDXidN/specification/object"
705705
}
@@ -730,29 +730,29 @@
730730
},
731731
"serial.disableRTS": {
732732
"$ref": "#/definitions/propertiesObjects/boardIDSerialDisableRTS/strict/object"
733+
}
734+
}
735+
},
736+
{
737+
"patternProperties": {
738+
"^upload.tool(\\..+)?$": {
739+
"$ref": "#/definitions/propertiesObjects/boardIDUploadTool/strict/object"
733740
},
734741
"upload.maximum_size": {
735742
"$ref": "#/definitions/propertiesObjects/boardIDUploadMaximumSize/strict/object"
736743
},
737744
"upload.maximum_data_size": {
738745
"$ref": "#/definitions/propertiesObjects/boardIDUploadMaximumDataSize/strict/object"
739746
},
740-
"upload.protocol": {
747+
"upload(\\..+)?\\.protocol": {
741748
"$ref": "#/definitions/propertiesObjects/boardIDUploadProtocol/strict/object"
742749
},
743-
"upload.tool": {
744-
"$ref": "#/definitions/propertiesObjects/boardIDUploadTool/strict/object"
745-
},
746-
"upload.use_1200bps_touch": {
750+
"upload(\\..+)?\\.use_1200bps_touch": {
747751
"$ref": "#/definitions/propertiesObjects/boardIDUploadUse1200bpsTouch/strict/object"
748752
},
749-
"upload.wait_for_upload_port": {
753+
"upload(\\..+)?\\.wait_for_upload_port": {
750754
"$ref": "#/definitions/propertiesObjects/boardIDUploadWaitForUploadPort/strict/object"
751-
}
752-
}
753-
},
754-
{
755-
"patternProperties": {
755+
},
756756
"^[vp]id\\.[0-9]+$": {
757757
"$ref": "#/definitions/propertiesObjects/boardIDXidN/strict/object"
758758
}
@@ -773,7 +773,7 @@
773773
"type": "string"
774774
},
775775
{
776-
"$ref": "#/definitions/enumObjects/booleanString"
776+
"$ref": "general-definitions-schema.json#/definitions/enumObjects/booleanString"
777777
}
778778
]
779779
}
@@ -814,7 +814,7 @@
814814
"type": "string"
815815
},
816816
{
817-
"$ref": "#/definitions/enumObjects/booleanString"
817+
"$ref": "general-definitions-schema.json#/definitions/enumObjects/booleanString"
818818
}
819819
]
820820
}
@@ -1016,7 +1016,7 @@
10161016
"type": "string"
10171017
},
10181018
{
1019-
"$ref": "#/definitions/enumObjects/booleanString"
1019+
"$ref": "general-definitions-schema.json#/definitions/enumObjects/booleanString"
10201020
}
10211021
]
10221022
}
@@ -1057,7 +1057,7 @@
10571057
"type": "string"
10581058
},
10591059
{
1060-
"$ref": "#/definitions/enumObjects/booleanString"
1060+
"$ref": "general-definitions-schema.json#/definitions/enumObjects/booleanString"
10611061
}
10621062
]
10631063
}
@@ -1215,11 +1215,6 @@
12151215
}
12161216
}
12171217
}
1218-
},
1219-
"enumObjects": {
1220-
"booleanString": {
1221-
"enum": ["true", "false"]
1222-
}
12231218
}
12241219
}
12251220
}

0 commit comments

Comments
 (0)