Browse Source

Lots of schematics changes.

Mathias Gottschlag 4 years ago
parent
commit
6d0dc28755

+ 27977
- 45424
hardware/base/base.kicad_pcb
File diff suppressed because it is too large
View File


+ 2
- 10
hardware/base/base.kicad_pro View File

357
     "pinned_symbol_libs": []
357
     "pinned_symbol_libs": []
358
   },
358
   },
359
   "meta": {
359
   "meta": {
360
-    "filename": "hackamp.kicad_pro",
360
+    "filename": "base.kicad_pro",
361
     "version": 1
361
     "version": 1
362
   },
362
   },
363
   "net_settings": {
363
   "net_settings": {
381
       }
381
       }
382
     ],
382
     ],
383
     "meta": {
383
     "meta": {
384
-      "version": 1
384
+      "version": 2
385
     },
385
     },
386
     "net_colors": null
386
     "net_colors": null
387
   },
387
   },
442
       "d50443f1-be1e-4114-bf48-a344401d3302",
442
       "d50443f1-be1e-4114-bf48-a344401d3302",
443
       ""
443
       ""
444
     ],
444
     ],
445
-    [
446
-      "00000000-0000-0000-0000-00005fa5bced",
447
-      "Speaker Amplifier"
448
-    ],
449
     [
445
     [
450
       "00000000-0000-0000-0000-00005fa5bd36",
446
       "00000000-0000-0000-0000-00005fa5bd36",
451
       "Headphone Amplifier"
447
       "Headphone Amplifier"
458
       "00000000-0000-0000-0000-00005fa5bd7a",
454
       "00000000-0000-0000-0000-00005fa5bd7a",
459
       "Processor"
455
       "Processor"
460
     ],
456
     ],
461
-    [
462
-      "00000000-0000-0000-0000-00005fa5bdb1",
463
-      "Bluetooth"
464
-    ],
465
     [
457
     [
466
       "00000000-0000-0000-0000-00005fb71226",
458
       "00000000-0000-0000-0000-00005fb71226",
467
       "Front"
459
       "Front"

+ 375
- 1228
hardware/base/base.kicad_sch
File diff suppressed because it is too large
View File


+ 1
- 0
hardware/base/fp-lib-table View File

1
 (fp_lib_table
1
 (fp_lib_table
2
   (lib (name "HackAmp-Footprints")(type "KiCad")(uri "${KIPRJMOD}/HackAmp-Footprints.pretty")(options "")(descr ""))
2
   (lib (name "HackAmp-Footprints")(type "KiCad")(uri "${KIPRJMOD}/HackAmp-Footprints.pretty")(options "")(descr ""))
3
+  (lib (name "MCU_RaspberryPi_and_Boards")(type "KiCad")(uri "${KIPRJMOD}/../../3rdparty/RP_Silicon_KiCad/KiCadLibraries/MCU_RaspberryPi_and_Boards.pretty")(options "")(descr ""))
3
 )
4
 )

+ 132
- 1811
hardware/base/front.kicad_sch
File diff suppressed because it is too large
View File


+ 1979
- 171
hardware/base/headphone-amp.kicad_sch
File diff suppressed because it is too large
View File


+ 1790
- 2844
hardware/base/processor.kicad_sch
File diff suppressed because it is too large
View File


+ 1
- 0
hardware/base/sym-lib-table View File

1
 (sym_lib_table
1
 (sym_lib_table
2
   (lib (name "HackAmp-Symbols")(type "KiCad")(uri "${KIPRJMOD}/HackAmp-Symbols.kicad_sym")(options "")(descr ""))
2
   (lib (name "HackAmp-Symbols")(type "KiCad")(uri "${KIPRJMOD}/HackAmp-Symbols.kicad_sym")(options "")(descr ""))
3
+  (lib (name "MCU_RaspberryPi_and_Boards")(type "Legacy")(uri "${KIPRJMOD}/../../3rdparty/RP_Silicon_KiCad/KiCadLibraries/MCU_RaspberryPi_and_Boards.lib")(options "")(descr ""))
3
 )
4
 )

+ 2115
- 11129
hardware/frontpanel/frontpanel.kicad_pcb
File diff suppressed because it is too large
View File


+ 47
- 8
hardware/frontpanel/frontpanel.kicad_pro View File

57
       ],
57
       ],
58
       "drc_exclusions": [],
58
       "drc_exclusions": [],
