1.0.6 Firmware release. More Github cleanup.

src/js/app.js

@@ -118,7 +118,8 @@ module.exports = new Vue({
       password: '',
       ipAddress: '0.0.0.0',
       wifiSSID: '',
-      confirmShutdown: false
+      confirmShutdown: false,
+      diskSpace: ''
     }
   },
 
@@ -309,6 +310,7 @@ module.exports = new Vue({
 
 	this.check_ip_address();
 	this.check_ssid();
+	//.check_disk_space();
 	
 
       }.bind(this))
@@ -341,6 +343,20 @@ module.exports = new Vue({
 	this.$broadcast('wifiSSID', data);
       }.bind(this))	
     },
+    
+//    check_disk_space : function() {
+//    	$.ajax({
+//        type: 'GET',
+//        url: 'diskinfo.txt',
+//        data: {hid: this.state.hid},
+//        cache: false
+//
+//      }).done(function (data) {
+//	console.debug('>', data);
+//	this.diskSpace = data;
+//	this.$broadcast('diskSpace', data);
+//     }.bind(this))
+//    },
 
     get_ip_address : function() {
 	console.debug('get_ip>', this.ipAddress);
@@ -352,11 +368,21 @@ module.exports = new Vue({
 	return this.wifiSSID;
     },
     
+//    get_disk_space : function() {
+//    	console.debug('get_disk>', this.diskSpace);
+//    	return this.diskSpace;
+//    },
+    
     shutdown : function() {
       this.confirmShutdown = false;
       api.put('shutdown');
     
     },
+    
+    reboot : function() {
+    	this.confirmShutdown = false;
+    	api.put('reboot');
+    },
 
     connect: function () {
       this.sock = new Sock('//' + window.location.host + '/sockjs');

src/js/control-view.js

@@ -73,7 +73,8 @@ module.exports = {
       ask_home: true,
       ask_home_msg: false,
       ask_zero_xy_msg: false,
-      ask_zero_z_msg: false
+      ask_zero_z_msg: false,
+      showGcodeMessage: false
     }
   },
 
@@ -92,6 +93,19 @@ module.exports = {
       },
       immediate: true
     },
+    
+    'state.bitDiameter': {
+      handler: function (bitDiameter) {
+        console.log("New bitDiameter " + bitDiameter);
+        console.log("Units: " + this.mach_units);
+        if(this.mach_units == 'IMPERIAL')
+          this.tool_diameter = bitDiameter / 25.4;
+        else
+          this.tool_diameter = bitDiameter;
+        console.log("Tool diameter: " + this.tool_diameter);
+      },
+      immediate: true
+    },
 
 
     mach_units: function (units) {
@@ -508,6 +522,7 @@ module.exports = {
         if (typeof toolpath.progress == 'undefined') {
           toolpath.filename = file;
           this.toolpath_progress = 1;
+          this.showGcodeMessage = false;
           this.toolpath = toolpath;
 
           var state = this.$root.state;
@@ -518,6 +533,7 @@ module.exports = {
           }
 
         } else {
+          this.showGcodeMessage = true;
           this.toolpath_progress = toolpath.progress;
           this.load_toolpath(file, file_time); // Try again
         }
@@ -590,7 +606,7 @@ module.exports = {
     home: function (axis) {
       
       this.ask_home = false;
-      this.ask_home_msg = false;
+      this.ask_home_msg = false;     
       
       if (typeof axis == 'undefined') api.put('home');