update_project

docs/index.html

@@ -94,7 +94,7 @@
                             <p><video controls width="100%"; max-width="800"><source src="presentation.mp4" type="video/mp4"></video></p>
                             
                                 
-                            <iframe src="https://player.vimeo.com/video/429399898" width="100%" height="564" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe>  
+                           <!--- <iframe src="https://player.vimeo.com/video/429399898" width="100%" height="564" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe>  --->  
                                 
                             </header>
                             </section>    
@@ -103,7 +103,7 @@
                                                 <div id="main">
 						                          <div class="inner">
                                                       <header>
-                                                    <h2>Updates</h2>
+                                              <!---      <h2>Updates</h2>
                                                     <ul>
                                                         <li><h3>01/02/2020: <a href="about.html"> <b> About</b></a> </h3>
                                                         <li><h3>03/02/2020: <a href="week01.html"> <b> Week 01</b></a> </h3>
@@ -124,7 +124,7 @@
                                                         <li><h3>26/05/2020: <a href="week16.html"> <b> Week 16</b></a> </h3> 
                                                         <li><h3>02/06/2020: <a href="week17.html"> <b> Week 17</b></a> </h3>
                                                             
-                                                    </ul>
+                                                    </ul> --->
                                                       </header>
                                          
                                                 

docs/project.html

@@ -50,13 +50,24 @@
 					<div id="main">
 						<div class="inner">
 							<h1>Final Project</h1>
+                            
+                            <p><span class="image main"><img src="images/project/week18.00.jpg" alt="" /></span></p>
+                            <p>The Fab Train Model is a set of modules that are part of a model.  It incorporates a train detection system that moves a level crossing.  This detection system can be used for other options, such as changing the signals or moving the motors of the changes of a station.</p>
+
+                            <p>I have milled the frame of the model with the CNC. For the electronics I use an ATtiny1614 with phototransistors to detect the train and servos to move the level crossing barriers. The barriers and signals are 3D printed. These boards are integrated into a 3D printed box. Below the track I have integrated the box with the electronics and cables. I modeled the landscape with Blender to later manufacture the composites. I put the track and decorate the landscape of the model. </p>
+                            <p>Fab Train Model is compatible with other modules with the standars. Fab Train Model is a sturdy, lightweight model with multipurpose electronics. It incorporates very precise details thanks to digital fabrication.</p>
 							
                             <p><span class="image main"><img src="presentation.png" alt="" /></span></p> 
                             
                             
                             <p><video controls width="100%"; max-width="800"><source src="presentation.mp4" type="video/mp4"></video></p>
                             
-                            <iframe src="https://player.vimeo.com/video/429399898" width="100%" height="564" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe> 
+                            <!---<iframe src="https://player.vimeo.com/video/429399898" width="100%" height="564" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe> --->
+                            
+                            <p>This is the video of my presentation to the entire #fablabnetwork. I am very proud of the great reception of my project. Thank you very much. 😍</p>
+                            <p><iframe src="https://player.vimeo.com/video/431810971" width="100%" height="360" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe></p>
+                            
+                            
                             
 						</div>
 					</div>

docs/projectmanagement.html

@@ -51,9 +51,16 @@
 					<div id="main">
 						<div class="inner">
 							<h1>Project Development</h1>
-                             <h1>Week 01. Sketch</h1>
-                            <p>My idea for the final project is to build a model using composites to model the terrain. Also that a level crossing works before the passage of the train.</p>
+                            
+                            <p>This is the process of my final project. I show at first the three slides you create. From the skecth where I had the final project proposal, through the slide I did for Invention, Intellectual Property and Business Models and the last one for the Final Project Presentation.</p>
+                            <p>I hope you enjoy my project as I have done making it. 🤗</p>
+                            
                             <span class="image main"><img src="images/week01/sketch.jpg" alt="" /></span>
+                            <span class="image main"><img src="images/week13/week13.03.png" alt="" /></span>
+                            <span class="image main"><img src="presentation.png" alt="" /></span>
+                            
+                            <h1>Week 01. Sketch</h1>
+                            <p>My idea for the final project is to build a model using composites to model the terrain. Also that a level crossing works before the passage of the train.</p>
                             
                             <p>The frame of the <b>model</b> will be built in wood (the perimeter). For the <b>landscape</b> until now we used polystyrene that we carved with a cutter and then put glue and paper. In the Fab Lab my instructor Nuria had taught me several examples of the use of <b>composites.</b> I plan to mill the polystyrene with the shape of the desired landscape, but slice it. This allows me to make different landscape combinations and recycling the milled polystyrene model.</p> 
                             

docs/week03.html

@@ -52,10 +52,10 @@
 							<h1>Week 03. Computer-Controlled Cutting</h1>
                             
                             
-                            <ul><li><a href="#Bend acrylic"><b>Bend acrylic with the laser cutter</b></a>
+                           <!--- <ul><li><a href="#Bend acrylic"><b>Bend acrylic with the laser cutter</b></a>
                                 <li><a href="#T-shirt"><b>T-shirt of Fab Academy</b></a>
                                 <li><a href="#Inflatables"><b>Inflatables</b></a>
-                                <li><a href="#Bridge"><b>Bridge with laser cutter</b></a>    
+                                <li><a href="#Bridge"><b>Bridge with laser cutter</b></a>    --->
                                 
                                 
                                 

docs/week06.html

@@ -223,9 +223,9 @@ void loop() {
   digitalWrite(ledPin4, HIGH);
   digitalWrite(ledPin5, HIGH);    
   delay(2000);
-  digitalWrite(ledPin3, HIGH);    
+  digitalWrite(ledPin1, HIGH);    
   delay(5000);
-  digitalWrite(ledPin3, LOW);    
+  digitalWrite(ledPin1, LOW);    
   delay(1000);
   digitalWrite(ledPin4, LOW);
   digitalWrite(ledPin5, LOW);

docs/week08.html

@@ -258,9 +258,9 @@ void loop() {
   digitalWrite(ledPin4, HIGH);
   digitalWrite(ledPin5, HIGH);    
   delay(2000);
-  digitalWrite(ledPin3, HIGH);    
+  digitalWrite(ledPin1, HIGH);    
   delay(5000);
-  digitalWrite(ledPin3, LOW);    
+  digitalWrite(ledPin1, LOW);    
   delay(1000);
   digitalWrite(ledPin4, LOW);
   digitalWrite(ledPin5, LOW);