diff --git a/Week_1.html b/Week_1.html
index 1745130eeae24762a334e16cd88f12ed07990ccc..4893c5cda03171fb699b583b8827e65649c8da5e 100644
--- a/Week_1.html
+++ b/Week_1.html
@@ -74,7 +74,7 @@
<div class="intro-text">
<span class="name">Week 1</span>
<hr class="star-light">
- <h1> Principles and practices <br> Project Managment </h1>
+ <h1> Principles and practices </h1>
</div>
</div>
</div>
@@ -89,167 +89,16 @@
<div class="col-lg-6 ">
<p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Assignment </u></em></p>
<ol style="font-size:18px">
- <li>Work through a git tutorial</li>
- <li>Build a personal site in the class archive.</li>
- </ol>
- </div>
- <div class="col-lg-6 ">
- <p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3"> <em><u> Personal objectives </u></em></p>
- <ol type="1" style="font-size:18px">
- <li> Develop a personal site to show the progress in the assignments and final project </li>
- <li> Learn how to use an html editor, as well as html, css and java code.</li>
- <li> Use Git repositories to project management.</li>
+ <li>Plan and sketch a potential final project</li>
</ol>
- </div>
- </div>
- <div class="row">
-
- <div class="col-lg-12">
-
- <h3 align="center"> <u> Git repositories and tutorial </u> </h3>
-
- <p align="justify" style="font-size:18px"> In order to update the weekly assignments and the development in the final project is necessary to clone the git repository in to my files system.
- This is made through a very simple procedure (in Ubuntu). The Steps are as follow: </p>
-
- <div class="boxed" class="col-lg-10">
- <table style="width:100%">
- <tr>
- <td> ~$ ssh-keygen -t rsa -C "c********@gmail.com" </td> <td>(Generate a key) </td>
- </tr>
- <tr>
- <td>~$ cat ~/.ssh/id_rsa.pub </td> <td>(Show the key generated)<br></td>
- </tr>
- <tr>
- <td> ~$ clip <~/.ssh/id_rsa.pub </td> <td> (copy the key) </td>
- </tr>
- <tr>
- <td> ~$ git clone git@git.fabacademy.org:fabacademy2017/ciudaddemexico.git</td> <td> (clone the git repository into the file system)</td>
- </tr>
- </table>
- </div>
- </div>
-
- <div class="col-lg-12">
- <p><br></p>
- <p align="justify" style="font-size:18px">Once the folder is clone in the file system, this must appear in your Home folder. It´s a very good practice to keep the folder with the webpage
- files in a different folder and sync this one with the one in the clone repository. This is made with the next command in a terminal:</p>
- <div class="boxed_col" class="col-lg-6">
- <table style="width:100%">
- <tr>
- <td> ~$ rsync -r [source folder] [destination folder] </td>
- </tr>
- </table>
-
- </div>
- <p><br></p>
- <p align="justify" style="font-size:18px"> This is a very convenient way to keep all the changes up to date. The next steps are necessary to synchronize the
- local files with the remote repository: </p>
- </div>
+ </div>
- <div class="col-lg-6 ">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_1/git_clone_1.png" class="img-responsive" alt="Atom">
- <figcaption> Folder with web page file system <figcaption>
- </a>
- </div>
- </section>
</div>
- <div class="col-lg-6 ">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_1/git_clone_2.png" class="img-responsive" alt="Atom">
- <figcaption> Folder with web page file system <figcaption>
- </a>
- </div>
- </section>
- </div>
-
- <div class="col-lg-12">
- <div class="boxed" class="col-lg-10">
- <table style="width:100%">
- <tr>
- <td> ~$ cd ~/ciudaddemexico/students/403 </td> <td> (Go to the clone repository)</td>
- </tr>
- <tr>
- <td> ~$ git add . </td> <td>(update the index based in the local files) </td>
- </tr>
- <tr>
- <td>~$ git commit -m "[comment]" </td> <td>(commit the changes. The "-m" option allows to insert a comment)</td>
- </tr>
- <tr>
- <td></td> <td>The comment option is useful to keep a control of the different version</td>
- </tr>
- <tr>
- <td>~$ git push origin master </td> <td>(send the project to the remote repository)</td>
- </tr>
- </table>
- </div>
- </div>
- </div>
<p><br> </p>
- <h3 align="center"> <u> Personal Website </u> </h3>
- <p align="justify" style="font-size:18px"> For the development of the personal site I decide to use a template available in <a href="http://startbootstrap.com/">Start Bootstrap</a>
- which is an open-source front-end framework whit HTML, CSS and JavaScript based design templates. Specifically the <a href="https://startbootstrap.com/template-overviews/freelancer/">freelancer
- template</a> </p>
- <p align="justify" style="font-size:18px"> I made the necessary modification in the html and css files using <a href="https://atom.io/">Atom</a>, which is an open source text editor. Personally I think Atom
- is a very helpful tool to edit html, css and js files. Thanks to Atom and html tutorials I was able to modify the template to make more personal modifying
- the colors, the hyper-references and off course the contents. </p>
- <p align="justify" style="font-size:18px">The images in the webpage are going to be hosted in my personal dropbox. The images are showed as modal images, which requires a
- complement with the css file and javascript. <br> The files are going to be hosted in the same server of the webpage, except when the size is to big; in that case
- an external host (mediafire) will be use. <br> <br>
- <u>Update:</u> After many struggle with the images and pictures hosted in dropbox, I decided to include the images
- in the root directory of my web page. Using the software <a href="https://pinta-project.com/pintaproject/pinta/">Pinta</a>, very Photoshop look alike,
- I keep the size of the images low.</p>
-
-
- <div class="col-lg-6 ">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal3" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_1/Atom_1.png" class="img-responsive" alt="Atom">
- <figcaption> Atom text editor in Ubuntu <figcaption>
-
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6 ">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal4" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_1/Atom_2.png" class="img-responsive" alt="Atom">
- <figcaption> Atom text editor in Windows <figcaption>
-
- </a>
- </div>
- </section>
- </div>
+
<div class="col-lg-12">
<h3 align="center"> <u> Project Managment </u> </h3>
@@ -268,27 +117,8 @@
</div>
- <div class="col-lg-12">
- <p align="center" style="font-size:25px"><u> <br> Files </u> </p>
- <p align="justify" style="font-size:18px"> <br> In this section the files generated during the development of the assignment will be available to download </p>
-
- <p> <br>
- <table border="1">
- <tr>
- <td> <a href="files/Week_1/Week_1.html" download>
- <img src="img/ico/html_ico.jpg" width="100px" height:"40px">
- </a> </td>
- </tr>
- <tr>
- <td align="center"> Week_1.html </td>
- </tr>
-
- </table>
-
- </p>
- </div>
- </div>
+ </div>
</div>
@@ -342,7 +172,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
- Copyright © <a href="http://archive.fabacademy.org/archives/2017/ciudaddemexico/students/403/">Christian Cárdenas | Fab Academy 2017 </a>
+ Copyright © <a href="http://fab.academany.org/2018/labs/fablabmexico/students/christian-cardenas/">Christian Cárdenas | Fab Academy 2018 </a>
</div>
</div>
</div>
diff --git a/Week_10.html b/Week_10.html
index 942d65bfa8008197343a3c3e1fa2f13e2b3fdd29..f6d444501a489ae0663bb20242a9e7f631b4572f 100644
--- a/Week_10.html
+++ b/Week_10.html
@@ -77,7 +77,7 @@
<div class="intro-text">
<span class="name">Week 10</span>
<hr class="star-light">
- <h1> Input Devices </h1>
+ <h1> Molding and casting</h1>
</div>
</div>
</div>
@@ -93,8 +93,9 @@
<p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Assignment </u></em></p>
<ol style="font-size:18px">
- <li>Measure something</li>
- <li>Add a sensor to a microcontroller board that you hace designed and read it</li>
+ <li>Design a 3D mold</li>
+ <li>Machine the mold</li>
+ <li>Use the mold to cast parts</li>
</ol>
</div>
<div class="col-lg-12 text-center">
@@ -164,7 +165,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
- Copyright © <a href="http://archive.fabacademy.org/archives/2017/ciudaddemexico/students/403/">Christian Cárdenas | Fab Academy 2017 </a>
+ Copyright © <a href="http://fab.academany.org/2018/labs/fablabmexico/students/christian-cardenas/">Christian Cárdenas | Fab Academy 2018 </a>
</div>
</div>
</div>
diff --git a/Week_11.html b/Week_11.html
index 68ef5b519c8263e76b48a8d1316e37ad9276388b..aa39351d92c0c1c8220e11806dcfd4560869bb45 100644
--- a/Week_11.html
+++ b/Week_11.html
@@ -53,13 +53,13 @@
<a href="#page-top"></a>
</li>
<li>
- <a href="Week_9.html"><< Week 10</a>
+ <a href="Week_10.html"><< Week 10</a>
</li>
<li class="page-scroll">
<a href="index.html">Home</a>
</li>
<li>
- <a href="Week_11.html">Week 12 >></a>
+ <a href="Week_12.html">Week 12 >></a>
</li>
</ul>
</div>
@@ -77,7 +77,7 @@
<div class="intro-text">
<span class="name">Week 11</span>
<hr class="star-light">
- <h1> Output Devices</h1>
+ <h1> Input Devices </h1>
</div>
</div>
</div>
@@ -93,16 +93,8 @@
<p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Assignment </u></em></p>
<ol style="font-size:18px">
- <li>add an output device to a microcontroller board you've designed and program it to do something</li>
-
- </ol>
- </div>
- <div class="col-lg-6 ">
-
- <p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Group Assignment </u></em></p>
- <ol style="font-size:18px">
- <li>Measure the power consumption of an output device</li>
-
+ <li>Measure something</li>
+ <li>Add a sensor to a microcontroller board that you hace designed and read it</li>
</ol>
</div>
<div class="col-lg-12 text-center">
@@ -110,10 +102,10 @@
<!-- <hr class="star-light-blue"> -->
</div>
</div>
- <!-- <div class="col-lg-12 text-center">
- <h1> <em>Wait for it!!</em> </h1> -->
+ <div class="col-lg-12 text-center">
+ <h1> <em>Wait for it!!</em> </h1>
<!-- <hr class="star-light-blue"> -->
- <!-- </div> -->
+ </div>
<!-- <div class="row">
<div class="col-lg-12 col-lg-offset-1">
<p align="justify"> Wait for it!!</p>
@@ -123,95 +115,8 @@
</div>
</div> -->
</div>
-
- <!-- Imagenes 1 y 2 =================================== -->
-
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div> <br>
- <img src="img/Week_11/Img_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> <figcaption>
- </a>
- </div>
- </section>
- </div>
-
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_11/Screenshot_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> <figcaption>
- </a>
- </div>
- </section>
- </div>
-
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_11/RGB_LED.jpg" class="img-responsive" alt="Atom">
- <figcaption> <figcaption>
- </a>
- </div>
- </section>
- </div>
-
-
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_11/Screenshot_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> <figcaption>
- </a>
- </div>
- </section>
- </div>
-
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_11/Img_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> <figcaption>
- </a>
- </div>
- </section>
- </div>
- <!-- Imagenes 1 y 2 =================================== -->
-
</section>
-
-
<!-- Footer -->
<footer class="text-center">
<div class="footer-above">
diff --git a/Week_12.html b/Week_12.html
index f433088eb0be9729f22536ef5632921820898226..6ea78b9ee9da08458685be6ab25f7e76b81ad510 100644
--- a/Week_12.html
+++ b/Week_12.html
@@ -9,7 +9,7 @@
<meta name="description" content="My fab academy project">
<meta name="author" content="Christrian Cárdenas">
- <title>FAB Acadaemy | Christian Cárdenas</title>
+ <title>FAB Academy | Christian Cárdenas</title>
<link rel="shortcut icon" href="../img/favicon.ico">
@@ -59,7 +59,7 @@
<a href="index.html">Home</a>
</li>
<li>
- <a href="Week_12.html">Week 13 >></a>
+ <a href="Week_13.html">Week 13 >></a>
</li>
</ul>
</div>
@@ -77,7 +77,7 @@
<div class="intro-text">
<span class="name">Week 12</span>
<hr class="star-light">
- <h1> Interface and Application Programming </h1>
+ <h1> Output Devices</h1>
</div>
</div>
</div>
@@ -93,27 +93,27 @@
<p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Assignment </u></em></p>
<ol style="font-size:18px">
- <li>Write an application that interfaces with an input and/or output device that you made</li>
- <li>Comparing as many tools as possible</li>
+ <li>add an output device to a microcontroller board you've designed and program it to do something</li>
+
</ol>
- </div>
+ </div>
+ <div class="col-lg-6 ">
+
+ <p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Group Assignment </u></em></p>
+ <ol style="font-size:18px">
+ <li>Measure the power consumption of an output device</li>
+
+ </ol>
+ </div>
<div class="col-lg-12 text-center">
<h1> <ins> </ins> </h1>
<!-- <hr class="star-light-blue"> -->
</div>
</div>
- <!--<div class="col-lg-12 text-center">
- <h1> <em>Wait for it!!</em> </h1>
- <hr class="star-light-blue">
- </div> -->
-
- <!-- Video 1 ============================== -->
- <div class="col-lg-6"> <br>
-
- <iframe class="center-block" width="560" height="315" src="https://www.youtube.com/embed/0zoGC3GOJbA" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
- </div>
- <!-- Video 1 ============================== -->
-
+ <!-- <div class="col-lg-12 text-center">
+ <h1> <em>Wait for it!!</em> </h1> -->
+ <!-- <hr class="star-light-blue"> -->
+ <!-- </div> -->
<!-- <div class="row">
<div class="col-lg-12 col-lg-offset-1">
<p align="justify"> Wait for it!!</p>
@@ -123,8 +123,95 @@
</div>
</div> -->
</div>
+
+ <!-- Imagenes 1 y 2 =================================== -->
+
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div> <br>
+ <img src="img/Week_11/Img_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_11/Screenshot_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_11/RGB_LED.jpg" class="img-responsive" alt="Atom">
+ <figcaption> <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_11/Screenshot_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_11/Img_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <!-- Imagenes 1 y 2 =================================== -->
+
</section>
+
+
<!-- Footer -->
<footer class="text-center">
<div class="footer-above">
@@ -172,7 +259,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
- Copyright © <a href="http://archive.fabacademy.org/archives/2017/ciudaddemexico/students/403/">Christian Cárdenas | Fab Academy 2017 </a>
+ Copyright © <a href="http://fab.academany.org/2018/labs/fablabmexico/students/christian-cardenas/">Christian Cárdenas | Fab Academy 2018 </a>
</div>
</div>
</div>
diff --git a/Week_13.html b/Week_13.html
new file mode 100644
index 0000000000000000000000000000000000000000..27d2254e04082900434e08be0ccfe74c787f5b14
--- /dev/null
+++ b/Week_13.html
@@ -0,0 +1,212 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <meta name="description" content="My fab academy project">
+ <meta name="author" content="Christrian Cárdenas">
+
+ <title>FAB Academy | Christian Cárdenas</title>
+
+ <link rel="shortcut icon" href="../img/favicon.ico">
+
+ <!-- Bootstrap Core CSS -->
+ <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+ <!-- Theme CSS -->
+ <link href="css/freelancer.css" rel="stylesheet">
+
+ <!-- Custom Fonts -->
+ <link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+ <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
+ <link href="https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic" rel="stylesheet" type="text/css">
+
+ <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+
+</head>
+
+<body id="page-top" class="index">
+
+ <!-- Navigation -->
+ <nav id="mainNav" class="navbar navbar-default navbar-fixed-top navbar-custom">
+ <div class="container">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header page-scroll">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span> Menu <i class="fa fa-bars"></i>
+ </button>
+ <a class="navbar-brand" href="#page-top">Christian Cárdenas | Assignments - Week 13</a>
+ </div>
+
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav navbar-right">
+ <li class="hidden">
+ <a href="#page-top"></a>
+ </li>
+ <li>
+ <a href="Week_12.html"><< Week 12</a>
+ </li>
+ <li class="page-scroll">
+ <a href="index.html">Home</a>
+ </li>
+ <li>
+ <a href="Week_13.html">Week 14 >></a>
+ </li>
+ </ul>
+ </div>
+ <!-- /.navbar-collapse -->
+ </div>
+ <!-- /.container-fluid -->
+ </nav>
+
+ <!-- Header -->
+ <header>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <!-- <img class="img-responsive center-block" src="https://dl.dropboxusercontent.com/u/4917033/img/Fab_Lab_logo.svg.png" style="width: 200px; height: 240px"> -->
+ <div class="intro-text">
+ <span class="name">Week 13</span>
+ <hr class="star-light">
+ <h1> Interface and Application Programming </h1>
+ </div>
+ </div>
+ </div>
+ </div>
+ </header>
+
+
+ <!-- About Section -->
+ <section class="success" id="about">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-6 ">
+
+ <p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Assignment </u></em></p>
+ <ol style="font-size:18px">
+ <li>Write an application that interfaces with an input and/or output device that you made</li>
+ <li>Comparing as many tools as possible</li>
+ </ol>
+ </div>
+ <div class="col-lg-12 text-center">
+ <h1> <ins> </ins> </h1>
+ <!-- <hr class="star-light-blue"> -->
+ </div>
+ </div>
+ <!--<div class="col-lg-12 text-center">
+ <h1> <em>Wait for it!!</em> </h1>
+ <hr class="star-light-blue">
+ </div> -->
+
+ <!-- Video 1 ============================== -->
+ <div class="col-lg-6"> <br>
+
+ <iframe class="center-block" width="560" height="315" src="https://www.youtube.com/embed/0zoGC3GOJbA" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+ </div>
+ <!-- Video 1 ============================== -->
+
+ <!-- <div class="row">
+ <div class="col-lg-12 col-lg-offset-1">
+ <p align="justify"> Wait for it!!</p>
+ </div>
+ <div class="col-lg-5">
+ <p align="justify"></p>
+ </div>
+ </div> -->
+ </div>
+ </section>
+
+ <!-- Footer -->
+ <footer class="text-center">
+ <div class="footer-above">
+ <div class="container">
+ <div class="row">
+ <div class="footer-col col-md-6">
+ <h3>Fab Lab <br> Ciudad de México</h3>
+ <p> <a href="http://www.fablab.mx/">www.fablab.mx</a>
+ <br>Anáhuac México | Campus Norte
+ <br> Av. Universidad Anáhuac 46
+ <br> Col. Lomas Anáhuac
+ <br> Huixquilucan, Estado de México, C.P. 52786</p>
+ </div>
+ <!-- <div class="footer-col col-md-4">
+ <h3>Around the Web</h3>
+ <ul class="list-inline">
+ <li>
+ <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-facebook"></i></a>
+ </li>
+ <li>
+ <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-google-plus"></i></a>
+ </li>
+ <li>
+ <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>
+ </li>
+ <li>
+ <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-linkedin"></i></a>
+ </li>
+ <li>
+ <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-dribbble"></i></a>
+ </li>
+ </ul>
+ </div> -->
+ <div class="footer-col col-md-6 ">
+ <h3>Contact Me</h3>
+ <p> Christian Cárdenas Jaramillo
+ <br> Universidad Anáhuac Querétaro
+ <br> <a href="mailto:christian.cardenas@anahuac.mx">christian.cardenas@anahuac.mx</a>
+ <br> Tel. + 52 (442) 245 67 42 Ext. 196</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="footer-below">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ Copyright © <a href="http://fab.academany.org/2018/labs/fablabmexico/students/christian-cardenas/">Christian Cárdenas | Fab Academy 2018 </a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </footer>
+
+
+ <!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
+ <!-- <div class="col-lg-8 col-lg-offset-2 text-center">
+ <div class="scroll-top page-scroll">
+ <a class="btn btn-lg btn-outline" href="#page-top">
+ <i class="fa fa-chevron-up"> Back to top </i>
+ </a>
+ </div>
+ </div> -->
+
+
+
+ <!-- jQuery -->
+ <script src="vendor/jquery/jquery.min.js"></script>
+
+ <!-- Bootstrap Core JavaScript -->
+ <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+
+ <!-- Plugin JavaScript -->
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script>
+
+ <!-- Contact Form JavaScript -->
+ <script src="js/jqBootstrapValidation.js"></script>
+ <script src="js/contact_me.js"></script>
+
+ <!-- Theme JavaScript -->
+ <script src="js/freelancer.min.js"></script>
+
+</body>
+
+</html>
diff --git a/Week_2.html b/Week_2.html
new file mode 100644
index 0000000000000000000000000000000000000000..e9360cf7f7c302a6f0369a0897c24aa6d8cbd972
--- /dev/null
+++ b/Week_2.html
@@ -0,0 +1,512 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <meta name="description" content="My fab academy project">
+ <meta name="author" content="Christrian Cárdenas">
+
+ <title>FAB Academy | Christian Cárdenas</title>
+
+ <link rel="shortcut icon" href="img/favicon.ico">
+
+ <!-- Bootstrap Core CSS -->
+ <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+
+ <!-- Theme CSS -->
+ <link href="css/freelancer.css" rel="stylesheet">
+
+ <!-- Custom Fonts -->
+ <link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+ <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
+ <link href="https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic" rel="stylesheet" type="text/css">
+
+ <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+
+</head>
+
+<body id="page-top" class="index">
+
+ <!-- Navigation -->
+ <nav id="mainNav" class="navbar navbar-default navbar-fixed-top navbar-custom">
+ <div class="container">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header page-scroll">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span> Menu <i class="fa fa-bars"></i>
+ </button>
+ <a class="navbar-brand" href="#page-top">Christian Cárdenas | Assignments - Week 2</a>
+ </div>
+
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav navbar-right">
+ <li class="hidden">
+ <a href="#page-top"></a>
+ </li>
+ <li>
+ <a href="Week_1.html"><< Week 1</a>
+ </li>
+ <li class="page-scroll">
+ <a href="index.html">Home</a>
+ </li>
+ <li>
+ <a href="Week_3.html">Week 3 >></a>
+ </li>
+ </ul>
+ </div>
+ <!-- /.navbar-collapse -->
+ </div>
+ <!-- /.container-fluid -->
+ </nav>
+
+ <!-- Header -->
+ <header>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <!-- <img class="img-responsive center-block" src="https://dl.dropboxusercontent.com/u/4917033/img/Fab_Lab_logo.svg.png" style="width: 200px; height: 240px"> -->
+ <div class="intro-text">
+ <span class="name">Week 2</span>
+ <hr class="star-light">
+ <h1> Project Managment </h1>
+ </div>
+ </div>
+ </div>
+ </div>
+ </header>
+
+
+ <!-- About Section -->
+ <section class="success">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-6 ">
+ <p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Assignment </u></em></p>
+ <ol style="font-size:18px">
+ <li>Work through a git tutorial</li>
+ <li>Build a personal site in the class archive.</li>
+ </ol>
+ </div>
+
+ </div>
+
+ <p> <br> </p>
+ <div class="row">
+
+ <div class="col-lg-12">
+
+ <h3 align="center"> <u> Git repositories and tutorial </u> </h3>
+
+ <p align="justify" style="font-size:18px"> In order to update the weekly assignments and the development in the final project is necessary to clone the git repository in to my files system.
+ This is made through a very simple procedure (in Ubuntu). The Steps are as follow: </p>
+
+ <div class="boxed" class="col-lg-12">
+ <table style="width:100%">
+ <tr>
+ <td> ~$ ssh-keygen -t rsa -C "christian.cardenas@anahuac.mx" </td> <td>(Generate a key) </td>
+ </tr>
+ <tr>
+ <td>~$ cat ~/.ssh/id_rsa.pub </td> <td>(Show the key generated)<br></td>
+ </tr>
+ <tr>
+ <td> ~$ clip <~/.ssh/id_rsa.pub </td> <td> (copy the key) </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+
+
+
+ <div class="col-lg-12">
+ <p><br></p>
+ <p align="justify" style="font-size:18px">Once the key is copied is necessary to add it to the SSH Keys in the GitLab account.
+ For this is necessary to go to Profile – Settings and the to SSH Keys – Add key. After this the repository must be clone, this is
+ made with the next command: <br> </p>
+ <p><br></p>
+
+ <div class="boxed" class="col-lg-12">
+ <table style="width:100%">
+ <tr>
+ <td> ~$ git clone git@gitlab.fabcloud.org/academany/fabacademy/2018/labs/fablabmexico/students/christian-cardenas.git </td>
+ </tr>
+ </table>
+ </div>
+
+ <p><br></p>
+ <p align="justify" style="font-size:18px">
+ Where the link after clone is copy form the project page in GitLab (Fig --). If the process was done correctly the folder a new folder must appear. It´s a very good practice to keep the folder with the webpage
+ files in a different folder and sync this one with the one in the clone repository. This is made with the next command in a terminal:</p>
+ <p><br></p>
+ <div class="boxed_col" class="col-lg-6">
+ <table style="width:100%">
+ <tr>
+ <td> ~$ rsync -r [source folder] [destination folder] </td>
+ </tr>
+ </table>
+
+ </div>
+ <p><br></p>
+ <p align="justify" style="font-size:18px"> This is a very convenient way to keep all the changes up to date. The next steps are necessary to synchronize the
+ local files with the remote repository: </p>
+ </div>
+
+ <div class="col-lg-6 ">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_1/git_clone_1.png" class="img-responsive" alt="Atom">
+ <figcaption> Folder with web page file system <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+ <div class="col-lg-6 ">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_1/git_clone_2.png" class="img-responsive" alt="Atom">
+ <figcaption> Folder with web page file system <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+ <div class="col-lg-12">
+ <div class="boxed" class="col-lg-10">
+ <table style="width:100%">
+ <tr>
+ <td> ~$ cd ~/ciudaddemexico/students/403 </td> <td> (Go to the clone repository)</td>
+ </tr>
+ <tr>
+ <td> ~$ git add . </td> <td>(update the index based in the local files) </td>
+ </tr>
+ <tr>
+ <td>~$ git commit -m "[comment]" </td> <td>(commit the changes. The "-m" option allows to insert a comment)</td>
+ </tr>
+ <tr>
+ <td></td> <td>The comment option is useful to keep a control of the different version</td>
+ </tr>
+ <tr>
+ <td>~$ git push origin master </td> <td>(send the project to the remote repository)</td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ <p><br> </p>
+
+ <h3 align="center"> <u> Personal Website </u> </h3>
+ <p align="justify" style="font-size:18px"> For the development of the personal site I decide to use a template available in <a href="http://startbootstrap.com/">Start Bootstrap</a>
+ which is an open-source front-end framework whit HTML, CSS and JavaScript based design templates. Specifically the <a href="https://startbootstrap.com/template-overviews/freelancer/">freelancer
+ template</a> </p>
+ <p align="justify" style="font-size:18px"> I made the necessary modification in the html and css files using <a href="https://atom.io/">Atom</a>, which is an open source text editor. Personally I think Atom
+ is a very helpful tool to edit html, css and js files. Thanks to Atom and html tutorials I was able to modify the template to make more personal modifying
+ the colors, the hyper-references and off course the contents. </p>
+ <p align="justify" style="font-size:18px">The images in the webpage are going to be hosted in my personal dropbox. The images are showed as modal images, which requires a
+ complement with the css file and javascript. <br> The files are going to be hosted in the same server of the webpage, except when the size is to big; in that case
+ an external host (mediafire) will be use. <br> <br>
+ <u>Update:</u> After many struggle with the images and pictures hosted in dropbox, I decided to include the images
+ in the root directory of my web page. Using the software <a href="https://pinta-project.com/pintaproject/pinta/">Pinta</a>, very Photoshop look alike,
+ I keep the size of the images low.</p>
+
+
+ <div class="col-lg-6 ">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal3" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_1/Atom_1.png" class="img-responsive" alt="Atom">
+ <figcaption> Atom text editor in Ubuntu <figcaption>
+
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6 ">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal4" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_1/Atom_2.png" class="img-responsive" alt="Atom">
+ <figcaption> Atom text editor in Windows <figcaption>
+
+ </a>
+ </div>
+ </section>
+ </div>
+
+
+
+
+ <div class="col-lg-12">
+ <p align="center" style="font-size:25px"><u> <br> Files </u> </p>
+ <p align="justify" style="font-size:18px"> <br> In this section the files generated during the development of the assignment will be available to download </p>
+
+ <p> <br>
+ <table border="1">
+ <tr>
+ <td> <a href="files/Week_1/Week_1.html" download>
+ <img src="img/ico/html_ico.jpg" width="100px" height:"40px">
+ </a> </td>
+ </tr>
+ <tr>
+ <td align="center"> Week_1.html </td>
+ </tr>
+
+ </table>
+
+ </p>
+ </div>
+
+ </div>
+
+ </div>
+
+ </section>
+
+
+ <!-- Footer -->
+ <footer class="text-center">
+ <div class="footer-above">
+ <div class="container">
+ <div class="row">
+ <div class="footer-col col-md-6">
+ <h3>Fab Lab <br> Ciudad de México</h3>
+ <p> <a href="http://www.fablab.mx/">www.fablab.mx</a>
+ <br>Anáhuac México | Campus Norte
+ <br> Av. Universidad Anáhuac 46
+ <br> Col. Lomas Anáhuac
+ <br> Huixquilucan, Estado de México, C.P. 52786</p>
+ </div>
+ <!-- <div class="footer-col col-md-4">
+ <h3>Around the Web</h3>
+ <ul class="list-inline">
+ <li>
+ <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-facebook"></i></a>
+ </li>
+ <li>
+ <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-google-plus"></i></a>
+ </li>
+ <li>
+ <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>
+ </li>
+ <li>
+ <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-linkedin"></i></a>
+ </li>
+ <li>
+ <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-dribbble"></i></a>
+ </li>
+ </ul>
+ </div> -->
+ <div class="footer-col col-md-6 ">
+ <h3>Contact Me</h3>
+ <p> Christian Cárdenas Jaramillo
+ <br> Universidad Anáhuac Querétaro
+ <br> <a href="mailto:christian.cardenas@anahuac.mx">christian.cardenas@anahuac.mx</a>
+ <br> Tel. + 52 (442) 245 67 42 Ext. 196</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="footer-below">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ Copyright © <a href="http://fab.academany.org/2018/labs/fablabmexico/students/christian-cardenas/">Christian Cárdenas | Fab Academy 2018 </a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </footer>
+
+
+ <!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
+ <div class="scroll-top page-scroll hidden-sm hidden-xs hidden-lg hidden-md">
+ <a class="btn btn-primary" href="#page-top">
+ <i class="fa fa-chevron-up"></i>
+ </a>
+ </div>
+
+
+ <!-- Image Modals -->
+ <div class="portfolio-modal modal fade" id="portfolioModal1" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10"> -->
+ <div class="modal-body">
+
+
+ <img src="img/Week_1/git_clone_1.png" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="portfolio-modal modal fade" id="portfolioModal2" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10"> -->
+ <div class="modal-body">
+
+
+ <img src="img/Week_1/git_clone_2.png" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+ <div class="portfolio-modal modal fade" id="portfolioModal3" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10"> -->
+ <div class="modal-body">
+
+
+ <img src="img/Week_1/Atom_1.png" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="portfolio-modal modal fade" id="portfolioModal4" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10"> -->
+ <div class="modal-body">
+
+
+ <img src="img/Week_1/Atom_2.png" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
+ <!-- <div class="portfolio-modal modal fade" id="portfolioModal1_1" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-8 col-lg-offset-2">
+ <div class="modal-body">
+ <img src="https://dl.dropboxusercontent.com/u/4917033/img/Screenshot_1.png" class="img-responsive img-centered" alt="Atom">
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div> -->
+
+
+ <!-- jQuery -->
+ <script src="vendor/jquery/jquery.min.js"></script>
+
+ <!-- Bootstrap Core JavaScript -->
+ <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+
+ <!-- Plugin JavaScript -->
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script>
+
+ <!-- Contact Form JavaScript -->
+ <script src="js/jqBootstrapValidation.js"></script>
+ <script src="js/contact_me.js"></script>
+
+ <!-- Theme JavaScript -->
+ <script src="js/freelancer.min.js"></script>
+
+
+</body>
+
+</html>
diff --git a/Week_3.html b/Week_3.html
index ab432085bbb929a88a5bda8ef7ad5f3dc6f20519..f844a76a37f4d230febeadee8fef07b440a75180 100644
--- a/Week_3.html
+++ b/Week_3.html
@@ -18,6 +18,7 @@
<!-- Theme CSS -->
<link href="css/freelancer.css" rel="stylesheet">
+ <link href="css/mi_css.css" rel="stylesheet">
<!-- Custom Fonts -->
<link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
@@ -60,6 +61,7 @@
</li>
<li>
<a href="Week_4.html">Week 4 >></a>
+ </li>
</ul>
</div>
<!-- /.navbar-collapse -->
@@ -68,7 +70,7 @@
</nav>
<!-- Header -->
- <header>
+ <header >
<div class="container">
<div class="row">
<div class="col-lg-12">
@@ -77,8 +79,8 @@
<span class="name">Week 3</span>
<hr class="star-light">
<div class="col-lg-12 text-center">
- <h1> Computer-controlled cutting </h1>
- </div>
+ <h1> Computer-aided design </h1>
+ </div>
<!-- <span class="skills">Principles and practices <br> Project Managment </span> -->
</div>
</div>
@@ -91,369 +93,55 @@
<section class="success" id="about">
<div class="container">
<div class="row">
+ <div class="col-lg-6 ">
- <div class="col-lg-6 ">
-
- <p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Assignment </u></em></p>
+ <p align="justify" style="font-size:24px; color:#91aac3" > <em><u> Assignment </u></em></p>
<ol style="font-size:18px">
- <li>Make lasercutter test part(s), varying cutting settings and slot dimensions</li>
- <li>Cut something in the vinylcutter</li>
- <li>Design, make, and document a parametric press-fit construction kit, accounting for the laser cutter kerf, which can be assembled in multiple ways.</li>
- </ol>
- </div>
-
- <div class="col-lg-6 ">
+ <li>Model a possible final project</li>
- <p align="justify" style="font-size:24px; color:#91aac3" > <em><u> Personal objectives </u></em></p>
- <ol style="font-size:18px">
- <li>Learn how to use an image vectorizer like Inkscape </li>
- <li>Learn the procedure to stablish the parameters of cutting in a laser cutter machine</li>
- <li>use the vinyl cutter to create an sticker</li>
- <li> Create a parametric design to create an assembly model of a desk lamp</li>
- </ol>
+ </ol>
</div>
+ <div class="col-lg-6 ">
+ <p align="justify" style="font-size:24px; color:#91aac3"> <em><u> Personal objectives </u></em></p>
+ <ol type="1" style="font-size:18px">
+ <li> Know and use different CAD software </li>
+ <li> Evaluate these software In order to determine the strengths and weaknesses of each one</li>
- <h3 align="center"> <u> Lasercut tests </u> </h3>
-
- <p align="justify" style="font-size:18px"> Before using the lasercut is a very good idea to test the parameters in order to understand the changes and the possibles
- outcomes when a laser cut machine. For this purpose I try first the engraving parameters first with a set of fixed speed and precision,
- and then varying the power of the laser.
- The speed is set in mm/min, the precision of the engraving in dpi, and the power is measure in percentage of the maximum laser power.
- <br>
- The tests was made in MDF of 3 mm thickness with the next parameters: </p>
- <br>
-
- <div class="col-lg-offset-2 col-lg-8">
- <table class="table-data" style="width:100%">
- <tr>
- <th> Speed </th> <th> Precision </th> <th colspan="8"> Power </th>
- </tr>
- <tr>
- <td rowspan="2"> 6000 mm/min </td> <td> 200 dpi</td> <td> 5 </td> <td> 10 </td> <td> 15 </td> <td>20 </td> <td> 25 </td> <td> 30 </td> <td> 35 </td> <td> 40 </td>
- </tr>
- <tr>
- <td> 300 dpi </td> <td> 5 </td> <td> 10 </td> <td> 15 </td> <td>20 </td> <td> 25 </td> <td> 30 </td> <td> 35 </td> <td> 40 </td>
- </tr>
- <tr>
- <td rowspan="2"> 7000 mm/min </td> <td> 200 dpi</td> <td> 5 </td> <td> 10 </td> <td> 15 </td> <td>20 </td> <td> 25 </td> <td> 30 </td> <td> 35 </td> <td> 40 </td>
- </tr>
- <tr>
- <td> 300 dpi </td> <td> 5 </td> <td> 10 </td> <td> 15 </td> <td>20 </td> <td> 25 </td> <td> 30 </td> <td> 35 </td> <td> 40 </td>
- </tr>
- </table>
- </div>
+ </ol>
+ </div>
-<!-- Imagenes 1 y 2 =================================== -->
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div> <br>
- <img src="img/Week_3/Engraving_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 1 - Settings of the engraving mode <figcaption>
- </a>
- </div>
- </section>
- </div>
-
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_3/Engraving_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig. 2 - Results of engraving parameters test <figcaption>
- </a>
- </div>
- </section>
- </div>
-<!-- Imagenes 1 y 2 =================================== -->
-
-
- <div class="col-lg-12">
- <p align="left" style="font-size:25px"><u> <br> Results </u> </p>
- </div>
- <div class="col-lg-12">
- <p align="justify" style="font-size:18px">
- <ol style="font-size:18px">
- <li> As can be seen in figure 2, an obvious statement is that the power affects the tone of the engraving.
- This can be useful for an artistic work, where several tones are needed. </li>
- <li> The speed (at least with these two sets) was not an influent factor in the results. It’s necessary to test
- with higher velocities. </li>
- <li> The precision setting affects the deep of the engraving, This factor has to be set depend on the thickness of the material. </li>
- <li>It is necessary to try more set of parameters and different materials with different techniques.</li>
- </ol> </p>
- </div>
-
-
-
-
- <div class="col-lg-12">
- <hr width="90%">
-
- <p align="justify" style="font-size:18px"> <br> In a similar way the parameters for cutting were tested. The parameters
- to try this time were speed (mm/min) and power (%). First and the power were fixed a 85 % and the speed were tested in a range of 900 to 3000 mm/min.
- </p>
- </div>
+ <div class="col-lg-12">
+ <p align="center" style="font-size:25px"><u> <br> Solidworks </u> </p>
+ </div>
+ <div class="col-lg-12">
+ <p align="center" style="font-size:25px"><u> <br> Antimony </u> </p>
+ </div>
- <!-- Imagenes 3 y 4 =================================== -->
-
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal3" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_3/Cutting_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 3 <figcaption>
- </a>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
</div>
- </section>
- </div>
-
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal4" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div> <br>
- <img src="img/Week_3/Cutting_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig. 4 <figcaption>
- </a>
- </div>
- </section>
- </div>
- <!-- Imagenes 3 y 4 =================================== -->
-
-
- <div class="col-lg-6">
- <p align="justify" style="font-size:18px"> <br> It was found that with a power of 85% the speed could be up to 2600 mm/min. However after 2000 mm/min,
- is necessary to push the cut in order to remove. That’s why I chose a 2000 mm/min speed for the varying power test. (Fig. 5) <br> <br>
- With a fix speed of 2000 mm/min the power were tested from 50% to 85% and it was found that even a 55 % power the cut is clean, but again at 55%
- it was necessary a push to remove the cut piece. <br> <u> As a conclusion the parameters to cut 3mm thickness MDF are: power: 60% and speed: 2000 mm/min.</u> </p>
- </div>
-
- <!-- Imagenes 5 =================================== -->
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal5" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_3/Cutting_3.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig. 5 <figcaption>
- </a>
- </div>
- </section>
- </div>
- <!-- Imagenes 5 =================================== -->
-
- <div class="col-lg-12">
- <hr width="90%">
-
- <p align="justify" style="font-size:18px"> For a press fit model is necessary to test the joints between
- the different parts. That’s why I made a test consisting in a test different joins with a reduction in percentage of the thickness of the MDF.
- First I use a reduction from 100% to 75 % in steps of -5% at a time. This was clearly an exaggeration because at 95% reduction the fit was to tight.
- That’s why a second test was made between 100% and 95% with steps of 1%. With this test it was found that a reduction of 4 % in the thickness for joints
- is a good point for a press-fit model. Gives the possibility to assemble and disassemble the model without compromise the integrity of the pieces. </p>
- </div>
-
-
-
- <!-- Imagenes 6, 7 y 8 ============================== -->
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal6" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_3/joints_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig. 6 - Model for test the joints for a press-fit model <figcaption>
- </a>
- </div>
- </section>
- </div>
-
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal7" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_3/joints_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 7- Test for joints in laser cut software <figcaption>
- </a>
- </div>
- </section>
- </div>
-
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal8" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_3/joints_3.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 8- Tests for joints <figcaption>
- </a>
- </div>
- </section>
- </div>
-
-
- <!-- Imagenes 6, 7 y 8 ============================== -->
-
- <!-- Video 1 ============================== -->
- <div class="col-lg-6">
-<iframe class="center-block" width="560" height="315" src="https://www.youtube.com/embed/sQJlg_3fzL0" frameborder="0" allowfullscreen></iframe>
- </div>
- <!-- Video 1 ============================== -->
-
- <div class="col-lg-12">
- <hr width="90%">
- <h3 align="center"> <u> press-fit models </u> </h3>
- </div>
-
-
+ <img src="img/Week_2/Antimony_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Antimony CAD Software <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
- <!-- Imagenes 9, 10, 11 y 12 ============================== -->
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal9" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_3/Base.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig. 9 - Centerpiece <figcaption>
- </a>
- </div>
- </section>
- </div>
-
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal10" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div> <br>
- <img src="img/Week_3/Parts.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig. 10 - Lateral piece <figcaption>
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal11" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_3/Assembly.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig. 11 - Assembly (Solidworks)<figcaption>
- </a>
+ <div class="col-lg-12">
+ <p align="center" style="font-size:25px"><u> <br> FreeCad </u> </p>
</div>
- </section>
- </div>
-
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal12" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_3/pressfit_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig. 12 - Complete model <figcaption>
- </a>
- </div>
- </section>
- </div>
-
- <!-- Imagenes 9, 10, 11 y 12 ============================== -->
-
-
-
- <div class="col-lg-12">
- <p align="center" style="font-size:25px"><u> <br> Files </u> </p>
- <p align="justify" style="font-size:18px"> <br> In this section the files generated during the development of the assignment will be available to download </p>
- <p> <br>
- <table class="table-data">
- <tr>
- <td> <a href="http://www.mediafire.com/file/p9t3wl87ep8d2n7/Sphere_Part_1.SLDPRT" download>
- <img src="img/ico/SolidW.jpg" width="100px" height:"40px">
- </a> </td>
- <td> <a href="http://www.mediafire.com/file/ztq7kicj4jp7y9m/Sphere_Part_2.SLDPRT" download>
- <img src="img/ico/SolidW.jpg" width="100px" height:"40px"> </a>
- </td>
- <td> <a href="http://www.mediafire.com/file/vpyp94tvnd7qubq/Sphere.SLDASM" download>
- <img src="img/ico/SolidW.jpg" width="100px" height:"40px"> </a>
- </td>
- </tr>
- <tr>
- <td> <a href="http://www.mediafire.com/file/p9t3wl87ep8d2n7/Sphere_Part_1.SLDPRT" download> Sphere_Part_1.SLDPRT </td></a>
- <td> <a href="http://www.mediafire.com/file/ztq7kicj4jp7y9m/Sphere_Part_2.SLDPRT" download> Sphere_Part_2.SLDPRT</td> </a>
- <td> <a href="http://www.mediafire.com/file/vpyp94tvnd7qubq/Sphere.SLDASM" download> Sphere.SLDASM</td></a>
- </tr>
-
- </table>
-
- </p>
- </div>
</div>
- <!--<div class="col-lg-12 text-center">
- <h1> <em>Wait for it!!</em> </h1>
- </div> -->
- <!-- <div class="row">
- <div class="col-lg-12 col-lg-offset-1">
- <p align="justify"> Wait for it!!</p>
- </div>
- <div class="col-lg-5">
- <p align="justify"></p>
- </div>
- </div> -->
- </div>
</section>
<!-- Footer -->
@@ -480,7 +168,9 @@
</li>
<li>
<a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>
- </li>https://www.dropbox.com/s/jq7vm4nhfr2nuds/Parts.png?raw=1cial btn-outline"><i class="fa fa-fw fa-linkedin"></i></a>
+ </li>
+ <li>
+ <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-linkedin"></i></a>
</li>
<li>
<a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-dribbble"></i></a>
@@ -501,7 +191,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
- Copyright © <a href="http://archive.fabacademy.org/archives/2017/ciudaddemexico/students/403/">Christian Cárdenas | Fab Academy 2017 </a>
+ Copyright © <a href="http://fab.academany.org/2018/labs/fablabmexico/students/christian-cardenas/">Christian Cárdenas | Fab Academy 2018 </a>
</div>
</div>
</div>
@@ -510,324 +200,41 @@
<!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
-
- <!-- Imagenes Modal %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
- <!-- Imagen 1 -->
- <div class="portfolio-modal modal fade" id="portfolioModal1" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_3/Engraving_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
+ <!-- <div class="col-lg-8 col-lg-offset-2 text-center">
+ <div class="scroll-top page-scroll">
+ <a class="btn btn-lg btn-outline" href="#page-top">
+ <i class="fa fa-chevron-up"> Back to top </i>
+ </a>
</div>
+ </div> -->
- <!-- Imagen 2 -->
- <div class="portfolio-modal modal fade" id="portfolioModal2" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="https://www.dropbox.com/s/0qy1e8nu23e7tzs/Engraving_1.png?raw=1" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Imagen 3 -->
- <div class="portfolio-modal modal fade" id="portfolioModal3" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
+ <div class="portfolio-modal modal fade" id="portfolioModal1" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
</div>
</div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-10 col-lg-offset-1"> -->
+ <div class="modal-body">
- <img src="img/Week_3/Cutting_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="img/Week_2/Antimony_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
</div>
</div>
</div>
+ </div>
- <!-- Imagen 4 -->
- <div class="portfolio-modal modal fade" id="portfolioModal4" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_3/Cutting_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Imagen 5 -->
- <div class="portfolio-modal modal fade" id="portfolioModal5" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_3/Cutting_3.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Imagen 6 -->
- <div class="portfolio-modal modal fade" id="portfolioModal6" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_3/joints_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
-<!-- Imagen 7 -->
-
- <div class="portfolio-modal modal fade" id="portfolioModal7" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_3/joints_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Imagen 8 -->
-
- <div class="portfolio-modal modal fade" id="portfolioModal8" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_3/joints_3.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Imagen 9 -->
-
- <div class="portfolio-modal modal fade" id="portfolioModal9" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_3/Base.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
-
- <!-- Imagen 10 -->
- <div class="portfolio-modal modal fade" id="portfolioModal10" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_3/Parts.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Imagen 11 -->
- <div class="portfolio-modal modal fade" id="portfolioModal11" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10"> -->
- <div class="modal-body">
-
-
- <img src="img/Week_3/Assembly.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
-
- <!-- Imagen 12 -->
- <div class="portfolio-modal modal fade" id="portfolioModal12" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10"> -->
- <div class="modal-body">
-
-
- <img src="img/Week_3/pressfit_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
<!-- jQuery -->
<script src="vendor/jquery/jquery.min.js"></script>
diff --git a/Week_4.html b/Week_4.html
index 70ca0835e2272a9eba8924a17612b24f2170cecd..746db6249cddd2d2e25f8ea0cf724f1020e379f2 100644
--- a/Week_4.html
+++ b/Week_4.html
@@ -60,7 +60,6 @@
</li>
<li>
<a href="Week_5.html">Week 5 >></a>
- </li>
</ul>
</div>
<!-- /.navbar-collapse -->
@@ -77,7 +76,10 @@
<div class="intro-text">
<span class="name">Week 4</span>
<hr class="star-light">
- <h1>Electronics production </h1>
+ <div class="col-lg-12 text-center">
+ <h1> Computer-controlled cutting </h1>
+ </div>
+ <!-- <span class="skills">Principles and practices <br> Project Managment </span> -->
</div>
</div>
</div>
@@ -89,12 +91,14 @@
<section class="success" id="about">
<div class="container">
<div class="row">
+
<div class="col-lg-6 ">
<p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Assignment </u></em></p>
<ol style="font-size:18px">
- <li>Make an in-circuit programmer by milling the PCB</li>
- <li>Program the in-circuit programmer made</li>
+ <li>Make lasercutter test part(s), varying cutting settings and slot dimensions</li>
+ <li>Cut something in the vinylcutter</li>
+ <li>Design, make, and document a parametric press-fit construction kit, accounting for the laser cutter kerf, which can be assembled in multiple ways.</li>
</ol>
</div>
@@ -102,319 +106,353 @@
<p align="justify" style="font-size:24px; color:#91aac3" > <em><u> Personal objectives </u></em></p>
<ol style="font-size:18px">
- <li align="justify">Use the fab modules tool (installation and connection with the Roland </li>
- <li align="justify">Develop the ability to complete a circuit board and recognize the different components involve in a circuit (microcontroller, resistors, capacitors, jumpers, etc.)</li>
- <li>Prove the function of the circuit board with a program</li>
-
+ <li>Learn how to use an image vectorizer like Inkscape </li>
+ <li>Learn the procedure to stablish the parameters of cutting in a laser cutter machine</li>
+ <li>use the vinyl cutter to create an sticker</li>
+ <li> Create a parametric design to create an assembly model of a desk lamp</li>
</ol>
</div>
- <h3 align="center"> <u> Installation of Fab Modules </u> </h3></p>
-
- <div class="col-lg-12">
- <p align="justify" style="font-size:18px">
- I decided to install fab modules in my computer as an exercise to test the connection and learn the correct procedure to install and use of the modules,
- so in the future Fab Lab Querétaro this would be easy. The procedure to install was download the zip file found in (link), then follow the next steps in
- the terminal (Ubuntu 16.04):
-
- <p style="font-size:18px">
- Download the fab_src.zip from <a href="http://kokompe.cba.mit.edu/downloads.html"> http://kokompe.cba.mit.edu/downloads.html </a> </p>
-
- <div class="boxed" class="col-lg-10">
- <table style="width:100%">
- <tr>
- <td> ~$ unzip fab_src.zip </td> <td>(Unzip the file) </td>
- </tr>
- <tr>
- <td>~$ sudo apt-get install libfg-dev libbooost-thread-dev libboost-system-dev </td> <td>(Install the prerequisites*)<br></td>
- </tr>
- <tr>
- <td> ~$ sudo apt-get install -y python-wxtools </td> <td> </td>
- </tr>
- <tr>
- <td> ~$ make fab </td> <td> (compiles the source code)</td>
- </tr>
- <tr>
- <td>~$ sudo make install </td> <td>(moves the application files to system directories)</td>
- </tr>
- <tr>
- <td colspan="2"> Optionally add the line PATH=â€/home/chris/Downloads/fab_src/binâ€:$PATH into your .bashrc**</td>
- </tr>
- </table>
- </div>
- <div class="col-lg-offset-1 col-lg-10">
- <table style="width:100%">
- <tr>
- <td>*Some of the packages needed for fab modules were already install in my laptop, so I just install the missing ones</td>
- </tr>
- <tr>
- <td> ** The path between " " it will depend of the folder the <i>make fab</i> was made</td>
- </tr>
- </table>
+ <h3 align="center"> <u> Lasercut tests </u> </h3>
+
+ <p align="justify" style="font-size:18px"> Before using the lasercut is a very good idea to test the parameters in order to understand the changes and the possibles
+ outcomes when a laser cut machine. For this purpose I try first the engraving parameters first with a set of fixed speed and precision,
+ and then varying the power of the laser.
+ The speed is set in mm/min, the precision of the engraving in dpi, and the power is measure in percentage of the maximum laser power.
+ <br>
+ The tests was made in MDF of 3 mm thickness with the next parameters: </p>
+ <br>
+
+ <div class="col-lg-offset-2 col-lg-8">
+ <table class="table-data" style="width:100%">
+ <tr>
+ <th> Speed </th> <th> Precision </th> <th colspan="8"> Power </th>
+ </tr>
+ <tr>
+ <td rowspan="2"> 6000 mm/min </td> <td> 200 dpi</td> <td> 5 </td> <td> 10 </td> <td> 15 </td> <td>20 </td> <td> 25 </td> <td> 30 </td> <td> 35 </td> <td> 40 </td>
+ </tr>
+ <tr>
+ <td> 300 dpi </td> <td> 5 </td> <td> 10 </td> <td> 15 </td> <td>20 </td> <td> 25 </td> <td> 30 </td> <td> 35 </td> <td> 40 </td>
+ </tr>
+ <tr>
+ <td rowspan="2"> 7000 mm/min </td> <td> 200 dpi</td> <td> 5 </td> <td> 10 </td> <td> 15 </td> <td>20 </td> <td> 25 </td> <td> 30 </td> <td> 35 </td> <td> 40 </td>
+ </tr>
+ <tr>
+ <td> 300 dpi </td> <td> 5 </td> <td> 10 </td> <td> 15 </td> <td>20 </td> <td> 25 </td> <td> 30 </td> <td> 35 </td> <td> 40 </td>
+ </tr>
+ </table>
+ </div>
+
+<!-- Imagenes 1 y 2 =================================== -->
+
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div> <br>
+ <img src="img/Week_3/Engraving_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 1 - Settings of the engraving mode <figcaption>
+ </a>
</div>
+ </section>
+ </div>
-<!-- =========================== Imagen 1 y 2 =================== -->
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div> <br>
- <img src="img/Week_4/Fabmod_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 1 - First window of Fab Modules<figcaption>
- </a>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
</div>
- </section>
- </div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div> <br>
- <img src="img/Week_4/Fabmod_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 2 - make rml from png <figcaption>
- </a>
- </div>
- </section>
- </div>
+ </div>
+ <img src="img/Week_3/Engraving_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig. 2 - Results of engraving parameters test <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+<!-- Imagenes 1 y 2 =================================== -->
+
+
+ <div class="col-lg-12">
+ <p align="left" style="font-size:25px"><u> <br> Results </u> </p>
+ </div>
+ <div class="col-lg-12">
+ <p align="justify" style="font-size:18px">
+ <ol style="font-size:18px">
+ <li> As can be seen in figure 2, an obvious statement is that the power affects the tone of the engraving.
+ This can be useful for an artistic work, where several tones are needed. </li>
+ <li> The speed (at least with these two sets) was not an influent factor in the results. It’s necessary to test
+ with higher velocities. </li>
+ <li> The precision setting affects the deep of the engraving, This factor has to be set depend on the thickness of the material. </li>
+ <li>It is necessary to try more set of parameters and different materials with different techniques.</li>
+ </ol> </p>
+ </div>
+
+
-<!-- =========================== Imagen 1 y 2 =================== -->
-
-<h3 align="center"> <u> PCB Milling </u> </h3></p>
-
-<p style="font-size:18px" text-align="justify">After the installation the modules can be called with the command <i>sudo fab</i> in the terminal
-(the sudo is necessary because other way the Roland doesn’t accept the controls from the module).
- Once the firs window of the fab modules is open the next steps should be followed: </p>
-<ol style="font-size:18px">
- <li>The input format and the output process should be selected. In this case the selection for input is image (.png)
- and the output is Roland MDX-20 mill (Figure 2). After the selection below the legend with workflow must appear a make_pgn_rml button. </li>
- <li>After click in make_pgn_rml a new window will be open (Figure 3). In this new window the following steps are necessary</li>
- <ol style="font-size:18px" type="a">
- <li>The image with the traces for the circuit board is loaded with load png.
- In this case the hell.ISP.44.res board (<a href="http://academy.cba.mit.edu/classes/embedded_programming/hello.ISP.44.res.png">board</a>) </li>
- <li>Then choose the process between: mill traces (1/64); mill traces (0.010); cut out board (1/32); wax rough cut (1/8) and wax
- finish cut (1/8). In my case I choose the mill traces (1/64).</li>
- <li>After configure the parameters wanted for the process and click in make .path a preview with the path of the tool will be show. <br> (Figure 4)</li>
- <li>The last part is to set the speed and the origin of the tool and click the make .rml button. After this the estimated time is shown and the Send it!
- Button appear. Its important to know that any change in the path or the rml configuration makes necessary to generate a new path and a new rml.</li>
- </ol>
- </ol>
-
-<!-- =========================== Imagen 3 y 4 =================== -->
-<div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal3" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
+
+ <div class="col-lg-12">
+ <hr width="90%">
+
+ <p align="justify" style="font-size:18px"> <br> In a similar way the parameters for cutting were tested. The parameters
+ to try this time were speed (mm/min) and power (%). First and the power were fixed a 85 % and the speed were tested in a range of 900 to 3000 mm/min.
+ </p>
</div>
- </div> <br>
- <img src="img/Week_4/Fabmod_3.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 3 - make rml window <figcaption>
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal4" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
+
+
+ <!-- Imagenes 3 y 4 =================================== -->
+
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal3" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_3/Cutting_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 3 <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal4" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div> <br>
+ <img src="img/Week_3/Cutting_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig. 4 <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <!-- Imagenes 3 y 4 =================================== -->
+
+
+ <div class="col-lg-6">
+ <p align="justify" style="font-size:18px"> <br> It was found that with a power of 85% the speed could be up to 2600 mm/min. However after 2000 mm/min,
+ is necessary to push the cut in order to remove. That’s why I chose a 2000 mm/min speed for the varying power test. (Fig. 5) <br> <br>
+ With a fix speed of 2000 mm/min the power were tested from 50% to 85% and it was found that even a 55 % power the cut is clean, but again at 55%
+ it was necessary a push to remove the cut piece. <br> <u> As a conclusion the parameters to cut 3mm thickness MDF are: power: 60% and speed: 2000 mm/min.</u> </p>
+ </div>
+
+ <!-- Imagenes 5 =================================== -->
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal5" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_3/Cutting_3.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig. 5 <figcaption>
+ </a>
</div>
- </div> <br>
- <img src="img/Week_4/Fabmod_4.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 4 - path preview for milling the PCB <figcaption>
- </a>
- </div>
- </section>
- </div>
-<!-- =========================== Imagen 3 y 4 =================== -->
-
-<!-- Video 1 ============================== -->
- <div class="col-lg-6"> <br>
-<iframe class="center-block" width="560" height="315" src="https://www.youtube.com/embed/t98v5kQHofk" frameborder="0" allowfullscreen></iframe>
-</div>
-<!-- Video 1 ============================== -->
-
-<!-- =========================== Imagen 5 =================== -->
-<div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal5" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div> <br>
- <img src="img/Week_4/PCB_mill_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 5 - PCB <figcaption>
- </a>
- </div>
- </section>
- </div>
-
-
-<!-- =========================== Imagen 5 =================== -->
-
-<h3 align="center"> <u> PCB Assembly </u> </h3></p>
-
-<p text-align="justify" style="font-size:18px" > Once the PCB is done the assembly of the components in its surface is through solder. As a beginner in this topic this part was quite challenging.
- It was necessary several attempts to finally make a decent solder. The biggest problems while the soldering process was the size of the components, and the skill to let the solder
- just in the joint between the components and the board. <br>
-The technique applied in this case was to first apply solder in all the paths in the board and then place the component and with the soldering iron heat the board and the tip of the
-component. In this way the amount of solder is better controlled and the risk to short circuits reduce.</p>
-
-<!-- =========================== Imagen 6 y 7 =================== -->
-<div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal6" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div> <br>
- <img src="img/Week_4/PCB_assem_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 6 - First attemps (not all of them) <figcaption>
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal7" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
+ </section>
+ </div>
+ <!-- Imagenes 5 =================================== -->
+
+ <div class="col-lg-12">
+ <hr width="90%">
+
+ <p align="justify" style="font-size:18px"> For a press fit model is necessary to test the joints between
+ the different parts. That’s why I made a test consisting in a test different joins with a reduction in percentage of the thickness of the MDF.
+ First I use a reduction from 100% to 75 % in steps of -5% at a time. This was clearly an exaggeration because at 95% reduction the fit was to tight.
+ That’s why a second test was made between 100% and 95% with steps of 1%. With this test it was found that a reduction of 4 % in the thickness for joints
+ is a good point for a press-fit model. Gives the possibility to assemble and disassemble the model without compromise the integrity of the pieces. </p>
</div>
- </div> <br>
- <img src="img/Week_4/PCB_assem_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 7 - Final assembly <figcaption>
- </a>
- </div>
- </section>
+
+
+
+ <!-- Imagenes 6, 7 y 8 ============================== -->
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal6" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_3/joints_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig. 6 - Model for test the joints for a press-fit model <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal7" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_3/joints_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 7- Test for joints in laser cut software <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal8" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_3/joints_3.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 8- Tests for joints <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+
+ <!-- Imagenes 6, 7 y 8 ============================== -->
+
+ <!-- Video 1 ============================== -->
+ <div class="col-lg-6">
+<iframe class="center-block" width="560" height="315" src="https://www.youtube.com/embed/sQJlg_3fzL0" frameborder="0" allowfullscreen></iframe>
</div>
-<!-- =========================== Imagen 6 y 7 =================== -->
- </div>
+ <!-- Video 1 ============================== -->
-<h3 align="center"> <u> Progamming </u> </h3></p>
+ <div class="col-lg-12">
+ <hr width="90%">
+ <h3 align="center"> <u> press-fit models </u> </h3>
+ </div>
-<div class="col-lg-12">
-<p text-align="justify" style="font-size:18px">
-After installing AVRDude in Ubuntu, the firmware was download from the <a href="http://academy.cba.mit.edu/classes/embedded_programming/firmware.zip">link</a> provided. As the programming of the
-FabISP was made with an USBASP AVP Programmer (<a href="http://eecs.oregonstate.edu/education/docs/ece375/USBASP-UG.pdf">User Guide</a>), and this programmer is an ISP – 10 pin IDC (Figure 8) and the
-Fab ISP is a 6 pin circuit it was necessary to use a breadboard (Figure 9) and Female to Male Dupont jumpers (this could be easier with Female to female Dupont jumpers but they weren´t available at the time).
-</p>
+ <!-- Imagenes 9, 10, 11 y 12 ============================== -->
- </div>
-<!-- =========================== Imagen 8 y 9 =================== -->
-<div class="col-lg-6"> <br> <br>
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal8" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div> <br>
- <img src="img/Week_4/Program_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 8 - USBASP pins used to programming the FabISP <figcaption>
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal9" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal9" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_3/Base.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig. 9 - Centerpiece <figcaption>
+ </a>
+ </div>
+ </section>
</div>
- </div> <br>
- <img src="img/Week_4/Program_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 9 - Configuration of USBASP programmer and FabISP with a breadboard <figcaption>
- </a>
- </div>
- </section>
- </div>
- <!-- =========================== Imagen 8 y 9 =================== -->
-
-
-<div class="col-lg-12">
-
-<p align="justify" style="font-size:18px">Once the connection was solve it was necessary to add the next line in the Makefile:</p>
-
-<div class="boxed" class="col-lg-10">
- <table style="width:70%">
- <tr>
- <td> AVRDUDE = avrdude -c usbasp -p USB -p $(DEVICE) </td>
- </tr>
- </table>
-</div>
-
-<p align="justify" style="font-size:18px"> <br>After this the communication was unsuccessful, and the search for problems begin. The first
- problem found was a short circuit with the usb port in the FabISP and the edges of the board, this is something that can be improved with the PCB design.
- In this case the problem was solved with a small piece of electrical tape (Figure 10). After this the programming wasn’t working yet, so consulting one of
- the avrdude options <br> <i>(~$ avrdude –c programmer-id)</i>, in the list of programmer recognized by the utility I found out that there are two types of usbasp programmer
- usbasp and usbasp-clone (Figure 11). </p>
-</div>
-<!-- =========================== Imagen 10 y 11 =================== -->
-<div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal10" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal10" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div> <br>
+ <img src="img/Week_3/Parts.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig. 10 - Lateral piece <figcaption>
+ </a>
+ </div>
+ </section>
</div>
- </div> <br>
- <img src="img/Week_4/Program_3.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 10 - Electrical tape to fix the short circuit with the usb port <figcaption>
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal11" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div> <br>
- <img src="img/Week_4/Program_4.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 11 - types of usbasp programmer recognized by the avrdude <figcaption>
- </a>
- </div>
- </section>
- </div>
-<!-- =========================== Imagen 10 y 11 =================== -->
- <div class="col-lg-12">
- <p align="justify" style="font-size:18px"> Then I changed the device name to “usbasp-clone†and everything went well and the programming didn't have any errors.
- Even though is necessary to test the FabISP with other board.
- </p>
- </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal11" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_3/Assembly.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig. 11 - Assembly (Solidworks)<figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal12" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_3/pressfit_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig. 12 - Complete model <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
-</div>
+ <!-- Imagenes 9, 10, 11 y 12 ============================== -->
+
+
+
+ <div class="col-lg-12">
+ <p align="center" style="font-size:25px"><u> <br> Files </u> </p>
+ <p align="justify" style="font-size:18px"> <br> In this section the files generated during the development of the assignment will be available to download </p>
+ <p> <br>
+ <table class="table-data">
+ <tr>
+ <td> <a href="http://www.mediafire.com/file/p9t3wl87ep8d2n7/Sphere_Part_1.SLDPRT" download>
+ <img src="img/ico/SolidW.jpg" width="100px" height:"40px">
+ </a> </td>
+ <td> <a href="http://www.mediafire.com/file/ztq7kicj4jp7y9m/Sphere_Part_2.SLDPRT" download>
+ <img src="img/ico/SolidW.jpg" width="100px" height:"40px"> </a>
+ </td>
+ <td> <a href="http://www.mediafire.com/file/vpyp94tvnd7qubq/Sphere.SLDASM" download>
+ <img src="img/ico/SolidW.jpg" width="100px" height:"40px"> </a>
+ </td>
+ </tr>
+ <tr>
+ <td> <a href="http://www.mediafire.com/file/p9t3wl87ep8d2n7/Sphere_Part_1.SLDPRT" download> Sphere_Part_1.SLDPRT </td></a>
+ <td> <a href="http://www.mediafire.com/file/ztq7kicj4jp7y9m/Sphere_Part_2.SLDPRT" download> Sphere_Part_2.SLDPRT</td> </a>
+ <td> <a href="http://www.mediafire.com/file/vpyp94tvnd7qubq/Sphere.SLDASM" download> Sphere.SLDASM</td></a>
+ </tr>
+
+ </table>
+
+ </p>
+ </div>
+ </div>
+ <!--<div class="col-lg-12 text-center">
+ <h1> <em>Wait for it!!</em> </h1>
+ </div> -->
+ <!-- <div class="row">
+ <div class="col-lg-12 col-lg-offset-1">
+ <p align="justify"> Wait for it!!</p>
+ </div>
+ <div class="col-lg-5">
+ <p align="justify"></p>
+ </div>
+ </div> -->
</div>
</section>
@@ -442,9 +480,7 @@ Fab ISP is a 6 pin circuit it was necessary to use a breadboard (Figure 9) and F
</li>
<li>
<a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>
- </li>
- <li>
- <a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-linkedin"></i></a>
+ </li>https://www.dropbox.com/s/jq7vm4nhfr2nuds/Parts.png?raw=1cial btn-outline"><i class="fa fa-fw fa-linkedin"></i></a>
</li>
<li>
<a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-dribbble"></i></a>
@@ -465,7 +501,7 @@ Fab ISP is a 6 pin circuit it was necessary to use a breadboard (Figure 9) and F
<div class="container">
<div class="row">
<div class="col-lg-12">
- Copyright © <a href="http://archive.fabacademy.org/archives/2017/ciudaddemexico/students/403/">Christian Cárdenas | Fab Academy 2017 </a>
+ Copyright © <a href="http://fab.academany.org/2018/labs/fablabmexico/students/christian-cardenas/">Christian Cárdenas | Fab Academy 2018 </a>
</div>
</div>
</div>
@@ -474,43 +510,10 @@ Fab ISP is a 6 pin circuit it was necessary to use a breadboard (Figure 9) and F
<!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
- <!-- <div class="col-lg-8 col-lg-offset-2 text-center">
- <div class="scroll-top page-scroll">
- <a class="btn btn-lg btn-outline" href="#page-top">
- <i class="fa fa-chevron-up"> Back to top </i>
- </a>
- </div>
- </div> -->
-
- <!-- Imagenes Modal %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
- <!-- Imagen 1 -->
- <div class="portfolio-modal modal fade" id="portfolioModal1" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
- <img src="img/Week_4/Fabmod_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Imagen 2 -->
- <div class="portfolio-modal modal fade" id="portfolioModal2" tabindex="-1" role="dialog" aria-hidden="true">
+ <!-- Imagenes Modal %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
+ <!-- Imagen 1 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal1" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-content">
<div class="close-modal" data-dismiss="modal">
<div class="lr">
@@ -524,7 +527,7 @@ Fab ISP is a 6 pin circuit it was necessary to use a breadboard (Figure 9) and F
<div class="modal-body">
- <img src="img/Week_4/Fabmod_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="img/Week_3/Engraving_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
@@ -534,8 +537,9 @@ Fab ISP is a 6 pin circuit it was necessary to use a breadboard (Figure 9) and F
</div>
</div>
</div>
- <!-- Imagen 3 -->
- <div class="portfolio-modal modal fade" id="portfolioModal3" tabindex="-1" role="dialog" aria-hidden="true">
+
+ <!-- Imagen 2 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal2" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-content">
<div class="close-modal" data-dismiss="modal">
<div class="lr">
@@ -549,7 +553,7 @@ Fab ISP is a 6 pin circuit it was necessary to use a breadboard (Figure 9) and F
<div class="modal-body">
- <img src="img/Week_4/Fabmod_3.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="https://www.dropbox.com/s/0qy1e8nu23e7tzs/Engraving_1.png?raw=1" class="img-responsive" alt="Atom" style="width:100%; height:auto">
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
@@ -559,8 +563,9 @@ Fab ISP is a 6 pin circuit it was necessary to use a breadboard (Figure 9) and F
</div>
</div>
</div>
- <!-- Imagen 4 -->
- <div class="portfolio-modal modal fade" id="portfolioModal4" tabindex="-1" role="dialog" aria-hidden="true">
+
+ <!-- Imagen 3 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal3" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-content">
<div class="close-modal" data-dismiss="modal">
<div class="lr">
@@ -574,7 +579,7 @@ Fab ISP is a 6 pin circuit it was necessary to use a breadboard (Figure 9) and F
<div class="modal-body">
- <img src="img/Week_4/Fabmod_4.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="img/Week_3/Cutting_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
@@ -583,184 +588,246 @@ Fab ISP is a 6 pin circuit it was necessary to use a breadboard (Figure 9) and F
</div>
</div>
</div>
- </div>
- <!-- Imagen 5 -->
- <div class="portfolio-modal modal fade" id="portfolioModal5" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_4/PCB_mill_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagen 6 -->
- <div class="portfolio-modal modal fade" id="portfolioModal6" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_4/PCB_assem_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagen 7 -->
- <div class="portfolio-modal modal fade" id="portfolioModal7" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_4/PCB_assem_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagen 8 -->
- <div class="portfolio-modal modal fade" id="portfolioModal8" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_4/Program_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagen 9 -->
- <div class="portfolio-modal modal fade" id="portfolioModal9" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_4/Program_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagen 10 -->
- <div class="portfolio-modal modal fade" id="portfolioModal10" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_4/Program_3.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagen 11 -->
- <div class="portfolio-modal modal fade" id="portfolioModal11" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_4/Program_4.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagenes Modal %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
+ </div>
+
+ <!-- Imagen 4 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal4" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_3/Cutting_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Imagen 5 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal5" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_3/Cutting_3.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Imagen 6 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal6" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_3/joints_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+<!-- Imagen 7 -->
+
+ <div class="portfolio-modal modal fade" id="portfolioModal7" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_3/joints_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Imagen 8 -->
+
+ <div class="portfolio-modal modal fade" id="portfolioModal8" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_3/joints_3.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Imagen 9 -->
+
+ <div class="portfolio-modal modal fade" id="portfolioModal9" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_3/Base.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <!-- Imagen 10 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal10" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_3/Parts.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Imagen 11 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal11" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10"> -->
+ <div class="modal-body">
+
+
+ <img src="img/Week_3/Assembly.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <!-- Imagen 12 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal12" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10"> -->
+ <div class="modal-body">
+
+
+ <img src="img/Week_3/pressfit_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
<!-- jQuery -->
<script src="vendor/jquery/jquery.min.js"></script>
diff --git a/Week_5.html b/Week_5.html
index 0928a2e1b2dc601e203b729f2d97dd3e2dd78a7b..67d8cf3c9b7f27ea81d30f513044a15eb7e30c56 100644
--- a/Week_5.html
+++ b/Week_5.html
@@ -9,7 +9,7 @@
<meta name="description" content="My fab academy project">
<meta name="author" content="Christrian Cárdenas">
- <title>FAB Acadaemy | Christian Cárdenas</title>
+ <title>FAB Academy | Christian Cárdenas</title>
<link rel="shortcut icon" href="../img/favicon.ico">
@@ -48,20 +48,20 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
- <ul class="nav navbar-nav navbar-right">
- <li class="hidden">
- <a href="#page-top"></a>
- </li>
- <li>
- <a href="Week_4.html"><< Week 4</a>
- </li>
- <li class="page-scroll">
- <a href="index.html">Home</a>
- </li>
- <li>
- <a href="Week_6.html">Week 6 >></a>
- </li>
- </ul>
+ <ul class="nav navbar-nav navbar-right">
+ <li class="hidden">
+ <a href="#page-top"></a>
+ </li>
+ <li>
+ <a href="Week_4.html"><< Week 4</a>
+ </li>
+ <li class="page-scroll">
+ <a href="index.html">Home</a>
+ </li>
+ <li>
+ <a href="Week_6.html">Week 6 >></a>
+ </li>
+ </ul>
</div>
<!-- /.navbar-collapse -->
</div>
@@ -77,7 +77,7 @@
<div class="intro-text">
<span class="name">Week 5</span>
<hr class="star-light">
- <h1> 3D Scanning and printing </h1>
+ <h1>Electronics production </h1>
</div>
</div>
</div>
@@ -93,9 +93,8 @@
<p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Assignment </u></em></p>
<ol style="font-size:18px">
- <li>Test the design rules for your printer</li>
- <li>Design and 3D print and object</li>
- <li>3D scan an object and print it</li>
+ <li>Make an in-circuit programmer by milling the PCB</li>
+ <li>Program the in-circuit programmer made</li>
</ol>
</div>
@@ -103,386 +102,318 @@
<p align="justify" style="font-size:24px; color:#91aac3" > <em><u> Personal objectives </u></em></p>
<ol style="font-size:18px">
- <li align="justify">- Know about the design rules for 3D printing and the influence of materials and printers in the results</li>
- <li align="justify">- Learn the 3D scan technique and the methods to fix the scans</li>
- </ol>
+ <li align="justify">Use the fab modules tool (installation and connection with the Roland </li>
+ <li align="justify">Develop the ability to complete a circuit board and recognize the different components involve in a circuit (microcontroller, resistors, capacitors, jumpers, etc.)</li>
+ <li>Prove the function of the circuit board with a program</li>
+
+ </ol>
</div>
- <div class="col-lg-12 text-center">
- <h3 align="center"> <u> 3D Printer test </u> </h3></p>
- <p align="justify" style="font-size:18px"> For this part of the assignment I Just test a model for testing available in thingiverse: <a href="https://www.thingiverse.com/thing:1363023">Ctrl V Test</a>
- in the two printers available at Anáhuac Querétaro: A <a href="https://ultimaker.com/en/products/ultimaker-2-plus">ultimaker 2+ Extended</a> an a <a href="http://us.xyzprinting.com/us_en/Product/da-Vinci-1.0">XYZ DaVinci 1.0.</a>
- This test include several features as Z-Height check, Warp Check,
- Spike, Hole in Wall, overhang steps, sharp edges, minimal distance, bridge print, sphere, etc. The result from each printer are showed in the Figure 2 and some of the features are summarized
- in the table after that. </p>
- </div>
+ <h3 align="center"> <u> Installation of Fab Modules </u> </h3></p>
+ <div class="col-lg-12">
+ <p align="justify" style="font-size:18px">
+ I decided to install fab modules in my computer as an exercise to test the connection and learn the correct procedure to install and use of the modules,
+ so in the future Fab Lab Querétaro this would be easy. The procedure to install was download the zip file found in (link), then follow the next steps in
+ the terminal (Ubuntu 16.04):
- <div class="col-lg-12">
- <!-- =========================== Imagen 11 y 12 =================== -->
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal11" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Test_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 1 <figcaption>
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal12" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Test_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 2 <figcaption>
- </a>
- </div>
- </section>
- </div>
- <!-- =========================== Imagen 11 y 12 =================== -->
- </div>
+ <p style="font-size:18px">
+ Download the fab_src.zip from <a href="http://kokompe.cba.mit.edu/downloads.html"> http://kokompe.cba.mit.edu/downloads.html </a> </p>
- <div class="col-lg-12">
- <div class="col-lg-offset-1 col-lg-10">
- <table class="table-data" style="width:100%">
+ <div class="boxed" class="col-lg-10">
+ <table style="width:100%">
<tr>
- <th> Test </th> <th> Ultimaker 2+ </th> <th> XYZ DaVinci 1.0 </th>
+ <td> ~$ unzip fab_src.zip </td> <td>(Unzip the file) </td>
</tr>
<tr>
- <td rowspan="2"> Nut, Size M4</td> <td rowspan="2"> ✔ </td> <td> ✖ </td>
+ <td>~$ sudo apt-get install libfg-dev libbooost-thread-dev libboost-system-dev </td> <td>(Install the prerequisites*)<br></td>
</tr>
<tr>
- <td> Not well define edges at the bottom</td>
+ <td> ~$ sudo apt-get install -y python-wxtools </td> <td> </td>
</tr>
<tr>
- <td>Wave (Rounded print)</td> <td> ✔ </td> <td> ✔ </td>
+ <td> ~$ make fab </td> <td> (compiles the source code)</td>
</tr>
<tr>
- <td rowspan="2">Star (Sharp Edges)</td> <td rowspan="2"> ✔ </td> <td> ✖ </td>
+ <td>~$ sudo make install </td> <td>(moves the application files to system directories)</td>
</tr>
- <tr>
- <td> Not sharp edges, more rounded than sharp </td>
- </tr>
- <tr>
- <td rowspan="2"> Name (complex shapes) </td> <td rowspan="2"> ✔ </td> <td> ✖ </td>
- </tr>
- <tr>
- <td> Not quite defined</td>
- </tr>
- <tr>
- <td rowspan="2"> Holes (3, 4 and 5 mm) </td> <td rowspan="2"> ✔ </td> <td> ✖ </td>
- </tr>
- <tr>
- <td> rests of materials Through the hole </td>
- </tr>
- <tr>
- <td rowspan="2"> Bridge print (2, 4, 8 and 16 mm) </td> <td> ✔ </td> <td> ✖ </td>
- </tr>
- <tr>
- <td> The largest bridge show some curling below </td> <td> The small distances was fine at first but break very easy</td>
- </tr>
- <tr>
- <td rowspan="2"> Hole in Wall </td> <td rowspan="2"> ✔ </td> <td> ✔ </td>
- </tr>
- <tr>
- <td> The hole is ok but change to an ellipse </td>
- </tr>
- <tr>
- <td rowspan="2"> Quarte shpere</td> <td rowspan="2"> ✔ </td> <td>✔ </td>
- </tr>
- <tr>
- <td> The sphere is ok, but with some gaps at the top </td>
+ <tr>
+ <td colspan="2"> Optionally add the line PATH=â€/home/chris/Downloads/fab_src/binâ€:$PATH into your .bashrc**</td>
</tr>
</table>
- </div>
- </div>
-
- <div class="col-lg-12">
- <p align="justify" style="font-size:18px"> <br> After the test, I tried another model from thingiverse (<a href="https://www.thingiverse.com/thing:633081">Bulbasaur Planter High Res</a> ),
- just to test an high resolution model with the best resolution in the Ultimaker 2+. The result was a beautiful planter with a very
- smooth surface and very good finishing (Figure 3 and 4)</p>
- </div>
-
- <div class="col-lg-12">
- <!-- =========================== Imagen 13 y 14 =================== -->
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal13" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Print_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 3 <figcaption>
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal14" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Print_3.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 4 <figcaption>
- </a>
- </div>
- </section>
</div>
- <!-- =========================== Imagen 13 y 14 =================== -->
- </div>
-
- <div class="col-lg-12">
- <h3 align="center"> <u> 3D Scanning </u> </h3></p>
-
- <p align="justify" style="font-size:18px"> For the 3D scanning I wanted to use a small figure to be able to print it in real scale after the scanning. That´s why I used an
- <a href="http://animal-crossing.com/amiibo/collections/amiibo-figures">Tom Nook amiibo</a> (a small nintendo’s collectible from animal crossing game, figure 5). The scanner used was a
- <a href="https://www.creaform3d.com/en/customer-support/legacy-products/first-generation-handyscan-3d-zscanner-700">Creaform – Handyscan 3D</a>, which works with the
- <a href="https://www.creaform3d.com/en/new-features-vxelements">VX Elements</a> software.</p>
- <p align="justify" style="font-size:18px">The procedure to make the 3D scanning is necessary to place positioning targets in the figure and, if possible, in a nonreflecting surface.
- This positioning targets (made of reflective tape) are necessary in order to give the scan a location of the object. The position targets are important due to the manual operation of the
- scan and the fact that is not always scanning from the same position. <br>
- After the position targets are located, the scan needs to be connected to the PC and the VX Elements software ready for scanning. The Handyscan has a trigger to activate the laser
- and the reflection received in the scanner sensors start to create the figure (Figures 6, 7 and 8)</p>
- </div>
+ <div class="col-lg-offset-1 col-lg-10">
+ <table style="width:100%">
+ <tr>
+ <td>*Some of the packages needed for fab modules were already install in my laptop, so I just install the missing ones</td>
+ </tr>
+ <tr>
+ <td> ** The path between " " it will depend of the folder the <i>make fab</i> was made</td>
+ </tr>
+ </table>
+ </div>
- <!-- =========================== Imagen 5, 6, 7 y 8 =================== -->
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Scan_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 5 - Collectible with position targets ready for 3D scanning <figcaption>
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Scan_3.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 6 - Positions Target are recognized first <figcaption>
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6">
+<!-- =========================== Imagen 1 y 2 =================== -->
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div> <br>
+ <img src="img/Week_4/Fabmod_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 1 - First window of Fab Modules<figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
<section class="images" id="images">
<div class="portfolio-item">
- <a href="#portfolioModal3" class="portfolio-link" data-toggle="modal">
+ <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
<div class="caption">
<div class="caption-content">
<i class="fa fa-2x"> Click to Enlarge </i>
</div>
- </div>
- <img src="img/Week_5/Scan_4.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 7 - 3D Construction of the object <figcaption>
+ </div> <br>
+ <img src="img/Week_4/Fabmod_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 2 - make rml from png <figcaption>
</a>
</div>
</section>
</div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal4" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Scan_5.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 8 - More complete construction <figcaption>
- </a>
- </div>
- </section>
- </div>
- <!-- =========================== Imagen 5, 6, 7 y 8 =================== -->
-
- <div class="col-lg-12">
- <p align="justify" style="font-size:18px">Once the scan is complete is necessary to clean and fix the result. As is seen in figure 8,
- the model is not quite complete: the white zones are holes in the model (positions targets and difficult points to reach with the laser).
- To fix the model I used the open source <a href="http://www.meshlab.net/">Meshlab</a> software (Figure 9). In the figure 10 the holes in the model are more visible.
- </p>
- </div>
+<!-- =========================== Imagen 1 y 2 =================== -->
+
+<h3 align="center"> <u> PCB Milling </u> </h3></p>
+
+<p style="font-size:18px" text-align="justify">After the installation the modules can be called with the command <i>sudo fab</i> in the terminal
+(the sudo is necessary because other way the Roland doesn’t accept the controls from the module).
+ Once the firs window of the fab modules is open the next steps should be followed: </p>
+<ol style="font-size:18px">
+ <li>The input format and the output process should be selected. In this case the selection for input is image (.png)
+ and the output is Roland MDX-20 mill (Figure 2). After the selection below the legend with workflow must appear a make_pgn_rml button. </li>
+ <li>After click in make_pgn_rml a new window will be open (Figure 3). In this new window the following steps are necessary</li>
+ <ol style="font-size:18px" type="a">
+ <li>The image with the traces for the circuit board is loaded with load png.
+ In this case the hell.ISP.44.res board (<a href="http://academy.cba.mit.edu/classes/embedded_programming/hello.ISP.44.res.png">board</a>) </li>
+ <li>Then choose the process between: mill traces (1/64); mill traces (0.010); cut out board (1/32); wax rough cut (1/8) and wax
+ finish cut (1/8). In my case I choose the mill traces (1/64).</li>
+ <li>After configure the parameters wanted for the process and click in make .path a preview with the path of the tool will be show. <br> (Figure 4)</li>
+ <li>The last part is to set the speed and the origin of the tool and click the make .rml button. After this the estimated time is shown and the Send it!
+ Button appear. Its important to know that any change in the path or the rml configuration makes necessary to generate a new path and a new rml.</li>
+ </ol>
+ </ol>
+
+<!-- =========================== Imagen 3 y 4 =================== -->
+<div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal3" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div> <br>
+ <img src="img/Week_4/Fabmod_3.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 3 - make rml window <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal4" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div> <br>
+ <img src="img/Week_4/Fabmod_4.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 4 - path preview for milling the PCB <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+<!-- =========================== Imagen 3 y 4 =================== -->
+
+<!-- Video 1 ============================== -->
+ <div class="col-lg-6"> <br>
+<iframe class="center-block" width="560" height="315" src="https://www.youtube.com/embed/t98v5kQHofk" frameborder="0" allowfullscreen></iframe>
+</div>
+<!-- Video 1 ============================== -->
+
+<!-- =========================== Imagen 5 =================== -->
+<div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal5" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div> <br>
+ <img src="img/Week_4/PCB_mill_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 5 - PCB <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+
+<!-- =========================== Imagen 5 =================== -->
+
+<h3 align="center"> <u> PCB Assembly </u> </h3></p>
+
+<p text-align="justify" style="font-size:18px" > Once the PCB is done the assembly of the components in its surface is through solder. As a beginner in this topic this part was quite challenging.
+ It was necessary several attempts to finally make a decent solder. The biggest problems while the soldering process was the size of the components, and the skill to let the solder
+ just in the joint between the components and the board. <br>
+The technique applied in this case was to first apply solder in all the paths in the board and then place the component and with the soldering iron heat the board and the tip of the
+component. In this way the amount of solder is better controlled and the risk to short circuits reduce.</p>
+
+<!-- =========================== Imagen 6 y 7 =================== -->
+<div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal6" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div> <br>
+ <img src="img/Week_4/PCB_assem_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 6 - First attemps (not all of them) <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal7" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div> <br>
+ <img src="img/Week_4/PCB_assem_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 7 - Final assembly <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+<!-- =========================== Imagen 6 y 7 =================== -->
+ </div>
+<h3 align="center"> <u> Progamming </u> </h3></p>
- <!-- =========================== Imagen 9 y 10 =================== -->
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal5" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Mesh_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 9 - STL file obtained from the 3D scanning in Meshlab <figcaption>
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal6" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Mesh_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 10 - Closeup of the model to see the holes in it <figcaption>
- </a>
- </div>
- </section>
- </div>
- <!-- =========================== Imagen 9 y 10 =================== -->
- </div>
+<div class="col-lg-12">
- <p align="justify" style="font-size:18px">
- The first step is to clean the model as much as possible, this is as simple as select and delete. After the model is clean I performed a
- Poisson surface reconstruction with the parameters show in figure 11. This surface reconstruction fills the voids in the model predicting the shape of the surface
- that should be in the holes. After the surface reconstruction is a good idea to smooth it, I made this using a Laplacian smooth with the parameters show in figure 12. </p>
-
- <!-- =========================== Imagen 11 y 12 =================== -->
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal7" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Mesh_4.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 11 - Poisson surface reconstruction in Meshlab <figcaption>
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal8" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Mesh_5.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 12 - Laplacian smooth in Meshlab <figcaption>
- </a>
- </div>
- </section>
- </div>
- <!-- =========================== Imagen 11 y 12 =================== -->
+<p text-align="justify" style="font-size:18px">
+After installing AVRDude in Ubuntu, the firmware was download from the <a href="http://academy.cba.mit.edu/classes/embedded_programming/firmware.zip">link</a> provided. As the programming of the
+FabISP was made with an USBASP AVP Programmer (<a href="http://eecs.oregonstate.edu/education/docs/ece375/USBASP-UG.pdf">User Guide</a>), and this programmer is an ISP – 10 pin IDC (Figure 8) and the
+Fab ISP is a 6 pin circuit it was necessary to use a breadboard (Figure 9) and Female to Male Dupont jumpers (this could be easier with Female to female Dupont jumpers but they weren´t available at the time).
+</p>
- <div class="col-lg-12">
- <p align="justify" style="font-size:18px"> As is can be see the surface reconstruction (figure 11) a demi sphere was created below the model, this is a problem with a very simple solution:
- in the <a href="https://ultimaker.com/en/products/cura-software">cura</a> software (or any other software to control the 3D printer o generate the .gcode) move the model until the
- non-flat part is below the workspace of the 3D printer. The 3D printing of the scanned model is shown in figure 13, besides some curling of the filament in some areas
- (probably lack of supports) the result was quite good, and now Tom Nook has a twin (or something like that).
- </p>
- </div>
- <div class="col-lg-12">
- <!-- =========================== Imagen 13 y 14=================== -->
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal9" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Prints_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 13 - Model in Cura ready to print <figcaption>
- </a>
- </div>
- </section>
- </div>
- <div class="col-lg-6">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal10" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_5/Prints_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 14 - The original Tom Nook and his evil clone <figcaption>
- </a>
- </div>
- </section>
- </div>
- <!-- =========================== Imagen 9 y 10 =================== -->
+ </div>
+<!-- =========================== Imagen 8 y 9 =================== -->
+<div class="col-lg-6"> <br> <br>
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal8" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
</div>
-
- <div class="col-lg-12">
- <p align="center" style="font-size:25px"><u> <br> Files </u> </p>
- <p align="justify" style="font-size:18px"> <br> In this section the files generated during the development of the assignment will be available to download. The files of the models
- of the 3D printer tests are available in thingiverse, the links were provided as they were mentioned. </p>
- <p> <br>
- <table class="table-data">
- <tr>
- <td> <a href="http://www.mediafire.com/file/679978dfwvdqv83/Scan_result.stl" download>
- <img src="img/ico/stl.jpg" width="100px" height:"40px">
- </a> </td>
- <td> <a href="http://www.mediafire.com/file/u5tj437p5262qb7/Meshlab_project.zip" download>
- <img src="img/ico/meshlab.jpg" width="100px" height:"40px"> </a>
- </td>
- <td> <a href="http://www.mediafire.com/file/r2k6tga85iargd4/Fix_Model.stl" download>
- <img src="img/ico/stl.jpg" width="100px" height:"40px"> </a>
- </td>
- <td> <a href="http://www.mediafire.com/file/sn73k3l3462abhw/Tom_Nook_model.gcode" download>
- <img src="img/ico/gcode.jpg" width="100px" height:"40px"> </a></a>
- </td>
- </tr>
- <tr>
- <td> <a href="http://www.mediafire.com/file/679978dfwvdqv83/Scan_result.stl" download> Scan_result.stl </td></a>
- <td> <a href="http://www.mediafire.com/file/u5tj437p5262qb7/Meshlab_project.zip" download> Meshlab_project.zip</td> </a>
- <td> <a href="http://www.mediafire.com/file/r2k6tga85iargd4/Fix_Model.stl" download> Fix_model.stl</td></a>
- <td> <a href="http://www.mediafire.com/file/sn73k3l3462abhw/Tom_Nook_model.gcode" download>Tom_Nook_model.gcode</td></a>
- </tr>
-
- </table>
-
- </p>
+ </div> <br>
+ <img src="img/Week_4/Program_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 8 - USBASP pins used to programming the FabISP <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal9" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div> <br>
+ <img src="img/Week_4/Program_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 9 - Configuration of USBASP programmer and FabISP with a breadboard <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+ <!-- =========================== Imagen 8 y 9 =================== -->
+
+
+<div class="col-lg-12">
+
+<p align="justify" style="font-size:18px">Once the connection was solve it was necessary to add the next line in the Makefile:</p>
+
+<div class="boxed" class="col-lg-10">
+ <table style="width:70%">
+ <tr>
+ <td> AVRDUDE = avrdude -c usbasp -p USB -p $(DEVICE) </td>
+ </tr>
+ </table>
+</div>
+
+<p align="justify" style="font-size:18px"> <br>After this the communication was unsuccessful, and the search for problems begin. The first
+ problem found was a short circuit with the usb port in the FabISP and the edges of the board, this is something that can be improved with the PCB design.
+ In this case the problem was solved with a small piece of electrical tape (Figure 10). After this the programming wasn’t working yet, so consulting one of
+ the avrdude options <br> <i>(~$ avrdude –c programmer-id)</i>, in the list of programmer recognized by the utility I found out that there are two types of usbasp programmer
+ usbasp and usbasp-clone (Figure 11). </p>
+</div>
+<!-- =========================== Imagen 10 y 11 =================== -->
+<div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal10" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
</div>
+ </div> <br>
+ <img src="img/Week_4/Program_3.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 10 - Electrical tape to fix the short circuit with the usb port <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal11" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div> <br>
+ <img src="img/Week_4/Program_4.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 11 - types of usbasp programmer recognized by the avrdude <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+<!-- =========================== Imagen 10 y 11 =================== -->
+
+ <div class="col-lg-12">
+ <p align="justify" style="font-size:18px"> Then I changed the device name to “usbasp-clone†and everything went well and the programming didn't have any errors.
+ Even though is necessary to test the FabISP with other board.
+ </p>
+ </div>
+</div>
</div>
</section>
@@ -534,7 +465,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
- Copyright © <a href="http://archive.fabacademy.org/archives/2017/ciudaddemexico/students/403/">Christian Cárdenas | Fab Academy 2018 </a>
+ Copyright © <a href="http://fab.academany.org/2018/labs/fablabmexico/students/christian-cardenas/">Christian Cárdenas | Fab Academy 2018 </a>
</div>
</div>
</div>
@@ -567,7 +498,7 @@
<div class="modal-body">
- <img src="img/Week_5/Scan_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="img/Week_4/Fabmod_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
@@ -593,7 +524,7 @@
<div class="modal-body">
- <img src="img/Week_5/Scan_3.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="img/Week_4/Fabmod_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
@@ -603,7 +534,6 @@
</div>
</div>
</div>
-
<!-- Imagen 3 -->
<div class="portfolio-modal modal fade" id="portfolioModal3" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-content">
@@ -619,7 +549,7 @@
<div class="modal-body">
- <img src="img/Week_5/Scan_4.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="img/Week_4/Fabmod_3.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
@@ -629,7 +559,6 @@
</div>
</div>
</div>
-
<!-- Imagen 4 -->
<div class="portfolio-modal modal fade" id="portfolioModal4" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-content">
@@ -645,7 +574,7 @@
<div class="modal-body">
- <img src="img/Week_5/Scan_5.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="img/Week_4/Fabmod_4.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
@@ -654,313 +583,185 @@
</div>
</div>
</div>
- </div>
-
- <!-- Imagen 5 -->
- <div class="portfolio-modal modal fade" id="portfolioModal5" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_5/Mesh_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Imagen 6 -->
- <div class="portfolio-modal modal fade" id="portfolioModal6" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_5/Mesh_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Imagen 7 -->
- <div class="portfolio-modal modal fade" id="portfolioModal7" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_5/Mesh_4.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Imagen 8 -->
- <div class="portfolio-modal modal fade" id="portfolioModal8" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_5/Mesh_5.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Imagen 9 -->
- <div class="portfolio-modal modal fade" id="portfolioModal9" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_5/Prints_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagen 10 -->
- <div class="portfolio-modal modal fade" id="portfolioModal10" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_5/Prints_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- <!-- Imagen 11 -->
- <div class="portfolio-modal modal fade" id="portfolioModal11" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_5/Test_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagen 12 -->
- <div class="portfolio-modal modal fade" id="portfolioModal12" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_5/Test_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagen 13 -->
- <div class="portfolio-modal modal fade" id="portfolioModal13" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_5/Print_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagen 14 -->
- <div class="portfolio-modal modal fade" id="portfolioModal14" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_5/Print_3.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagen 15 -->
- <div class="portfolio-modal modal fade" id="portfolioModal15" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_5/Print_4.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
-
-
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Imagen 16 -->
- <div class="portfolio-modal modal fade" id="portfolioModal16" tabindex="-1" role="dialog" aria-hidden="true">
- <div class="modal-content">
- <div class="close-modal" data-dismiss="modal">
- <div class="lr">
- <div class="rl">
- </div>
- </div>
- </div>
- <div class="container">
- <div class="row">
- <div class="col-lg-12 col-md-10">
- <div class="modal-body">
-
-
- <img src="img/Week_5/Print_5.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ </div>
+ <!-- Imagen 5 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal5" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_4/PCB_mill_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 6 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal6" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_4/PCB_assem_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 7 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal7" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_4/PCB_assem_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 8 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal8" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_4/Program_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 9 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal9" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_4/Program_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 10 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal10" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_4/Program_3.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 11 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal11" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_4/Program_4.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagenes Modal %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
- <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
<!-- jQuery -->
<script src="vendor/jquery/jquery.min.js"></script>
diff --git a/Week_6.html b/Week_6.html
index 6580c8e6d6e3a79ad36141fc341d7d3be8f71de6..c4191ca8fdcc184b344898a7a022f3618b0e8a81 100644
--- a/Week_6.html
+++ b/Week_6.html
@@ -77,7 +77,7 @@
<div class="intro-text">
<span class="name">Week 6</span>
<hr class="star-light">
- <h1> Electronics Design </h1>
+ <h1> 3D Scanning and printing </h1>
</div>
</div>
</div>
@@ -85,41 +85,51 @@
</header>
-
-
<!-- About Section -->
<section class="success" id="about">
<div class="container">
<div class="row">
+ <div class="col-lg-6 ">
+
+ <p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Assignment </u></em></p>
+ <ol style="font-size:18px">
+ <li>Test the design rules for your printer</li>
+ <li>Design and 3D print and object</li>
+ <li>3D scan an object and print it</li>
+ </ol>
+ </div>
+
+ <div class="col-lg-6 ">
+
+ <p align="justify" style="font-size:24px; color:#91aac3" > <em><u> Personal objectives </u></em></p>
+ <ol style="font-size:18px">
+ <li align="justify">- Know about the design rules for 3D printing and the influence of materials and printers in the results</li>
+ <li align="justify">- Learn the 3D scan technique and the methods to fix the scans</li>
+ </ol>
+ </div>
<div class="col-lg-12 text-center">
- <h1> <ins> </ins> </h1>
- <!-- <hr class="star-light-blue"> -->
- </div>
- </div>
- <!-- <div class="col-lg-12 text-center">
- <h1> <em>Wait for it!!</em> </h1>
- <hr class="star-light-blue">
- </div> -->
- <!-- <div class="row">
- <div class="col-lg-12 col-lg-offset-1">
- <p align="justify"> Wait for it!!</p>
- </div>
- <div class="col-lg-5">
- <p align="justify"></p>
- </div>
- </div> -->
+ <h3 align="center"> <u> 3D Printer test </u> </h3></p>
+ <p align="justify" style="font-size:18px"> For this part of the assignment I Just test a model for testing available in thingiverse: <a href="https://www.thingiverse.com/thing:1363023">Ctrl V Test</a>
+ in the two printers available at Anáhuac Querétaro: A <a href="https://ultimaker.com/en/products/ultimaker-2-plus">ultimaker 2+ Extended</a> an a <a href="http://us.xyzprinting.com/us_en/Product/da-Vinci-1.0">XYZ DaVinci 1.0.</a>
+ This test include several features as Z-Height check, Warp Check,
+ Spike, Hole in Wall, overhang steps, sharp edges, minimal distance, bridge print, sphere, etc. The result from each printer are showed in the Figure 2 and some of the features are summarized
+ in the table after that. </p>
+ </div>
+
+
+
<div class="col-lg-12">
- <!-- =========================== Imagen 1 y 2 =================== -->
+ <!-- =========================== Imagen 11 y 12 =================== -->
<div class="col-lg-6">
<section class="images" id="images">
<div class="portfolio-item">
- <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
+ <a href="#portfolioModal11" class="portfolio-link" data-toggle="modal">
<div class="caption">
<div class="caption-content">
<i class="fa fa-2x"> Click to Enlarge </i>
</div>
</div>
- <img src="img/Week_6/Eagle_1.png" class="img-responsive" alt="Atom">
+ <img src="img/Week_5/Test_1.jpg" class="img-responsive" alt="Atom">
<figcaption> Fig 1 <figcaption>
</a>
</div>
@@ -128,29 +138,143 @@
<div class="col-lg-6">
<section class="images" id="images">
<div class="portfolio-item">
- <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
+ <a href="#portfolioModal12" class="portfolio-link" data-toggle="modal">
<div class="caption">
<div class="caption-content">
<i class="fa fa-2x"> Click to Enlarge </i>
</div>
</div>
- <img src="img/Week_6/Eagle_2.png" class="img-responsive" alt="Atom">
+ <img src="img/Week_5/Test_2.jpg" class="img-responsive" alt="Atom">
<figcaption> Fig 2 <figcaption>
</a>
</div>
</section>
</div>
+ <!-- =========================== Imagen 11 y 12 =================== -->
+ </div>
+
+ <div class="col-lg-12">
+ <div class="col-lg-offset-1 col-lg-10">
+ <table class="table-data" style="width:100%">
+ <tr>
+ <th> Test </th> <th> Ultimaker 2+ </th> <th> XYZ DaVinci 1.0 </th>
+ </tr>
+ <tr>
+ <td rowspan="2"> Nut, Size M4</td> <td rowspan="2"> ✔ </td> <td> ✖ </td>
+ </tr>
+ <tr>
+ <td> Not well define edges at the bottom</td>
+ </tr>
+ <tr>
+ <td>Wave (Rounded print)</td> <td> ✔ </td> <td> ✔ </td>
+ </tr>
+ <tr>
+ <td rowspan="2">Star (Sharp Edges)</td> <td rowspan="2"> ✔ </td> <td> ✖ </td>
+ </tr>
+ <tr>
+ <td> Not sharp edges, more rounded than sharp </td>
+ </tr>
+ <tr>
+ <td rowspan="2"> Name (complex shapes) </td> <td rowspan="2"> ✔ </td> <td> ✖ </td>
+ </tr>
+ <tr>
+ <td> Not quite defined</td>
+ </tr>
+ <tr>
+ <td rowspan="2"> Holes (3, 4 and 5 mm) </td> <td rowspan="2"> ✔ </td> <td> ✖ </td>
+ </tr>
+ <tr>
+ <td> rests of materials Through the hole </td>
+ </tr>
+ <tr>
+ <td rowspan="2"> Bridge print (2, 4, 8 and 16 mm) </td> <td> ✔ </td> <td> ✖ </td>
+ </tr>
+ <tr>
+ <td> The largest bridge show some curling below </td> <td> The small distances was fine at first but break very easy</td>
+ </tr>
+ <tr>
+ <td rowspan="2"> Hole in Wall </td> <td rowspan="2"> ✔ </td> <td> ✔ </td>
+ </tr>
+ <tr>
+ <td> The hole is ok but change to an ellipse </td>
+ </tr>
+ <tr>
+ <td rowspan="2"> Quarte shpere</td> <td rowspan="2"> ✔ </td> <td>✔ </td>
+ </tr>
+ <tr>
+ <td> The sphere is ok, but with some gaps at the top </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+
+ <div class="col-lg-12">
+ <p align="justify" style="font-size:18px"> <br> After the test, I tried another model from thingiverse (<a href="https://www.thingiverse.com/thing:633081">Bulbasaur Planter High Res</a> ),
+ just to test an high resolution model with the best resolution in the Ultimaker 2+. The result was a beautiful planter with a very
+ smooth surface and very good finishing (Figure 3 and 4)</p>
+ </div>
+
+ <div class="col-lg-12">
+ <!-- =========================== Imagen 13 y 14 =================== -->
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal13" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_5/Print_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 3 <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal14" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_5/Print_3.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 4 <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <!-- =========================== Imagen 13 y 14 =================== -->
+ </div>
+
+ <div class="col-lg-12">
+ <h3 align="center"> <u> 3D Scanning </u> </h3></p>
+
+ <p align="justify" style="font-size:18px"> For the 3D scanning I wanted to use a small figure to be able to print it in real scale after the scanning. That´s why I used an
+ <a href="http://animal-crossing.com/amiibo/collections/amiibo-figures">Tom Nook amiibo</a> (a small nintendo’s collectible from animal crossing game, figure 5). The scanner used was a
+ <a href="https://www.creaform3d.com/en/customer-support/legacy-products/first-generation-handyscan-3d-zscanner-700">Creaform – Handyscan 3D</a>, which works with the
+ <a href="https://www.creaform3d.com/en/new-features-vxelements">VX Elements</a> software.</p>
+ <p align="justify" style="font-size:18px">The procedure to make the 3D scanning is necessary to place positioning targets in the figure and, if possible, in a nonreflecting surface.
+ This positioning targets (made of reflective tape) are necessary in order to give the scan a location of the object. The position targets are important due to the manual operation of the
+ scan and the fact that is not always scanning from the same position. <br>
+ After the position targets are located, the scan needs to be connected to the PC and the VX Elements software ready for scanning. The Handyscan has a trigger to activate the laser
+ and the reflection received in the scanner sensors start to create the figure (Figures 6, 7 and 8)</p>
+ </div>
+
+ <!-- =========================== Imagen 5, 6, 7 y 8 =================== -->
<div class="col-lg-6">
<section class="images" id="images">
<div class="portfolio-item">
- <a href="#portfolioModal3" class="portfolio-link" data-toggle="modal">
+ <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
<div class="caption">
<div class="caption-content">
<i class="fa fa-2x"> Click to Enlarge </i>
</div>
</div>
- <img src="img/Week_6/Board.png" class="img-responsive" alt="Atom">
- <figcaption> Fig 3 <figcaption>
+ <img src="img/Week_5/Scan_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 5 - Collectible with position targets ready for 3D scanning <figcaption>
</a>
</div>
</section>
@@ -158,36 +282,208 @@
<div class="col-lg-6">
<section class="images" id="images">
<div class="portfolio-item">
- <a href="#portfolioModal4" class="portfolio-link" data-toggle="modal">
+ <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
<div class="caption">
<div class="caption-content">
<i class="fa fa-2x"> Click to Enlarge </i>
</div>
</div>
- <img src="img/Week_6/Board_1.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 4 <figcaption>
+ <img src="img/Week_5/Scan_3.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 6 - Positions Target are recognized first <figcaption>
</a>
</div>
</section>
</div>
- <div class="col-lg-12">
- <section class="images" id="images">
- <div class="portfolio-item">
- <a href="#portfolioModal5" class="portfolio-link" data-toggle="modal">
- <div class="caption">
- <div class="caption-content">
- <i class="fa fa-2x"> Click to Enlarge </i>
- </div>
- </div>
- <img src="img/Week_6/Board_2.jpg" class="img-responsive" alt="Atom">
- <figcaption> Fig 5 <figcaption>
- </a>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal3" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_5/Scan_4.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 7 - 3D Construction of the object <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal4" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
</div>
- </section>
- </div>
+ <img src="img/Week_5/Scan_5.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 8 - More complete construction <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
- <!-- =========================== Imagen 1 2, 3 y 4 =================== -->
+ <!-- =========================== Imagen 5, 6, 7 y 8 =================== -->
+
+ <div class="col-lg-12">
+ <p align="justify" style="font-size:18px">Once the scan is complete is necessary to clean and fix the result. As is seen in figure 8,
+ the model is not quite complete: the white zones are holes in the model (positions targets and difficult points to reach with the laser).
+ To fix the model I used the open source <a href="http://www.meshlab.net/">Meshlab</a> software (Figure 9). In the figure 10 the holes in the model are more visible.
+ </p>
+ </div>
+
+
+ <!-- =========================== Imagen 9 y 10 =================== -->
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal5" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_5/Mesh_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 9 - STL file obtained from the 3D scanning in Meshlab <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal6" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_5/Mesh_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 10 - Closeup of the model to see the holes in it <figcaption>
+ </a>
+ </div>
+ </section>
</div>
+ <!-- =========================== Imagen 9 y 10 =================== -->
+ </div>
+
+ <p align="justify" style="font-size:18px">
+ The first step is to clean the model as much as possible, this is as simple as select and delete. After the model is clean I performed a
+ Poisson surface reconstruction with the parameters show in figure 11. This surface reconstruction fills the voids in the model predicting the shape of the surface
+ that should be in the holes. After the surface reconstruction is a good idea to smooth it, I made this using a Laplacian smooth with the parameters show in figure 12. </p>
+
+ <!-- =========================== Imagen 11 y 12 =================== -->
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal7" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_5/Mesh_4.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 11 - Poisson surface reconstruction in Meshlab <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal8" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_5/Mesh_5.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 12 - Laplacian smooth in Meshlab <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <!-- =========================== Imagen 11 y 12 =================== -->
+
+ <div class="col-lg-12">
+ <p align="justify" style="font-size:18px"> As is can be see the surface reconstruction (figure 11) a demi sphere was created below the model, this is a problem with a very simple solution:
+ in the <a href="https://ultimaker.com/en/products/cura-software">cura</a> software (or any other software to control the 3D printer o generate the .gcode) move the model until the
+ non-flat part is below the workspace of the 3D printer. The 3D printing of the scanned model is shown in figure 13, besides some curling of the filament in some areas
+ (probably lack of supports) the result was quite good, and now Tom Nook has a twin (or something like that).
+ </p>
+ </div>
+
+ <div class="col-lg-12">
+ <!-- =========================== Imagen 13 y 14=================== -->
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal9" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_5/Prints_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 13 - Model in Cura ready to print <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal10" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_5/Prints_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 14 - The original Tom Nook and his evil clone <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <!-- =========================== Imagen 9 y 10 =================== -->
+ </div>
+
+ <div class="col-lg-12">
+ <p align="center" style="font-size:25px"><u> <br> Files </u> </p>
+ <p align="justify" style="font-size:18px"> <br> In this section the files generated during the development of the assignment will be available to download. The files of the models
+ of the 3D printer tests are available in thingiverse, the links were provided as they were mentioned. </p>
+ <p> <br>
+ <table class="table-data">
+ <tr>
+ <td> <a href="http://www.mediafire.com/file/679978dfwvdqv83/Scan_result.stl" download>
+ <img src="img/ico/stl.jpg" width="100px" height:"40px">
+ </a> </td>
+ <td> <a href="http://www.mediafire.com/file/u5tj437p5262qb7/Meshlab_project.zip" download>
+ <img src="img/ico/meshlab.jpg" width="100px" height:"40px"> </a>
+ </td>
+ <td> <a href="http://www.mediafire.com/file/r2k6tga85iargd4/Fix_Model.stl" download>
+ <img src="img/ico/stl.jpg" width="100px" height:"40px"> </a>
+ </td>
+ <td> <a href="http://www.mediafire.com/file/sn73k3l3462abhw/Tom_Nook_model.gcode" download>
+ <img src="img/ico/gcode.jpg" width="100px" height:"40px"> </a></a>
+ </td>
+ </tr>
+ <tr>
+ <td> <a href="http://www.mediafire.com/file/679978dfwvdqv83/Scan_result.stl" download> Scan_result.stl </td></a>
+ <td> <a href="http://www.mediafire.com/file/u5tj437p5262qb7/Meshlab_project.zip" download> Meshlab_project.zip</td> </a>
+ <td> <a href="http://www.mediafire.com/file/r2k6tga85iargd4/Fix_Model.stl" download> Fix_model.stl</td></a>
+ <td> <a href="http://www.mediafire.com/file/sn73k3l3462abhw/Tom_Nook_model.gcode" download>Tom_Nook_model.gcode</td></a>
+ </tr>
+
+ </table>
+
+ </p>
+ </div>
+
+
+
</div>
</section>
@@ -238,7 +534,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
- Copyright © <a href="http://archive.fabacademy.org/archives/2017/ciudaddemexico/students/403/">Christian Cárdenas | Fab Academy 2018 </a>
+ Copyright © <a href="http://fab.academany.org/2018/labs/fablabmexico/students/christian-cardenas/">Christian Cárdenas | Fab Academy 2018 </a>
</div>
</div>
</div>
@@ -271,7 +567,7 @@
<div class="modal-body">
- <img src="img/Week_6/Eagle_1.png" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="img/Week_5/Scan_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
@@ -297,7 +593,7 @@
<div class="modal-body">
- <img src="img/Week_6/Eagle_2.png" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="img/Week_5/Scan_3.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
@@ -323,7 +619,7 @@
<div class="modal-body">
- <img src="img/Week_6/Board.png" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="img/Week_5/Scan_4.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
@@ -333,6 +629,7 @@
</div>
</div>
</div>
+
<!-- Imagen 4 -->
<div class="portfolio-modal modal fade" id="portfolioModal4" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-content">
@@ -348,7 +645,7 @@
<div class="modal-body">
- <img src="img/Week_6/Board_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="img/Week_5/Scan_5.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
@@ -357,8 +654,8 @@
</div>
</div>
</div>
- </div>
</div>
+
<!-- Imagen 5 -->
<div class="portfolio-modal modal fade" id="portfolioModal5" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-content">
@@ -374,7 +671,7 @@
<div class="modal-body">
- <img src="img/Week_6/Board_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+ <img src="img/Week_5/Mesh_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
@@ -383,10 +680,287 @@
</div>
</div>
</div>
- </div>
</div>
- <!-- Imagenes Modal %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
+ <!-- Imagen 6 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal6" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_5/Mesh_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Imagen 7 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal7" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_5/Mesh_4.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Imagen 8 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal8" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_5/Mesh_5.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Imagen 9 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal9" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_5/Prints_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 10 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal10" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_5/Prints_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Imagen 11 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal11" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_5/Test_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 12 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal12" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_5/Test_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 13 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal13" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_5/Print_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 14 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal14" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_5/Print_3.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 15 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal15" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_5/Print_4.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 16 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal16" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_5/Print_5.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
<!-- jQuery -->
<script src="vendor/jquery/jquery.min.js"></script>
diff --git a/Week_7.html b/Week_7.html
index cb0353b4a24c8851b6d4b27cfbd1a8fe10d452b2..dfd27b3ec431d5f51cad2e9611b790f1ea9bd61d 100644
--- a/Week_7.html
+++ b/Week_7.html
@@ -9,7 +9,7 @@
<meta name="description" content="My fab academy project">
<meta name="author" content="Christrian Cárdenas">
- <title>FAB Acadaemy | Christian Cárdenas</title>
+ <title>FAB Academy | Christian Cárdenas</title>
<link rel="shortcut icon" href="../img/favicon.ico">
@@ -77,7 +77,7 @@
<div class="intro-text">
<span class="name">Week 7</span>
<hr class="star-light">
- <h1> Computer-controlled machining </h1>
+ <h1> Electronics Design </h1>
</div>
</div>
</div>
@@ -85,6 +85,8 @@
</header>
+
+
<!-- About Section -->
<section class="success" id="about">
<div class="container">
@@ -94,10 +96,10 @@
<!-- <hr class="star-light-blue"> -->
</div>
</div>
- <div class="col-lg-12 text-center">
+ <!-- <div class="col-lg-12 text-center">
<h1> <em>Wait for it!!</em> </h1>
- <!-- <hr class="star-light-blue"> -->
- </div>
+ <hr class="star-light-blue">
+ </div> -->
<!-- <div class="row">
<div class="col-lg-12 col-lg-offset-1">
<p align="justify"> Wait for it!!</p>
@@ -105,7 +107,87 @@
<div class="col-lg-5">
<p align="justify"></p>
</div>
- </div> -->
+ </div> -->
+ <div class="col-lg-12">
+ <!-- =========================== Imagen 1 y 2 =================== -->
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal1" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_6/Eagle_1.png" class="img-responsive" alt="Atom">
+ <figcaption> Fig 1 <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal2" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_6/Eagle_2.png" class="img-responsive" alt="Atom">
+ <figcaption> Fig 2 <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal3" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_6/Board.png" class="img-responsive" alt="Atom">
+ <figcaption> Fig 3 <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-6">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal4" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_6/Board_1.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 4 <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+ <div class="col-lg-12">
+ <section class="images" id="images">
+ <div class="portfolio-item">
+ <a href="#portfolioModal5" class="portfolio-link" data-toggle="modal">
+ <div class="caption">
+ <div class="caption-content">
+ <i class="fa fa-2x"> Click to Enlarge </i>
+ </div>
+ </div>
+ <img src="img/Week_6/Board_2.jpg" class="img-responsive" alt="Atom">
+ <figcaption> Fig 5 <figcaption>
+ </a>
+ </div>
+ </section>
+ </div>
+
+ <!-- =========================== Imagen 1 2, 3 y 4 =================== -->
+ </div>
</div>
</section>
@@ -156,7 +238,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
- Copyright © <a href="http://archive.fabacademy.org/archives/2017/ciudaddemexico/students/403/">Christian Cárdenas | Fab Academy 2017 </a>
+ Copyright © <a href="http://fab.academany.org/2018/labs/fablabmexico/students/christian-cardenas/">Christian Cárdenas | Fab Academy 2018 </a>
</div>
</div>
</div>
@@ -173,7 +255,137 @@
</div>
</div> -->
+ <!-- Imagenes Modal %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
+ <!-- Imagen 1 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal1" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_6/Eagle_1.png" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Imagen 2 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal2" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_6/Eagle_2.png" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Imagen 3 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal3" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_6/Board.png" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 4 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal4" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_6/Board_1.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagen 5 -->
+ <div class="portfolio-modal modal fade" id="portfolioModal5" tabindex="-1" role="dialog" aria-hidden="true">
+ <div class="modal-content">
+ <div class="close-modal" data-dismiss="modal">
+ <div class="lr">
+ <div class="rl">
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-12 col-md-10">
+ <div class="modal-body">
+
+
+ <img src="img/Week_6/Board_2.jpg" class="img-responsive" alt="Atom" style="width:100%; height:auto">
+
+ <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- Imagenes Modal %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
<!-- jQuery -->
<script src="vendor/jquery/jquery.min.js"></script>
diff --git a/Week_8.html b/Week_8.html
index 61bd2a506bd2cbd3de6bcab57af9fde7642222fa..ebb2c334869f39f9a69fcea630ef057a94002d0d 100644
--- a/Week_8.html
+++ b/Week_8.html
@@ -9,7 +9,7 @@
<meta name="description" content="My fab academy project">
<meta name="author" content="Christrian Cárdenas">
- <title>FAB Acadaemy | Christian Cárdenas</title>
+ <title>FAB Academy | Christian Cárdenas</title>
<link rel="shortcut icon" href="../img/favicon.ico">
@@ -77,7 +77,7 @@
<div class="intro-text">
<span class="name">Week 8</span>
<hr class="star-light">
- <h1> Embedded Programming</h1>
+ <h1> Computer-controlled machining </h1>
</div>
</div>
</div>
@@ -156,7 +156,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
- Copyright © <a href="http://archive.fabacademy.org/archives/2017/ciudaddemexico/students/403/">Christian Cárdenas | Fab Academy 2017 </a>
+ Copyright © <a href="http://fab.academany.org/2018/labs/fablabmexico/students/christian-cardenas/">Christian Cárdenas | Fab Academy 2018 </a>
</div>
</div>
</div>
diff --git a/Week_9.html b/Week_9.html
index fb971b6e568643703989c9fa8a15b69065d0bb08..3a846cbbc6346399a54ef66843a1228adc836bcc 100644
--- a/Week_9.html
+++ b/Week_9.html
@@ -77,7 +77,7 @@
<div class="intro-text">
<span class="name">Week 9</span>
<hr class="star-light">
- <h1> Molding and casting</h1>
+ <h1> Embedded Programming</h1>
</div>
</div>
</div>
@@ -89,15 +89,6 @@
<section class="success" id="about">
<div class="container">
<div class="row">
- <div class="col-lg-6 ">
-
- <p align="justify" padding-top="20px" style="font-size:24px; color:#91aac3" > <em><u> Assignment </u></em></p>
- <ol style="font-size:18px">
- <li>Design a 3D mold</li>
- <li>Machine the mold</li>
- <li>Use the mold to cast parts</li>
- </ol>
- </div>
<div class="col-lg-12 text-center">
<h1> <ins> </ins> </h1>
<!-- <hr class="star-light-blue"> -->
@@ -165,7 +156,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
- Copyright © <a href="http://archive.fabacademy.org/archives/2017/ciudaddemexico/students/403/">Christian Cárdenas | Fab Academy 2017 </a>
+ Copyright © <a href="http://fab.academany.org/2018/labs/fablabmexico/students/christian-cardenas/">Christian Cárdenas | Fab Academy 2018 </a>
</div>
</div>
</div>
diff --git a/img/index/Modificar/About.jpg b/img/index/Modificar/About.jpg
deleted file mode 100644
index 292cd39b22fd3dcad2e4ff8743536c260b9d38f2..0000000000000000000000000000000000000000
Binary files a/img/index/Modificar/About.jpg and /dev/null differ
diff --git a/img/index/Modificar/Week10B.jpg b/img/index/Modificar/Week10B.jpg
deleted file mode 100644
index 0d155ae11c12e7075b90db46f1565cd6228f4069..0000000000000000000000000000000000000000
Binary files a/img/index/Modificar/Week10B.jpg and /dev/null differ
diff --git a/img/index/Modificar/Week10_2.jpg b/img/index/Modificar/Week10_2.jpg
deleted file mode 100644
index 945334de02b5b8ce4e7f60f6910678f2b188f303..0000000000000000000000000000000000000000
Binary files a/img/index/Modificar/Week10_2.jpg and /dev/null differ
diff --git a/img/index/Modificar/Week11AA.jpg b/img/index/Modificar/Week11AA.jpg
deleted file mode 100644
index 4dc9b3f69800d61aaa210c992cd92e55a0d5b0cc..0000000000000000000000000000000000000000
Binary files a/img/index/Modificar/Week11AA.jpg and /dev/null differ
diff --git a/img/index/Modificar/Week11BB.jpg b/img/index/Modificar/Week11BB.jpg
deleted file mode 100644
index 4a360dac3b1caa97b7adb03f1b8902ada48e8b48..0000000000000000000000000000000000000000
Binary files a/img/index/Modificar/Week11BB.jpg and /dev/null differ
diff --git a/img/index/Modificar/Week9AA.jpg b/img/index/Modificar/Week9AA.jpg
deleted file mode 100644
index eae8b56eb412bca00509eb513213720342162184..0000000000000000000000000000000000000000
Binary files a/img/index/Modificar/Week9AA.jpg and /dev/null differ
diff --git a/img/index/Modificar/Week9B.jpg b/img/index/Modificar/Week9B.jpg
deleted file mode 100644
index 9f0d2aebd14b05d4af9c4e7d30f413580efcb423..0000000000000000000000000000000000000000
Binary files a/img/index/Modificar/Week9B.jpg and /dev/null differ
diff --git a/img/index/Week1.jpg b/img/index/Week1.jpg
index 74f76b0ebf5b7a0295d2ca2c61915a51508f8baa..f7670abdb7c4211b7f976435ae6bd070dfb22cf8 100644
Binary files a/img/index/Week1.jpg and b/img/index/Week1.jpg differ
diff --git a/img/index/Week10.jpg b/img/index/Week10.jpg
index 32bfa1a3b47f13826bc0e0cae50d683ee5943214..b5702a9ee8374f080a909dec021dc886e790d403 100644
Binary files a/img/index/Week10.jpg and b/img/index/Week10.jpg differ
diff --git a/img/index/Week11.jpg b/img/index/Week11.jpg
index 58ce786a829ba40397752c570f0c6c9a17e54e5e..32bfa1a3b47f13826bc0e0cae50d683ee5943214 100644
Binary files a/img/index/Week11.jpg and b/img/index/Week11.jpg differ
diff --git a/img/index/Week12.jpg b/img/index/Week12.jpg
index c7214eef727dc7f9d35235c8bd07d2eedbb1730f..58ce786a829ba40397752c570f0c6c9a17e54e5e 100644
Binary files a/img/index/Week12.jpg and b/img/index/Week12.jpg differ
diff --git a/img/index/Week13.jpg b/img/index/Week13.jpg
index 0d155ae11c12e7075b90db46f1565cd6228f4069..c7214eef727dc7f9d35235c8bd07d2eedbb1730f 100644
Binary files a/img/index/Week13.jpg and b/img/index/Week13.jpg differ
diff --git a/img/index/Week14.jpg b/img/index/Week14.jpg
index 6cde373388c36a5df52184b8177edef91dd21ed4..e8599a55224d570ab8ef6bf9485c0d1749655208 100644
Binary files a/img/index/Week14.jpg and b/img/index/Week14.jpg differ
diff --git a/img/index/Week15.jpg b/img/index/Week15.jpg
index 75d0a5e29514f7356b4faed07a30577f93ef96f7..8d5f306d0b0bd111147ded567e9d9428f9856966 100644
Binary files a/img/index/Week15.jpg and b/img/index/Week15.jpg differ
diff --git a/img/index/Week1_e.jpg b/img/index/Week1_e.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..919612b171989faa81c1ad6dd75d6116bafa04b6
Binary files /dev/null and b/img/index/Week1_e.jpg differ
diff --git a/img/index/Week1a.jpg b/img/index/Week1a.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d12d55b9c49cc1f08515f352b0556e1e7f84be92
Binary files /dev/null and b/img/index/Week1a.jpg differ
diff --git a/img/index/Week2.jpg b/img/index/Week2.jpg
index 01df3a83985d72838f62a3f4da48af32fd93eb13..1064696472fa15f9b5c8c59a4f782d922ed69821 100644
Binary files a/img/index/Week2.jpg and b/img/index/Week2.jpg differ
diff --git a/img/index/Week2_e.jpg b/img/index/Week2_e.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4d17eba0b8553f71f8435de639b4dff74cb770ae
Binary files /dev/null and b/img/index/Week2_e.jpg differ
diff --git a/img/index/Week3.jpg b/img/index/Week3.jpg
index 47b6345b6c18e9a7a8d10386d83a6ea504bd8ae0..e6f29e215e1413529a57a07663ddaf23969d5f5f 100644
Binary files a/img/index/Week3.jpg and b/img/index/Week3.jpg differ
diff --git a/img/index/Week3_e.jpg b/img/index/Week3_e.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ac705689d6fc44ef8ee23962d0880fa661b6572e
Binary files /dev/null and b/img/index/Week3_e.jpg differ
diff --git a/img/index/Week4.jpg b/img/index/Week4.jpg
index 88b05f6cc33ed1237a774dab95f3fcada27cf6a9..8d6947594bbb7979b5e79ab5311e2f4ed1c91e87 100644
Binary files a/img/index/Week4.jpg and b/img/index/Week4.jpg differ
diff --git a/img/index/Week4_e.jpg b/img/index/Week4_e.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..466dbe1fe39aeedd4d2aa67f30cd8204a81a18a6
Binary files /dev/null and b/img/index/Week4_e.jpg differ
diff --git a/img/index/Week5.jpg b/img/index/Week5.jpg
index 947206b4331397c382d00fad4a43960250498ba2..7f57c6d5c8bb02abb81d174d54c15fa379dbf866 100644
Binary files a/img/index/Week5.jpg and b/img/index/Week5.jpg differ
diff --git a/img/index/Week5_e.jpg b/img/index/Week5_e.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..524baeab611c9fd7b664546cc528990d1768fb22
Binary files /dev/null and b/img/index/Week5_e.jpg differ
diff --git a/img/index/Week6.jpg b/img/index/Week6.jpg
index 449b62dfa6d10b0c9c0631855f8f92c54d68b60c..eac023e9a66a2f8bccfe4f7cbe0a3aa2a0e86f57 100644
Binary files a/img/index/Week6.jpg and b/img/index/Week6.jpg differ
diff --git a/img/index/Week6_e.jpg b/img/index/Week6_e.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5154dc26125925c795d9c5390fc15040ddedd441
Binary files /dev/null and b/img/index/Week6_e.jpg differ
diff --git a/img/index/Week7.jpg b/img/index/Week7.jpg
index 3d4c722c8d600e75c6c9b01a825fdfdfe6e676ef..266d7bc9c90ce114c25b7c1da43365fd8e6cb6c7 100644
Binary files a/img/index/Week7.jpg and b/img/index/Week7.jpg differ
diff --git a/img/index/Week7_e.jpg b/img/index/Week7_e.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..511d613da6159ac33ea917ab67b1f5465fb0a623
Binary files /dev/null and b/img/index/Week7_e.jpg differ
diff --git a/img/index/Week8.jpg b/img/index/Week8.jpg
index 9d2cd16d397a3180540c42f76a6a0bb15fb5c036..0cf6109fddac90099e0365d51a158d433d414635 100644
Binary files a/img/index/Week8.jpg and b/img/index/Week8.jpg differ
diff --git a/img/index/Week8_e.jpg b/img/index/Week8_e.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..27e98a731393850ccd978def2cf01483431ed552
Binary files /dev/null and b/img/index/Week8_e.jpg differ
diff --git a/img/index/Week9.jpg b/img/index/Week9.jpg
index b5702a9ee8374f080a909dec021dc886e790d403..54366d07accbd158505d1f88fe9b222a573ecb79 100644
Binary files a/img/index/Week9.jpg and b/img/index/Week9.jpg differ
diff --git a/img/index/work.jpg b/img/index/work.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c27551b24cc1d9c42d03580c632eeeb6659b84a0
Binary files /dev/null and b/img/index/work.jpg differ
diff --git a/index.html b/index.html
index 06269b3ca4db3137ff974c43f84df0f99d13f8cd..f910d1d292c909a54a99c371765c3981f2eb657e 100644
--- a/index.html
+++ b/index.html
@@ -104,234 +104,220 @@
<div class="overlay">
<!--<i class="skills">Project <br> Managment </i>-->
- <img src="img/index/Week1_enter.jpg" class="img-responsive" alt="">
+ <img src="img/index/Week1_e.jpg" class="img-responsive" alt="">
</div>
</div>
- <img src="img/index/Week1.jpg" class="img-responsive" alt="">
+ <img src="img/index/Week1a.jpg" class="img-responsive" alt="">
</a>
</div>
<div class="col-sm-4 portfolio-item">
- <a href="Week_2.html" class="portfolio-link" >
+ <a href="Week_2.html" class="portfolio-link">
<div class="caption">
- <div class="caption-content">
- <i class="skills">Computer-aided Design</i>
- <br> <span class="skills"></span>
+
+ <div class="overlay">
+ <!--<i class="skills">Project <br> Managment </i>-->
+ <img src="img/index/Week2_e.jpg" class="img-responsive" alt="">
</div>
</div>
- <img src="img/index/Week2.jpg" class="img-responsive" alt="">
+ <img src="img/index/Week2.jpg" class="img-responsive" alt="">
+
</a>
</div>
<div class="col-sm-4 portfolio-item">
- <a href="Week_3.html" class="portfolio-link">
+ <a href="Week_3.html" class="portfolio-link" >
<div class="caption">
- <div class="caption-content">
- <i class="skills">Computer-controlled cutting</i>
- <br> <span class="skills"></span>
+ <div class="overlay">
+ <!--<i class="skills">Project <br> Managment </i>-->
+ <img src="img/index/Week3_e.jpg" class="img-responsive" alt="">
</div>
</div>
- <!-- <img src="https://dl.dropboxusercontent.com/u/4917033/img/Mdf-14.jpg" class="img-responsive" alt=""> -->
<img src="img/index/Week3.jpg" class="img-responsive" alt="">
</a>
</div>
- <div class="col-sm-4 portfolio-item">
+ <div class="col-sm-4 portfolio-item">
<a href="Week_4.html" class="portfolio-link">
+ <div class="caption">
+ <div class="overlay">
+ <img src="img/index/Week4_e.jpg" class="img-responsive" alt="">>
+ </div>
+ </div>
+ <img src="img/index/Week4.jpg" class="img-responsive" alt="">
+ </a>
+ </div>
+ <div class="col-sm-4 portfolio-item">
+ <a href="Week_5.html" class="portfolio-link">
<div class="caption">
- <div class="caption-content">
- <i class="skills">Electronics Production </i>
- <br><span class="skills"> </span>
+ <div class="overlay">
+ <img src="img/index/Week5_e.jpg" class="img-responsive" alt="">
</div>
</div>
- <img src="img/index/Week4.jpg" class="img-responsive" alt="">
+ <img src="img/index/Week5.jpg" class="img-responsive" alt="">
</a>
</div>
<div class="col-sm-4 portfolio-item">
- <a href="Week_5.html" class="portfolio-link">
+ <a href="Week_6.html" class="portfolio-link">
<div class="caption">
- <div class="caption-content">
- <i class="skills">3D scanning and printing </i>
- <br><span class="skills"></span>
+ <div class="overlay">
+ <img src="img/index/Week6_e.jpg" class="img-responsive" alt="">
</div>
</div>
- <img src="img/index/Week5.jpg" class="img-responsive" alt="">
+ <img src="img/index/Week6.jpg" class="img-responsive" alt="">
</a>
</div>
<div class="col-sm-4 portfolio-item">
- <a href="Week_6.html" class="portfolio-link">
+ <a href="Week_7.html" class="portfolio-link">
<div class="caption">
- <div class="caption-content">
- <i class="skills">Electronics Design </i>
- <br><span class="skills"> </span>
+ <div class="overlay">
+ <img src="img/index/Week7_e.jpg" class="img-responsive" alt="">
</div>
</div>
- <img src="img/index/Week6.jpg" class="img-responsive" alt="">
+ <img src="img/index/Week7.jpg" class="img-responsive" alt="">
</a>
</div>
<div class="col-sm-4 portfolio-item">
- <a href="Week_7.html" class="portfolio-link">
+ <a href="Week_8.html" class="portfolio-link">
<div class="caption">
- <div class="caption-content">
- <i class="skills">Computer-crontolled <br> machining</i>
- <br><span class="skills"> </span>
+ <div class="overlay">
+ <img src="img/index/Week8_e.jpg" class="img-responsive" alt="">
</div>
</div>
- <img src="img/index/Week7.jpg" class="img-responsive" alt="">
+ <img src="img/index/Week8.jpg" class="img-responsive" alt="">
</a>
</div>
<div class="col-sm-4 portfolio-item">
- <a href="Week_8.html" class="portfolio-link">
+ <a href="Week_9.html" class="portfolio-link">
<div class="caption">
<div class="caption-content">
<i class="skills">Embedded programming </i>
<br><span class="skills"></span>
</div>
</div>
- <img src="img/index/Week8.jpg" class="img-responsive"alt="">
+ <img src="img/index/Week9.jpg" class="img-responsive"alt="">
</a>
</div>
<div class="col-sm-4 portfolio-item">
- <a href="Week_9.html" class="portfolio-link">
+ <a href="Week_10.html" class="portfolio-link">
<div class="caption">
<div class="caption-content">
<i class="skills">Molding and Casting</i>
<br><span class="skills"></span>
</div>
</div>
- <img src="img/index/Week9.jpg" class="img-responsive"alt="">
+ <img src="img/index/Week10.jpg" class="img-responsive"alt="">
</a>
</div>
<div class="col-sm-4 portfolio-item">
- <a href="Week_10.html" class="portfolio-link">
+ <a href="Week_11.html" class="portfolio-link">
<div class="caption">
<div class="caption-content">
<i class="skills">Input Devices</i>
<br><span class="skills"></span>
</div>
</div>
- <img src="img/index/Week10.jpg" class="img-responsive"alt="">
+ <img src="img/index/Week11.jpg" class="img-responsive"alt="">
</a>
</div>
<div class="col-sm-4 portfolio-item">
- <a href="Week_11.html" class="portfolio-link">
+ <a href="Week_12.html" class="portfolio-link">
<div class="caption">
<div class="caption-content">
<i class="skills"> Output Devices </i>
<br><span class="skills"></span>
</div>
</div>
- <img src="img/index/Week11.jpg" class="img-responsive"alt="">
+ <img src="img/index/Week12.jpg" class="img-responsive"alt="">
</a>
</div>
<div class="col-sm-4 portfolio-item">
- <a href="Week_12.html" class="portfolio-link">
+ <a href="Week_13.html" class="portfolio-link">
<div class="caption">
<div class="caption-content">
<i class="skills">Interface and application programming</i>
<br><span class="skills"></span>
</div>
</div>
- <img src="img/index/Week12.jpg" class="img-responsive"alt="">
+ <img src="img/index/Week13.jpg" class="img-responsive"alt="">
</a>
</div>
- <!--<div class="col-sm-3 portfolio-item">
- <a href="Week_10.html" class="portfolio-link">
+ <div class="col-sm-4 portfolio-item">
+ <a href="Week_14.html" class="portfolio-link">
<div class="caption">
<div class="caption-content">
- <i class="skills"> Output Devices </i>
+ <i class="skills"> Networking and communications </i>
<br><span class="skills"></span>
</div>
</div>
- <img src="img/index/Week10.jpg" class="img-responsive"alt="">
- <img src="https://www.dropbox.com/s/91bx2256m1leeye/Week8.jpg?raw=1" class="img-responsive" alt="">
- </a>
+ <img src="img/index/Week14.jpg" class="img-responsive"alt="">
+ </a>
</div>
- <div class="col-sm-3 portfolio-item">
- <a href="Week_11.html" class="portfolio-link">
+ <div class="col-sm-4 portfolio-item">
+ <a href="Week_15.html" class="portfolio-link">
<div class="caption">
<div class="caption-content">
- <i class="skills">Machine design</i>
+ <i class="skills">Mechanical design</i>
<br><span class="skills"></span>
</div>
</div>
- <img src="img/index/Week11.jpg" class="img-responsive"alt="">
- <img src="https://www.dropbox.com/s/91bx2256m1leeye/Week8.jpg?raw=1" class="img-responsive" alt="">
- </a>
+ <img src="img/index/work.jpg" class="img-responsive"alt="">
+ </a>
</div>
-
-
- <div class="col-sm-3 portfolio-item">
- <a href="Week_14.html" class="portfolio-link">
+ <div class="col-sm-4 portfolio-item">
+ <a href="Week_16.html" class="portfolio-link">
<div class="caption">
<div class="caption-content">
- <i class="skills">Composites</i>
+ <i class="skills">Machine Design</i>
<br><span class="skills"></span>
</div>
</div>
- <img src="img/index/Week14.jpg" class="img-responsive"alt="">
- <img src="https://www.dropbox.com/s/91bx2256m1leeye/Week8.jpg?raw=1" class="img-responsive" alt="">
+ <img src="img/index/work.jpg" class="img-responsive"alt="">
</a>
</div>
- <div class="col-sm-3 portfolio-item">
- <a href="Week_15.html" class="portfolio-link">
+ <div class="col-sm-4 portfolio-item">
+ <a href="Week_17.html" class="portfolio-link">
<div class="caption">
<div class="caption-content">
- <i class="skills">Networking and communications</i>
+ <i class="skills">Wildcard Week</i>
<br><span class="skills"></span>
</div>
</div>
- <img src="img/index/Week15.jpg" class="img-responsive"alt="">
- <img src="https://www.dropbox.com/s/91bx2256m1leeye/Week8.jpg?raw=1" class="img-responsive" alt="">
- </a>
+ <img src="img/index/work.jpg" class="img-responsive"alt="">
+ </a>
</div>
- <div class="col-sm-3 portfolio-item">
- <a href="Week_16.html" class="portfolio-link">
+ <div class="col-sm-4 portfolio-item">
+ <a href="Week_18.html" class="portfolio-link">
<div class="caption">
<div class="caption-content">
- <i class="skills">Interface and application programming</i>
+ <i class="skills">Applications and Implications</i>
<br><span class="skills"></span>
</div>
</div>
- <img src="img/index/Week16.jpg" class="img-responsive"alt="">
- <img src="https://www.dropbox.com/s/91bx2256m1leeye/Week8.jpg?raw=1" class="img-responsive" alt="">
+ <img src="img/index/work.jpg" class="img-responsive"alt="">
</a>
</div>
- <div class="col-sm-3 portfolio-item">
- <a href="Week_17.html" class="portfolio-link">
+ <div class="col-sm-4 portfolio-item">
+ <a href="Week_19.html" class="portfolio-link">
<div class="caption">
<div class="caption-content">
- <i class="skills">Applications and Implications</i>
+ <i class="skills">Invention, intellectual property, and income </i>
<br><span class="skills"></span>
</div>
</div>
- <img src="img/index/Week17.png" class="img-responsive"alt="">
- <img src="https://www.dropbox.com/s/91bx2256m1leeye/Week8.jpg?raw=1" class="img-responsive" alt="">
- </a>
+ <img src="img/index/work.jpg" class="img-responsive"alt="">
+ </a>
</div>
- <div class="col-sm-3 portfolio-item">
- <a href="Week_18.html" class="portfolio-link">
+ <div class="col-sm-4 portfolio-item">
+ <a href="Week_20.html" class="portfolio-link">
<div class="caption">
<div class="caption-content">
- <i class="skills">Invention, intellectual property, and income</i>
+ <i class="skills">Project Development</i>
<br><span class="skills"></span>
</div>
</div>
- <img src="img/index/Week18.png" class="img-responsive"alt="">
- <img src="https://www.dropbox.com/s/91bx2256m1leeye/Week8.jpg?raw=1" class="img-responsive" alt="">
+ <img src="img/index/work.jpg" class="img-responsive"alt="">
</a>
</div>
- <div class="col-sm-3 portfolio-item">
- <a href="Week_19.html" class="portfolio-link">
- <div class="caption">
- <div class="caption-content">
- <i class="skills">Project Development</i>
- <br><span class="skills"></span>
- </div>
- </div>
- <img src="img/index/Week19.png" class="img-responsive"alt="">
- <img src="https://www.dropbox.com/s/91bx2256m1leeye/Week8.jpg?raw=1" class="img-responsive" alt="">
- </a>
- </div> -->
</div>
</div>
</section>
@@ -384,17 +370,15 @@
<img src="img/index/About.jpg" class="img-responsive, circular--square" alt="" width="500" height="500">
</div>
<div class="col-lg-6">
- <p align="justify" >My name is Christian Cárdenas, I was born Cali, Colombia. I grew up with a small but very close family of four. Since I was a child,
- the mathematics and the puzzle games were, and still are, my favorites. That´s why I developed a skill in math and in general the basic sciences.
- After the culmination of my college studies I had the opportunity to travel to Mexico and continue my studies in one of the best research centers in the country.
- Since then I lived very happy in Mexico, where also had the opportunity to start a career as an educator in higher education institutions.
- The education and the research has become my two biggest passions. I consider myself as a dedicated person who puts all its efforts in completing its goals and
- projects. </p>
- <p align="justify">I obtained my bachelor degree in materials engineering at Universidad del Valle in Cali-Colombia. My thesis was center in multilayer coatings of CrN
- and TiN with magnetron sputtering. Then I obtained a scholarship of the Mexican government (Conacyt) to perform a master degree in materials science at
- Cinvestav – IPN (Centro de investigación y estudios avanzados del instituto politécnico nacional) in the city of Querétaro. During this master studies
- I specialized in theoretical studies of magnesium oxide by first principles and DFT theory. During my short time as an educator I have delved in the study
- of the basic sciences in all his levels. </p>
+ <p align="justify" >My name is Christian Cárdenas. I was born in Cali, Colombia. I´ve been living in Mexico for the last nine years. <br>
+ I am a materials engineering graduate from Universidad del Valle in Colombia. After I obtained my bachelor’s degree I travel to Mexico to
+ continue my studies where I got a master’s degree in material science at CINVESTAV – Querétaro. During this period, I had the opportunity of
+ work with basic science and perform first principles simulation using Density Functional Theory. </p>
+
+ <p align="justify"> Since then, I’ve been working as an educator in a couple of universities in Querétaro. Now I’m a full-time professor at
+ Universidad Anáhuac Campus Querétaro where the Fab Lab Querétaro project is dawning. <br> During my first contact with the FabLab philosophy,
+ I found out that is truly a future forward concept that gives everybody the opportunity to think in a different way and completely outside the box.
+ I hope to apply and share all the knowledge and skills I acquire in the Fab Academy with my students, colleagues, and all people around me. </p>
</div>
<!-- <div class="col-lg-8 col-lg-offset-2 text-center">
<a href="#" class="btn btn-lg btn-outline">