diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 2854f15cb..32f9f0479 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -234,7 +234,7 @@
},
"defaultWelcomeText": {
- "message": "The application supports all hardware that can run cleanflight (SPRacingF3, Vortex, Sparky, DoDo, CC3D/EVO, Air Hero 32, Flip32/+/Deluxe, DragonFly32, CJMCU Microquad, Chebuzz F3, STM32F3Discovery, Hermit, Naze32 Tricopter Frame, Skyline32, Naze/32/Mini/Pro/Blackbox etc)
The firmware source code can be downloaded from here
The newest binary firmware image is available here, development builds available here
Latest CP210x Drivers can be downloaded from here
"
+ "message": "The application supports all hardware that can run cleanflight (SPRacingF3, Vortex, Sparky, DoDo, CC3D/EVO, Air Hero 32, Flip32/+/Deluxe, DragonFly32, CJMCU Microquad, Chebuzz F3, STM32F3Discovery, Hermit, Naze32 Tricopter Frame, Skyline32, Naze/32/Mini/Pro/Blackbox etc)
The firmware source code can be downloaded from here
The newest binary firmware image is available here, development builds available here
Latest CP210x Drivers can be downloaded from here
Latest STM USB VCP Drivers can be downloaded from here
Latest Zadig for Windows DFU flashing can be downloaded from here
"
},
"defaultContributingHead": {
"message": "Contributing"
@@ -1370,7 +1370,7 @@
"message": "Manual baud rate"
},
"firmwareFlasherManualBaudDescription": {
- "message": "Manual selection of baud rate for boards that don't support the default speed or for flashing via bluetooth."
+ "message": "Manual selection of baud rate for boards that don't support the default speed or for flashing via bluetooth.
Note: Not used when flashing via USB DFU"
},
"firmwareFlasherShowDevelopmentReleases":{
"message": "Show unstable releases"
@@ -1412,13 +1412,13 @@
"message": "Warning"
},
"firmwareFlasherWarningText": {
- "message": "Please do not try to flash non-cleanflight hardware with this firmware flasher.
Do not disconnect the board or turn off your computer while flashing.
Note: STM32 bootloader is stored in ROM, it cannot be bricked.
Note: Auto-Connect is always disabled while you are inside firmware flasher.
Note: Make sure you have a backup; some upgrades/downgrades will wipe your configuration.
Note: If you have problems flashing try disconnecting all cables from your FC first, try rebooting, upgrade chrome, upgrade drivers.
"
+ "message": "Please do not try to flash non-cleanflight hardware with this firmware flasher.
Do not disconnect the board or turn off your computer while flashing.
Note: STM32 bootloader is stored in ROM, it cannot be bricked.
Note: Auto-Connect is always disabled while you are inside firmware flasher.
Note: Make sure you have a backup; some upgrades/downgrades will wipe your configuration.
Note: If you have problems flashing try disconnecting all cables from your FC first, try rebooting, upgrade chrome, upgrade drivers.
Note: When flashing boards that have directly connected USB sockets (SPRacingF3Mini, Sparky, ColibriRace, etc) ensure you have read the USB Flashing section of the Cleanflight manual and have the correct software and drivers installed"
},
"firmwareFlasherRecoveryHead": {
"message": "Recovery / Lost communication"
},
"firmwareFlasherRecoveryText": {
- "message": "If you have lost communication with your board follow these steps to restore communication: - Power off
- Enable 'No reboot sequence', enable 'Full chip erase'.
- Jumper the BOOT pins or hold BOOT button.
- Power on (activity LED will NOT flash if done correctly).
- Release BOOT button if your FC has one.
- Flash with correct firmware (using manual baud rate if specified in your FC's manual).
- Power off.
- Remove BOOT jumper.
- Power on (activity LED should flash).
- Connect normally.
"
+ "message": "If you have lost communication with your board follow these steps to restore communication: - Power off
- Enable 'No reboot sequence', enable 'Full chip erase'.
- Jumper the BOOT pins or hold BOOT button.
- Power on (activity LED will NOT flash if done correctly).
- Install all STM32 drivers and Zadig if required (see USB Flashing section of cleanflight manual).
- Close configurator, Close all running chrome instances, Close all Chrome apps, Restart Configurator.
- Release BOOT button if your FC has one.
- Flash with correct firmware (using manual baud rate if specified in your FC's manual).
- Power off.
- Remove BOOT jumper.
- Power on (activity LED should flash).
- Connect normally.
"
},
"firmwareFlasherButtonLeave": {
"message": "Leave Firmware Flasher"
diff --git a/changelog.html b/changelog.html
index 608495e4d..49e77f533 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,8 @@
+2015.12.15 - 1.2.1 - cleanflight
+
+ - Add links to STM VCP Drivers and Zadig.
+ - Update recovery procedure on Firmware Flasher page.
+
2015.12.15 - 1.2.0 - cleanflight
- Support Cleanflight API 1.15.0.
diff --git a/js/data_storage.js b/js/data_storage.js
index 3c56846f3..9542afc75 100755
--- a/js/data_storage.js
+++ b/js/data_storage.js
@@ -1,10 +1,10 @@
'use strict';
var CONFIGURATOR = {
- 'releaseDate': 1454638198085, // new Date().getTime() - Fri Feb 05 2016 03:09:53 GMT+0100
+ 'releaseDate': 1456164608903, // new Date().getTime() - Mon Feb 22 2016 19:10:05 GMT+0100
// all versions are specified and compared using semantic versioning http://semver.org/
- 'apiVersionAccepted': '1.2.0',
+ 'apiVersionAccepted': '1.2.1',
'backupRestoreMinApiVersionAccepted': '1.5.0',
'pidControllerChangeMinApiVersion': '1.5.0',
'backupFileMinVersionAccepted': '0.55.0', // chrome.runtime.getManifest().version is stored as string, so does this one
diff --git a/js/serial.js b/js/serial.js
index 03b0adf50..ff432d1ed 100644
--- a/js/serial.js
+++ b/js/serial.js
@@ -77,21 +77,23 @@ var serial = {
setTimeout(function() {
chrome.serial.setPaused(info.connectionId, false, function() {
self.getInfo(function (info) {
- if (info.paused) {
- // assume unrecoverable, disconnect
- console.log('SERIAL: Connection did not recover from ' + self.error + ' condition, disconnecting');
- GUI.log('Unrecoverable failure of serial connection, disconnecting...');
- googleAnalytics.sendException('Serial: ' + self.error + ' - unrecoverable', false);
-
- if (GUI.connected_to || GUI.connecting_to) {
- $('a.connect').click();
- } else {
- self.disconnect();
+ if (info) {
+ if (info.paused) {
+ // assume unrecoverable, disconnect
+ console.log('SERIAL: Connection did not recover from ' + self.error + ' condition, disconnecting');
+ GUI.log('Unrecoverable failure of serial connection, disconnecting...');
+ googleAnalytics.sendException('Serial: ' + self.error + ' - unrecoverable', false);
+
+ if (GUI.connected_to || GUI.connecting_to) {
+ $('a.connect').click();
+ } else {
+ self.disconnect();
+ }
+ }
+ else {
+ console.log('SERIAL: Connection recovered from ' + self.error + ' condition');
+ googleAnalytics.sendException('Serial: ' + self.error + ' - recovered', false);
}
- }
- else {
- console.log('SERIAL: Connection recovered from ' + self.error + ' condition');
- googleAnalytics.sendException('Serial: ' + self.error + ' - recovered', false);
}
});
});
diff --git a/manifest.json b/manifest.json
index a78da0203..3cd820acd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"minimum_chrome_version": "38",
- "version": "1.2.0",
+ "version": "1.2.1",
"author": "Hydra",
"name": "Cleanflight - Configurator",
"short_name": "cleanflight",