c

Web/classes/electronics_design/index.html

@@ -49,8 +49,8 @@
    <a href=http://www.cadsoftusa.com/>Eagle</a> <a href=http://fabacademy.org/archives/2015/doc/electronics/fab.lbr>fab.lbr</a>
    <a href=http://www.rs-online.com/designspark/electronics/eng/page/designspark-pcb-home-page>DesignSpark</a>
    <a href=http://www.kicad-pcb.org/display/KICAD/KiCad+EDA+Software+Suite>KiCad</a> <a href=http://www.geda-project.org>gEDA</a>
-   <a href=http://www.cadence.com/products/orcad/pages/default.aspx>OrCAD</a> <a href=http://www.altium.com>Altium</a>
-   <a href=http://www.cadence.com>Cadence</a> <a href=http://www.synopsys.com>Synopsys</a> <a href=http://www.mentor.com/>Mentor</a> <a href=http://www.tannereda.com/>Tanner</a> <a href=http://opencircuitdesign.com/>Magic</a>
+   <a href=http://www.altium.com>Altium</a> <a href=http://www.circuitmaker.com/#why_circuitmaker>Circuit Maker</a>
+   <a href=http://www.cadence.com/products/orcad/pages/default.aspx>OrCAD</a> <a href=http://www.cadence.com>Cadence</a> <a href=http://www.synopsys.com>Synopsys</a> <a href=http://www.mentor.com/>Mentor</a> <a href=http://www.tannereda.com/>Tanner</a> <a href=http://opencircuitdesign.com/>Magic</a>
    <a href=http://bwrcs.eecs.berkeley.edu/Classes/IcBook/SPICE/>SPICE</a> <a href=http://www.linear.com/designtools/software/>LTspice</a> <a href=http://ngspice.sourceforge.net/>ngspice</a> <a href=http://users.tpg.com.au/micksw012/gspiceui.html>gSpiceUI</a>
    <a href=http://www.gnucap.org/>Gnucap</a> <a href=http://qucs.sourceforge.net/>Qucs</a> <a href=https://github.com/marc-lorber/oregano>Oregano</a>
    <a href=http://www.123dapp.com/circuits>123D Circuits</a> <a href=http://www.virtualbreadboard.com/>Virtual Breadboard</a> <a href=http://fritzing.org/home/>Fritzing</a> <a href=http://www.ni.com/academic/multisimse.htm>Multisim</a> <a href=http://www.mouser.com/MultiSimBlue>BLUE</a>

Web/classes/electronics_production/index.html

@@ -43,7 +43,7 @@
       <a href=http://www.globallaminates.com>FR1</a> (phenolic paper)
    flex
       <a href=http://www2.dupont.com/Kapton/en_US/>Kapton</a>
-      <a href=http://www3.3m.com/catalog/hk/en009/utilities_telecom/-/node_HCC7X1ZCDXbe/root_BHGFV1MRNXgv/vroot_VJMHZQJC02ge/gvel_DX90B6PJ2Ngl/theme_hk_utilitiestelecom_3_0/command_AbcPageHandler/output_html>#1 epoxy film</a>, <a href=http://multimedia.3m.com/mws/mediawebserver?mwsId=66666UgxGCuNyXTtlXTyMxftEVtQEcuZgVs6EVs6E666666--&fn=78-8125-9946-8%20Rev%20D.pdf>#1126 copper tape</a>
+      <a href=http://multimedia.3m.com/mws/media/37468O/3m-epoxy-film-electrical-tape-1.pdf>#1 epoxy film</a>, <a href=http://multimedia.3m.com/mws/media/104361O/tape-1126-copper-foil-with-conductive-adhesive.pdf>#1126 copper tape</a>
    high-frequency
       teflon
       glass
@@ -84,8 +84,8 @@
       fumes
       washing
    desoldering
-      braid
-      hot air
+      <a href=http://www.digikey.com/product-detail/en/Q-B-10AS/EB1088-ND>braid</a>
+      <a href=http://www.amazon.com/Weller-6966C-Watts-Electric-Industrial/dp/B000ICGMN4>hot air</a>
       gravity
    cutting traces, adding jumpers
    <a href=http://www.ddmnovastar.com/pick-and-place>pick-and-place</a>

Web/classes/scanning_printing/index.html

@@ -41,6 +41,9 @@
       <a href=http://www.makerbot.com/>MakerBot</a>
       <a href="http://formlabs.com/">Formlabs</a>
       <a href="http://mtm.cba.mit.edu/">MTM</a>
+   <i>service bureaus</i>
+      <a href=http://www.shapeways.com/>Shapeways</a>
+      <a href=https://www.ponoko.com/>Ponoko</a>
 
 <b>file formats</b>
    STL