Merge branch 'master' into pr/1010

Documentation/Flashing.md

@@ -20,7 +20,7 @@ Then this works the same as a production release (use the correct file).
 
 ## Miniware irons (TS100, TS80, TS80P)
 
-This is completely safe, but if it goes wrong just put the .hex file from the official website onto the unit and you're back to the old firmware. Downloads for the hex files to flash are available on the [releases page.](https://github.com/Ralim/IronOS/releases) The file you want is called _(MODEL)\_EN.hex_ unless you want the translations, they are (MODEL)\__language short name_.hex. Where (MODEL) is either TS100 or TS80.
+This is completely safe, but if it goes wrong just put the .hex file from the [official website](http://www.miniware.com.cn/product-category/soldering-pen/electric-soldering-kit/) onto the unit and you're back to the old firmware. Downloads for the hex files to flash are available on the [releases page.](https://github.com/Ralim/IronOS/releases) The file you want is called _(MODEL)\_EN.hex_ unless you want the translations, they are (MODEL)\__language short name_.hex. Where (MODEL) is either TS100 or TS80.
 
 Officially the bootloader on the iron only works under Windows (use the built-in File Explorer, as alternative file managers or copy handlers like Teracopy will fail). However, users have reported that it does work under Mac, and can be made to work under Linux _sometimes_. Details over on the [wiki page](https://github.com/Ralim/ts100/wiki/Upgrading-Firmware).
 
@@ -98,6 +98,12 @@ Using `dfu-util` you can flash the firmware using a command line as such:
 dfu-util -d 28e9:0189 -a 0 -D Pinecil_EN.bin -s 0x08000000:mass-erase:force
 ```
 
+If this command fails with `dfu-util: Error during special command "MASS_ERASE" get_status`, try this instead:
+
+```
+dfu-util -d 28e9:0189 -a 0 -D Pinecil_EN.bin -s 0x08000000
+```
+
 ### Windows
 
 For windows the easiest tool to use is the vendors gui tool from [here](http://www.gd32mcu.com/download/down/document_id/176/path_type/1).

source/Core/Threads/GUIThread.cpp

@@ -551,28 +551,27 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
     OLED::clearScreen();
     // Draw in the screen details
     if (systemSettings.detailedSoldering) {
-      OLED::print(translatedString(Tr->SolderingAdvancedPowerPrompt),
-                  FontStyle::SMALL); // Power:
+      gui_drawTipTemp(true, FontStyle::LARGE);
+
+#ifndef NO_SLEEP_MODE
+      if (systemSettings.sensitivity && systemSettings.SleepTime) {
+        OLED::setCursor(47, 0);
+        display_countdown(getSleepTimeout());
+      }
+#endif
+
+      if (boostModeOn) {
+        OLED::setCursor(54, 8);
+        OLED::print(SymbolPlus, FontStyle::SMALL);
+      }
+
+      OLED::setCursor(67, 0);
       OLED::printNumber(x10WattHistory.average() / 10, 2, FontStyle::SMALL);
       OLED::print(SymbolDot, FontStyle::SMALL);
       OLED::printNumber(x10WattHistory.average() % 10, 1, FontStyle::SMALL);
       OLED::print(SymbolWatts, FontStyle::SMALL);
-#ifndef NO_SLEEP_MODE
-      if (systemSettings.sensitivity && systemSettings.SleepTime) {
-        OLED::print(SymbolSpace, FontStyle::SMALL);
-        display_countdown(getSleepTimeout());
-      }
-#endif
-      OLED::setCursor(0, 8);
-      OLED::print(translatedString(Tr->SleepingTipAdvancedString), FontStyle::SMALL);
-      gui_drawTipTemp(true, FontStyle::SMALL);
-
-      if (boostModeOn) {
-        OLED::print(SymbolPlus, FontStyle::SMALL);
-      } else {
-        OLED::print(SymbolSpace, FontStyle::SMALL);
-      }
 
+      OLED::setCursor(67, 8);
       printVoltage();
       OLED::print(SymbolVolts, FontStyle::SMALL);
     } else {
@@ -904,15 +903,22 @@ void startGUITask(void const *argument __unused) {
       if (isTipDisconnected()) {
         OLED::print(translatedString(Tr->TipDisconnectedString), FontStyle::SMALL);
       } else {
-        OLED::print(translatedString(Tr->IdleTipString), FontStyle::SMALL);
-        gui_drawTipTemp(false, FontStyle::SMALL);
-        OLED::print(translatedString(Tr->IdleSetString), FontStyle::SMALL);
-        OLED::printNumber(systemSettings.SolderingTemp, 3, FontStyle::SMALL);
+        if (!(systemSettings.coolingTempBlink && (tipTemp > 55) && (xTaskGetTickCount() % 1000 < 300)))
+          // Blink temp if setting enable and temp < 55°
+          // 1000 tick/sec
+          // OFF 300ms ON 700ms
+          gui_drawTipTemp(true, FontStyle::LARGE);                            // draw in the temp
+        OLED::setCursor(73, 0);                                               // top right
+        OLED::printNumber(systemSettings.SolderingTemp, 3, FontStyle::SMALL); // draw set temp
+        if (systemSettings.temperatureInF)
+          OLED::print(SymbolDegF, FontStyle::SMALL);
+        else
+          OLED::print(SymbolDegC, FontStyle::SMALL);
       }
-      OLED::setCursor(0, 8);
 
-      OLED::print(translatedString(Tr->InputVoltageString), FontStyle::SMALL);
-      printVoltage();
+      OLED::setCursor(67, 8); // bottom right
+      printVoltage();         // draw voltage then symbol (v)
+      OLED::print(SymbolVolts, FontStyle::SMALL);
 
     } else {
 #ifdef OLED_FLIP