7
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 00:21:25 +00:00

Update a few demos

This commit is contained in:
jean-pierre charras 2021-11-01 18:36:53 +01:00
parent afb4cd8acf
commit 4fe9f01eb0
12 changed files with 1627 additions and 688 deletions

View File

@ -316,6 +316,7 @@
],
"rule_severities": {
"bus_definition_conflict": "error",
"bus_entry_needed": "error",
"bus_label_syntax": "error",
"bus_to_bus_conflict": "error",
"bus_to_net_conflict": "error",
@ -398,7 +399,7 @@
}
],
"meta": {
"version": 1
"version": 2
},
"net_colors": null
},
@ -415,6 +416,7 @@
"page_layout_descr_file": "pagelayout_logo.kicad_wks"
},
"schematic": {
"annotate_start_num": 0,
"drawing": {
"default_bus_thickness": 12.0,
"default_junction_size": 32.0,
@ -428,20 +430,24 @@
"intersheets_ref_show": false,
"intersheets_ref_suffix": "",
"junction_size_choice": 3,
"label_size_ratio": 0.1,
"pin_symbol_size": 25.0,
"text_offset_ratio": 0.1
},
"legacy_lib_dir": "",
"legacy_lib_list": [],
"meta": {
"version": 0
"version": 1
},
"net_format_name": "",
"ngspice": {
"fix_include_paths": true,
"fix_passive_vals": false,
"meta": {
"version": 0
},
"model_mode": 0
"model_mode": 0,
"workbook_filename": ""
},
"page_layout_descr_file": "",
"plot_directory": "",

View File

@ -29,6 +29,7 @@
"equivalence_files": []
},
"erc": {
"erc_exclusions": [],
"meta": {
"version": 0
},
@ -39,6 +40,7 @@
0,
0,
0,
0,
1,
0,
0,
@ -52,6 +54,7 @@
0,
1,
0,
0,
1,
0,
2,
@ -65,6 +68,7 @@
0,
0,
0,
0,
1,
0,
1,
@ -78,6 +82,7 @@
0,
0,
0,
0,
1,
1,
2,
@ -91,6 +96,7 @@
0,
0,
0,
0,
1,
0,
0,
@ -98,12 +104,27 @@
0,
2
],
[
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
2
],
[
1,
1,
1,
1,
1,
0,
1,
1,
1,
@ -117,6 +138,7 @@
0,
1,
0,
0,
1,
0,
0,
@ -130,6 +152,7 @@
1,
2,
0,
0,
1,
0,
2,
@ -143,6 +166,7 @@
0,
1,
0,
0,
1,
0,
2,
@ -156,6 +180,7 @@
1,
1,
0,
0,
1,
0,
2,
@ -174,17 +199,21 @@
2,
2,
2,
2,
2
]
],
"rule_severities": {
"bus_definition_conflict": "error",
"bus_entry_needed": "error",
"bus_label_syntax": "error",
"bus_to_bus_conflict": "error",
"bus_to_net_conflict": "error",
"different_unit_footprint": "error",
"different_unit_net": "error",
"duplicate_reference": "error",
"duplicate_sheet_names": "error",
"extra_units": "error",
"global_label_dangling": "warning",
"hier_label_mismatch": "error",
"label_dangling": "error",
@ -198,6 +227,8 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",
"wire_dangling": "error"
}
@ -231,7 +262,7 @@
}
],
"meta": {
"version": 0
"version": 2
},
"net_colors": null
},
@ -247,6 +278,7 @@
"page_layout_descr_file": ""
},
"schematic": {
"annotate_start_num": 0,
"drawing": {
"default_bus_thickness": 12.0,
"default_junction_size": 40.0,
@ -254,20 +286,31 @@
"default_text_size": 50.0,
"default_wire_thickness": 6.0,
"field_names": [],
"intersheets_ref_own_page": false,
"intersheets_ref_prefix": "",
"intersheets_ref_short": false,
"intersheets_ref_show": false,
"intersheets_ref_suffix": "",
"junction_size_choice": 3,
"label_size_ratio": 0.3,
"pin_symbol_size": 25.0,
"text_offset_ratio": 0.3
},
"legacy_lib_dir": "",
"legacy_lib_list": [],
"meta": {
"version": 0
"version": 1
},
"net_format_name": "",
"ngspice": {
"fix_include_paths": true,
"fix_passive_vals": false,
"meta": {
"version": 0
},
"model_mode": 0,
"workbook_filename": ""
},
"page_layout_descr_file": "",
"plot_directory": "",
"spice_adjust_passive_values": false,
@ -277,7 +320,7 @@
},
"sheets": [
[
"8abf6269-0a25-40f2-a0d9-47149e05857b",
"345f09c0-9aae-452d-8e25-bb6665c6b8ac",
""
]
],

View File

View File

@ -13,6 +13,7 @@
"equivalence_files": []
},
"erc": {
"erc_exclusions": [],
"meta": {
"version": 0
},
@ -23,6 +24,7 @@
0,
0,
0,
0,
1,
0,
0,
@ -36,6 +38,7 @@
0,
1,
0,
0,
1,
0,
2,
@ -49,6 +52,7 @@
0,
0,
0,
0,
1,
0,
1,
@ -62,6 +66,7 @@
0,
0,
0,
0,
1,
1,
2,
@ -75,6 +80,7 @@
0,
0,
0,
0,
1,
0,
0,
@ -82,12 +88,27 @@
0,
2
],
[
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
2
],
[
1,
1,
1,
1,
1,
0,
1,
1,
1,
@ -101,6 +122,7 @@
0,
1,
0,
0,
1,
0,
0,
@ -114,6 +136,7 @@
1,
2,
0,
0,
1,
0,
2,
@ -127,6 +150,7 @@
0,
1,
0,
0,
1,
0,
2,
@ -140,6 +164,7 @@
1,
1,
0,
0,
1,
0,
2,
@ -158,17 +183,21 @@
2,
2,
2,
2,
2
]
],
"rule_severities": {
"bus_definition_conflict": "error",
"bus_entry_needed": "error",
"bus_label_syntax": "error",
"bus_to_bus_conflict": "error",
"bus_to_net_conflict": "error",
"different_unit_footprint": "error",
"different_unit_net": "error",
"duplicate_reference": "error",
"duplicate_sheet_names": "error",
"extra_units": "error",
"global_label_dangling": "warning",
"hier_label_mismatch": "error",
"label_dangling": "error",
@ -182,6 +211,8 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",
"wire_dangling": "error"
}
@ -215,7 +246,7 @@
}
],
"meta": {
"version": 0
"version": 2
},
"net_colors": null
},
@ -231,6 +262,7 @@
"page_layout_descr_file": ""
},
"schematic": {
"annotate_start_num": 0,
"drawing": {
"default_bus_thickness": 12.0,
"default_junction_size": 40.0,
@ -238,20 +270,31 @@
"default_text_size": 50.0,
"default_wire_thickness": 6.0,
"field_names": [],
"intersheets_ref_own_page": false,
"intersheets_ref_prefix": "",
"intersheets_ref_short": false,
"intersheets_ref_show": false,
"intersheets_ref_suffix": "",
"junction_size_choice": 3,
"label_size_ratio": 0.3,
"pin_symbol_size": 25.0,
"text_offset_ratio": 0.3
},
"legacy_lib_dir": "",
"legacy_lib_list": [],
"meta": {
"version": 0
"version": 1
},
"net_format_name": "",
"ngspice": {
"fix_include_paths": true,
"fix_passive_vals": false,
"meta": {
"version": 0
},
"model_mode": 0,
"workbook_filename": ""
},
"page_layout_descr_file": "",
"plot_directory": "",
"spice_adjust_passive_values": false,
@ -261,7 +304,7 @@
},
"sheets": [
[
"f677828c-ca14-4db1-bece-cae0f95e097c",
"a4349b77-fc13-4b06-b73d-e811f055a7b6",
""
]
],

View File

LOADING design file

View File

@ -29,6 +29,7 @@
"equivalence_files": []
},
"erc": {
"erc_exclusions": [],
"meta": {
"version": 0
},
@ -39,6 +40,7 @@
0,
0,
0,
0,
1,
0,
0,
@ -52,6 +54,7 @@
0,
1,
0,
0,
1,
0,
2,
@ -65,6 +68,7 @@
0,
0,
0,
0,
1,
0,
1,
@ -78,6 +82,7 @@
0,
0,
0,
0,
1,
1,
2,
@ -91,6 +96,7 @@
0,
0,
0,
0,
1,
0,
0,
@ -98,12 +104,27 @@
0,
2
],
[
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
2
],
[
1,
1,
1,
1,
1,
0,
1,
1,
1,
@ -117,6 +138,7 @@
0,
1,
0,
0,
1,
0,
0,
@ -130,6 +152,7 @@
1,
2,
0,
0,
1,
0,
2,
@ -143,6 +166,7 @@
0,
1,
0,
0,
1,
0,
2,
@ -156,6 +180,7 @@
1,
1,
0,
0,
1,
0,
2,
@ -174,17 +199,21 @@
2,
2,
2,
2,
2
]
],
"rule_severities": {
"bus_definition_conflict": "error",
"bus_entry_needed": "error",
"bus_label_syntax": "error",
"bus_to_bus_conflict": "error",
"bus_to_net_conflict": "error",
"different_unit_footprint": "error",
"different_unit_net": "error",
"duplicate_reference": "error",
"duplicate_sheet_names": "error",
"extra_units": "error",
"global_label_dangling": "warning",
"hier_label_mismatch": "error",
"label_dangling": "error",
@ -198,6 +227,8 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",
"wire_dangling": "error"
}
@ -231,7 +262,7 @@
}
],
"meta": {
"version": 0
"version": 2
},
"net_colors": null
},
@ -247,6 +278,7 @@
"page_layout_descr_file": ""
},
"schematic": {
"annotate_start_num": 0,
"drawing": {
"default_bus_thickness": 12.0,
"default_junction_size": 40.0,
@ -254,20 +286,31 @@
"default_text_size": 50.0,
"default_wire_thickness": 6.0,
"field_names": [],
"intersheets_ref_own_page": false,
"intersheets_ref_prefix": "",
"intersheets_ref_short": false,
"intersheets_ref_show": false,
"intersheets_ref_suffix": "",
"junction_size_choice": 3,
"label_size_ratio": 0.3,
"pin_symbol_size": 25.0,
"text_offset_ratio": 0.3
},
"legacy_lib_dir": "",
"legacy_lib_list": [],
"meta": {
"version": 0
"version": 1
},
"net_format_name": "",
"ngspice": {
"fix_include_paths": true,
"fix_passive_vals": false,
"meta": {
"version": 0
},
"model_mode": 0,
"workbook_filename": ""
},
"page_layout_descr_file": "",
"plot_directory": "",
"spice_adjust_passive_values": false,
@ -277,7 +320,7 @@
},
"sheets": [
[
"44b83a72-9432-4d83-8777-cf2ffbf3b822",
"2382c413-3719-4909-9dfc-b83bba71274f",
""
]
],

View File

LOADING design file

View File

@ -299,6 +299,7 @@
],
"rule_severities": {
"bus_definition_conflict": "error",
"bus_entry_needed": "error",
"bus_label_syntax": "error",
"bus_to_bus_conflict": "error",
"bus_to_net_conflict": "error",
@ -355,7 +356,7 @@
}
],
"meta": {
"version": 1
"version": 2
},
"net_colors": null
},
@ -371,6 +372,7 @@
"page_layout_descr_file": ""
},
"schematic": {
"annotate_start_num": 0,
"drawing": {
"default_bus_thickness": 12.0,
"default_junction_size": 40.0,
@ -384,20 +386,24 @@
"intersheets_ref_show": false,
"intersheets_ref_suffix": "",
"junction_size_choice": 3,
"label_size_ratio": 0.3,
"pin_symbol_size": 25.0,
"text_offset_ratio": 0.3
},
"legacy_lib_dir": "",
"legacy_lib_list": [],
"meta": {
"version": 0
"version": 1
},
"net_format_name": "",
"ngspice": {
"fix_include_paths": true,
"fix_passive_vals": false,
"meta": {
"version": 0
},
"model_mode": 0
"model_mode": 0,
"workbook_filename": ""
},
"page_layout_descr_file": "",
"plot_directory": "",
@ -408,7 +414,7 @@
},
"sheets": [
[
"f876fb8e-239d-4024-923f-c28189413c8d",
"403a5eac-c035-4b08-8ba1-e036b0ed18fb",
""
]
],

