agregado seleccion de modos

Author: victordiaz

nw-miniblip/firmwares.json

@@ -4,6 +4,7 @@
   "version": "0.0.1",
   "author": "victor",
   "filename": "anim",
+  "id": 1,
   "type": "",
   "image": "yes", 
   "md5": "" 
@@ -13,6 +14,7 @@
   "version": "0.0.1",
   "author": "victor2",
   "filename": "serial", 
+  "id": 2,
   "type": "firmware", 
   "image": "yes",
   "md5": ""

nw-miniblip/index.html

@@ -12,11 +12,12 @@
   <script>
 	var editor;
 	$( document ).ready(function() {
+            bind_buttons();
 	    get_list_firmwares_local();
 
 	    editor = ace.edit("editor");
 	    editor.setTheme("ace/theme/monokai");
-	    editor.getSession().setMode("ace/mode/javascript");
+	    editor.getSession().setMode("ace/mode/c_cpp");
 	    editor.setOptions({
 		  fontSize: "15pt"
 	    });
@@ -28,34 +29,56 @@
     <div id = "container"> 
 	<div id = "toolbar">
 		<ul> 
-			<li> <i class="fa fa-list fa-2x"></i></li>
-			<li> <i class="fa fa-terminal fa-2x"></i></li>
-			<li> <i class="fa fa-code fa-2x"></i></li>
+			<li id = "list"> <i class="fa fa-list fa-2x"></i></li>
+			<li id = "console"> <i class="fa fa-terminal fa-2x"></i></li>
+			<li id = "code"> <i class="fa fa-code fa-2x"></i></li>
 
 
 		</ul>
 	</div>
 
 	<div id = "main">
 
-		<div id = "firmwares"> 
+		<div id = "firmware-list"> 
 
 		</div>
 
 	    	<div id = "board"> 
 			<img src="./images/miniblip_board.png">
 		</div>
 
-		<div id="editor">function foo(items) {
-		    var x = "All this is syntax highlighted";
-		    return x;
-		}</div>
-    
+		<div id="editor-container">
+			<div id = "actions"> 
+				<ul> 
+					<li> <i class="fa fa-play-circle fa-2x"></i></li>
+					<li> <i class="fa fa-stop-circle fa-2x"></i></li>
+					<li> <i class="fa fa-arrow-circle-right fa-2x"></i></li>
+				</ul>
+			</div>
+
+			<div id="editor">
 
+void setup() {
+    // Turn off miniblip buzzer
+    speaker=0.0;
 
-		<div id = "actions"> 
+    serial.printf("Hello world!\n");    
+    
+    for (int i = 0; i < TOUCH_N; i++) {
+        p_touch_io[i] = new DigitalInOut(touch_pin[i]);
+        p_touch_io[i]->mode(PullDown);
+        p_touch_io[i]->output();
+        p_touch_io[i]->write(1);
+    }
+    
+    tick.attach(detect, 1.0 / 40.0);
+}
 
+			</div>		
 		</div>
+    
+
+
 
 		<div id = "console"> 
 			<ul>

nw-miniblip/javascript/main.js

@@ -3,10 +3,30 @@ function detect_board() {
 
 } 
 
-
-function upload_firmware() {
-
-
+function upload_firmware(path_in, path_out) {
+	var cmd_dd = "sudo dd if="+path_in+" of="+path_out+" bs=512 seek=4 conv=notrunc";
+
+	console.log(cmd_dd);
+
+
+	var execFile = require 
+	    ('child_process').execFile, child;
+
+	 child = execFile(cmd_dd,
+	       function(error,stdout,stderr) { 
+	    if (error) {
+	      console.log(error.stack); 
+	      console.log('Error code: '+ error.code); 
+	      console.log('Signal received: '+ 
+		     error.signal);
+	      } 
+	    console.log('Child Process stdout: '+ stdout);
+	    console.log('Child Process stderr: '+ stderr);
+	  }); 
+	  child.on('exit', function (code) { 
+	    console.log('Child process exited '+
+		'with exit code '+ code);
+	  });
 } 
 
 
@@ -19,6 +39,20 @@ function init_console(div) {
 function get_list_firmwares_remote() {
 
 
+}
+
+function get_local_firmware_path(firmware_name) {
+	var base = process.cwd() + "/firmwares-prueba/";
+	
+	var path = base + "firmware_name";
+	console.log(path);
+
+	return path;
+}
+
+function get_remote_firmware_url() {
+
+
 }
 
 function get_list_firmwares_local() {
@@ -29,10 +63,13 @@ function get_list_firmwares_local() {
 		console.log(data);
 		var obj = $.parseJSON( data );
 
-		for (var i = 0; i < obj.length; i++) {
+		$.each(obj, function(i, value) {
 			console.log(obj[i].name);
-			$("#firmwares").append('<div class="item"><div class="name">' + obj[i].name +'</div><div class="author">'+obj[i].author+'</div></div>');
-		}
+			$("#firmware-list").append('<div class="item" id = '+obj[i].id +'><div class="name">' + obj[i].name +'</div><div class="author">'+obj[i].author+'</div></div>');
+			$("#firmware-list #" + obj[i].id).click(function() {
+				upload_firmware(get_local_firmware_path(obj[i].id), "/dev/sdb");
+			});
+		});
 		//console.log(obj);
 	});	
 }
@@ -42,3 +79,34 @@ function get_list_firmwares_local() {
 function download_firmware() {
 
 }
+
+
+
+
+function bind_buttons() {
+	$("#toolbar #list").click(function() {
+		hide_all_sections();
+		$("#main #firmware-list").show();
+	});
+
+	$("#toolbar #console").click(function() {
+		hide_all_sections();
+		$("#main #console").show();
+	});
+
+	$("#toolbar #code").click(function() {
+		hide_all_sections();
+		$("#main #editor-container").show();
+	});
+}
+
+
+function hide_all_sections() {
+	$("#main #editor-container").hide();
+
+} 
+
+function show_section() {
+	
+
+}

nw-miniblip/styles/main.less

@@ -82,11 +82,26 @@ body {
   position: absolute;
 }
 
+#actions {
+	z-index: 10;
+	position: absolute;
+	top: 0;
+	right: -32px;
+	background: rgb(255, 223, 0);
+	padding: 10px;
+	border-radius: 0px 0px 2px 2px;
+	box-shadow: 0px 0px 10px black;
+	color: rgb(95, 91, 10);
+
+	
+	li {
+	  padding: 10px;
+	}
 
+}
 
 
-
-#firmwares {
+#firmware-list {
   float: left;
   width: 200px;
   background: white;
@@ -100,6 +115,16 @@ body {
 	.name {
 	  font-weight: bold;
 	}
+
+	.author {
+	  color: gray;
+	  font-style: italic;
+	  font-size: 0.8em;
+	}
+
+	&:hover {
+ 	 background: rgba(0, 0, 0, 0.08);
+	}
   }
 }