Commit cc429599 authored by Daniela Felix's avatar Daniela Felix
Browse files

update

parent 4f68315b
Pipeline #222673 passed with stage
in 9 seconds
...@@ -76,66 +76,90 @@ ...@@ -76,66 +76,90 @@
<div class="page-heading"> <div class="page-heading">
<h1>Group Machine</h1> <h1>Group Machine</h1>
<hr class="small"> <hr class="small">
<span class="subheading">Process of creating our machine</span> <span class="subheading">Our machine working</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</header> </header>
<!-- Main Content -->
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<p>See the final result of our group.
<img class="image" src="img/vending1.jpg" height="200" alt="vending">
</p>
</div>
</div>
</div>
<hr>
<!-- Footer --> <!-- INFO -->
<footer> <article>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<ul class="list-inline text-center">
<li>
<a href="https://www.facebook.com/fablabzoi">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-facebook fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
<li>
<a href="https://www.instagram.com/fablabzoi/">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-instagram fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
<li>
<a href="https://gitlab.fabcloud.org/academany/fabacademy/2021/labs/zoi/site">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-github fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
</ul>
<p class="copyright text-muted">Copyright &copy; Fab Academy 2021 ZOI</p>
</div>
</div>
</div>
</footer>
<!-- jQuery --> <header>
<h2>ABOUT OUR MACHINE</h2>
<p> The automatic drill is a PCB electronic circuit drilling system, it searches for a point of origin automatically, through the use of a laser,
in this way the machine can interpret a gcode file, which will indicate where to perform the perforations necessary for the placement of the
necessary electronic components. </p>
<p> <b>The automatic drill</b> was born from the need of the digital manufacturing laboratory ZOI Ecuador which needed to have a machine that allows it to
automatically drill the electronic circuits of pbc. With greater precision than could be done manually.<br>
</p>
<h2>SKILLS USED IN THE PROCESS</h2>
<ul>
<li>CNC</li>
<li> 3D Printing</li>
<li> Electronics design</li>
<li> Electronics productions</li>
<li> Embeded programming</li>
<li> I/O devices</li>
</ul>
<hr>
<!-- INFOGRAPHIC -->
<span class="image"><img src="img/w9/machine-info_Mesa de trabajo 1 copia.jpg" alt="" height="700"/></span>
<hr>
<script src="vendor/jquery/jquery.min.js"></script> <script src="vendor/jquery/jquery.min.js"></script>
</header>
</div>
</div>
</div>
<!-- Footer -->
<footer>
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<ul class="list-inline text-center">
<li>
<a href="https://www.facebook.com/fablabzoi">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-facebook fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
<li>
<a href="https://www.instagram.com/fablabzoi/">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-instagram fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
<li>
<a href="https://gitlab.fabcloud.org/academany/fabacademy/2021/labs/zoi/site">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-github fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
</ul>
<p class="copyright text-muted">Copyright &copy; Fab Academy 2021 ZOI</p>
</div>
</div>
</div>
</footer>
<!-- Bootstrap Core JavaScript --> <!-- Bootstrap Core JavaScript -->
<script src="vendor/bootstrap/js/bootstrap.min.js"></script> <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
......
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
</div> </div>
</p> </p>
<p>The next piece is designed to hold the phototransistor that responds by matching the laser. <br> <p>The next piece is designed to hold the phototransistor that responds by matching the laser. <br>
<span class="image"><img src="images/9-machine/s9_pinza10-min.jpg" alt="" height="300"/></span> <span class="image"><img src="img/w9/s9_pinza10-min.jpg" alt="" height="300"/></span>
</p> </p>
<p>Printed once more the dremel support, this is the result:<br> <p>Printed once more the dremel support, this is the result:<br>
<div class="row"> <div class="row">
...@@ -369,10 +369,12 @@ ...@@ -369,10 +369,12 @@
<!-- PHASE IV - CAMILO --> <!-- PHASE IV - CAMILO -->
<h3>PHASE IV - TESTING</h3> <h3>PHASE IV - TESTING</h3>
<p>You can find the result of our group <a href="machine.html"> <b>here</b></a>.</p> <p>You can find the result of our group <a href="machine.html"> <b>here</b></a>.</p>
<div class="row">
<img src="img/w9/s9-group1.jpg" alt="print" class="img-responsive col-4 col-xs-6"/> <div class="row">
<img src="img/w9/s9-group2.jpg" alt="print" class="img-responsive col-4 col-xs-6"/> <img src="img/w9/s9-group1.jpg" alt="team" class="img-responsive col-4 col-xs-6"/>
</div> <img src="img/w9/s9-group2.jpg" alt="team" class="img-responsive col-4 col-xs-6"/>
<img src="img/w9/4.jpg" alt="team" class="img-responsive col-4 col-xs-6"/>
</div>
<hr> <hr>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment