fix timers

10.3.x-maintenance
cTn 2014-10-01 15:18:37 +02:00
parent a580d94d10
commit 3312bf5df2
2 changed files with 4 additions and 4 deletions

View File

@ -128,7 +128,7 @@ STM32_protocol.prototype.initialize = function () {
self.receive_buffer = [];
self.verify_hex = [];
self.upload_time_start = microtime();
self.upload_time_start = millitime();
self.upload_process_alive = false;
// reset progress bar to initial state
@ -655,7 +655,7 @@ STM32_protocol.prototype.upload_procedure = function (step) {
// disconnect
GUI.interval_remove('STM32_timeout'); // stop STM32 timeout timer (everything is finished now)
console.log('Script finished after: ' + (microtime() - self.upload_time_start).toFixed(4) + ' seconds');
console.log('Script finished after: ' + ((millitime() - self.upload_time_start) / 1000) + ' seconds');
// close connection
serial.disconnect(function (result) {

View File

@ -67,7 +67,7 @@ STM32DFU_protocol.prototype.connect = function (device, hex) {
self.hex = hex;
// reset and set some variables before we start
self.upload_time_start = microtime();
self.upload_time_start = millitime();
self.verify_hex = [];
// reset progress bar to initial state
@ -466,7 +466,7 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
break;
case 99:
// cleanup
console.log('Script finished after: ' + (microtime() - self.upload_time_start).toFixed(4) + ' seconds');
console.log('Script finished after: ' + ((millitime() - self.upload_time_start) / 1000) + ' seconds');
self.releaseInterface(0);
break;