View File

LOADING design file

View File

@ -29,6 +29,7 @@
"equivalence_files": []
},
"erc": {
"erc_exclusions": [],
"meta": {
"version": 0
},
@ -39,6 +40,7 @@
0,
0,
0,
0,
1,
0,
0,
@ -52,6 +54,7 @@
0,
1,
0,
0,
1,
0,
2,
@ -65,6 +68,7 @@
0,
0,
0,
0,
1,
0,
1,
@ -78,6 +82,7 @@
0,
0,
0,
0,
1,
1,
2,
@ -91,6 +96,7 @@
0,
0,
0,
0,
1,
0,
0,
@ -98,12 +104,27 @@
0,
2
],
[
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
2
],
[
1,
1,
1,
1,
1,
0,
1,
1,
1,
@ -117,6 +138,7 @@
0,
1,
0,
0,
1,
0,
0,
@ -130,6 +152,7 @@
1,
2,
0,
0,
1,
0,
2,
@ -143,6 +166,7 @@
0,
1,
0,
0,
1,
0,
2,
@ -156,6 +180,7 @@
1,
1,
0,
0,
1,
0,
2,
@ -174,17 +199,21 @@
2,
2,
2,
2,
2
]
],
"rule_severities": {
"bus_definition_conflict": "error",
"bus_entry_needed": "error",
"bus_label_syntax": "error",
"bus_to_bus_conflict": "error",
"bus_to_net_conflict": "error",
"different_unit_footprint": "error",
"different_unit_net": "error",
"duplicate_reference": "error",
"duplicate_sheet_names": "error",
"extra_units": "error",
"global_label_dangling": "warning",
"hier_label_mismatch": "error",
"label_dangling": "error",
@ -198,6 +227,8 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",
"wire_dangling": "error"
}
@ -231,7 +262,7 @@
}
],
"meta": {
"version": 0
"version": 2
},
"net_colors": null
},
@ -247,6 +278,7 @@
"page_layout_descr_file": ""
},
"schematic": {
"annotate_start_num": 0,
"drawing": {
"default_bus_thickness": 12.0,
"default_junction_size": 40.0,
@ -254,20 +286,31 @@
"default_text_size": 50.0,
"default_wire_thickness": 6.0,
"field_names": [],
"intersheets_ref_own_page": false,
"intersheets_ref_prefix": "",
"intersheets_ref_short": false,
"intersheets_ref_show": false,
"intersheets_ref_suffix": "",
"junction_size_choice": 3,
"label_size_ratio": 0.3,
"pin_symbol_size": 25.0,
"text_offset_ratio": 0.3
},
"legacy_lib_dir": "",
"legacy_lib_list": [],
"meta": {
"version": 0
"version": 1
},
"net_format_name": "",
"ngspice": {
"fix_include_paths": true,
"fix_passive_vals": false,
"meta": {
"version": 0
},
"model_mode": 0,
"workbook_filename": ""
},
"page_layout_descr_file": "",
"plot_directory": "",
"spice_adjust_passive_values": false,
@ -277,7 +320,7 @@
},
"sheets": [
[
"e7742228-28f4-4bb6-8fbe-92538b2432d9",
"290fe62e-4cea-473b-badf-2a76c0d280cd",
""
]
],

View File

LOADING design file

View File

@ -40,10 +40,10 @@ inline double asinh( double x )
inline double acosh( double x )
{
// must be x>=1, if not return Nan (Not a Number)
if( !(x>1.0) ) return sqrt( -1.0 );
if( x < 1.0 ) return sqrt( -1.0 );
// return only the positive result (as sqrt does).
return log( x+sqrt(x*x-1.0) );
return log( x+sqrt( x*x-1.0 ) );
}
#endif