From 9be277e98767b828e254f09d70092829bdd3eba0 Mon Sep 17 00:00:00 2001 From: skaman82 Date: Mon, 2 Nov 2015 22:23:39 +0100 Subject: [PATCH] fixing things --- _locales/en/messages.json | 37 ++++++---------- main.html | 92 ++++++++++++++++++++------------------- 2 files changed, 61 insertions(+), 68 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 6a29cba1..08f26414 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -128,22 +128,6 @@ "message": "Failed to close serial port" }, - "usbDeviceOpened": { - "message": "USB device successfully opened with ID: $1" - }, - "usbDeviceOpenFail": { - "message": "Failed to open USB device!" - }, - "usbDeviceClosed": { - "message": "USB device successfully closed" - }, - "usbDeviceCloseFail": { - "message": "Failed to close USB device" - }, - "usbDeviceUdevNotice": { - "message": "Are udev rules installed correctly? See docs for instructions" - }, - "noConfigurationReceived": { "message": "No configuration received within 10 seconds, communication failed" }, @@ -206,18 +190,26 @@ "message": "Cycle Time:" }, - "dfu_connect_message": { - "message": "Please use the Firmware Flasher to access DFU devices" + "please_grant_usb_permissions": { + "message": "Please click on \"Request Optional Permissions\" button to grant application required USB access" }, - - "dfu_erased_kilobytes": { - "message": "Erased $1 kB of flash successfully" + "usb_permissions_granted": { + "message": "Optional USB permissions granted" }, "eeprom_saved_ok": { "message": "EEPROM saved" }, + "default_optional_permissions_head": { + "message": "Optional USB Permissions" + }, + "default_optional_permissions_text": { + "message": "Due to addition of Naze32PRO to the supported hardware family, Configurator requires USB access to allow firmware flashing via DFU" + }, + "default_request_optional_permissions": { + "message": "Request Optional Permissions" + }, "defaultWelcomeText": { "message": "Welcome to Cleanflight - Configurator, a utility designed to simplify updating, configuring and tuning of your flight controller.

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
" }, @@ -1137,8 +1129,7 @@ "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.

Note: If you have lost comminication with your board then power off the board, jumper the bootloader pins, power on, enable 'No reboot sequence', enable 'Full chip erase', re-flash, then power off, remove bootloader jumper, power on and connect (For all firmware except OPBL firmware)." ->>>>>>> cleanflight/development + "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.

Note: If you have lost comminication with your board then power off the board, jumper the bootloader pins, power on, enable 'No reboot sequence', enable 'Full chip erase', re-flash, then power off, remove bootloader jumper, power on and connect (For all firmware except OPBL firmware)." }, "firmwareFlasherButtonLeave": { "message": "Leave Firmware Flasher" diff --git a/main.html b/main.html index 76c4161f..ee6ddbab 100755 --- a/main.html +++ b/main.html @@ -29,51 +29,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +