Merge branch 'master' into Add-warnings

This commit is contained in:
Ben V. Brown
2021-01-04 18:21:56 +11:00
committed by GitHub
3 changed files with 100 additions and 98 deletions

View File

@@ -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

View File

@@ -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": "Sicher, dass alle Werte zurückgesetzt werden sollen?",
"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:",
@@ -22,32 +22,32 @@
"TipDisconnectedString": "Spitze fehlt",
"SolderingAdvancedPowerPrompt": "Leistung: ",
"OffString": "Aus",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your Gain:",
"SettingsResetMessage": "Einstellungen\nzurück gesetzt!",
"NoAccelerometerMessage": "No accelerometer\ndetected!",
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
"ResetOKMessage": "Reset abgeschlossen!",
"YourGainMessage": "Dein Faktor:",
"SettingsResetMessage": "Einstellungen \nzurü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": {
@@ -59,7 +59,7 @@
},
"PowerSavingMenu": {
"text2": [
"Schlaf-",
"Ruhe-",
"modus"
],
"desc": "Energiespareinstellungen"
@@ -89,10 +89,10 @@
},
"SleepTemperature": {
"text2": [
"Ruhetemp-",
"eratur"
"Ruhe-",
"temperatur"
],
"desc": "Ruhetemperatur"
"desc": "Ruhetemperatur der Spitze"
},
"SleepTimeout": {
"text2": [
@@ -113,7 +113,7 @@
"Bewegungs-",
"empfindlichk."
],
"desc": "Bewegungsempfindlichkeit <0=Aus, 1=Minimal ... 9=Maximal>"
"desc": "Bewegungsempfindlichkeit <0=aus, 1=minimal ... 9=maximal>"
},
"TemperatureUnit": {
"text2": [
@@ -134,28 +134,28 @@
"Anzeige-",
"ausrichtung"
],
"desc": "Ausrichtung der Anzeige <A=Automatisch, L=Linkshändig, R=Rechtshändig>"
"desc": "Ausrichtung der Anzeige <A=automatisch, L=linkshändig, R=rechtshändig>"
},
"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. <T=Lötmodus S=Ruhezustand F=Aus>"
"desc": "Bestimmt das Heizverhalten beim Einschalten der Spannungsversorgung. <L=Lötmodus R=Ruhemodus O=Ruhemodus bei Raumtemperatur A=aus>"
},
"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": [
@@ -169,7 +169,7 @@
"Einstellungen",
"zurücksetzen?"
],
"desc": "Einstellungen auf werkseinstellungen zurück setzen"
"desc": "Werte werden auf Werkseinstellungen zurückgesetzt"
},
"VoltageCalibration": {
"text2": [
@@ -190,7 +190,7 @@
"Scroll-",
"geschw."
],
"desc": "Scrollgeschwindigkeit der Texte <S=Langsam F=Schnell>"
"desc": "Scrollgeschwindigkeit der Erläuterungen <L=langsam S=schnell>"
},
"TipModel": {
"text2": [
@@ -204,7 +204,7 @@
"Einfache",
"Kalibrierung"
],
"desc": "Einfache Kalibrierung mittels heißem Wasser"
"desc": "Einfache Kalibrierung mittels heißen Wassers"
},
"AdvancedCalibrationMode": {
"text2": [
@@ -223,58 +223,58 @@
"PowerLimit": {
"text2": [
"Leistungs-",
"Limit"
"limit"
],
"desc": "Maximale aufnahme der Lötspitze <Watt>"
"desc": "Maximale Leistungsaufnahme des Lötkolbens <Watt>"
},
"ReverseButtonTempChange": {
"text2": [
"Taste +-",
"Umkehren?"
"+- Tasten",
"umkehren?"
],
"desc": "Temperaturnderungs-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": [
"Power",
"Pulse W"
"Leistungs-",
"impuls"
],
"desc": "Keep awake pulse power intensity"
"desc": "Powerbank wird mittels eines Impulses wach gehalten <Watt>"
},
"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 <O=Off,L=Low,M=Medium,H=High>"
"desc": "Empfindlichkeit des Hall Effekt Sensors beim Erkennen des Ruhemodus <A=aus,N=niedrig,M=mittel,H=hoch>"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
"Knopf-",
"sperre"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
"desc": "Langes drücken beider Knöpfe im Lötmodus, sperrt diese <D=deaktiviert, B=nur Boost, V=vollständig gesperrt>"
}
}
}
}

View File

@@ -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,19 +15,19 @@
"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!",
"NoAccelerometerMessage": "No accelerometer\ndetected!",
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!",
"LockingKeysString": " LOCKED",
"LockingKeysString": "LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
},
@@ -37,10 +37,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",
@@ -60,7 +60,7 @@
"PowerSavingMenu": {
"text2": [
"Sleep",
"modes"
"mode"
],
"desc": "Power saving settings"
},
@@ -92,35 +92,35 @@
"Sleep",
"temp"
],
"desc": "Sleep temperature"
"desc": "Tip temperature while in sleep mode"
},
"SleepTimeout": {
"text2": [
"Sleep",
"timeout"
],
"desc": "Sleep timeout <Minutes/Seconds>"
"desc": "Interval before sleep mode kicks in <S=seconds M=minutes>"
},
"ShutdownTimeout": {
"text2": [
"Shutdown",
"timeout"
],
"desc": "Shutdown timeout <Minutes>"
"desc": "Interval before the iron shuts down <M=minutes>"
},
"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 <C=Celsius F=Fahrenheit>"
"desc": "C=Celsius F=Fahrenheit"
},
"AdvancedIdle": {
"text2": [
@@ -134,7 +134,7 @@
"Display",
"orientation"
],
"desc": "Display orientation <A=Automatic L=Left-handed R=Right-handed>"
"desc": "A=automatic L=left-handed R=right-handed"
},
"BoostTemperature": {
"text2": [
@@ -148,49 +148,49 @@
"Auto",
"start"
],
"desc": "Automatically starts the iron into soldering on power up <F=Off T=Soldering S=Sleep O=Sleep at room temperature>"
"desc": "Starts the iron into soldering mode on power up <O=off S=soldering Z=sleep R=sleep at room temperature>"
},
"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 temperature offset calibration"
},
"SettingsReset": {
"text2": [
"Factory",
"Reset?"
"reset?"
],
"desc": "Reset all settings!"
"desc": "Reset settings to default"
},
"VoltageCalibration": {
"text2": [
"Calibrate",
"input voltage?"
],
"desc": "VIN Calibration <long press to exit>"
"desc": "Start VIN calibration <long press to exit>"
},
"AdvancedSoldering": {
"text2": [
"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 <S=Slow F=Fast>"
"desc": "Speed info text scrolls past at <S=slow F=fast>"
},
"TipModel": {
"text2": [
@@ -204,28 +204,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 <Watts>"
"desc": "Maximum power the iron can use <W=watt>"
},
"ReverseButtonTempChange": {
"text2": [
@@ -239,21 +239,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 W"
"pulse"
],
"desc": "Keep awake pulse power intensity"
"desc": "Intensity of power of keep-awake-pulse <watt>"
},
"TipGain": {
"text2": [
@@ -264,17 +264,17 @@
},
"HallEffSensitivity": {
"text2": [
"Hall Eff",
"Sensitivity"
"Hall sensor",
"sensitivity"
],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
"desc": "Sensitivity of the Hall effect sensor to detect sleep <O=off L=low M=medium H=high>"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
"Allow locking",
"buttons"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
"desc": "When soldering, long press on both buttons, to lock them <D=disable B=\"boost mode\" only F=full locking>"
}
}
}
}