diff --git a/assignment/assignment5.html b/assignment/assignment5.html
index 3ed645d610e2723b701a6722fde3ee407db088b8..22b566563fb2e37484b3d57e930debea3df6e2e0 100644
--- a/assignment/assignment5.html
+++ b/assignment/assignment5.html
@@ -172,72 +172,215 @@ horizontal. So this is our obseravation from Group Assignment</strong> </p> <br>
<br> <br>
<h4 id="Modes Selection" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong> Modes Selection </strong> </h4>
<p style="justify-content: center"><strong>The machine software can read only rml file. so we used different modes to converts the file into rml formatt. This
- modes are develop by Fab Academy. It is used for all cutter machine in Fab Lab. Go through the following website for to open the modes </strong> </p>
+ modes are develop by Fab Academy. It is used for all cutting machine in Fab Lab. Lets see how we can used it step by step. <br>
+ Step 1: Go through the following website for to open the modes </strong> </p>
<div class="row">
<div class="col">
<div class="card text-center">
<div class="oval"><img src="image/a4_3.png" width="75%"
height="300" class="svg__image"> </div>
<br> <br>
- <p style="justify-content: center"><strong>Select the programm>open server programm </strong> </p>
+ <p style="justify-content: center"><strong>Step 2:Select the programm>open server programm </strong> </p>
<div class="row">
<div class="col">
<div class="card text-center">
<div class="oval"><img src="image/a4_4.jpg" width="75%"
height="300" class="svg__image"> </div>
<br> <br>
- <p style="justify-content: center"><strong>Select the type of machine>the design file formatt </strong> </p>
+ <p style="justify-content: center"><strong>Step 3:Select the type of machine>the design file formatt </strong> </p>
<div class="row">
<div class="col">
<div class="card text-center">
<div class="oval"><img src="image/a4_5.jpg" width="75%"
height="300" class="svg__image"> </div>
<br> <br>
- <p style="justify-content: center"><strong>Select the type of machine>the design file formatt>select png file>select tool </strong> </p>
- <div class="row">
- <div class="col">
- <div class="card text-center">
- <div class="oval"><img src="image/a4_6.png" width="75%"
- height="300" class="svg__image"> </div>
- <br> <br>
+ <p style="justify-content: center"><strong>Step 4:Select the png file from our computer</strong> </p>
+
+ <!DOCTYPE html>
+<html>
+<head>
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<style>
+* {box-sizing: border-box;}
+
+.img-zoom-container {
+ position: relative;
+}
+
+.img-zoom-lens {
+ position: absolute;
+ border: 1px solid #d4d4d4;
+ /*set the size of the lens:*/
+ width: 60px;
+ height: 60px;
+}
+
+.img-zoom-result {
+ border: 1px solid #d4d4d4;
+ /*set the size of the result div:*/
+ width: 600px;
+ height: 400px;
+}
+</style>
+<script>
+function imageZoom(imgID, resultID) {
+ var img, lens, result, cx, cy;
+ img = document.getElementById(imgID);
+ result = document.getElementById(resultID);
+ /*create lens:*/
+ lens = document.createElement("DIV");
+ lens.setAttribute("class", "img-zoom-lens");
+ /*insert lens:*/
+ img.parentElement.insertBefore(lens, img);
+ /*calculate the ratio between result DIV and lens:*/
+ cx = result.offsetWidth / lens.offsetWidth;
+ cy = result.offsetHeight / lens.offsetHeight;
+ /*set background properties for the result DIV:*/
+ result.style.backgroundImage = "url('" + img.src + "')";
+ result.style.backgroundSize = (img.width * cx) + "px " + (img.height * cy) + "px";
+ /*execute a function when someone moves the cursor over the image, or the lens:*/
+ lens.addEventListener("mousemove", moveLens);
+ img.addEventListener("mousemove", moveLens);
+ /*and also for touch screens:*/
+ lens.addEventListener("touchmove", moveLens);
+ img.addEventListener("touchmove", moveLens);
+ function moveLens(e) {
+ var pos, x, y;
+ /*prevent any other actions that may occur when moving over the image:*/
+ e.preventDefault();
+ /*get the cursor's x and y positions:*/
+ pos = getCursorPos(e);
+ /*calculate the position of the lens:*/
+ x = pos.x - (lens.offsetWidth / 2);
+ y = pos.y - (lens.offsetHeight / 2);
+ /*prevent the lens from being positioned outside the image:*/
+ if (x > img.width - lens.offsetWidth) {x = img.width - lens.offsetWidth;}
+ if (x < 0) {x = 0;}
+ if (y > img.height - lens.offsetHeight) {y = img.height - lens.offsetHeight;}
+ if (y < 0) {y = 0;}
+ /*set the position of the lens:*/
+ lens.style.left = x + "px";
+ lens.style.top = y + "px";
+ /*display what the lens "sees":*/
+ result.style.backgroundPosition = "-" + (x * cx) + "px -" + (y * cy) + "px";
+ }
+ function getCursorPos(e) {
+ var a, x = 0, y = 0;
+ e = e || window.event;
+ /*get the x and y positions of the image:*/
+ a = img.getBoundingClientRect();
+ /*calculate the cursor's x and y coordinates, relative to the image:*/
+ x = e.pageX - a.left;
+ y = e.pageY - a.top;
+ /*consider any page scrolling:*/
+ x = x - window.pageXOffset;
+ y = y - window.pageYOffset;
+ return {x : x, y : y};
+ }
+}
+</script>
+</head>
+<body>
+
+<div class="img-zoom-container">
+ <img id="myimage" src="image/a4_58.png" width="75%"
+ height="300">
+ <div id="myresult" class="img-zoom-result"></div>
+</div>
+<script>
+// Initiate zoom effect:
+imageZoom("myimage", "myresult");
+</script>
+
+</body>
+ <p style="justify-content: center"><strong>Step 5:Select the tool> for trace operation, tool is 1/64 inch>then click on calculate opetion.</strong> </p>
<div class="row">
<div class="col">
<div class="card text-center">
<div class="oval"><img src="image/a4_7.png" width="75%"
height="300" class="svg__image"> </div>
- <br> <br>
- <p style="justify-content: center"><strong>Now we have to save the file in rml formatt>for this purpose add the new module in the programm i.e. file>save>then connect the output of milling machine
- to input of file>also set the origin of tool i.e. x,y,z direction,jog height, speed etc.>Save the file>file will get download</strong> </p>
+ <body> <br> <br>
+ <p style="justify-content: center"><strong>Step6: Now we have to save the file in rml formatt>for this purpose add the new module in the programm i.e. file>save</strong> </p>
<div class="row">
<div class="col">
<div class="card text-center">
<div class="oval"><img src="image/a4_8.png" width="75%"
height="300" class="svg__image"> </div>
<br> <br>
+ <p style="justify-content: center"><strong>Step 7: Then click on file>save module for to save the rml file. </strong> </p>
<div class="row">
<div class="col">
<div class="card text-center">
<div class="oval"><img src="image/a4_9.png" width="75%"
height="300" class="svg__image"> </div>
<br> <br>
+ <p style="justify-content: center"><strong>Step 8: After clicking on file module> the following module will get open.</strong> </p>
<div class="row">
<div class="col">
<div class="card text-center">
<div class="oval"><img src="image/a4_10.png" width="75%"
height="300" class="svg__image"> </div>
<br> <br>
+ <p style="justify-content: center"><strong> Step9: Then connect the output of milling machine to input of file>also set the origin of tool i.e. x,y,z direction,jog height, speed etc.</strong> </p>
<div class="row">
<div class="col">
<div class="card text-center">
<div class="oval"><img src="image/a4_11.png" width="75%"
height="300" class="svg__image"> </div>
<br> <br>
+ <p style="justify-content: center"><strong> Step 10: Then click on Save the file>file will get download </strong> </p>
<div class="row">
<div class="col">
<div class="card text-center">
<div class="oval"><img src="image/a4_12.png" width="75%"
height="300" class="svg__image"> </div>
<br> <br>
+ <p style="justify-content: center"><strong> The zoom image of above step is shown below:</strong> </p>
+ <!DOCTYPE html>
+<html>
+<head>
+<style>
+* {
+ box-sizing: border-box;
+}
+
+.column {
+ float: left;
+ width: 33.33%;
+ padding: 5px;
+}
+
+/* Clearfix (clear floats) */
+.row::after {
+ content: "";
+ clear: both;
+ display: table;
+}
+</style>
+</head>
+<body>
+
+<div class="row">
+<div class="column">
+ <img src="image/a4_52.png" alt="Snow" style="width:100%">
+ </div>
+ <div class="column">
+ <img src="image/a4_53.png" alt="Snow" style="width:100%">
+ </div>
+ <div class="column">
+ <img src="image/a4_54.png" alt="Snow" style="width:100%">
+ </div>
+ <div class="column">
+ <img src="image/a4_55.png" alt="Forest" style="width:100%">
+ </div>
+ <div class="column">
+ <img src="image/a4_56.png" alt="Mountains" style="width:100%">
+ </div>
+ <div class="column">
+ <img src="image/a4_57.png" alt="Mountains" style="width:100%">
+ </div>
+</div>
+<br> <br>
<h4 id="PCB Machining" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong> PCB Machining </strong> </h4>
<p style="justify-content: center"><strong>On machine we have to do the two operation, first one is to make trace on PCB and second one is cutting of PCB.Fab academy
also provide two file to us. One for trace and one for cut.so in modes we have converts this two files in rml formatt. But one thing is important. There
diff --git a/assignment/assignment7.html b/assignment/assignment7.html
index 0d01df593d7aca55c17eb4ac8bc5a6ec905277a6..f161389bbf38bcb1e27f1ee85371f15c2d105b48 100644
--- a/assignment/assignment7.html
+++ b/assignment/assignment7.html
@@ -73,8 +73,8 @@
<br> <br>
<h4 id="Individual Assignment" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong>Individual Assignment </strong> </h4>
- <p style="justify-content: center"><strong>The task for the week is to redraw an echo hello-world board, provided by Fab Academy and add (at least) a button and LED (with current-limiting resistor), check the design rules, make it, and test it
- So to redraw the echo hello-world, I used Eagle software and also i am tried Easy Eda software. </strong> </p> <br> <br>
+ <p style="justify-content: center"><strong>The task for the week is to redraw an echo hello-world board, provided by Fab Academy and add (at least) a button and LED (with current-limiting resistor),
+ check the design rules, make it, and test it. So to redraw the echo hello-world, I used Eagle software and also i am tried Easy Eda software. </strong> </p> <br> <br>
<h4 id="redrawing" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong> Redrawing of Echo Hello-World Board</strong> </h4>
<p style="justify-content: center"><strong> Firstly i downloaded the Eagle software and installed it. Then i have download the Fab libraries from the given link.
Extracted the folder in a my documents folder. </strong> </p>
@@ -465,7 +465,11 @@
2. At the time of programming, it will shows one error of connections, so here again i have made connections. <br>
3. Also by mistakely i have soldered one wrong resisitor, that i have to replace</strong> </p>
-
+ <h4 id="Group Assignment" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong>Group Assignment </strong> </h4>
+ <p style="justify-content: center"><strong>The task for group assignment is to use the test equipment in our lab to observe the operation
+ of a microcontroller circuit board. The test equipment available in our lab is regulated power supply, digital multimeter and oscilloscope. Here we test our group member Snehal microcontroller and observe its operation.
+The more details about group assignment is available on our group member (Tejaswini) website. So lets click on the give link for more details.
+<a href= "http://fabacademy.org/2020/labs/vigyanashram/students/tejswini-chaudhari/assignments/ass6.html"> Electronics Design Group Assignment</a> </strong> </p> <br> <br>
<h4 id="What i learn" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong> What i learn? </strong> </h4>
<p style="justify-content: center"><strong> I am learn about <br>
@@ -474,13 +478,14 @@
3. Specification and selection of components for circuit <br>
4. Microcontroller and its pin configurations. <br>
5. Machining, soldering and conductivity testing of board <br>
- 6. Programming and testing of board from given program
+ 6. Programming and testing of board from given program <br>
+ 7. To test the microcontroller using different test equipment such as regulated power supply, digital multimeter and oscilloscope etc.
</strong> </p>
<a style="color:mediumvioletred" class="btn-new rom-middle animated" href="./file/file6.zip">Download my original file here</a> <br> <br>
- <p>Go to the <a href="#Introduction">top</a></p>
+ <p>Go to the <a href="#6-Week Task">top</a></p>
</section>
</div>
@@ -490,7 +495,7 @@
<h2>Content</h2>
</header>
<ul class="style1">
- <li class="first"><span class="fa fa-check"></span><a href="#6-Week Task">Week Task</a> </li> <br>
+ <li class="first"><span class="fa fa-check"></span><a href="#">Week Task</a> </li> <br>
<li><span class="fa fa-check"></span><a href="#Introduction">Introduction</a></li><br>
<li><span class="fa fa-check"></span><a href="#Individual Assignment"> Individual Assignment</a> </li><br>
<li><span class="fa fa-check"></span><a href="#redrawing">Redrawing of Board</a></li><br>
@@ -499,6 +504,7 @@
<li><span class="fa fa-check"></span><a href="#connections"> Connections and Conductivity Teasting</a> </li><br>
<li><span class="fa fa-check"></span><a href="#programming"> Programming and Testing of Board</a> </li><br>
<li><span class="fa fa-check"></span><a href="#What"> What problem i have faced?</a> </li><br>
+ <li><span class="fa fa-check"></span><a href="#Group Assignment"> Group Assignment</a> </li><br>
<li><span class="fa fa-check"></span><a href="#What I learn"> What I learn?</a> </li><br>
</ul>
diff --git a/assignment/assignment8.html b/assignment/assignment8.html
index 9d2897489bdbc170f8cb381f3decfd78ac3c7738..8e7a9bc21273f99b168b1d4d2694b05d17f9f71a 100644
--- a/assignment/assignment8.html
+++ b/assignment/assignment8.html
@@ -99,7 +99,13 @@
<h4 id="Different" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong> Different CAM Machine</strong> </h4>
<p style="justify-content: center"><strong> 1. CNC Lathe Machine <br>
2. CNC Milling Machine <br> 3. Abrasive Jet Machine (AJM)<br> 4. Ultrasonic Machine(USM)<br> 5. Ion-Beam Machine(IBM)<br> 6. Plasma Arc Machine(PAM)<br> 6. Electrical Discharge Machine(EDM)<br>
- 7. Laser Beam Machine (LBM)<br> 8. Electro-Chemical Machine (ECM) etc. </strong> </p>
+ 7. Laser Beam Machine (LBM)<br> 8. Electro-Chemical Machine (ECM) etc. </strong> </p>
+
+
+ <h4 id="Group Assignment" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong>Group Assignment </strong> </h4>
+ <p style="justify-content: center"><strong>The task for group assignment is to test runout, alignment, speeds, feeds, and toolpaths for our machine.
+ This group assignment we have perform at Fab Lab, COE, Pune. The assignment is available on our group member Tejaswini website, so lets click for more details.
+ <a href= "http://fabacademy.org/2020/labs/vigyanashram/students/tejswini-chaudhari/assignments/ass7.html"> CAM Group Assignment</a> </strong> </p> <br> <br>
<h4 id="Individual" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong> Individual Assignment</strong> </h4>
<p style="justify-content: center"><strong> The task for the week in individual assignment is to make (design+mill+assemble) something big using CAM Machine.
@@ -312,9 +318,7 @@ Belows are the some photos during milling. </strong> </p>
</body>
</html>
<br> <br>
-<h4 id="What" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong> What problem i have faced? </strong> </h4>
- <p style="justify-content: center"><strong></strong> </p>
- <h4 id="What i learn" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong> What i learn? </strong> </h4>
+ <h4 id="What i learn" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong> What i learn? </strong> </h4>
<p style="justify-content: center"><strong> I am learn about <br>
1. Parametric design using spreadsheet for big size furniture <br>
2. Use of CAM software <br>
@@ -342,6 +346,7 @@ Belows are the some photos during milling. </strong> </p>
<li><span class="fa fa-check"></span><a href="#Introduction">Introduction</a></li><br>
<li><span class="fa fa-check"></span><a href="#Function"> Function of CAM Software</a> </li><br>
<li><span class="fa fa-check"></span><a href="#Different">Different CAM Machine</a></li><br>
+ <li><span class="fa fa-check"></span><a href="#Group Assignment">Group Assignment</a></li><br>
<li><span class="fa fa-check"></span><a href="#Individual Assignment">Individual Assignment</a></li><br>
<li><span class="fa fa-check"></span><a href="#CAD">CAD Design</a> </li><br>
<li><span class="fa fa-check"></span><a href="#CAM">CAM Machining</a></li><br>
diff --git a/assignment/file/file7.zip b/assignment/file/file7.zip
index bf018be92a633bafdc3e3efb50e3725bbb027012..de1eac82df26db9b2eb42782565b7085074044e5 100644
Binary files a/assignment/file/file7.zip and b/assignment/file/file7.zip differ
diff --git a/assignment/image/a4_52.png b/assignment/image/a4_52.png
new file mode 100644
index 0000000000000000000000000000000000000000..f51ceb8c0be2867627b6c8dda2f9d091a5252a0f
Binary files /dev/null and b/assignment/image/a4_52.png differ
diff --git a/assignment/image/a4_53.png b/assignment/image/a4_53.png
new file mode 100644
index 0000000000000000000000000000000000000000..edb5d584d98932c78a6e9c9a0f1d522666f1beaa
Binary files /dev/null and b/assignment/image/a4_53.png differ
diff --git a/assignment/image/a4_54.png b/assignment/image/a4_54.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d7286195847c6b46da0ffc34337356234966e7d
Binary files /dev/null and b/assignment/image/a4_54.png differ
diff --git a/assignment/image/a4_55.png b/assignment/image/a4_55.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1898a28c7eeb8b836e6ae14419a77b6b048e4ab
Binary files /dev/null and b/assignment/image/a4_55.png differ
diff --git a/assignment/image/a4_56.png b/assignment/image/a4_56.png
new file mode 100644
index 0000000000000000000000000000000000000000..f32421c836b1dedec69c65b5572a6a9d42fa1233
Binary files /dev/null and b/assignment/image/a4_56.png differ
diff --git a/assignment/image/a4_57.png b/assignment/image/a4_57.png
new file mode 100644
index 0000000000000000000000000000000000000000..1257e00ec44540bf89238bd8a095e3134fe762b7
Binary files /dev/null and b/assignment/image/a4_57.png differ
diff --git a/assignment/image/a4_58.png b/assignment/image/a4_58.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6d50dcad8aa3ace41e28a138e6c6982232d8b19
Binary files /dev/null and b/assignment/image/a4_58.png differ