Merge branch 'master' into supporting-FUSB302

2020-07-23 20:26:56 +10:00
parent b40a21470b db517a13e8
commit 85decdc15b
7 changed files with 3143 additions and 65 deletions
--- a/Resources/force_blank_flash.hex
+++ b/Resources/force_blank_flash.hex
--- a/Editor/translation_cs.json
+++ b/Editor/translation_cs.json
@@ -22,7 +22,8 @@
 		"SolderingAdvancedPowerPrompt": "Ohřev: ",
 		"OffString": "Vyp",
 		"ResetOKMessage": "Reset OK",
-		"YourGainMessage": "Zisk:"
+		"YourGainMessage": "Zisk:",
+		"SettingsResetMessage": "Tov. nas. obnov."
 	},
 	"characters": {
 		"SettingRightChar": "P",
@@ -238,58 +239,58 @@
 		"PowerLimitEnable": {
 			"text": "PLIMEN",
 			"text2": [
-				"P Limit",
-				"Enable"
+				"Omez. výk.",
+				"Aktivovat"
 			],
-			"desc": "Enable power limit"
+			"desc": "Aktivovat omezení výkonu"
 		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
-				"Power",
-				"Limit"
+				"Omezení",
+				"Výkonu"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Maximální příkon <Watty>"
 		},
 		"ReverseButtonTempChange": {
 			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Prohodit",
+				"tl. +-?"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Prohodí tlačítka plus a minus pro změnu teploty hrotu."
 		},
 		"TempChangeShortStep": {
 			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Krok teploty",
+				"krátký?"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Velikost skoku při změně teploty krátkým stiskem tlačítka!"
 		},
 		"TempChangeLongStep": {
 			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Krok teploty",
+				"dlouhý?"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Velikost skoku při změně teploty dlouhým stiskem tlačítka!"
 		},
 		"PowerPulsePower": {
 			"text": "POWPLS",
 			"text2": [
-				"Power",
-				"Pulse W"
+				"Intenzita",
+				"Výkon. pulsu"
 			],
-			"desc": "Keep awake pulse power intensity"
+			"desc": "Puls pro udržení zařízení v chodu (kvůli power bankám)."
 		},
 		"TipGain": {
 			"text": "TG",
 			"text2": [
-				"Modify",
-				"tip gain"
+				"Změnit",
+				"zisk hr."
 			],
-			"desc": "Tip gain"
+			"desc": "Zisk hrotu (měření)"
 		}
 	}
 }
--- a/Editor/translation_es.json
+++ b/Editor/translation_es.json
@@ -23,7 +23,7 @@
 		"OffString": " No",
 		"ResetOKMessage": "Hecho.       ",
 		"YourGainMessage": "Gananc.:",
-		"SettingsResetMessage": "Restablecidos."
+		"SettingsResetMessage": "Ajustes borrados"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -255,42 +255,42 @@
 		"ReverseButtonTempChange": {
 			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Invertir",
+				"botones +/-"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Intercambia las funciones de subir y bajar la temperatura de los botones +/- para que funcionen al revés."
 		},
 		"TempChangeShortStep": {
 			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Cambio temp.",
+				"puls. cortas"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Subir y bajar X grados de temperatura con cada pulsación corta de los botones +/-."
 		},
 		"TempChangeLongStep": {
 			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Cambio temp.",
+				"puls. largas"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Subir y bajar X grados de temperatura con cada pulsación larga de los botones +/-."
 		},
 		"PowerPulsePower": {
 			"text": "POWPLS",
 			"text2": [
-				"Power",
-				"Pulse W"
+				"Pulsos bat.",
+				"constantes"
 			],
-			"desc": "Keep awake pulse power intensity"
+			"desc": "Aplica unos pulsos necesarios para mantener encendidas ciertas baterías portátiles. En vatios."
 		},
 		"TipGain": {
 			"text": "TG",
 			"text2": [
-				"Modify",
-				"tip gain"
+				"Ajustar ganancia",
+				"de punta"
 			],
-			"desc": "Tip gain"
+			"desc": "Modificar el valor de ganancia de la punta."
 		}
 	}
 }
--- a/Editor/translation_it.json
+++ b/Editor/translation_it.json
@@ -279,18 +279,18 @@
 		"PowerPulsePower": {
 			"text": "POWPLS",
 			"text2": [
-				"Power",
-				"Pulse W"
+				"Potenza impulso",
+				"«Keep-Alive»"
 			],
-			"desc": "Keep awake pulse power intensity"
+			"desc": "Regola la potenza d'impulso in ingresso al saldatore per prevenire lo standby eventuale dell'alimentatore <watt>"
 		},
 		"TipGain": {
 			"text": "TG",
 			"text2": [
-				"Modify",
-				"tip gain"
+				"Guadagno",
+				"punta"
 			],
-			"desc": "Tip gain"
+			"desc": "Varia il guadagno della punta"
 		}
 	}
 }
--- a/Editor/translation_ru.json
+++ b/Editor/translation_ru.json
@@ -4,7 +4,7 @@
 	"cyrillicGlyphs": true,
 	"messages": {
 		"SettingsCalibrationDone": "Калибровка завершена!",
-		"SettingsCalibrationWarning": "Прежде чем продолжить, пожалуйста, убедитесь что жало имеет комнатную температуру!",
+		"SettingsCalibrationWarning": "Прежде чем продолжить, пожалуйста, убедитесь, что жало имеет комнатную температуру!",
 		"SettingsResetWarning": "Вы уверены, что хотите сбросить настройки к значениям по умолчанию?",
 		"UVLOWarningString": "НАПРЯЖ--",
 		"UndervoltageString": "Низк. напряжение",
@@ -114,7 +114,7 @@
 				"Единицы",
 				"температуры"
 			],
-			"desc": "Единицы изменения температуры <C=Цельция, F=Фаренгейта>"
+			"desc": "Единицы измерения температуры <C=Цельcия, F=Фаренгейта>"
 		},
 		"AdvancedIdle": {
 			"text": "ИнфОжд",
@@ -122,7 +122,7 @@
 				"Подробный",
 				"реж. ожидания"
 			],
-			"desc": "Отображать детальную информацию уменьшенным шрифтом на домашнем экране"
+			"desc": "Отображать детальную информацию уменьшенным шрифтом на экране ожидания"
 		},
 		"DisplayRotation": {
 			"text": "ПовЭкр",
@@ -138,7 +138,7 @@
 				"Турбо",
 				"режим"
 			],
-			"desc": "Включить активацию турбо-режма, при удержании ближней к жалу кнопки во время пайки"
+			"desc": "Включить активацию турбо-режима удержанием ближней к жалу кнопки во время пайки"
 		},
 		"BoostTemperature": {
 			"text": "ТемпТурб",
@@ -146,7 +146,7 @@
 				"t° турбо",
 				"режима"
 			],
-			"desc": "Температура жала в турбо режиме"
+			"desc": "Температура жала в турбо-режиме"
 		},
 		"AutoStart": {
 			"text": "АвтоРеж",
@@ -154,7 +154,7 @@
 				"Авто",
 				"старт"
 			],
-			"desc": "Режим с которым запускается паяльник при подаче питания <П=Пайка, О=Ожидание, К=Ожидание при комн. темп., В=Выкл.>"
+			"desc": "Режим, в котором запускается паяльник при подаче питания <П=Пайка, О=Ожидание, К=Ожидание при комн. темп., В=Выкл.>"
 		},
 		"CooldownBlink": {
 			"text": "МигТемп",
@@ -242,7 +242,7 @@
 				"Ограничение",
 				"мощности"
 			],
-			"desc": "Включить лимит потреблямой мощности"
+			"desc": "Включить лимит потребляемой мощности"
 		},
 		"PowerLimit": {
 			"text": "ЗначЛимW",
@@ -250,7 +250,7 @@
 				"Максимальная",
 				"мощность"
 			],
-			"desc": "Максимальная мощность которую может использовать паяльник <Ватт>"
+			"desc": "Максимальная мощность, которую может использовать паяльник <Ватт>"
 		},
 		"ReverseButtonTempChange": {
 			"text": "ИнвКноп",
--- a/upgrading.md
+++ b/upgrading.md
@@ -4,7 +4,7 @@

 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/ts100/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. 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).
+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). 



@@ -20,8 +20,11 @@ Officially the bootloader on the iron only works under Windows. However, users h


 For the more adventurous out there, you can also load this firmware onto the device using an SWD programmer.
-On the bottom of the MCU riser PCB, there are 4 pads for programming.
+
+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/).
+
 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).
+
 For the TS80 the SWD pins are used for the QC negotiation, so you can actually connect to the SWD power via the USB connector.


--- a/workspace/TS100/Core/Src/gui.cpp
+++ b/workspace/TS100/Core/Src/gui.cpp
@@ -819,8 +819,8 @@ static void settings_setTempChangeShortStep(void) {
 	}
 }
 static void settings_displayTempChangeShortStep(void) {
-	printShortDescription(24, 5);
-	OLED::printNumber(systemSettings.TempChangeShortStep, 3);
+	printShortDescription(24, 6);
+	OLED::printNumber(systemSettings.TempChangeShortStep, 2);
 }

 static void settings_setTempChangeLongStep(void) {
@@ -830,8 +830,8 @@ static void settings_setTempChangeLongStep(void) {
 	}
 }
 static void settings_displayTempChangeLongStep(void) {
-	printShortDescription(25, 5);
-	OLED::printNumber(systemSettings.TempChangeLongStep, 3);
+	printShortDescription(25, 6);
+	OLED::printNumber(systemSettings.TempChangeLongStep, 2);
 }

 static void settings_setPowerPulse(void) {
@@ -934,7 +934,7 @@ void gui_Menu(const menuitem *menu) {
 			OLED::clearScreen();
 			menu[currentScreen].draw.func();
 			uint8_t indicatorHeight = OLED_HEIGHT / scrollContentSize;
-			uint8_t position = currentScreen * indicatorHeight;
+			uint8_t position = OLED_HEIGHT * currentScreen / scrollContentSize;
 			OLED::drawScrollIndicator(position, indicatorHeight);
 			lastOffset = -1;
 			lcdRefresh = true;