59
       "meta": {
59
       "meta": {
60
-        "version": 1
60
+        "version": 2
61
       },
61
       },
62
       "rule_severities": {
62
       "rule_severities": {
63
         "annular_width": "error",
63
         "annular_width": "error",
112
         "min_track_width": 0.19999999999999998,
112
         "min_track_width": 0.19999999999999998,
113
         "min_via_annular_width": 0.049999999999999996,
113
         "min_via_annular_width": 0.049999999999999996,
114
         "min_via_diameter": 0.39999999999999997,
114
         "min_via_diameter": 0.39999999999999997,
115
-        "solder_mask_clearance": 0.0,
116
-        "solder_mask_min_width": 0.0,
117
-        "solder_paste_clearance": 0.0,
118
-        "solder_paste_margin_ratio": -0.0
115
+        "use_height_for_length_calcs": true
119
       },
116
       },
120
       "track_widths": [
117
       "track_widths": [
121
         0.0,
118
         0.0,
149
         0,
146
         0,
150
         0,
147
         0,
151
         0,
148
         0,
149
+        0,
152
         1,
150
         1,
153
         0,
151
         0,
154
         0,
152
         0,
162
         0,
160
         0,
163
         1,
161
         1,
164
         0,
162
         0,
163
+        0,
165
         1,
164
         1,
166
         0,
165
         0,
167
         2,
166
         2,
175
         0,
174
         0,
176
         0,
175
         0,
177
         0,
176
         0,
177
+        0,
178
         1,
178
         1,
179
         0,
179
         0,
180
         1,
180
         1,
188
         0,
188
         0,
189
         0,
189
         0,
190
         0,
190
         0,
191
+        0,
191
         1,
192
         1,
192
         1,
193
         1,
193
         2,
194
         2,
201
         0,
202
         0,
202
         0,
203
         0,
203
         0,
204
         0,
205
+        0,
204
         1,
206
         1,
205
         0,
207
         0,
206
         0,
208
         0,
208
         0,
210
         0,
209
         2
211
         2
210
       ],
212
       ],
213
+      [
214
+        0,
215
+        0,
216
+        0,
217
+        0,
218
+        0,
219
+        0,
220
+        0,
221
+        0,
222
+        0,
223
+        0,
224
+        0,
225
+        2
226
+      ],
211
       [
227
       [
212
         1,
228
         1,
213
         1,
229
         1,
214
         1,
230
         1,
215
         1,
231
         1,
216
         1,
232
         1,
233
+        0,
217
         1,
234
         1,
218
         1,
235
         1,
219
         1,
236
         1,
227
         0,
244
         0,
228
         1,
245
         1,
229
         0,
246
         0,
247
+        0,
230
         1,
248
         1,
231
         0,
249
         0,
232
         0,
250
         0,
240
         1,
258
         1,
241
         2,
259
         2,
242
         0,
260
         0,
261
+        0,
243
         1,
262
         1,
244
         0,
263
         0,
245
         2,
264
         2,
253
         0,
272
         0,
254
         1,
273
         1,
255
         0,
274
         0,
275
+        0,
256
         1,
276
         1,
257
         0,
277
         0,
258
         2,
278
         2,
266
         1,
286
         1,
267
         1,
287
         1,
268
         0,
288
         0,
289
+        0,
269
         1,
290
         1,
270
         0,
291
         0,
271
         2,
292
         2,
284
         2,
305
         2,
285
         2,
306
         2,
286
         2,
307
         2,
308
+        2,
287
         2
309
         2
288
       ]
310
       ]
289
     ],
311
     ],
290
     "rule_severities": {
312
     "rule_severities": {
291
       "bus_definition_conflict": "error",
313
       "bus_definition_conflict": "error",
314
+      "bus_entry_needed": "error",
292
       "bus_label_syntax": "error",
315
       "bus_label_syntax": "error",
293
       "bus_to_bus_conflict": "error",
316
       "bus_to_bus_conflict": "error",
294
       "bus_to_net_conflict": "error",
317
       "bus_to_net_conflict": "error",
295
       "different_unit_footprint": "error",
318
       "different_unit_footprint": "error",
296
       "different_unit_net": "error",
319
       "different_unit_net": "error",
320
+      "duplicate_reference": "error",
297
       "duplicate_sheet_names": "error",
321
       "duplicate_sheet_names": "error",
322
+      "extra_units": "error",
298
       "global_label_dangling": "warning",
323
       "global_label_dangling": "warning",
299
       "hier_label_mismatch": "error",
324
       "hier_label_mismatch": "error",
300
       "label_dangling": "error",
325
       "label_dangling": "error",
308
       "pin_to_pin": "warning",
333
       "pin_to_pin": "warning",
309
       "power_pin_not_driven": "error",
334
       "power_pin_not_driven": "error",
310
       "similar_labels": "warning",
335
       "similar_labels": "warning",
336
+      "unannotated": "error",
337
+      "unit_value_mismatch": "error",
311
       "unresolved_variable": "error",
338
       "unresolved_variable": "error",
312
       "wire_dangling": "error"
339
       "wire_dangling": "error"
313
     }
340
     }
