diff --git a/assignment/assignment.html b/assignment/assignment.html
index 0253fa1849805b4dce3d63efdc96a07ed0e7a76d..77aa99350ddf1f6fcc7daff4e0236485fd11dc7f 100644
--- a/assignment/assignment.html
+++ b/assignment/assignment.html
@@ -50,14 +50,14 @@ http://www.tooplate.com/view/2096-individual
</style>
</head>
-<a class="nav-link js-scroll-trigger active" href="..//index.html">Home</a>
+<a class="nav-link js-scroll-trigger " href="..//index.html">Home</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="..//about me.html">About me</a>
</li>
<li class="nav-item">
- <a class="nav-link js-scroll-trigger" href="assignment.html">Assignment</a>
+ <a class="nav-link js-scroll-trigger active" href="assignment.html">Assignment</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="..//my project.html">My Project</a>
@@ -74,7 +74,7 @@ http://www.tooplate.com/view/2096-individual
<!DOCTYPE html>
<html lang="en">
<head>
- <titl> Assignment</title>
+ <title> Assignment</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
diff --git a/assignment/assignment1.html b/assignment/assignment1.html
index 45484222eaa40a5d6c0f6cb293720514550a7e0d..4ecbd1e55a11ac970a44a10727d6bb6872dd1851 100644
--- a/assignment/assignment1.html
+++ b/assignment/assignment1.html
@@ -308,10 +308,10 @@ imageZoom("myimage", "myresult");
<div class="6u">
<section id="box2">
<header>
- <h2> <a href="assignment2.html">Assignment 2: Computer Aided Design </a></h2>
+ <h2> <a href="assignment2.html">Assignment 2: Project Management </a></h2>
</header>
- <div> <a href="assignment2.html" class="image full"><img src="img/cad11.jpeg" alt=""></a> </div>
- <p>CAD (Computer Aided Design) is the use of computer software to design and document a product’s design process.</p>
+ <div> <a href="assignment2.html" class="image full"><img src="img/cad12.png" alt=""></a> </div>
+ <p>Website Development, Version-control etc.</p>
</section>
</div>
<div class="3u">
diff --git a/assignment/assignment10.html b/assignment/assignment10.html
index c3fe9595113a4952a1bcf28d9698072ec428b3d1..46ddb12e99310182ebf64fe3a2e0d6730432ec3e 100644
--- a/assignment/assignment10.html
+++ b/assignment/assignment10.html
@@ -303,8 +303,17 @@ in Eagle software is as belows. The schematic of the PCB is as follows: </stro
9. 4 Pin connector for output- 01 Nos.<br>
10. 4 Pin connetor for smoke sensor connection- 01 Nos.<br>
11. 3 pin connector for input connection- 01 Nos.<br>
-12.3 pin connector for LED connection - 01 Nos.
+12.3 pin connector for LED connection - 01 Nos. <br>
+The above component is soldered on the PCB. The smoke sensor is connected by wire to the board and the final board is here. One jumper wire is connected for VCC, because during milling, when I am giving the cut file for outer border cutting, it has cut the one path of the board.So need to used wire. </strong> </p>
+<div class="row">
+ <div class="col">
+ <div class="card text-center">
+ <div class="oval"><img src="image/a9_18.png" width="75%"
+ height="550" class="svg__image"> </div>
+ <br>
</strong> </p>
+<h4 id="design" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong>Programming and Testing of board</strong> </h4>
+<p style="justify-content: center"><strong>Now this is some what hard task to me, to solve all the error, while programming in board, I have decided to go firstly for simple blinking code for the board and then we will read the sensor and print it on serial monitor. </strong> </p>
<h4 id="What problem" 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>
diff --git a/assignment/assignment2.html b/assignment/assignment2.html
index 9ad652ce59281e1a167e02f8c1b36b536e76c1de..d43f9bc575decdb8fc628b61bb1caae070e87116 100644
--- a/assignment/assignment2.html
+++ b/assignment/assignment2.html
@@ -322,6 +322,10 @@
<div class="oval"><img src="img/Screenshot_27.png" width="75%"
height="300" class="svg__image"> </div>
<br> <br>
+ <h4 style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong> Video Conference </strong></h4>
+ <p style="justify-content: center"><strong>Global lectures happen on Wednesdays at 9:00 on the US East Coast (ranging from 6:00 on the West Coast to 23:00 in Japan). In India, it will be in between 6.30pm to 9.30 pm.
+ Prof. Neil used the zoom app for the lectures. There is ID and Password of the mmeting, by putting this we can join the meeting and also the recorded video also available after two days of lectures for references.
+ Recitations happen on Mondays at the same hour for one hour, and global lab sections and regional reviews are scheduled on every Tuesday 4 pm of the week scheduled by the regional reviewer .
<h4 id="What" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong> What i learn? </strong></h4>
<p style="justify-content: center"><strong>
• HTML pages are text documents. <br>
diff --git a/assignment/assignment3.html b/assignment/assignment3.html
index ac3d329b34b454ed26764f18076ecfca9de3d1ca..eb12e869b3b9346da0516e155af223531381b878 100644
--- a/assignment/assignment3.html
+++ b/assignment/assignment3.html
@@ -246,7 +246,7 @@
<div class="oval"><img src="img/Screenshot_82.png" width="75%"
height="300" class="svg__image"> </div>
<br> <br>
- <p style="justify-content: center"><strong> With reference to first slot applied on side, same slot is given on side and apllying constraints from this slot </strong></p>
+ <p style="justify-content: center"><strong> With reference to first slot applied on side, same slot is given on side and applying constraints from this slot </strong></p>
<div class="row">
<div class="col">
<div class="card text-center">
diff --git a/assignment/assignment4.html b/assignment/assignment4.html
index 457de7c7de81efd2cb8f7ca17c33ee3fbf20e412..d0d27032449742f6b5240ac30947b9450eccecdf 100644
--- a/assignment/assignment4.html
+++ b/assignment/assignment4.html
@@ -78,7 +78,7 @@
<p style="justify-content: center"><strong> In this week, in group assignment, we have to characterize the lasercutters focus, power, speed, rate, kerf
and joint clearance. We cut different pieces of cardboard by using different speed and power, then optimize the proper speed and power for cardboard.
Then by measuring the cutting dimension, compared it with design dimension, we calculte kerf. The details about Group Assignment is given on our Fab Lab, Vigyan Ashram page<br>
- <a href= "http://fabacademy.org/2020/labs/vigyanashram/gassignment/computer_controlled_cutting.html"> Click here for details about 3-Week Group Assignment</a></strong> </p></strong></p>
+ <a href= "http://fabacademy.org/2020/labs/vigyanashram/group/assignments/computer_controlled_cutting.html"> Click here for details about 3-Week Group Assignment</a></strong> </p></strong></p>
<h4 id="Individual Assignment" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong>Individual Assignment </strong> </h4>
<p style="justify-content: center"><strong>In the individual assignment, we have to cut something on Vinyl cutter and make a parametric construction kit
diff --git a/assignment/assignment5.html b/assignment/assignment5.html
index 22b566563fb2e37484b3d57e930debea3df6e2e0..d6fbd2b7d38a257e8f8191bd60aae9983b5e6dc6 100644
--- a/assignment/assignment5.html
+++ b/assignment/assignment5.html
@@ -78,7 +78,8 @@
<h4 id="Group Assignment" style="border-bottom: 6px solid yellow; background-color: lightgrey" > <strong>Group Assignment</strong> </h4>
<p style="justify-content: center"><strong>In group assignment, the task for this week is to characterize the design rules for PCB production process.
So we five member in group, trying to machining of PCB usign SRM-20 i.e. PCB milling machine available in our Fab Lab. So,lets see how we develop the PCB.
- The given png image for trace and cut is shown below </strong> </p>
+ The given png image for trace and cut is shown below. <br>
+ </strong> </p>
<div class="row">
<div class="col">
<div class="card text-center">
@@ -144,8 +145,9 @@
<p style="justify-content: center"><strong> Here the line test is conducted between the 0.001 mil to 0.020 mil. The line widths around .001 mil are bit risky to mill, but the ones nearer to 0.01 mil are quite good and line around 0.020 are good to machining.<br>
When you are fitting the board with double-side tape to the wooden surface be sure to press it really strongly! Sometimes it’s a good practice to clean the wooden plate from rests of the previous tapes, or even hardly visible glue. Due to uneven pasting, the bubble are form
to the back of PCB material, it will affect to machining, sometiomes it fails to machining also. Also its also need to check the bed level, its also affect on machining. The bed should be perfectly
-horizontal. So this is our obseravation from Group Assignment</strong> </p> <br>
- <html>
+horizontal. So this is our obseravation from Group Assignment
+<a href= "http://fabacademy.org/2020/labs/vigyanashram/group/assignments/Electronic_Production.html"> Click here for details about 4-Week Group Assignment</a> </strong> </p> <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>In this assignment, we have to make an in-circuit programmer by milling and stuffing the PCB, test it, then optionally try other PCB processes. So lets discuss, how the
ISP is developed. </strong> </p>
diff --git a/assignment/assignment6.html b/assignment/assignment6.html
index 79433b3706f533b8ee3caa5908dc82be46426e61..5f02524727c184bd05859f896c76040e2b56ff5d 100644
--- a/assignment/assignment6.html
+++ b/assignment/assignment6.html
@@ -86,7 +86,7 @@
Power Failure ressurection - Never lose a print to power failures again. <br>
Multi Filament Capability: PLA, ABS, Flexible, Composite Materials (Wood Fill, Bronze Fill, etc), Nylon 618 <br>
The details about Group Assignment is given on our Fab Lab, Vigyan Ashram page<br>
- <a href= "http://fabacademy.org/2020/labs/vigyanashram/gassignment/scanning%20and%20printing.html"> Click here for details about 5-Week Group Assignment </a>
+ <a href= "http://fabacademy.org/2020/labs/vigyanashram/group/assignments/scanning_and_printing.html"> Click here for details about 5-Week Group Assignment </a>
</strong> </p>
<div class="row">
<div class="col">
diff --git a/assignment/assignment7.html b/assignment/assignment7.html
index 96488b0d8cda402f36b763fb245ee19aa24a545e..95e6248f75b570cdd3b77cf5d4500481237d8aee 100644
--- a/assignment/assignment7.html
+++ b/assignment/assignment7.html
@@ -469,7 +469,7 @@
<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/gassignment/Electronics%20Design.html"> Electronics Design Group Assignment</a> </strong> </p> <br> <br>
+<a href= "http://fabacademy.org/2020/labs/vigyanashram/group/assignments/Electronics_Design.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>
diff --git a/assignment/file/file10.zip b/assignment/file/file10.zip
index 4b26ab0d71104f51a610652c9a6cf5f5694484d5..476b9c288dfdf17fa4fc23411ba96a72c202dcf8 100644
Binary files a/assignment/file/file10.zip and b/assignment/file/file10.zip differ
diff --git a/assignment/file/file3.zip b/assignment/file/file3.zip
index 9ec954a56925b8b5aa2fb63caa532f1aab9c33ac..58c840d8861a1d7a78e4f33a8d450a9fb6644f72 100644
Binary files a/assignment/file/file3.zip and b/assignment/file/file3.zip differ
diff --git a/assignment/file/file4.zip b/assignment/file/file4.zip
index b38dea827613aa112e354acbe53197c712860da4..0b9010ae4ffba40f3940f0711b0906b1ee4b47c6 100644
Binary files a/assignment/file/file4.zip and b/assignment/file/file4.zip differ
diff --git a/assignment/img/cad12.png b/assignment/img/cad12.png
new file mode 100644
index 0000000000000000000000000000000000000000..17c7e6c1501549d978aa2e01970ba79e5961598e
Binary files /dev/null and b/assignment/img/cad12.png differ