Merge branch 'production' of https://github.com/hisashin/NinjaPCR-web into production

Author: maripo

ios/NinjaPCR_console/console/js/chromeSerial.js

@@ -149,7 +149,7 @@ Serial.prototype.requestStatus = function (callback) {
 	var self = this;
 	var connectionId = self.connectionId;
 	var data = getFullCommand("", STATUS_REQ);
-	console.verbose("Request status... connectionId=" + connectionId);
+	console.log("Request status... connectionId=" + connectionId);
 	chrome.serial.send(connectionId, data, function (sendInfo) {
 		if (sendInfo.error) {
 			console.log("sendInfo=" + sendInfo.error);

ios/NinjaPCR_console/console/js/chromeUtil.js

@@ -1,11 +1,11 @@
 var chromeUtil = {
 };
 chromeUtil.getOS = function () {
-		console.verbose("getOS OS=" + navigator.appVersion);
+		console.log("getOS OS=" + navigator.appVersion);
 		return navigator.appVersion;
 };
 chromeUtil.alert = function (message) {
-	console.verbose("Alert " + message);
+	console.log("Alert " + message);
 	if (!chromeUtil.alertDialogInit) {
 		chromeUtil.alertDialogInit = true;
 		$('#alert_dialog').dialog({
@@ -71,7 +71,7 @@ chromeUtil.alertUpdate = function (currentVersion, latestVersion) {
 	var message = getLocalizedMessage('firmwareUpdateAvailable')
 		.replace("___LATEST_VERSION___", latestVersion)
 		.replace("___INSTALLED_VERSION___", currentVersion);
-	console.verbose(message);
+	console.log(message);
 }
 
 var Storage = function () {
@@ -84,20 +84,20 @@ var STORAGE_KEY_EXPERIMENT_LIST = "experimentList";
 var STORAGE_KEY_EXPERIMENT_PREFIX = "pcr_";
 
 Storage.prototype.loadList = function (callback) {
-	console.verbose("Storage.prototype.loadList");
+	console.log("Storage.prototype.loadList");
 	var self = this;
 	chrome.storage.sync.get(STORAGE_KEY_EXPERIMENT_LIST, function (data) {
-		console.verbose("Load done. data=" + data);
+		console.log("Load done. data=" + data);
 		if (data[STORAGE_KEY_EXPERIMENT_LIST])
 			self.experiments = JSON.parse(data[STORAGE_KEY_EXPERIMENT_LIST]);
 		else
 			self.experiments = [];
 		if (self.experiments && self.experiments.length>0) {
-			console.verbose("Storage.loadList Experiment List Found.");
+			console.log("Storage.loadList Experiment List Found.");
 			callback(self.experiments);
 		} else {
 			//Empty
-			console.verbose("Empty. Add default experiment and save.");
+			console.log("Empty. Add default experiment and save.");
 			self.insertDefaultExperiment(callback);
 		}
 	});
@@ -114,7 +114,7 @@ Storage.prototype.loadExperiment = function (experimentId, callback) {
 	var self = this;
 	chrome.storage.sync.get(key, function(data){
 		var dataStr = data[key];
-		console.verbose("Data str=" + dataStr);
+		console.log("Data str=" + dataStr);
 		var experiment = null;
 
 		if (dataStr!=null) {
@@ -131,9 +131,9 @@ Storage.prototype.loadExperiment = function (experimentId, callback) {
 
 };
 Storage.prototype.clearAllData = function () {
-	console.verbose("clearAllData");
+	console.log("clearAllData");
 	chrome.storage.sync.clear (function(){
-		console.verbose("Done.");
+		console.log("Done.");
 	});
 };
 Storage.prototype.generateId = function () {
@@ -148,15 +148,15 @@ Storage.prototype.updateCurrentExperiment = function (name, newData, callback) {
 	for (var i=0; i<this.experiments.length; i++) {
 		var experiment = this.experiments[i];
 		if (experiment.id==id) {
-			console.verbose("Old name=" + experiment.name);
+			console.log("Old name=" + experiment.name);
 			this.experiments[i].name = name;
 		}
 	}
 	var storageObj = {};
 	storageObj[STORAGE_KEY_EXPERIMENT_LIST] = JSON.stringify(this.experiments, null, '');
 	var self = this;
 	chrome.storage.sync.set(storageObj, function() {
-			console.verbose('Experiment "'+name+'" saved');
+			console.log('Experiment "'+name+'" saved');
 			var detailStorageObj = {};
 			detailStorageObj[key]  = JSON.stringify(newData, null, '');
 			chrome.storage.sync.set(detailStorageObj, function() {
@@ -168,12 +168,12 @@ Storage.prototype.updateCurrentExperiment = function (name, newData, callback) {
 		});
 };
 Storage.prototype.deleteCurrentExperiment = function (callback) {
-	console.verbose("deleteCurrentExperiment " + this.currentExperimentId);
+	console.log("deleteCurrentExperiment " + this.currentExperimentId);
 
 	for (var i=0; i<this.experiments.length; i++) {
 		var experiment = this.experiments[i];
 		if (experiment.id==this.currentExperimentId) {
-			console.verbose("Remove " + i);
+			console.log("Remove " + i);
 			this.experiments.splice(i, 1);
 			break;
 		}
@@ -182,11 +182,11 @@ Storage.prototype.deleteCurrentExperiment = function (callback) {
 	storageObj[STORAGE_KEY_EXPERIMENT_LIST] = JSON.stringify(this.experiments, null, '');
 	var self = this;
 	chrome.storage.sync.set(storageObj, function() {
-			console.verbose('List saved.');
+			console.log('List saved.');
 			var detailStorageObj = {};
 			var key = self.getKeyForId(self.currentExperimentId);
 			chrome.storage.sync.remove(key, function() {
-				console.verbose('Detail data removed.');
+				console.log('Detail data removed.');
 				callback();
 			});
 		});
@@ -202,7 +202,7 @@ Storage.prototype.insertExperiment = function (name, experiment, callback) {
 	storageObj[STORAGE_KEY_EXPERIMENT_LIST] = JSON.stringify(this.experiments, null, '');
 	var self = this;
 	chrome.storage.sync.set(storageObj, function() {
-			console.verbose('Experiment "'+name+'" saved');
+			console.log('Experiment "'+name+'" saved');
 			var detailStorageObj = {};
 			var key = self.getKeyForId(id);
 			detailStorageObj[key]  = JSON.stringify(experiment, null, '');
@@ -215,7 +215,7 @@ Storage.prototype.insertExperiment = function (name, experiment, callback) {
 		});
 };
 Storage.prototype.updateExperiment = function (experiment) {
-	console.verbose("Storage#updateExperiment");
+	console.log("Storage#updateExperiment");
 };
 
 Storage.prototype.getLogFileName = function () {

ios/NinjaPCR_console/console/js/form.js

@@ -225,7 +225,7 @@ var ProfileForm = function () {
   }, {
     key: 'save',
     value: function save(name, isNew, callback) {
-      console.verbose("save " + name + ", isNew=" + isNew); // grab the current experiment and update window.experiment
+      console.log("save " + name + ", isNew=" + isNew); // grab the current experiment and update window.experiment
 
       var pcrProgram = this.writeoutExperiment();
       console.log("pcrProgram=" + pcrProgram); // update the name of the experiment
@@ -234,7 +234,7 @@ var ProfileForm = function () {
 
       if (isNew) {
         pcrStorage.insertExperiment(name, pcrProgram, function (result) {
-          console.verbose("result=" + result);
+          console.log("result=" + result);
 
           if (callback) {
             callback();
@@ -248,7 +248,7 @@ var ProfileForm = function () {
         });
       } else {
         pcrStorage.updateCurrentExperiment(name, pcrProgram, function (result) {
-          console.verbose("result=" + result);
+          console.log("result=" + result);
 
           if (callback) {
             callback();
@@ -589,7 +589,7 @@ var ProfileForm = function () {
        */
 
       $('.deleteStepButton').on('click', function () {
-        console.verbose("deleteStepButton");
+        console.log("deleteStepButton");
         $(this).parent().slideUp('slow', function () {
           // after animation is complete, remove parent step
           $(this).remove(); //// if the length is now 0, hide the whole div
@@ -606,7 +606,7 @@ var ProfileForm = function () {
        */
 
       $('.deleteStepButton').on('click', function () {
-        console.verbose("deleteStepButton");
+        console.log("deleteStepButton");
         $(this).parent().slideUp('slow', function () {
           // after animation is complete, remove parent step
           $(this).remove(); //// if the length is now 0, hide the whole div

ios/NinjaPCR_console/console/js/logger.js

@@ -47,7 +47,7 @@ console.log = function(msg) {
 	Log.showInDebugArea("L", msg);
 	
 };
-console.verbose = function(msg) {
+console.log = function(msg) {
 	console.log_orig(msg);
 	Log.showInDebugArea("V", msg);
 	

ios/NinjaPCR_console/console/js/openpcr.js

@@ -13,7 +13,7 @@
  */
 
 var FIRMWARE_VERSION_CURRENT = "0.0.0";
-var FIRMWARE_VERSION_LATEST = "1.0.5";
+var FIRMWARE_VERSION_LATEST = "1.2.2";
 var FIRMWARE_VERSION_REQUIRED = "1.0.5";
 var CURRENT_UI_VERSION = "1.1";
 var MIN_FINAL_HOLD_TEMP = 16;
@@ -178,7 +178,7 @@ function listSubmit() {
  * loads the experiment with the given experimentID
  */
 function loadExperiment(experimentID) {
-	console.verbose("loadExperiment id=" + experimentID);
+	console.log("loadExperiment id=" + experimentID);
 	pcrStorage.loadExperiment(experimentID, function(experiment) {
 		// Now we've made all the modifications needed, display the Form page
 
@@ -321,38 +321,38 @@ function startPCR() {
 	// command id can't be 0
 	// where is OpenPCR
 	var devicePort = communicator.port;
-	console.verbose("devicePort=" + devicePort);
+	console.log("devicePort=" + devicePort);
 
 	pcrProgram = profileForm.writeoutExperiment();
 	var encodedProgram = programToDeviceCommand (pcrProgram);
 	// verify that there are no more than 16 top level steps
-	console.verbose(pcrProgram.steps.length + " : top level steps");
-	console.verbose(window.lessthan20steps + " : cycle level steps");
+	console.log(pcrProgram.steps.length + " : top level steps");
+	console.log(window.lessthan20steps + " : cycle level steps");
 	var totalSteps = window.lessthan20steps + pcrProgram.steps.length;
 
 	// check that the entire protocol isn't >252 bytes
-	console.verbose("encodedProgram=" + encodedProgram);
+	console.log("encodedProgram=" + encodedProgram);
 	if (encodedProgram.length > 512) {
 		chromeUtil.alert(getLocalizedMessage('lengthLimit').replace('___LENGTH___', encodedProgram.length));
 		return 0;
 	}
 
 	// verify the cycle step has no more than 16 steps
 	else if (window.lessthan20steps > 16) {
-		console.verbose(encodedProgram);
+		console.log(encodedProgram);
 		chromeUtil.alert(getLocalizedMessage('stepLimit').replace('___STEPS___',window.lessthan20steps));
 		return 0;
 	}
 
 	// and check that the total overall is less than 25
 	else if (totalSteps > 25) {
-		console.verbose(encodedProgram);
+		console.log(encodedProgram);
 		chromeUtil.alert(getLocalizedMessage('totalStepLimit').replace('___STEPS___',totalSteps));
 		return 0;
 	}
 
 	//debug
-	console.verbose(encodedProgram);
+	console.log(encodedProgram);
 
 	// go to the Running dashboard
 	showRunningDashboard();
@@ -502,7 +502,7 @@ function stopPCR() {
 	// increment the window.command id and send the new command to the device
 	window.command_id++;
 	stopCommand += '&d=' + window.command_id;
-	console.verbose(stopCommand);
+	console.log(stopCommand);
 	// Send out the STOP command
 	communicator.sendStopCommand(stopCommand, function() {
 		onStopPCR();
@@ -729,7 +729,7 @@ $(function() {
 										+ '&d=' + command_id;
 
 								// trace it
-								console.verbose("string: " + contrast_string);
+								console.log("string: " + contrast_string);
 
 								// Write out the  command to CONTROL.TXT
 								// name of the output file
@@ -755,7 +755,7 @@ $(function() {
 								contrast_string = 's=ACGTC&c=cfg&o=' + contrast
 										+ '&d=' + command_id;
 								// trace it
-								console.verbose("string: " + contrast_string);
+								console.log("string: " + contrast_string);
 								// Write out the  command to CONTROL.TXT
 								// name of the output file
 								if (window.path != null) {

ios/NinjaPCR_console/console/js/serialPortScanner.js

@@ -116,4 +116,3 @@ SerialPortScanner.prototype._read = function (data) {
 		}
 	}
 };
-console.log("_read 2");