[Cryptech-Commits] [user/ft/alpha_to_kicad] 10/15: Merge branch 'master' into ft-add_components

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

fredrik at thulin.net pushed a commit to branch master
in repository user/ft/alpha_to_kicad.

commit c8553cafe3337aff39db6d415fa42daca170db57
Merge: 23f5296 0951574
Author: Fredrik Thulin <fredrik at thulin.net>
AuthorDate: Wed May 9 11:14:43 2018 +0200

    Merge branch 'master' into ft-add_components

 .gitignore                     |   3 +
 Cryptech Alpha.pro.template    |   9 +-
 Cryptech Alpha.sch.template    |  34 +-----
 convert.sh                     |   6 +-
 rev03-KiCad/Cryptech Alpha.pro |  33 ------
 rev03-KiCad/Cryptech Alpha.sch | 262 -----------------------------------------
 rev03-KiCad/rev02_00.sch       |  35 +-----
 rev03-KiCad/rev02_01.sch       | 135 +++++++++------------
 rev03-KiCad/rev02_02.sch       |  77 ++++--------
 rev03-KiCad/rev02_03.sch       |  89 +++++---------
 rev03-KiCad/rev02_04.sch       | 109 +++++++----------
 rev03-KiCad/rev02_05.sch       |  37 +-----
 rev03-KiCad/rev02_06.sch       | 101 ++++++----------
 rev03-KiCad/rev02_07.sch       |  47 ++------
 rev03-KiCad/rev02_08.sch       |  59 +++-------
 rev03-KiCad/rev02_09.sch       | 141 +++++++++-------------
 rev03-KiCad/rev02_10.sch       | 141 +++++++++-------------
 rev03-KiCad/rev02_11.sch       | 101 ++++++----------
 rev03-KiCad/rev02_12.sch       |  75 ++++--------
 rev03-KiCad/rev02_13.sch       |  97 ++++++---------
 rev03-KiCad/rev02_14.sch       |  53 ++-------
 rev03-KiCad/rev02_15.sch       |  85 +++++--------
 rev03-KiCad/rev02_16.sch       |  41 +------
 rev03-KiCad/rev02_17.sch       |  41 +------
 rev03-KiCad/rev02_18.sch       | 113 +++++++-----------
 rev03-KiCad/rev02_19.sch       |  79 ++++---------
 rev03-KiCad/rev02_20.sch       |  45 ++-----
 rev03-KiCad/rev02_21.sch       |  51 ++------
 rev03-KiCad/rev02_22.sch       | 205 ++++++++++++++------------------
 rev03-KiCad/rev02_23.sch       | 195 +++++++++++++-----------------
 rev03-KiCad/rev02_24.sch       |  81 ++++---------
 rev03-KiCad/rev02_25.sch       |  79 ++++---------
 sym-lib-table.template         |   3 +
 33 files changed, 795 insertions(+), 1867 deletions(-)

diff --cc convert.sh
index fbfd6f6,19fd2fd..56827c1
--- a/convert.sh
+++ b/convert.sh
@@@ -99,51 -99,11 +99,55 @@@ don
  
  # Turn some labels into global labels. All labels seem to be global in Altium?
  ../fix-labels.py rev02*sch
 +# Add NotConnected and some other symbols
 +../add-components.py rev02*sch
 +
 +# Conversion seems to make all power pins power-input, change some to power-output
 +# LT3060ITS8-15
 +sed -i -e 's/^X OUT 6 600 300 200 L 70 70 0 1 W$/X OUT 6 600 300 200 L 70 70 0 1 w/' Cryptech_Alpha.lib
 +# Voltage regulator outputs
 +#sed -i -e 's/^X VOUT \(.*\) W$/X VOUT \1 w/g' Cryptech_Alpha.lib
 +# Power jack
 +sed -i \
 +    -e 's/^X PWR 1 100 300 100 L 1 1 0 1 w$/X PWR 1 100 300 100 L 1 1 0 1 P/' \
 +    -e 's/^X GND 2 100 100 100 L 1 1 0 1 W$/X GND 2 100 100 100 L 1 1 0 1 P/' \
 +    -e 's/^X GNDBREAK 3 100 200 100 L 1 1 0 1 W$/X GNDBREAK 3 100 200 100 L 1 1 0 1 P/' \
 +    Cryptech_Alpha.lib
 +# VCCs
 +#sed -i \
 +#    -e 's/^X 3V3_BATT 1 0 0 0 U 50 50 1 1 w N$/X 3V3_BATT 1 0 0 0 U 50 50 1 1 W N/' \
 +#    -e 's/^X FT_VPLL 1 0 0 0 U 50 50 1 1 w N$/X FT_VPLL 1 0 0 0 U 50 50 1 1 W N/' \
 +#    -e 's/^X FT_VPHY 1 0 0 0 U 50 50 1 1 w N$/X FT_VPHY 1 0 0 0 U 50 50 1 1 W N/' \
 +#    -e 's/^X FT_VREGIN 1 0 0 0 U 50 50 1 1 w N$/X FT_VREGIN 1 0 0 0 U 50 50 1 1 W N/' \
 +#    -e 's/^X FT_VCC3V3 1 0 0 0 U 50 50 1 1 w N$/X FT_VCC3V3 1 0 0 0 U 50 50 1 1 W N/' \
 +#    -e 's/^X FT_VREGIN 1 0 0 0 U 50 50 1 1 w N$/X FT_VREGIN 1 0 0 0 U 50 50 1 1 W N/' \
 +#    Cryptech_Alpha.lib
 +
 +# Fix off-grid capacitor
 +sed -i \
 +    -e 's/^X + 1 110 0 10 L 1 1 0 1 P$/X + 1 100 0 10 L 1 1 0 1 P/' \
 +    -e 's/^X - 2 -110 0 10 R 1 1 0 1 P$/X - 2 -100 0 10 R 1 1 0 1 P/' \
 +    Cryptech_Alpha.lib
 +
 +# Component attributes seem to get added in a big pile on components
 +grep -v \
 +     -e '^T 0 -80 120 50 0 1 1 10% Normal 1 C C' \
 +     -e '^T 0 -80 120 50 0 1 1 50V Normal 1 C C' \
 +     -e '^T 0 -80 120 50 0 1 1 6.3V Normal 1 C C' \
 +     -e '^T 0 -80 120 50 0 1 1 X5R Normal 1 C C' \
 +     -e '^T 0 -80 120 50 0 1 1 X7R Normal 1 C C' \
 +     -e '^T 0 -220 -50 50 0 1 1 5% Normal 1 C C' \
 +     -e '^T 0 -220 40 50 0 1 1 5% Normal 1 C C' \
 +     -e '^T 0 -80 120 50 0 1 1 16V Normal 1 C C' \
 +     -e '^T 0 -80 120 50 0 1 1 20% Normal 1 C C' \
 +     Cryptech_Alpha.lib > Cryptech_Alpha.lib2
 +mv Cryptech_Alpha.lib2 Cryptech_Alpha.lib
 +
  
+ # KiCad nightly has changed how symbols are located
+ ../remap-symbols.py rev02*sch
+ cp ../sym-lib-table.template sym-lib-table
+ 
  # Segments on non-copper layer Eco2.User are not visible, and causes ERC warnings.
  # Turn them into graphical lines instead.
  sed -i -e 's/segment \(.*\)layer Eco2.User.*/gr_line \1layer Eco2.User\)\)/g' Cryptech\ Alpha.kicad_pcb