updates to gpio test code

jmstriegel · jmstriegel · commit 017d3e75a601 · 2014-01-08T16:19:34.000-05:00
diff --git a/coder-apps/tests/gpio_test/app/app.js b/coder-apps/tests/gpio_test/app/app.js
@@ -1,7 +1,7 @@
 var gpio = require("gpio");
 gpio.logging = true;
 
-var gpioID = 7; //pin 26, bottom right header
+var gpioID = 4; //actually pin 7, 4 down on left header
 var gpioDevice;
 var connected = false; //ensure only one process talks to us at a time.
 
diff --git a/coder-apps/tests/gpio_test/app/meta.json b/coder-apps/tests/gpio_test/app/meta.json
@@ -1,6 +1,6 @@
 {
     "created": "2013-11-30",
-    "modified": "2013-12-03",
+    "modified": "2013-12-08",
     "color": "#2ecc71",
     "author": "",
     "name": "GPIO Test",
diff --git a/coder-apps/tests/gpio_test/static/js/index.js b/coder-apps/tests/gpio_test/static/js/index.js
@@ -18,15 +18,13 @@ $(document).ready( function() {
         // enabled is set below by a button click.
         var blinkval = 0;
         setInterval( function() {
-        
-            if ( blinkval ) {
-                blinkval = 0;
-            } else {
-                blinkval = 1;
-            }
 
             if ( enabled ) {
-                
+                if ( blinkval ) {
+                    blinkval = 0;
+                } else {
+                    blinkval = 1;
+                }
                 Coder.socketConnection.sendData( 'gpio', {
                     command: "set",
                     value: blinkval
@@ -39,31 +37,56 @@ $(document).ready( function() {
         //Enable or disable the blinker
         var enabled = false;
         $("#on").click( function() {
-            Coder.socketConnection.sendData( 'gpio', {
-                command: "set",
-                value: 1
-            });
+            lightOn();
             enabled = true;
         });
         $("#off").click( function() {
-            Coder.socketConnection.sendData( 'gpio', {
-                command: "set",
-                value: 0
-            });
+            lightOff();
+            enabled = false;
+        });
+        $("#toggle").click( function() {
+            enabled = false;
+            if ( blinkval ) {
+                blinkval = 0;
+                lightOff();
+            } else {
+                blinkval = 1;
+                lightOn();
+            }
+        });
+        $("#push").on("mousedown", function() {
             enabled = false;
+            blinkval = 1;
+            lightOn();
+        }).on("mouseup", function() {
+            enabled = false;
+            blinkval = 0;
+            lightOff();
         });
+
         
     });
 
     addOutputMessage( "Connecting... see the debug console for log messages." );
 
 });
 
-
+var lightOn = function() {
+    Coder.socketConnection.sendData( 'gpio', {
+        command: "set",
+        value: 1
+    });
+};
+var lightOff = function() {
+    Coder.socketConnection.sendData( 'gpio', {
+        command: "set",
+        value: 0
+    });
+};
 
 var addOutputMessage = function( text ) {
     var $output = $("#output");
     $output.prepend( $("<p/>").text( text ) );
     console.log( text );
-}
+};
 
diff --git a/coder-apps/tests/gpio_test/views/index.html b/coder-apps/tests/gpio_test/views/index.html
@@ -26,8 +26,10 @@
 <body class="">
     <div class="pagecontent">
         <h1>GPIO Test</h1>
-        <div id="on" class="button">ON</div>
-        <div id="off" class="button">OFF</div>
+        <div id="on" class="button">BLINK</div>
+        <div id="off" class="button">STOP BLINK</div>
+        <div id="toggle" class="button">TOGGLE</div>
+        <div id="push" class="button">PUSH</div>
         <div id="output">
             
         </div>        

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"created": "2013-11-30",`
`3`		`- "modified": "2013-12-03",`
	`3`	`+ "modified": "2013-12-08",`
`4`	`4`	`"color": "#2ecc71",`
`5`	`5`	`"author": "",`
`6`	`6`	`"name": "GPIO Test",`