From 9165fc65de6ed80b6c3195a209c3f35f4ddc5cbf Mon Sep 17 00:00:00 2001 From: cTn Date: Fri, 11 Apr 2014 21:22:05 +0200 Subject: [PATCH] release --- changelog.html | 3 ++- js/gui.js | 4 ++++ js/stm32.js | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index ad4d57b4..825d4a78 100644 --- a/changelog.html +++ b/changelog.html @@ -1,6 +1,7 @@ -xx.xx.2014 - 0.31 +04.11.2014 - 0.31

- Bugfix for Sliders not properly updating
+ - Bugfix for CLI line feed on ChromeOS

04.03.2014 - 0.30

diff --git a/js/gui.js b/js/gui.js index a2eeb793..95e8f3e0 100644 --- a/js/gui.js +++ b/js/gui.js @@ -13,6 +13,7 @@ var GUI_control = function() { else if (navigator.appVersion.indexOf("CrOS") != -1) this.operating_system = "ChromeOS"; else if (navigator.appVersion.indexOf("Linux") != -1) this.operating_system = "Linux"; else if (navigator.appVersion.indexOf("X11") != -1) this.operating_system = "UNIX"; + else this.operating_system = "Unknown"; }; // Timer managing methods @@ -295,6 +296,9 @@ GUI_control.prototype.tab_switch_cleanup = function(callback) { case 'firmware_flasher': PortHandler.flush_callbacks(); + // unbind "global" events + $(document).unbind('keypress'); + if (callback) callback(); break; diff --git a/js/stm32.js b/js/stm32.js index 544f3665..2df23cf6 100644 --- a/js/stm32.js +++ b/js/stm32.js @@ -61,7 +61,7 @@ STM32_protocol.prototype.connect = function(hex) { flashing_bitrate = 921600; break; case 'MacOS': - flashing_bitrate = 921600; /* max of 38400 was fixed in dev branch, 33 still broken */ + flashing_bitrate = 921600; break; case 'ChromeOS': case 'Linux':