341
       }
368
       }
342
     ],
369
     ],
343
     "meta": {
370
     "meta": {
344
-      "version": 0
371
+      "version": 2
345
     },
372
     },
346
     "net_colors": null
373
     "net_colors": null
347
   },
374
   },
357
     "page_layout_descr_file": ""
384
     "page_layout_descr_file": ""
358
   },
385
   },
359
   "schematic": {
386
   "schematic": {
387
+    "annotate_start_num": 0,
360
     "drawing": {
388
     "drawing": {
361
       "default_bus_thickness": 12.0,
389
       "default_bus_thickness": 12.0,
362
       "default_junction_size": 40.0,
390
       "default_junction_size": 40.0,
364
       "default_text_size": 50.0,
392
       "default_text_size": 50.0,
365
       "default_wire_thickness": 6.0,
393
       "default_wire_thickness": 6.0,
366
       "field_names": [],
394
       "field_names": [],
395
+      "intersheets_ref_own_page": false,
367
       "intersheets_ref_prefix": "",
396
       "intersheets_ref_prefix": "",
368
       "intersheets_ref_short": false,
397
       "intersheets_ref_short": false,
369
       "intersheets_ref_show": false,
398
       "intersheets_ref_show": false,
370
       "intersheets_ref_suffix": "",
399
       "intersheets_ref_suffix": "",
371
       "junction_size_choice": 3,
400
       "junction_size_choice": 3,
401
+      "label_size_ratio": 0.3,
372
       "pin_symbol_size": 25.0,
402
       "pin_symbol_size": 25.0,
373
       "text_offset_ratio": 0.3
403
       "text_offset_ratio": 0.3
374
     },
404
     },
375
     "legacy_lib_dir": "",
405
     "legacy_lib_dir": "",
376
     "legacy_lib_list": [],
406
     "legacy_lib_list": [],
377
     "meta": {
407
     "meta": {
378
-      "version": 0
408
+      "version": 1
379
     },
409
     },
380
     "net_format_name": "",
410
     "net_format_name": "",
411
+    "ngspice": {
412
+      "fix_include_paths": true,
413
+      "fix_passive_vals": false,
414
+      "meta": {
415
+        "version": 0
416
+      },
417
+      "model_mode": 0,
418
+      "workbook_filename": ""
419
+    },
381
     "page_layout_descr_file": "",
420
     "page_layout_descr_file": "",
382
     "plot_directory": "",
421
     "plot_directory": "",
383
     "spice_adjust_passive_values": false,
422
     "spice_adjust_passive_values": false,
387
   },
426
   },
388
   "sheets": [
427
   "sheets": [
389
     [
428
     [
390
-      "3dc5306a-e1b9-4f95-bde0-3d7cf23e0f0a",
429
+      "636f54ba-fb14-4e7d-a99e-fc516a258ec4",
391
       ""
430
       ""
392
     ]
431
     ]
393
   ],
432
   ],

+ 129
- 1538
hardware/frontpanel/frontpanel.kicad_sch
File diff suppressed because it is too large
View File


+ 2
- 2
hardware/speakers/speakers.kicad_pro View File

349
     "pinned_symbol_libs": []
349
     "pinned_symbol_libs": []
350
   },
350
   },
351
   "meta": {
351
   "meta": {
352
-    "filename": "tas5760m-amp-module.kicad_pro",
352
+    "filename": "speakers.kicad_pro",
353
     "version": 1
353
     "version": 1
354
   },
354
   },
355
   "net_settings": {
355
   "net_settings": {
373
       }
373
       }
374
     ],
374
     ],
375
     "meta": {
375
     "meta": {
376
-      "version": 1
376
+      "version": 2
377
     },
377
     },
378
     "net_colors": null
378
     "net_colors": null
379
   },
379
   },

Loading…
Cancel
Save