haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add $schema prop to drc/erc

This commit is contained in:
Marek Roszko 2024-02-13 19:03:22 -05:00
parent 7e89d9dee2
commit f73d45b0cf
5 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eeschema/erc_report.cpp
View File

@ -115,6 +115,7 @@ bool ERC_REPORT::WriteJsonReport( const wxString& aFullFileName )
RC_JSON::ERC_REPORT reportHead; RC_JSON::ERC_REPORT reportHead;
wxFileName fn( m_sch->GetFileName() ); wxFileName fn( m_sch->GetFileName() );
reportHead.$schema = "https://schemas.kicad.org/erc.v1.json";
reportHead.source = fn.GetFullName(); reportHead.source = fn.GetFullName();
reportHead.date = GetISO8601CurrentDateTime(); reportHead.date = GetISO8601CurrentDateTime();
reportHead.kicad_version = GetMajorMinorPatchVersion(); reportHead.kicad_version = GetMajorMinorPatchVersion();

5
include/rc_json_schema.h
View File

@ -78,6 +78,7 @@ inline void from_json( const nlohmann::json& aJson, VIOLATION& aViolation )
struct REPORT_BASE struct REPORT_BASE
{ {
wxString $schema;
wxString source; wxString source;
wxString date; wxString date;
wxString kicad_version; wxString kicad_version;
@ -94,7 +95,7 @@ struct DRC_REPORT : REPORT_BASE
std::vector<VIOLATION> schematic_parity; std::vector<VIOLATION> schematic_parity;
}; };
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE( DRC_REPORT, source, date, kicad_version, violations, NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE( DRC_REPORT, $schema, source, date, kicad_version, violations,
unconnected_items, schematic_parity, coordinate_units ) unconnected_items, schematic_parity, coordinate_units )
struct ERC_SHEET struct ERC_SHEET
@ -113,7 +114,7 @@ struct ERC_REPORT : REPORT_BASE
std::vector<ERC_SHEET> sheets; std::vector<ERC_SHEET> sheets;
}; };
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE( ERC_REPORT, source, date, kicad_version, sheets, NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE( ERC_REPORT, $schema, source, date, kicad_version, sheets,
coordinate_units ) coordinate_units )
} // namespace RC_JSON } // namespace RC_JSON

1
pcbnew/drc/drc_report.cpp
View File

@ -123,6 +123,7 @@ bool DRC_REPORT::WriteJsonReport( const wxString& aFullFileName )
RC_JSON::DRC_REPORT reportHead; RC_JSON::DRC_REPORT reportHead;
wxFileName fn( m_board->GetFileName() ); wxFileName fn( m_board->GetFileName() );
reportHead.$schema = "https://schemas.kicad.org/drc.v1.json";
reportHead.source = fn.GetFullName(); reportHead.source = fn.GetFullName();
reportHead.date = GetISO8601CurrentDateTime(); reportHead.date = GetISO8601CurrentDateTime();
reportHead.kicad_version = GetMajorMinorPatchVersion(); reportHead.kicad_version = GetMajorMinorPatchVersion();

4
resources/schemas/drc.v1.json
View File

@ -6,6 +6,10 @@
"type": "object", "type": "object",
"additionalProperties": false, "additionalProperties": false,
"properties": { "properties": {
"$schema": {
"type": "string",
"description": "JSON schema reference"
},
"source": { "source": {
"type": "string", "type": "string",
"description": "Source file path" "description": "Source file path"

4
resources/schemas/erc.v1.json
View File

@ -6,6 +6,10 @@
"type": "object", "type": "object",
"additionalProperties": false, "additionalProperties": false,
"properties": { "properties": {
"$schema": {
"type": "string",
"description": "JSON schema reference"
},
"source": { "source": {
"type": "string", "type": "string",
"description": "Source file path" "description": "Source file path"