Merge pull request #14 from virtual-labs/testing

Testing

README.md

@@ -8,15 +8,19 @@
 
 ### About the Experiment 
 
-Fill a brief description of this experiment here
-
-### Subject Matter Expert
-<b>Name | <b> **Prof. Chittaranjan Mandal**
+1. Familiarisation of Function Generator
+2. To undertand Oscilloscope using the Sine, Square, and Triangle waveforms.
+3. Checking the frequencies of the Sine, Square, and Triangle waves on the waveform generator
+4. This experiment will help the students to learn measuring voltages, time, frequency.
+5. This experiment will help the students to learn about lissajous figures
+
+### Project Principal Investigator
+<b>Name | <b> **Prof. C.S.Kumar**
 :--|:--|
 <b> Institute | <b>  **Indian Institute of Technology Kharagpur**
-<b> Email id|     <b>  **chitta@iitkgp.ac.in**
-<b> Department |  **Department of Computer Science and Engineering**
-<b>Webpage| <b> [http://www.iitkgp.ac.in/department/CS/faculty/cs-chitta](http://www.iitkgp.ac.in/department/CS/faculty/cs-chitta)
+<b> Email id|     <b>  **kumar@mech.iitkgp.ac.in**
+<b> Department |  **Department of Mechanical Engineering**
+<b>Webpage| <b> [http://facweb.iitkgp.ac.in/~cskumar/](http://facweb.iitkgp.ac.in/~cskumar/)
 
 
 ### Contributors List

experiment-descriptor.json

@@ -39,7 +39,7 @@
     },
     {
       "target": "simulation.html",
-      "source": "simulation/index.html",
+      "source": "simulation/oscilloscope_functng.html",
       "label": "Simulation",
       "unit-type": "task",
       "content-type": "simulation"

experiment/contributors.md

@@ -1,13 +1,12 @@
-### Subject Matter Expert
-<b>Name | <b> **Prof. Chittaranjan Mandal**
+## Project Principal Investigator
+<b>Name | <b> **Prof. C.S.Kumar**
 :--|:--|
 <b> Institute | <b>  **Indian Institute of Technology Kharagpur**
-<b> Email id|     <b>  **chitta@iitkgp.ac.in**
-<b> Department |  **Department of Computer Science and Engineering**
-<b>Webpage| <b> [http://www.iitkgp.ac.in/department/CS/faculty/cs-chitta](http://www.iitkgp.ac.in/department/CS/faculty/cs-chitta)
+<b> Email id|     <b>  **kumar@mech.iitkgp.ac.in**
+<b> Department |  **Department of Mechanical Engineering**
+<b>Webpage| <b> [http://facweb.iitkgp.ac.in/~cskumar/](http://facweb.iitkgp.ac.in/~cskumar/)
 
-
-### Contributors List
+## Contributors List
 
 SrNo | Name | Developer and Integration Engineer | Department| Institute | Email id
 :--|:--|:--|:--|:--|:--|

experiment/oscitut.md

@@ -33,4 +33,8 @@ In the figure 3, if volt/div is set to 2 volt/div, which implies each mazor divi
 <p>Figure 3</p>
 </div>
 
-Note: If you set the Volts/Div too low, you’ll clip the signal. Similarly, setting it too high, and you’ll won’t find the signal, i.e. the signal will b flat. ncreasing the Timebase will display more cycles of a periodic signal. Conversely, reducing the Timebase, fewer cycles will be displayed.
+Note: If you set the Volts/Div too low, you’ll clip the signal. Similarly, setting it too high, and you’ll won’t find the signal, i.e. the signal will b flat. ncreasing the Timebase will display more cycles of a periodic signal. Conversely, reducing the Timebase, fewer cycles will be displayed.
+
+Oscilloscope and function generator is described more elaborately->
+[Oscilloscope and Function Generator](http://vlabs.iitkgp.ac.in/aec/exp1/content/Oscilloscope%20and%20Function%20Generator%20Details.pdf)
+

experiment/posttest.json

@@ -2,7 +2,7 @@
   "version": 2.0,
   "questions": [
     {
-      "question": "Oscilloscope is __________",
+      "question": "1. Oscilloscope is __________",
       "answers": {
         "a": "a ohmmeter",
         "b": "an ammeter",
@@ -14,7 +14,7 @@
       "difficulty": "beginner"
     },
     {
-      "question": "One oscilloscope selector knob that allows the major and minor divisions of the graticule to be used to determine a signal amplitude value is called the",
+      "question": "2. One oscilloscope selector knob that allows the major and minor divisions of the graticule to be used to determine a signal amplitude value is called the",
       "answers": {
         "a": "Time/cm control",
         "b": "Volts/cm control",
@@ -26,7 +26,7 @@
       "difficulty": "beginner"
     },
     {
-      "question": "A CRO can display",
+      "question": "3. A CRO can display",
       "answers": {
         "a": "AC signals",
         "b": "DC signals",
@@ -38,7 +38,7 @@
       "difficulty": "beginner"
     },
     {
-      "question": "If the vertical sensitivity is set to 1 volt per division and occupies 2 divisions, then peak-to-peak voltage is",
+      "question": "4. If the vertical sensitivity is set to 1 volt per division and occupies 2 divisions, then peak-to-peak voltage is",
       "answers": {
         "a": "4 volt",
         "b": "5 volt",
@@ -50,7 +50,7 @@
       "difficulty": "beginner"
     },
     {
-      "question": "If the controls on the CRO are set at 0.2ms/div, find the frequency of the signal?<br/><p style=\"text-align:center\"><img src=\"image/postquiz3.png \" style=\"width:350px;height:200px\"></p>",
+      "question": "5. If the controls on the CRO are set at 0.2ms/div, find the frequency of the signal?<br/><p style=\"text-align:center\"><img src=\"images/postquiz3.png \" style=\"width:350px;height:200px\"></p>",
       "answers": {
         "a": "1 kHz",
         "b": "2 kHz",

experiment/pretest.json

@@ -2,7 +2,7 @@
   "version": 2.0,
   "questions": [
     {
-      "question": "CRO stands for_____________",
+      "question": "1. CRO stands for_____________",
       "answers": {
         "a": "Current Resistance Oscillator",
         "b": "Capacitance Resistance Oscilloscope",
@@ -14,7 +14,7 @@
       "difficulty": "beginner"
     },
     {
-      "question": "A function generator is a multipurpose signal source, it can generate:",
+      "question": "2. A function generator is a multipurpose signal source, it can generate:",
       "answers": {
         "a": "Square Wave",
         "b": "Triangle Wave",
@@ -26,7 +26,7 @@
       "difficulty": "beginner"
     },
     {
-      "question": "An advantage of Oscilloscope over multimeter is that",
+      "question": "3. An advantage of Oscilloscope over multimeter is that",
       "answers": {
         "a": "We can measure accurate value of voltage",
         "b": "We can see the wave shape of voltage",
@@ -38,7 +38,7 @@
       "difficulty": "beginner"
     },
     {
-      "question": "The graticule of an oscilloscope, which has a grid pattern graduated in",
+      "question": "4. The graticule of an oscilloscope, which has a grid pattern graduated in",
       "answers": {
         "a": "Square centimeters",
         "b": "Millimeters",
@@ -50,7 +50,7 @@
       "difficulty": "beginner"
     },
     {
-      "question": " If the vertical sensitivity is set to 0.5 volt per division and occupies 4 divisions, then peak-to-peak voltage is",
+      "question": "5. If the vertical sensitivity is set to 0.5 volt per division and occupies 4 divisions, then peak-to-peak voltage is",
       "answers": {
         "a": "4 volt",
         "b": "5 volt",

experiment/references.md

@@ -1 +1,9 @@
-### Link your references in here
+## References
+
+#### Books
+
+1. Boylestad / Nashelsky, Electronic Devices and Circuit Theory , Pearson Education India; 11 edition (2015)
+2. Adel S. Sedra , Kenneth C. Smith , Arun N. Chandorkar , Microelectronic Circuits: Theory And Applications,Oxford University Press ,Seventh Edition, (1 June 2017)
+3. Donald Neamen, Electronic Circuits: Analysis and Design, McGraw Hill Education; 3 edition (25 August 2006)
+4. Jacob Millman , Christos Halkias , Chetan Parikh , Millman's Integrated Electronics, McGraw Hill Education; 2 edition (1 July 2017)
+5. B.G. Streetman and S. Banerjee, Solid State Electronic Devices, Prentice Hall.

experiment/simulation/css/main.css

@@ -1 +1,18 @@
-/* You CSS goes in here */
+/* You CSS goes in here */
+input{
+    width:310px; 
+    height:40px;
+    background:#4E9CAF; 
+    padding:20px;
+    padding-top:3px;
+    padding-bottom:3px;
+    border-radius:10px;
+    color:white;
+    font-weight: bold;
+    font-size:12pt;
+    display: inline-block;
+    cursor:pointer;
+}
+input:hover{
+    background-color: #20B2AA;  
+}

experiment/simulation/index.html

@@ -5,9 +5,10 @@
     <link rel="stylesheet" href="./css/main.css">
 </head>
 <body>
-		<!-- Your code goes here-->
+	<div class="content" id="experiment-article-section-4-content" style="position:relative;top:-22px;width:650px;height:410px; margin:0 auto;">
 		<input type="button" onclick="window.open('./oscilloscope_functng.html', '_blank');" value="Oscilloscope and Function Generator" style="position:absolute; top:70px;  right:110px;"/>
-	<!-- Add JS at the bottom of HTML file --> 
+
+	</div>
         <script src="./js/main.js"></script>
 </body>
 </html>

experiment/simulation/oscilloscope_functng.html

@@ -98,20 +98,20 @@
 });
 </script-->
     </head>
-    <body bgcolor="#000066";data-demo-id="animation"; style="width:100%;">
+    <body data-demo-id="animation"; style="width:100%;">
 	<!-- Google Tag Manager (noscript) -->
 <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KM82TPW"
 height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 <!-- End Google Tag Manager (noscript) -->
         <header class="default" id="experiment-header">
             <div class="logo" id="experiment-header-logo" style="text-align:center">
 
-                <img src="./images/logo.jpg" style="height:150px;width:1260px;"></div>
+                <!--img src="./images/logo.jpg" style="height:150px;width:1260px;"></div-->
         </header>
 
 
          <div class="wholebody" >
-             <div style="font-size:30px; text-align:center;padding-right:100px; height:60px">  <b>Familiarisation of Oscilloscope and Function Generator</b></div>
+             <div style="font-size:30px; text-align:center;padding-right:100px; height:60px">  <b></b></div>
             <div id="description" >
                 <div class="dropdown">
                     <p style="text-align:center;padding-right:350px;color:white"> INSTRUCTION</p>
@@ -314,7 +314,7 @@
         <div id="lab-footer" style="height:20px;width:1310px;text-align: center;padding:bottom">
 
             <div style="margin-left:10%; margin-right:10% ">
-                Copyright &copy; 2020 Indian Institute of Technology Kharagpur,<a href="../license/index.html" target="_blank" style="margin:auto"> Licensing Terms </a>
+                Copyright &copy; 2020 Indian Institute of Technology Kharagpur
             </div>
 
         </div>
@@ -325,7 +325,7 @@
          <div id="calculator" >
             <div class="bttncls" id="close" >
                 <button type="button"  onclick="ok()" style="width:20px;right:-50px;top:25px;height:25px;border:none;background-color:white;cursor:pointer">
-                    <img src="./images/Close Window.png Window.png" alt="Save icon" style="width:30px;height:30px"/>
+                    <img src="./images/Close Window.png " alt="Save icon" style="width:30px;height:30px"/>
                 </button></div>
 
             <div class="box" id="hide" >

experiment/theory.md

@@ -77,21 +77,21 @@ A function generator is a device that can produce various patterns of voltage at
 
 <div align="center">
 <img src="images/sqrwave.png" width="50%">
-<p>Figure 4</p>
+<p>Figure 5</p>
 </div>
 
 - **Sine wave** - The signal curves like a sinusoid from high to low voltage.
 
 <div align="center">
 <img src="images/sinewave.png" width="50%">
-<p>Figure 4</p>
+<p>Figure 6</p>
 </div>
 
 - **Triangle wave** - The signal goes from high to low voltage at a fixed rate.
 
 <div align="center">
 <img src="images/triwave.png" width="50%">
-<p>Figure 4</p>
+<p>Figure 7</p>
 </div>
 
 2. The amplitude control on a function generator varies the voltage difference between the high and low voltage of the output signal.
@@ -103,4 +103,7 @@ A function generator is a device that can produce various patterns of voltage at
 
 - After powering on the function generator, the output signal needs to be configured to the desired shape. Typically, this means connecting the signal and ground leads to an oscilloscope to check the controls.
 - Adjust the function generator until the output signal is correct, then attach the signal and ground leads from the function generator to the input and ground of the device under test.
-- For some applications, the negative lead of the function generator should attach to a negative input of the device, but usually attaching to ground is sufficient.
+- For some applications, the negative lead of the function generator should attach to a negative input of the device, but usually attaching to ground is sufficient.
+
+
+<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>