Commit 9cc1044a authored by ivanmilara's avatar ivanmilara

Solved merge conflict

parents cdce89c0 3e574409
Pipeline #109250 passed with stages
in 28 seconds
......@@ -41,29 +41,29 @@ We also decided to re-use most of the material from previous years such as the l
## 3D Modeling in Fusion 360
As we wanted to have a visual model of the final machine, we decided to design a 3D model. For this, Yasir used Autodesk Fusion 360.
As we wanted to have a visual model of the final machine, we decided to design a 3D model. For this, Sahan used Autodesk Fusion 360.
![](../../assets/img/team1/gw_md.png)
More details about this 3D design can be found on Yasir's page.
More details about this 3D design can be found on [Sahan's](http://fabacademy.org/2019/labs/oulu/students/sahan-wickramaarachchi/week15.html) page.
## 2D Design in Inkscape
Even though we utilised the components from the previous year, we still needed to create the main body of the machine. For this, we needed to laser cut the different parts. [Sahan]() unfolded the 3D model above in Inkscape and prepared it for laser cutting following the process outlined in [week 4](http://fabacademy.org/2019/labs/oulu/students/michael-oduor/assignments/week04/).
Even though we utilised the components from the previous year, we still needed to create the main body of the machine. For this, we needed to laser cut the different parts. [Yasir](http://fabacademy.org/2019/labs/oulu/students/yasir-shafiullah/week%2015.html) unfolded the 3D model above in Inkscape and prepared it for laser cutting following the process outlined in [week 4](http://fabacademy.org/2019/labs/oulu/students/michael-oduor/assignments/week04/).
![](../../assets/img/team1/laser-c.png)
<sup>2D design in Inkscape</sup>
More details on 2D design available from [Sahan's page](http://fabacademy.org/2019/labs/oulu/students/sahan-wickramaarachchi/week14.html).
More details on 2D design available from [Yasir's page](http://fabacademy.org/2019/labs/oulu/students/yasir-shafiullah/week%2015.html).
## Laser cutting and assembly
After the 2D design files were ready, Yasir, Sahan and Jobin laser cut and assembled the first part.
After the 2D design files were ready, [Yasir](http://fabacademy.org/2019/labs/oulu/students/yasir-shafiullah/week%2015.html), [Sahan](http://fabacademy.org/2019/labs/oulu/students/sahan-wickramaarachchi/week15.html) and [Jobin](http://fabacademy.org/2019/labs/oulu/students/jobin-varghese/assignments/week15/) laser cut and assembled the first part.
![](../../assets/img/team1/assemby.jpg)
The following Monday, Jobin and I cut the other two parts, and Jobin started working on the assembly, positioning, and motion of the pen.
The following Monday, Jobin and I cut the other two parts, and [Jobin](http://fabacademy.org/2019/labs/oulu/students/jobin-varghese/assignments/week15/) started working on the assembly, positioning, and motion of the pen.
![](../../assets/img/team1/assemby01.jpg)
......@@ -86,7 +86,7 @@ The main tasks for the week were to:
- 3D print joints to attach the top node to the other two.
Additional minor tasks included designing a [logo](../../assets/img/team1/logo.svg) and a one-page presentation of the group project.
Additional minor tasks included designing a [logo](../../assets/img/team1/logo.svg) and a one-page [presentation](../../assets/img/team1/presentation.jpg) of the group project.
## Programming
The programming environment was prepared by:
......@@ -95,7 +95,7 @@ The programming environment was prepared by:
- Installing [pyserial](https://pyserial.readthedocs.io/en/latest/pyserial.html)
- Cloning [Gestalt](https://github.com/nadya/pygestalt)
For programming, we first tested one motor and when this worked, the other two. The motor needs 12 Volts power supply and we set the current limit to 0.600 Amps. Below is a [video](../../assets/img/team1/na.mp4) of all three nodes moving. More details of programming can be found in [Sahan's]() page.
For programming, we first tested one motor and when this worked, the other two. The motor needs 12 Volts power supply and we set the current limit to 0.600 Amps. Below is a [video](../../assets/img/team1/na.mp4) of all three nodes moving. More details of programming can be found in [Sahan's](http://fabacademy.org/2019/labs/oulu/students/sahan-wickramaarachchi/week17.html), [Yasir's](http://fabacademy.org/2019/labs/oulu/students/yasir-shafiullah/week%2017.html) and [Alok's](http://fabacademy.org/2019/labs/oulu/students/alok-sethi/assignments/week17/) pages, who were each responsible for different parts of the programming.
<div class="project-video embed-responsive embed-responsive-16by9">
<video class="embed-responsive-item" controls>
<source src="../../assets/img/team1/na.mp4" type="video/mp4"/>
......@@ -109,6 +109,22 @@ As the support connecting to the two nodes on the Y-axis was not strong enough,
## 3D printing
Using Formlabs, we also 3D printed joints to attach the three nodes together. This was to ensure the top node was firm when it was moving along the Y axis.
## Final presentation and video
Below are the presentation and [video]((../../assets/img/team1/machine1.mp4)) of the Writing bot at work!
![](../../assets/img/team1/presentation.jpg)
<sup>Group work presentation</sup>
<div class="project-video embed-responsive embed-responsive-16by9">
<video class="embed-responsive-item" controls>
<source src="../../assets/img/team1/na.mp4" type="video/mp4"/>
Your browser does not support the video tag
</video>
</div>
![](../../assets/img/team1/machine1.mp4)
<sup>Video of the writing bot</sup>
......@@ -117,6 +133,7 @@ Using Formlabs, we also 3D printed joints to attach the three nodes together. Th
- Inkscape - [Zip file](../../assets/img/team1/w-machine.zip)
- Python - [Single node](../../assets/img/team1/single_node.py) / [Three nodes](../../assets/img/team1/Three_node.py)
- Logo - [Project logo](../../assets/img/team1/logo.svg)
- Presentation - [Group presentation](../../assets/img/team1/presentation.jpg)
......
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