From b8b947ab68df853100a8c89da18f706c4fe396c8 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sat, 2 Jan 2021 20:07:58 +1100 Subject: [PATCH 1/6] Update DebugMenu.md --- Documentation/DebugMenu.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/DebugMenu.md b/Documentation/DebugMenu.md index f06ed6b2..aa13c92e 100644 --- a/Documentation/DebugMenu.md +++ b/Documentation/DebugMenu.md @@ -40,15 +40,17 @@ This is the raw tip reading in uV. This can be used when assessing the calibrati ### CTip -This is the tip temperature in deg C. This can be used with RTip for assessing temperature processing performance. +This is the tip temperature in deg C. +This can be used with RTip for assessing temperature processing performance. ### CHan This is the handle temperature in C. This is used for cold junction compensation of the tip temp. +This is shown in degrees C x10, so 200 == 20.0C ### Vin -The input voltage reading. +The input voltage as read by the internal ADC. Can be used to sanity check its being read correctly. ### PCB From 94afc22fcf40cc80f427289b81aa7556fc2b9069 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Sat, 2 Jan 2021 23:15:01 +0100 Subject: [PATCH 2/6] Update translation_en.json --- Translation Editor/translation_en.json | 66 +++++++++++++------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/Translation Editor/translation_en.json b/Translation Editor/translation_en.json index 7394907d..22873c8a 100644 --- a/Translation Editor/translation_en.json +++ b/Translation Editor/translation_en.json @@ -6,7 +6,7 @@ "messages": { "SettingsCalibrationDone": "Calibration done!", "SettingsCalibrationWarning": "Please ensure the tip is at room temperature, before continuing!", - "SettingsResetWarning": "Are you sure you want to reset settings to default values?", + "SettingsResetWarning": "Sure you want to restore default settings?", "UVLOWarningString": "DC LOW", "UndervoltageString": "Undervoltage", "InputVoltageString": "Input V: ", @@ -15,17 +15,17 @@ "SleepingSimpleString": "Zzzz", "SleepingAdvancedString": "Sleeping...", "WarningSimpleString": "HOT!", - "WarningAdvancedString": "!!! TIP HOT !!!", + "WarningAdvancedString": "!!! HOT TIP !!!", "SleepingTipAdvancedString": "Tip:", "IdleTipString": "Tip:", "IdleSetString": " Set:", - "TipDisconnectedString": "TIP DISCONNECTED", + "TipDisconnectedString": "NO TIP", "SolderingAdvancedPowerPrompt": "Power: ", "OffString": "Off", - "ResetOKMessage": "Reset OK", + "ResetOKMessage": "Reset done!", "YourGainMessage": "Your gain:", "SettingsResetMessage": "Settings were\nreset!", - "LockingKeysString": " LOCKED", + "LockingKeysString": "LOCKED", "UnlockingKeysString": "UNLOCKED", "WarningKeysLockedString": "!LOCKED!" }, @@ -58,7 +58,7 @@ "PowerSavingMenu": { "text2": [ "Sleep", - "modes" + "mode" ], "desc": "Power saving settings" }, @@ -90,35 +90,35 @@ "Sleep", "temp" ], - "desc": "Sleep temperature" + "desc": "Tip temperature while in sleep mode" }, "SleepTimeout": { "text2": [ "Sleep", "timeout" ], - "desc": "Sleep timeout " + "desc": "Interval before sleep mode kicks in " }, "ShutdownTimeout": { "text2": [ "Shutdown", "timeout" ], - "desc": "Shutdown timeout " + "desc": "Interval before the iron shuts down " }, "MotionSensitivity": { "text2": [ "Motion", "sensitivity" ], - "desc": "Motion sensitivity <0=Off 1=Least sensitive 9=Most sensitive>" + "desc": "0=off 1=least sensitive ... 9=most sensitive" }, "TemperatureUnit": { "text2": [ "Temperature", "unit" ], - "desc": "Temperature unit " + "desc": "C=Celsius F=Fahrenheit" }, "AdvancedIdle": { "text2": [ @@ -132,7 +132,7 @@ "Display", "orientation" ], - "desc": "Display orientation " + "desc": "A=automatic L=left-handed R=right-handed" }, "BoostTemperature": { "text2": [ @@ -146,28 +146,28 @@ "Auto", "start" ], - "desc": "Automatically starts the iron into soldering on power up " + "desc": "Automatically starts the iron into soldering mode on power up " }, "CooldownBlink": { "text2": [ "Cooldown", "blink" ], - "desc": "Blink the temperature on the cooling screen while the tip is still hot" + "desc": "Flash the temperature after heating was halted, while the tip is still hot." }, "TemperatureCalibration": { "text2": [ "Calibrate", "temperature?" ], - "desc": "Calibrate tip offset?" + "desc": "Start tip offset calibrating procedure" }, "SettingsReset": { "text2": [ "Factory", - "Reset?" + "reset?" ], - "desc": "Reset all settings!" + "desc": "Reset settings to default!" }, "VoltageCalibration": { "text2": [ @@ -181,14 +181,14 @@ "Detailed", "solder screen" ], - "desc": "Display detailed information while soldering" + "desc": "Display detailed information in a smaller font on soldering screen" }, "ScrollingSpeed": { "text2": [ "Scrolling", "speed" ], - "desc": "Speed this text scrolls past at " + "desc": "Speed info text scrolls past at " }, "TipModel": { "text2": [ @@ -202,28 +202,28 @@ "Simple", "calibration" ], - "desc": "Simple calibration using hot water" + "desc": "Using hot water to calibrate tip" }, "AdvancedCalibrationMode": { "text2": [ "Advanced", "calibration" ], - "desc": "Advanced calibration using thermocouple on the tip" + "desc": "Using a thermocouple on the tip to calibrate it" }, "QCMaxVoltage": { "text2": [ "QC", - "Voltage" + "voltage" ], - "desc": "Desired max QC Voltage negotiated for" + "desc": "Desired max QC voltage the iron negotiates for" }, "PowerLimit": { "text2": [ "Power", "limit" ], - "desc": "Maximum power the iron can use " + "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { "text2": [ @@ -249,9 +249,9 @@ "PowerPulsePower": { "text2": [ "Power", - "Pulse W" + "pulse" ], - "desc": "Keep awake pulse power intensity" + "desc": "Intensity of power of keep-awake-pulse " }, "TipGain": { "text2": [ @@ -262,17 +262,17 @@ }, "HallEffSensitivity": { "text2": [ - "Hall Eff", - "Sensitivity" + "Hall sensor", + "sensitivity" ], - "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + "desc": "Sensitivity of the Hall effect sensor in detecting sleep " }, "LockingMode": { "text2": [ - "Allow buttons", - "locking" + "Allow locking", + "buttons" ], - "desc": "When soldering, long press on both buttons lock them " + "desc": "When soldering, long press on both buttons, to lock them " } } -} \ No newline at end of file +} From dd38213729901d4f5650ad457d0c0edb8d0b2364 Mon Sep 17 00:00:00 2001 From: Dag0d Date: Sun, 3 Jan 2021 18:16:43 +0100 Subject: [PATCH 3/6] Improved German translation --- Translation Editor/translation_de.json | 66 +++++++++++++------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/Translation Editor/translation_de.json b/Translation Editor/translation_de.json index 0ba7c800..8058bbd9 100644 --- a/Translation Editor/translation_de.json +++ b/Translation Editor/translation_de.json @@ -6,7 +6,7 @@ "messages": { "SettingsCalibrationDone": "Kalibrierung abgeschlossen!", "SettingsCalibrationWarning": "Vor dem Fortfahren muss die Lötspitze vollständig abgekühlt sein!", - "SettingsResetWarning": "Sind Sie sicher, dass Sie alle Werte zurücksetzen wollen?", + "SettingsResetWarning": "Bist du sicher, dass du alle Werte zurücksetzen willst?", "UVLOWarningString": "V niedr.", "UndervoltageString": "Unterspannung", "InputVoltageString": "V Eingang: ", @@ -14,7 +14,7 @@ "BadTipString": "Spitze Defekt", "SleepingSimpleString": "Zzz ", "SleepingAdvancedString": "Ruhemodus...", - "WarningSimpleString": "HEIß", + "WarningSimpleString": "HEIß!", "WarningAdvancedString": "! Achtung Heiß !", "SleepingTipAdvancedString": "Temp:", "IdleTipString": "Ist:", @@ -23,29 +23,29 @@ "SolderingAdvancedPowerPrompt": "Leistung: ", "OffString": "Aus", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Your Gain:", - "SettingsResetMessage": "Einstellungen\nzurück gesetzt!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Dein Faktor:", + "SettingsResetMessage": "Einstellungen zurückgesetzt!", + "LockingKeysString": "GESPERRT", + "UnlockingKeysString": "ENTSPERRT", + "WarningKeysLockedString": "!GESPERRT!" }, "characters": { "SettingRightChar": "R", "SettingLeftChar": "L", "SettingAutoChar": "A", - "SettingFastChar": "F", - "SettingSlowChar": "S", - "SettingStartSolderingChar": "T", - "SettingStartSleepChar": "S", + "SettingFastChar": "S", + "SettingSlowChar": "L", + "SettingStartSolderingChar": "L", + "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "O", - "SettingStartNoneChar": "F", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "L", + "SettingStartNoneChar": "A", + "SettingSensitivityOff": "A", + "SettingSensitivityLow": "N", "SettingSensitivityMedium": "M", "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", - "SettingLockFullChar": "F" + "SettingLockFullChar": "V" }, "menuGroups": { "SolderingMenu": { @@ -90,7 +90,7 @@ "Ruhetemp-", "eratur" ], - "desc": "Ruhetemperatur" + "desc": "Ruhetemperatur der Spitze" }, "SleepTimeout": { "text2": [ @@ -146,7 +146,7 @@ "Start im", "Lötmodus?" ], - "desc": "Automatischer Start-Modus beim Einschalten der Spannungsversorgung. " + "desc": "Automatischer Start-Modus beim Einschalten der Spannungsversorgung. " }, "CooldownBlink": { "text2": [ @@ -167,7 +167,7 @@ "Einstellungen", "zurücksetzen?" ], - "desc": "Einstellungen auf werkseinstellungen zurück setzen" + "desc": "Einstellungen auf Werkseinstellungen zurücksetzen" }, "VoltageCalibration": { "text2": [ @@ -188,7 +188,7 @@ "Scroll-", "geschw." ], - "desc": "Scrollgeschwindigkeit der Texte " + "desc": "Scrollgeschwindigkeit der Texte " }, "TipModel": { "text2": [ @@ -223,12 +223,12 @@ "Leistungs-", "Limit" ], - "desc": "Maximale aufnahme der Lötspitze " + "desc": "Maximale Leistungsaufnahme des Lötkolbens " }, "ReverseButtonTempChange": { "text2": [ "Taste +-", - "Umkehren?" + "umkehren?" ], "desc": "Temperatur-Änderungs-Tasten-Belegung Plus-Minus umkehren?" }, @@ -248,31 +248,31 @@ }, "PowerPulsePower": { "text2": [ - "Power", - "Pulse W" + "Leistungs-", + "impuls in Watt" ], - "desc": "Keep awake pulse power intensity" + "desc": "Halte das Netzteil mit einem Leistungsimpuls wach" }, "TipGain": { "text2": [ - "Modify", - "tip gain" + "Ändere", + "Spitzen Faktor" ], - "desc": "Tip gain" + "desc": "Spitzen Faktor" }, "HallEffSensitivity": { "text2": [ - "Hall Eff", - "Sensitivity" + "Hall Sensor", + "Empfindlichkeit" ], - "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + "desc": "Empfindlichkeit des Hall Effekt Sensors beim erkennen des Ruhemodus " }, "LockingMode": { "text2": [ - "Allow buttons", - "locking" + "Erlaube Knopf-", + "Sperre" ], - "desc": "When soldering, long press on both buttons lock them " + "desc": "Langes drücken beider Knöpfe beim Löten, sperrt diese " } } } \ No newline at end of file From e2600b433657887d9c12e0353cac053d779a2d6a Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Mon, 4 Jan 2021 02:53:18 +0100 Subject: [PATCH 4/6] Update translation_de.json --- Translation Editor/translation_de.json | 68 +++++++++++++------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Translation Editor/translation_de.json b/Translation Editor/translation_de.json index 8058bbd9..78147ef8 100644 --- a/Translation Editor/translation_de.json +++ b/Translation Editor/translation_de.json @@ -6,7 +6,7 @@ "messages": { "SettingsCalibrationDone": "Kalibrierung abgeschlossen!", "SettingsCalibrationWarning": "Vor dem Fortfahren muss die Lötspitze vollständig abgekühlt sein!", - "SettingsResetWarning": "Bist du sicher, dass du alle Werte zurücksetzen willst?", + "SettingsResetWarning": "Sicher, dass alle Werte zurückgesetzt werden sollen?", "UVLOWarningString": "V niedr.", "UndervoltageString": "Unterspannung", "InputVoltageString": "V Eingang: ", @@ -22,9 +22,9 @@ "TipDisconnectedString": "Spitze fehlt", "SolderingAdvancedPowerPrompt": "Leistung: ", "OffString": "Aus", - "ResetOKMessage": "Reset OK", + "ResetOKMessage": "Reset abgeschlossen!", "YourGainMessage": "Dein Faktor:", - "SettingsResetMessage": "Einstellungen zurückgesetzt!", + "SettingsResetMessage": "Einstellungen \nzurückgesetzt!", "LockingKeysString": "GESPERRT", "UnlockingKeysString": "ENTSPERRT", "WarningKeysLockedString": "!GESPERRT!" @@ -57,7 +57,7 @@ }, "PowerSavingMenu": { "text2": [ - "Schlaf-", + "Ruhe-", "modus" ], "desc": "Energiespareinstellungen" @@ -87,8 +87,8 @@ }, "SleepTemperature": { "text2": [ - "Ruhetemp-", - "eratur" + "Ruhe- + "temperatur" ], "desc": "Ruhetemperatur der Spitze" }, @@ -111,7 +111,7 @@ "Bewegungs-", "empfindlichk." ], - "desc": "Bewegungsempfindlichkeit <0=Aus, 1=Minimal ... 9=Maximal>" + "desc": "Bewegungsempfindlichkeit <0=aus, 1=minimal ... 9=maximal>" }, "TemperatureUnit": { "text2": [ @@ -132,28 +132,28 @@ "Anzeige-", "ausrichtung" ], - "desc": "Ausrichtung der Anzeige " + "desc": "Ausrichtung der Anzeige " }, "BoostTemperature": { "text2": [ - "Boosttemp-", - "eratur" + "Boost-", + "temperatur" ], - "desc": "Temperatur im Boostmodus (In der eingestellten Einheit)" + "desc": "Temperatur im Boostmodus" }, "AutoStart": { "text2": [ "Start im", - "Lötmodus?" + "Lötmodus" ], - "desc": "Automatischer Start-Modus beim Einschalten der Spannungsversorgung. " + "desc": "Bestimmt das Heizverhalten beim Einschalten der Spannungsversorgung. " }, "CooldownBlink": { "text2": [ "Abkühl-", - "blinken?" + "blinken" ], - "desc": "Blinkende Temperaturanzeige beim Abkühlen, solange heiß ist." + "desc": "Temperaturanzeige blinkt beim Abkühlen, solange Spitze heiß ist." }, "TemperatureCalibration": { "text2": [ @@ -167,7 +167,7 @@ "Einstellungen", "zurücksetzen?" ], - "desc": "Einstellungen auf Werkseinstellungen zurücksetzen" + "desc": "Werte werden auf Werkseinstellungen zurückgesetzt" }, "VoltageCalibration": { "text2": [ @@ -188,7 +188,7 @@ "Scroll-", "geschw." ], - "desc": "Scrollgeschwindigkeit der Texte " + "desc": "Scrollgeschwindigkeit der Erläuterungen " }, "TipModel": { "text2": [ @@ -202,7 +202,7 @@ "Einfache", "Kalibrierung" ], - "desc": "Einfache Kalibrierung mittels heißem Wasser" + "desc": "Einfache Kalibrierung mittels heißen Wassers" }, "AdvancedCalibrationMode": { "text2": [ @@ -221,37 +221,37 @@ "PowerLimit": { "text2": [ "Leistungs-", - "Limit" + "limit" ], "desc": "Maximale Leistungsaufnahme des Lötkolbens " }, "ReverseButtonTempChange": { "text2": [ - "Taste +-", + "+- Tasten", "umkehren?" ], - "desc": "Temperatur-Änderungs-Tasten-Belegung Plus-Minus umkehren?" + "desc": "Tastenbelegung zur Temperaturänderung umkehren" }, "TempChangeShortStep": { "text2": [ - "T. Schritt", - "Taste kurz?" + "Temp-Schritt", + "kurzer Druck" ], - "desc": "Temperaturwechselschritte bei kurzem Tastendruck!" + "desc": "Schrittweite für Temperaturwechsel bei kurzem Tastendruck" }, "TempChangeLongStep": { "text2": [ - "T. Schritt", - "Taste Lang?" + "Temp-Schritt", + "langer Druck" ], - "desc": "Temperaturwechselschritte bei langem Tastendruck!" + "desc": "Schrittweite für Temperaturwechsel bei langem Tastendruck" }, "PowerPulsePower": { "text2": [ "Leistungs-", - "impuls in Watt" + "impuls" ], - "desc": "Halte das Netzteil mit einem Leistungsimpuls wach" + "desc": "Powerbank wird mittels eines Impulses wach gehalten " }, "TipGain": { "text2": [ @@ -265,14 +265,14 @@ "Hall Sensor", "Empfindlichkeit" ], - "desc": "Empfindlichkeit des Hall Effekt Sensors beim erkennen des Ruhemodus " + "desc": "Empfindlichkeit des Hall Effekt Sensors beim Erkennen des Ruhemodus " }, "LockingMode": { "text2": [ - "Erlaube Knopf-", - "Sperre" + "Knopf-", + "sperre" ], - "desc": "Langes drücken beider Knöpfe beim Löten, sperrt diese " + "desc": "Langes drücken beider Knöpfe im Lötmodus, sperrt diese " } } -} \ No newline at end of file +} From 5c493f2bbd411d279e2c3a37f04934b1f7dc36cd Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Mon, 4 Jan 2021 03:10:57 +0100 Subject: [PATCH 5/6] Update translation_en.json --- Translation Editor/translation_en.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Translation Editor/translation_en.json b/Translation Editor/translation_en.json index 22873c8a..6340c91e 100644 --- a/Translation Editor/translation_en.json +++ b/Translation Editor/translation_en.json @@ -35,10 +35,10 @@ "SettingAutoChar": "A", "SettingFastChar": "F", "SettingSlowChar": "S", - "SettingStartSolderingChar": "T", - "SettingStartSleepChar": "S", - "SettingStartSleepOffChar": "O", - "SettingStartNoneChar": "F", + "SettingStartSolderingChar": "S", + "SettingStartSleepChar": "Z", + "SettingStartSleepOffChar": "R", + "SettingStartNoneChar": "O", "SettingSensitivityOff": "O", "SettingSensitivityLow": "L", "SettingSensitivityMedium": "M", @@ -146,7 +146,7 @@ "Auto", "start" ], - "desc": "Automatically starts the iron into soldering mode on power up " + "desc": "Starts the iron into soldering mode on power up " }, "CooldownBlink": { "text2": [ @@ -160,21 +160,21 @@ "Calibrate", "temperature?" ], - "desc": "Start tip offset calibrating procedure" + "desc": "Start tip temperature offset calibration" }, "SettingsReset": { "text2": [ "Factory", "reset?" ], - "desc": "Reset settings to default!" + "desc": "Reset settings to default" }, "VoltageCalibration": { "text2": [ "Calibrate", "input voltage?" ], - "desc": "VIN Calibration " + "desc": "Start VIN calibration " }, "AdvancedSoldering": { "text2": [ @@ -237,21 +237,21 @@ "Temp change", "short" ], - "desc": "Temperature change steps on short button press" + "desc": "Temperature change increment on short button press" }, "TempChangeLongStep": { "text2": [ "Temp change", "long" ], - "desc": "Temperature change steps on long button press" + "desc": "Temperature change increment on long button press" }, "PowerPulsePower": { "text2": [ "Power", "pulse" ], - "desc": "Intensity of power of keep-awake-pulse " + "desc": "Intensity of power of keep-awake-pulse " }, "TipGain": { "text2": [ @@ -265,7 +265,7 @@ "Hall sensor", "sensitivity" ], - "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + "desc": "Sensitivity of the Hall effect sensor to detect sleep " }, "LockingMode": { "text2": [ From 5f732998a455b800c6cc27ad4d42c56d4e1a2a55 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Mon, 4 Jan 2021 03:17:25 +0100 Subject: [PATCH 6/6] Update translation_de.json --- Translation Editor/translation_de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Translation Editor/translation_de.json b/Translation Editor/translation_de.json index 78147ef8..b7304799 100644 --- a/Translation Editor/translation_de.json +++ b/Translation Editor/translation_de.json @@ -87,7 +87,7 @@ }, "SleepTemperature": { "text2": [ - "Ruhe- + "Ruhe-", "temperatur" ], "desc": "Ruhetemperatur der Spitze"