From 9b66f60b255f3914b0c2b6a78707c7eb6cf564a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kry=C5=A1tof=20=C4=8Cern=C3=BD?= Date: Tue, 19 Apr 2022 12:23:15 +0200 Subject: [PATCH 1/6] Update docs with new Miniware DFU bootloader --- Documentation/Flashing.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/Flashing.md b/Documentation/Flashing.md index de27e56c..21d0e1bc 100644 --- a/Documentation/Flashing.md +++ b/Documentation/Flashing.md @@ -226,7 +226,6 @@ If you are on Windows, it's often best to try another computer (friends, work, p If you are an advanced user, and you have used `usb-dfu` tools before, or you would like to learn; there is an alternative bootloader for these irons. This will **NOT** show up as a USB storage drive, but instead show up using a standard DFU protocol device. You can then use dfu tools or GUI's to upgrade the iron using the `.bin` files that are posted to the releases page. -To change to dapboot based alternative bootloader, you need to flash the hex file from [here](https://github.com/eDesignOSS/ts100-bl-flasher/releases). -`ts100-stockbl.hex` will reflash the stock bootloader, `ts100-dapboot.hex` will flash the new dapboot based usb bootloader. +To install this alternative bootloader, follow the instructions [here](https://github.com/Ralim/IronOS-dfu/blob/mainline/docs/Bootloader.md). Note that this is only recommended for users who know what they are doing. If you don't understand how this works, please don't flash this. From 0a00e3fee374048be8a71c982f3585d2dbd7c3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kry=C5=A1tof=20=C4=8Cern=C3=BD?= Date: Tue, 19 Apr 2022 13:18:52 +0200 Subject: [PATCH 2/6] Update the upper part of the document --- Documentation/Flashing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/Flashing.md b/Documentation/Flashing.md index 21d0e1bc..bbd01ba3 100644 --- a/Documentation/Flashing.md +++ b/Documentation/Flashing.md @@ -39,9 +39,9 @@ Officially the bootloader on the devices only works under Windows (use the built 7. If it didn't work the first time, try copying the file again without disconnecting the device, often it will work on the second shot. 8. Disconnect the USB and power up the device. You're good to go. -For the more adventurous out there, you can also load this firmware onto the device using an SWD programmer. +For the more adventurous out there, you can also load this firmware onto the device using an SWD programmer, for easier installation follow the guide at the end of this document. -On the bottom of the MCU riser PCB, there are 4 pads for programming. On v2.51A PCB revision `USB_D+` is shorted to `SWDIO` and `USB_D-` is shorted to `SWCLK` so debugging works without disassembly (attach while staying in the bootloader). Installing [dapboot from eDesignOSS](https://github.com/eDesignOSS/dapboot) (`make TARGET=TS100 -C src`) is recommended as it allows reliable flashing of binary files with [dfu-util](http://dfu-util.sourceforge.net/). +On the bottom of the MCU riser PCB, there are 4 pads for programming. On v2.51A PCB revision `USB_D+` is shorted to `SWDIO` and `USB_D-` is shorted to `SWCLK` so debugging works without disassembly (attach while staying in the bootloader). Installing [IronOS-dfu](https://github.com/Ralim/IronOS-dfu) is recommended as it allows reliable flashing of binary files with [dfu-util](http://dfu-util.sourceforge.net/). There is a complete device flash backup included in this repository. (Note this includes the bootloader, so will need an SWD programmer to load onto the unit). From 69f0f43c1a7fd43888730b0924138942d06db32d Mon Sep 17 00:00:00 2001 From: JugglerLKR Date: Tue, 19 Apr 2022 16:49:37 +0300 Subject: [PATCH 3/6] Update translation_RU.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit String "Invert screen can be longer", so now it says "Инвесрия" --- Translations/translation_RU.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index 1d418689..9958d4be 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -196,7 +196,7 @@ "desc": "Настройки контраста/яркости OLED экрана" }, "ColourInversion": { - "text2": ["Инверт", "экрана"], + "text2": ["Инверсия", "экрана"], "desc": "Инвертировать цвета на OLED экране" }, "LOGOTime": { From 12729821fada14a2658e1630a2b69bb47a1eeb82 Mon Sep 17 00:00:00 2001 From: JugglerLKR Date: Tue, 19 Apr 2022 16:55:51 +0300 Subject: [PATCH 4/6] Update translation_RU.json LOGO time translation --- Translations/translation_RU.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index 9958d4be..436b3def 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -200,8 +200,8 @@ "desc": "Инвертировать цвета на OLED экране" }, "LOGOTime": { - "text2": ["Boot logo", "duration"], - "desc": "Sets the duration for the boot logo (s=seconds)" + "text2": ["Длительность", "показа логотипа"], + "desc": "Длительность отображения логотипа (в секундах)" } } } From baeb1091b8fddeada57cede706c6febaa0bee9a7 Mon Sep 17 00:00:00 2001 From: Alfredo Colas <57442104+LyricPants66133@users.noreply.github.com> Date: Tue, 19 Apr 2022 19:43:45 -0400 Subject: [PATCH 5/6] Minor Bootup Logo readme fix fixed incorrectly formatted file link in readme --- Bootup Logo/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bootup Logo/README.md b/Bootup Logo/README.md index 55f7559f..b56b3457 100644 --- a/Bootup Logo/README.md +++ b/Bootup Logo/README.md @@ -4,4 +4,4 @@ IronOS supports both a bootup logo _AND_ bootup animations. However, they are no longer included in this repo. -(Please read the docs)[../Documentation/Logo.md] +[Please read the docs](../Documentation/Logo.md) From 665badd2270fd408404c5770b6b0e109f37ba503 Mon Sep 17 00:00:00 2001 From: dmitrygribenchuk Date: Thu, 21 Apr 2022 14:46:09 +0300 Subject: [PATCH 6/6] Update translation_BE.json --- Translations/translation_BE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json index 0270833a..94b3cb8a 100644 --- a/Translations/translation_BE.json +++ b/Translations/translation_BE.json @@ -200,8 +200,8 @@ "desc": "Інвертаваць колеры OLED-экрана" }, "LOGOTime": { - "text2": ["Boot logo", "duration"], - "desc": "Sets the duration for the boot logo (s=seconds)" + "text2": ["Лагатып загрузкі", "працягласць"], + "desc": "Усталяваць працягласць лагатыпа загрузки (s=Секунды)" } } }