FW 0.6.0 compat

Author: etx

gulpfile.js

@@ -132,6 +132,7 @@ gulp.task('electron-copy', ['sass', 'scripts'], function() {
     'node_modules/intel-hex/**/*',
     'node_modules/electron-squirrel-startup/**/*',
     'node_modules/chip.avr.avr109/**/*',
+    'node_modules/semver/**/*',
   ];
 
 

package.json

@@ -38,6 +38,7 @@
     "electron-squirrel-startup": "^0.1.4",
     "intel-hex": "^0.1.1",
     "noble": "^1.1.0",
+    "semver": "^5.1.0",
     "serialport": "^2.0.6"
   }
 }

www/js/app/services/HardwareService.js

@@ -17,6 +17,7 @@ angular.module('cbt')
 					USB:'usb',
 					BT:'bt'
 				},
+				semver = require('semver'),
 				hardwareInfo = {version:'0.4.0'};
 
 
@@ -44,7 +45,6 @@ angular.module('cbt')
 
 
 
-
 		/*
 		*	Enable/Disable hardware search
 		*	@param {Boolean} b
@@ -325,6 +325,29 @@ angular.module('cbt')
 
 		function setHardwareInfo(obj){
 			hardwareInfo = obj;
+			updateCommands();
+		}
+
+
+		/*
+		 *	Update command array for various firmware versions
+		 */
+
+		function updateCommands(){
+
+			switch(true){
+				case semver.satisfies(hardwareInfo.version, '>=0.6.0'):
+					commands.bus1logOn = [0x03, 0x01, 0x02];
+					commands.bus2logOn = [0x03, 0x02, 0x02];
+					commands.bus3logOn = [0x03, 0x03, 0x02];
+				break;
+				case semver.satisfies(hardwareInfo.version, '<0.6.0'):
+					commands.bus1logOn = [0x03, 0x01, 0x01];
+					commands.bus2logOn = [0x03, 0x02, 0x01];
+					commands.bus3logOn = [0x03, 0x03, 0x01];
+				break;
+			}
+
 		}
 
 

www/js/scripts.js

@@ -21,7 +21,6 @@ autoUpdater.on('update-downloaded', function(event, releaseNotes, releaseName, r
     quitAndUpdate();
     console.log('Notification clicked')
   }
-
   // quitAndUpdate();
 });
 
@@ -3508,6 +3507,7 @@ angular.module('cbt')
 					USB:'usb',
 					BT:'bt'
 				},
+				semver = require('semver'),
 				hardwareInfo = {version:'0.4.0'};
 
 
@@ -3535,7 +3535,6 @@ angular.module('cbt')
 
 
 
-
 		/*
 		*	Enable/Disable hardware search
 		*	@param {Boolean} b
@@ -3816,6 +3815,31 @@ angular.module('cbt')
 
 		function setHardwareInfo(obj){
 			hardwareInfo = obj;
+			updateCommands();
+		}
+
+
+		/*
+		 *	Update command array for various firmware versions
+		 */
+
+		function updateCommands(){
+
+			switch(true){
+				case semver.satisfies(hardwareInfo.version, '>=0.6.0'):
+					commands.bus1logOn = [0x03, 0x01, 0x02];
+					commands.bus2logOn = [0x03, 0x02, 0x02];
+					commands.bus3logOn = [0x03, 0x03, 0x02];
+				break;
+				case semver.satisfies(hardwareInfo.version, '<0.6.0'):
+					commands.bus1logOn = [0x03, 0x01, 0x01];
+					commands.bus2logOn = [0x03, 0x02, 0x01];
+					commands.bus3logOn = [0x03, 0x03, 0x01];
+				break;
+			}
+
+			console.log(commands);
+
 		}