diff --git a/Documentation/Menu.md b/Documentation/Menu.md index a8ac4fc5..b9cebe74 100644 --- a/Documentation/Menu.md +++ b/Documentation/Menu.md @@ -39,11 +39,13 @@ To calibrate your iron: 7. Press both buttons at the same time to Save and Exit to the menu ### Calibrate Tip CJC -This performs a Tip Cold Junction Calibration (CJC) ([see Temperature for details](https://ralim.github.io/IronOS/Temperature/)). This is normally not needed unless you have an issue with tip temperature or your tips are wearing out prematurely. Changing tip lengths does not necessarily mean a calibration is needed. Check first that your tips are not defective, and measured resistance is close to specifications (Pinecil/TS100 short tips 6.2 Ω, long tips 8 Ω, TS80(P) ~4.5 Ω). +This calibrates the [Cold Junction Compensation](https://ralim.github.io/IronOS/Temperature/) *(CJC)* for the tip. This is normally not needed unless you have an issue with tip temperature or your tips are wearing out prematurely. Changing tip lengths does not necessarily mean a calibration is needed. Check first that your tips are not defective and measured resistance is close to specifications *[Pinecil / TS100 short tips **6.2 Ω**, long tips **8 Ω**, TS80/P ~**4.5 Ω**]*. -What this is for: some tips have an offset on their readings which causes issues, i.e., the actual temperature of the tip is much higher than displayed. To calibrate this out, perform the following steps. +What this is for:
+Some tips have an offset on their readings which causes issues, i.e. The actual temperature of the tip is much higher than displayed. Follow the steps below to calibrate this. -Caution: if the method below is not followed, the iron could be worse than before calibration. If you need to repeat the method, first unplug and let the handle/PCB cool down to room temperature. +Caution:
+If the method below is not followed, the iron could be worse than before calibration. If you need to repeat the method, first unplug and let the handle/PCB cool down to room temperature. 1. Connect power to your device. 2. Go to **`Advanced Settings`** using (`-/B`) and press (`+/A`) to select it. Use (`-/B`) to scroll to **`Calibrate CJC at next boot`** and confirm with (`+/A`). @@ -52,11 +54,11 @@ Caution: if the method below is not followed, the iron could be worse than befor 4. Unplug you device. 5. **Critical: Make sure a tip is attached & wait until the tip & handle are at room temperature.** (Wait a reasonable amount of time after having used the device.) 6. Power the device and ideally keep it out of your hands (You know it might get warm.). -7. The display shows **`....`** for a short time while the device measures and compares the tip and handle voltages. -8. As a result the new *Offset value* is displayed. This value can later be viewed in the **`Debug menu`**. +7. The display shows **`calibrating ....`** for a short time while the device measures and compares the tip and handle voltages. +8. **`Calibration done!`** is displayed for 3 seconds. The new offset value can later be viewed in the **`Debug menu`**. 9. Calibration is done and the device proceeds booting. -Note: offsets are dependant on your tip, temperature sensor, and the MCU. It's the culmination of tolerances at rest. Typical values are 700-1000 range. This is only designed to be used at boot while cold (ambient room temperature), as temperatures drift apart as soon as power is connected. Doing this reading repeatedly could result in wide varience of the offset number and/or incorrect calibration. +Note: offsets are dependant on your tip, temperature sensor, and the MCU. It's the culmination of tolerances at rest. Typical values are 700-1000 range. This is only designed to be used at boot while cold (ambient / room temperature), as temperatures drift apart as soon as power is connected. Doing this reading repeatedly could result in wide varience of the offset number and/or incorrect calibration. ### Boost mode diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json index 67b9ae2a..bd3bfa18 100644 --- a/Translations/translation_BE.json +++ b/Translations/translation_BE.json @@ -17,8 +17,8 @@ }, "messagesWarn": { "CJCCalibrationDone": [ - "Calibration", - "done!" + "Каліброўка", + "зроблена!" ], "ResetOKMessage": "Скід OK", "SettingsResetMessage": [ @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "П", "SettingStartSleepChar": "Ч", "SettingStartSleepOffChar": "К", - "SettingSensitivityOff": "А", - "SettingSensitivityLow": "Н", - "SettingSensitivityMedium": "С", - "SettingSensitivityHigh": "В", "SettingLockDisableChar": "А", "SettingLockBoostChar": "Т", "SettingLockFullChar": "П" @@ -293,7 +289,7 @@ "Каліброўка тэмпературы", "пры наступнай загрузцы" ], - "desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)" + "desc": "Каліброўка тэмпературы пры наступным уключэнні (не патрабуецца, калі розніца тэмператур меньш за 5°C)" }, "VoltageCalibration": { "text2": [ diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json index e6715866..3d33f47a 100644 --- a/Translations/translation_BG.json +++ b/Translations/translation_BG.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "Р", "SettingStartSleepChar": "С", "SettingStartSleepOffChar": "П", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", "SettingLockFullChar": "F" diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json index 6a7e6bf4..ce82d4b4 100644 --- a/Translations/translation_CS.json +++ b/Translations/translation_CS.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "P", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "M", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "M", - "SettingSensitivityMedium": "S", - "SettingSensitivityHigh": "V", "SettingLockDisableChar": "Z", "SettingLockBoostChar": "B", "SettingLockFullChar": "U" diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json index 37953a92..acecb5dc 100644 --- a/Translations/translation_DA.json +++ b/Translations/translation_DA.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "L", "SettingStartSleepChar": "D", "SettingStartSleepOffChar": "R", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", "SettingLockFullChar": "F" diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json index 2902ee61..1590e89f 100644 --- a/Translations/translation_DE.json +++ b/Translations/translation_DE.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "L", "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "K", - "SettingSensitivityOff": "A", - "SettingSensitivityLow": "N", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "A", "SettingLockBoostChar": "B", "SettingLockFullChar": "V" diff --git a/Translations/translation_EL.json b/Translations/translation_EL.json index 27971dab..3af8cea4 100644 --- a/Translations/translation_EL.json +++ b/Translations/translation_EL.json @@ -56,10 +56,6 @@ "SettingStartSolderingChar": "Κ", "SettingStartSleepChar": "Ζ", "SettingStartSleepOffChar": "Υ", - "SettingSensitivityOff": "0", - "SettingSensitivityLow": "Χ", - "SettingSensitivityMedium": "Μ", - "SettingSensitivityHigh": "Υ", "SettingLockDisableChar": "Α", "SettingLockBoostChar": "B", "SettingLockFullChar": "Π" diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json index 14405cc7..72f503ca 100644 --- a/Translations/translation_EN.json +++ b/Translations/translation_EN.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "S", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "R", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", "SettingLockFullChar": "F" @@ -67,35 +63,35 @@ "Power", "settings" ], - "desc": "Settings for Power Supply (Batteries, Quick Charge, PD etc)" + "desc": "" }, "SolderingMenu": { "text2": [ "Soldering", "settings" ], - "desc": "Soldering settings, boost modes; how the iron operates" + "desc": "" }, "PowerSavingMenu": { "text2": [ "Sleep", "mode" ], - "desc": "Sleep modes; methods we use to save power on the device by shutting down" + "desc": "" }, "UIMenu": { "text2": [ "User", "interface" ], - "desc": "User interactions (how it looks, animations, units etc)" + "desc": "" }, "AdvancedMenu": { "text2": [ "Advanced", "settings" ], - "desc": "Advanced or Misc options." + "desc": "" } }, "menuOptions": { @@ -223,7 +219,7 @@ "Scrolling", "speed" ], - "desc": "Speed info text scrolls past at (S=slow | F=fast)" + "desc": "Scrolling speed of info text (S=slow | F=fast)" }, "ReverseButtonTempChange": { "text2": [ @@ -293,7 +289,7 @@ "Calibrate CJC", "at next boot" ], - "desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)" + "desc": "Calbrate Cold Junction Compensation at next boot (not required if Delta T is < 5°C)" }, "VoltageCalibration": { "text2": [ @@ -307,7 +303,7 @@ "Power", "pulse" ], - "desc": "Intensity of power of keep-awake-pulse (watt)" + "desc": "Intensity of power of keep-awake-pulse (W=watt)" }, "PowerPulseWait": { "text2": [ @@ -335,7 +331,7 @@ "Language:", " EN English" ], - "desc": "Toggle active language" + "desc": "" } } } diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json index 6b8539f2..b523274f 100644 --- a/Translations/translation_ES.json +++ b/Translations/translation_ES.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "S", "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "F", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", "SettingLockFullChar": "F" diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json index 57ec7664..482764e2 100644 --- a/Translations/translation_FI.json +++ b/Translations/translation_FI.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "J", "SettingStartSleepChar": "L", "SettingStartSleepOffChar": "H", - "SettingSensitivityOff": "P", - "SettingSensitivityLow": "A", - "SettingSensitivityMedium": "K", - "SettingSensitivityHigh": "S", "SettingLockDisableChar": "P", "SettingLockBoostChar": "V", "SettingLockFullChar": "K" diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json index 51841fef..7e32ac83 100644 --- a/Translations/translation_FR.json +++ b/Translations/translation_FR.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "A", "SettingStartSleepChar": "V", "SettingStartSleepOffChar": "O", - "SettingSensitivityOff": "D", - "SettingSensitivityLow": "B", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", "SettingLockFullChar": "V" diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json index a0cd93fb..3e39d9b0 100644 --- a/Translations/translation_HR.json +++ b/Translations/translation_HR.json @@ -1,344 +1,337 @@ { - "languageCode": "HR", - "languageLocalName": "Hrvatski", - "tempUnitFahrenheit": false, - "messages": { - "SettingsCalibrationWarning": "Prije restarta provjerite da su vrh i ručka na sobnoj temperaturi!", - "CJCCalibrating": "kalibriram", - "SettingsResetWarning": "Jeste li sigurni da želite sve postavke vratiti na tvorničke vrijednosti?", - "UVLOWarningString": "BAT!!!", - "UndervoltageString": "PRENIZAK NAPON", - "InputVoltageString": "Napon V: ", - "SleepingSimpleString": "Zzz ", - "SleepingAdvancedString": "SPAVAM...", - "SleepingTipAdvancedString": "Vrh: ", - "OffString": "Off", - "DeviceFailedValidationWarning": "Vaš uređaj je najvjerojatnije krivotvoren!" - }, - "messagesWarn": { - "CJCCalibrationDone": [ - "Kalibracija", - "dovršena!" - ], - "ResetOKMessage": "Reset OK", - "SettingsResetMessage": [ - "Neke postavke", - "su izmijenjene!" - ], - "NoAccelerometerMessage": [ - "Akcelerometar", - "nije pronađen!" - ], - "NoPowerDeliveryMessage": [ - "USB-PD IC", - "nije pronađen!" - ], - "LockingKeysString": "ZAKLJUČ", - "UnlockingKeysString": "OTKLJUČ", - "WarningKeysLockedString": "ZAKLJUČ!", - "WarningThermalRunaway": [ - "Neispravan", - "grijač" - ] - }, - "characters": { - "SettingRightChar": "D", - "SettingLeftChar": "L", - "SettingAutoChar": "A", - "SettingOffChar": "U", - "SettingSlowChar": "S", - "SettingMediumChar": "M", - "SettingFastChar": "B", - "SettingStartNoneChar": "U", - "SettingStartSolderingChar": "L", - "SettingStartSleepChar": "T", - "SettingStartSleepOffChar": "H", - "SettingSensitivityOff": "U", - "SettingSensitivityLow": "N", - "SettingSensitivityMedium": "S", - "SettingSensitivityHigh": "V", - "SettingLockDisableChar": "O", - "SettingLockBoostChar": "B", - "SettingLockFullChar": "Z" - }, - "menuGroups": { - "PowerMenu": { - "text2": [ - "Postavke", - "napajanja" - ], - "desc": "Postavke napajanja (baterije, punjač, USB-PD itd.)" - }, - "SolderingMenu": { - "text2": [ - "Postavke", - "lemljenja" - ], - "desc": "Postavke lemljenja, pojačani način, kako se lemilica ponaša" - }, - "PowerSavingMenu": { - "text2": [ - "Ušteda", - "energije" - ], - "desc": "Spavanje, načini uštede energije gašenjem uređaja" - }, - "UIMenu": { - "text2": [ - "Korisničko", - "sučelje" - ], - "desc": "Interakcija s korisnikom (izgled, animacije, jedinice itd.)" - }, - "AdvancedMenu": { - "text2": [ - "Napredne", - "opcije" - ], - "desc": "Napredne i ostale opcije" - } - }, - "menuOptions": { - "DCInCutoff": { - "text2": [ - "Izvor", - "napajanja" - ], - "desc": "Izvor napajanja. Postavlja napon isključivanja. (DC 10V) (S 3.3V po ćeliji)" - }, - "MinVolCell": { - "text2": [ - "Najniži", - "napon" - ], - "desc": "Najniži dozvoljeni napon po ćeliji baterije (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)" - }, - "QCMaxVoltage": { - "text2": [ - "Snaga", - "napajanja" - ], - "desc": "Snaga modula za napajanje" - }, - "PDNegTimeout": { - "text2": [ - "USB-PD", - "timeout" - ], - "desc": "Timeout za USB-Power Delivery u koracima od 100ms za kompatibilnost s nekim QC punjačima" - }, - "BoostTemperature": { - "text2": [ - "Boost", - "temp" - ], - "desc": "Temperatura u pojačanom (Boost) načinu." - }, - "AutoStart": { - "text2": [ - "Auto", - "start" - ], - "desc": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati. (U=ugašeno | L=lemljenje | T=spavanje toplo | H=spavanje hladno)" - }, - "TempChangeShortStep": { - "text2": [ - "Korak temp", - "kratki pritisak" - ], - "desc": "Korak temperature pri kratkom pritisku tipke" - }, - "TempChangeLongStep": { - "text2": [ - "Korak temp", - "dugi pritisak" - ], - "desc": "Korak temperature pri dugačkom pritisku tipke" - }, - "LockingMode": { - "text2": [ - "Zaključavanje", - "tipki" - ], - "desc": "Tokom lemljenja, držite obje tipke kako biste ih zaključali ili otključali (O=otključano | B=zaključan boost | Z=zaključano sve)" - }, - "MotionSensitivity": { - "text2": [ - "Osjetljivost", - "pokreta" - ], - "desc": "Osjetljivost prepoznavanja pokreta. (0=ugašeno | 1=najmanje osjetljivo | ... | 9=najosjetljivije)" - }, - "SleepTemperature": { - "text2": [ - "Temp", - "spavanja" - ], - "desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja (C | F)" - }, - "SleepTimeout": { - "text2": [ - "Vrijeme", - "spavanja" - ], - "desc": "Vrijeme mirovanja nakon kojega lemilica spušta temperaturu. (Minute | Sekunde)" - }, - "ShutdownTimeout": { - "text2": [ - "Vrijeme", - "gašenja" - ], - "desc": "Vrijeme mirovanja nakon kojega će se lemilica ugasiti (Minute)" - }, - "HallEffSensitivity": { - "text2": [ - "Osjetljivost", - "Hall senzora" - ], - "desc": "Osjetljivost senzora magnetskog polja za detekciju spavanja (U=Ugašeno | N=Najmanja | S=Srednja | V=Visoka)" - }, - "TemperatureUnit": { - "text2": [ - "Jedinica", - "temperature" - ], - "desc": "Jedinica temperature (C=Celzij | F=Fahrenheit)" - }, - "DisplayRotation": { - "text2": [ - "Rotacija", - "ekrana" - ], - "desc": "Orijentacija ekrana (D=desnoruki | L=ljevoruki | A=automatski)" - }, - "CooldownBlink": { - "text2": [ - "Upozorenje", - "pri hlađenju" - ], - "desc": "Bljeskanje temperature prilikom hlađenja, ako je lemilica vruća" - }, - "ScrollingSpeed": { - "text2": [ - "Brzina", - "poruka" - ], - "desc": "Brzina kretanja dugačkih poruka (B=brzo | S=sporo)" - }, - "ReverseButtonTempChange": { - "text2": [ - "Zamjena", - "+ - tipki" - ], - "desc": "Zamjenjuje funkciju gornje i donje tipke za podešavanje temperature" - }, - "AnimSpeed": { - "text2": [ - "Brzina", - "animacije" - ], - "desc": "Brzina animacije ikona u menijima (U=ugašeno | S=sporo | M=srednje | B=brzo)" - }, - "AnimLoop": { - "text2": [ - "Ponavljanje", - "animacije" - ], - "desc": "Hoće li se animacije menija vrtiti u petlji - samo ako brzina animacije nije na \"Ugašeno\"" - }, - "Brightness": { - "text2": [ - "Svjetlina", - "ekrana" - ], - "desc": "Podešavanje svjetline OLED ekrana. Veća svjetlina može dugotrajno dovesti do pojave duhova na ekranu." - }, - "ColourInversion": { - "text2": [ - "Inverzija", - "ekrana" - ], - "desc": "Inverzan prikaz slike na ekranu" - }, - "LOGOTime": { - "text2": [ - "Trajanje", - "boot logotipa" - ], - "desc": "Trajanje prikaza boot logotipa (s=seconds)" - }, - "AdvancedIdle": { - "text2": [ - "Detalji", - "pri čekanju" - ], - "desc": "Prikazivanje detaljnih informacija tijekom čekanja" - }, - "AdvancedSoldering": { - "text2": [ - "Detalji", - "pri lemljenju" - ], - "desc": "Prikazivanje detaljnih informacija tijekom lemljenja" - }, - "PowerLimit": { - "text2": [ - "Ograničenje", - "snage" - ], - "desc": "Najveća snaga koju lemilica smije vući iz napajanja (W=watt)" - }, - "CalibrateCJC": { - "text2": [ - "Kalibracija kod", - "sljed. starta" - ], - "desc": "Kod sljedećeg starta izvršit će se kalibracija (nije potrebno ako je pogreška manja od 5°C)" - }, - "VoltageCalibration": { - "text2": [ - "Kalibracija", - "napajanja" - ], - "desc": "Kalibracija ulaznog napona napajanja (Podešavanje tipkama, dugački pritisak za kraj)" - }, - "PowerPulsePower": { - "text2": [ - "Snaga period.", - "pulsa napajanja" - ], - "desc": "Intenzitet periodičkog pulsa kojega lemilica povlači kako se USB napajanje ne bi ugasilo (W=watt)" - }, - "PowerPulseWait": { - "text2": [ - "Interval per.", - "pulsa nap." - ], - "desc": "Razmak periodičkih pulseva koje lemilica povlači kako se USB napajanje ne bi ugasilo (x 2.5s)" - }, - "PowerPulseDuration": { - "text2": [ - "Trajanje per.", - "pulsa nap." - ], - "desc": "Trajanje periodičkog pulsa kojega lemilica povlači kako se USB napajanje ne bi ugasilo (x 250ms)" - }, - "SettingsReset": { - "text2": [ - "Tvorničke", - "postavke" - ], - "desc": "Vraćanje svih postavki na tvorničke vrijednosti" - }, - "LanguageSwitch": { - "text2": [ - "Jezik:", - " HR Hrvatski" - ], - "desc": "Promjena jezika" - } - }, - "fonts": [ - "ascii_basic" - ] -} + "languageCode": "HR", + "languageLocalName": "Hrvatski", + "tempUnitFahrenheit": false, + "messages": { + "SettingsCalibrationWarning": "Prije restarta provjerite da su vrh i ručka na sobnoj temperaturi!", + "CJCCalibrating": "kalibriram", + "SettingsResetWarning": "Jeste li sigurni da želite sve postavke vratiti na tvorničke vrijednosti?", + "UVLOWarningString": "BAT!!!", + "UndervoltageString": "PRENIZAK NAPON", + "InputVoltageString": "Napon V: ", + "SleepingSimpleString": "Zzz ", + "SleepingAdvancedString": "SPAVAM...", + "SleepingTipAdvancedString": "Vrh: ", + "OffString": "Off", + "DeviceFailedValidationWarning": "Vaš uređaj je najvjerojatnije krivotvoren!" + }, + "messagesWarn": { + "CJCCalibrationDone": [ + "Kalibracija", + "dovršena!" + ], + "ResetOKMessage": "Reset OK", + "SettingsResetMessage": [ + "Neke postavke", + "su izmijenjene!" + ], + "NoAccelerometerMessage": [ + "Akcelerometar", + "nije pronađen!" + ], + "NoPowerDeliveryMessage": [ + "USB-PD IC", + "nije pronađen!" + ], + "LockingKeysString": "ZAKLJUČ", + "UnlockingKeysString": "OTKLJUČ", + "WarningKeysLockedString": "ZAKLJUČ!", + "WarningThermalRunaway": [ + "Neispravan", + "grijač" + ] + }, + "characters": { + "SettingRightChar": "D", + "SettingLeftChar": "L", + "SettingAutoChar": "A", + "SettingOffChar": "U", + "SettingSlowChar": "S", + "SettingMediumChar": "M", + "SettingFastChar": "B", + "SettingStartNoneChar": "U", + "SettingStartSolderingChar": "L", + "SettingStartSleepChar": "T", + "SettingStartSleepOffChar": "H", + "SettingLockDisableChar": "O", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "Z" + }, + "menuGroups": { + "PowerMenu": { + "text2": [ + "Postavke", + "napajanja" + ], + "desc": "" + }, + "SolderingMenu": { + "text2": [ + "Postavke", + "lemljenja" + ], + "desc": "" + }, + "PowerSavingMenu": { + "text2": [ + "Ušteda", + "energije" + ], + "desc": "" + }, + "UIMenu": { + "text2": [ + "Korisničko", + "sučelje" + ], + "desc": "" + }, + "AdvancedMenu": { + "text2": [ + "Napredne", + "opcije" + ], + "desc": "" + } + }, + "menuOptions": { + "DCInCutoff": { + "text2": [ + "Izvor", + "napajanja" + ], + "desc": "Izvor napajanja. Postavlja napon isključivanja. (DC 10V) (S 3.3V po ćeliji)" + }, + "MinVolCell": { + "text2": [ + "Najniži", + "napon" + ], + "desc": "Najniži dozvoljeni napon po ćeliji baterije (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)" + }, + "QCMaxVoltage": { + "text2": [ + "Snaga", + "napajanja" + ], + "desc": "Snaga modula za napajanje" + }, + "PDNegTimeout": { + "text2": [ + "USB-PD", + "timeout" + ], + "desc": "Timeout za USB-Power Delivery u koracima od 100ms za kompatibilnost s nekim QC punjačima" + }, + "BoostTemperature": { + "text2": [ + "Boost", + "temp" + ], + "desc": "Temperatura u pojačanom (Boost) načinu." + }, + "AutoStart": { + "text2": [ + "Auto", + "start" + ], + "desc": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati. (U=ugašeno | L=lemljenje | T=spavanje toplo | H=spavanje hladno)" + }, + "TempChangeShortStep": { + "text2": [ + "Korak temp", + "kratki pritisak" + ], + "desc": "Korak temperature pri kratkom pritisku tipke" + }, + "TempChangeLongStep": { + "text2": [ + "Korak temp", + "dugi pritisak" + ], + "desc": "Korak temperature pri dugačkom pritisku tipke" + }, + "LockingMode": { + "text2": [ + "Zaključavanje", + "tipki" + ], + "desc": "Tokom lemljenja, držite obje tipke kako biste ih zaključali ili otključali (O=otključano | B=zaključan boost | Z=zaključano sve)" + }, + "MotionSensitivity": { + "text2": [ + "Osjetljivost", + "pokreta" + ], + "desc": "Osjetljivost prepoznavanja pokreta. (0=ugašeno | 1=najmanje osjetljivo | ... | 9=najosjetljivije)" + }, + "SleepTemperature": { + "text2": [ + "Temp", + "spavanja" + ], + "desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja (C | F)" + }, + "SleepTimeout": { + "text2": [ + "Vrijeme", + "spavanja" + ], + "desc": "Vrijeme mirovanja nakon kojega lemilica spušta temperaturu. (Minute | Sekunde)" + }, + "ShutdownTimeout": { + "text2": [ + "Vrijeme", + "gašenja" + ], + "desc": "Vrijeme mirovanja nakon kojega će se lemilica ugasiti (Minute)" + }, + "HallEffSensitivity": { + "text2": [ + "Osjetljivost", + "Hall senzora" + ], + "desc": "Osjetljivost senzora magnetskog polja za detekciju spavanja (U=Ugašeno | N=Najmanja | S=Srednja | V=Visoka)" + }, + "TemperatureUnit": { + "text2": [ + "Jedinica", + "temperature" + ], + "desc": "Jedinica temperature (C=Celzij | F=Fahrenheit)" + }, + "DisplayRotation": { + "text2": [ + "Rotacija", + "ekrana" + ], + "desc": "Orijentacija ekrana (D=desnoruki | L=ljevoruki | A=automatski)" + }, + "CooldownBlink": { + "text2": [ + "Upozorenje", + "pri hlađenju" + ], + "desc": "Bljeskanje temperature prilikom hlađenja, ako je lemilica vruća" + }, + "ScrollingSpeed": { + "text2": [ + "Brzina", + "poruka" + ], + "desc": "Brzina kretanja dugačkih poruka (B=brzo | S=sporo)" + }, + "ReverseButtonTempChange": { + "text2": [ + "Zamjena", + "+ - tipki" + ], + "desc": "Zamjenjuje funkciju gornje i donje tipke za podešavanje temperature" + }, + "AnimSpeed": { + "text2": [ + "Brzina", + "animacije" + ], + "desc": "Brzina animacije ikona u menijima (U=ugašeno | S=sporo | M=srednje | B=brzo)" + }, + "AnimLoop": { + "text2": [ + "Ponavljanje", + "animacije" + ], + "desc": "Hoće li se animacije menija vrtiti u petlji - samo ako brzina animacije nije na \"Ugašeno\"" + }, + "Brightness": { + "text2": [ + "Svjetlina", + "ekrana" + ], + "desc": "Podešavanje svjetline OLED ekrana. Veća svjetlina može dugotrajno dovesti do pojave duhova na ekranu." + }, + "ColourInversion": { + "text2": [ + "Inverzija", + "ekrana" + ], + "desc": "Inverzan prikaz slike na ekranu" + }, + "LOGOTime": { + "text2": [ + "Trajanje", + "boot logotipa" + ], + "desc": "Trajanje prikaza boot logotipa (s=seconds)" + }, + "AdvancedIdle": { + "text2": [ + "Detalji", + "pri čekanju" + ], + "desc": "Prikazivanje detaljnih informacija tijekom čekanja" + }, + "AdvancedSoldering": { + "text2": [ + "Detalji", + "pri lemljenju" + ], + "desc": "Prikazivanje detaljnih informacija tijekom lemljenja" + }, + "PowerLimit": { + "text2": [ + "Ograničenje", + "snage" + ], + "desc": "Najveća snaga koju lemilica smije vući iz napajanja (W=watt)" + }, + "CalibrateCJC": { + "text2": [ + "Kalibracija kod", + "sljed. starta" + ], + "desc": "Kod sljedećeg starta izvršit će se kalibracija (nije potrebno ako je pogreška manja od 5°C)" + }, + "VoltageCalibration": { + "text2": [ + "Kalibracija", + "napajanja" + ], + "desc": "Kalibracija ulaznog napona napajanja (Podešavanje tipkama, dugački pritisak za kraj)" + }, + "PowerPulsePower": { + "text2": [ + "Snaga period.", + "pulsa napajanja" + ], + "desc": "Intenzitet periodičkog pulsa kojega lemilica povlači kako se USB napajanje ne bi ugasilo (W=watt)" + }, + "PowerPulseWait": { + "text2": [ + "Interval per.", + "pulsa nap." + ], + "desc": "Razmak periodičkih pulseva koje lemilica povlači kako se USB napajanje ne bi ugasilo (x 2.5s)" + }, + "PowerPulseDuration": { + "text2": [ + "Trajanje per.", + "pulsa nap." + ], + "desc": "Trajanje periodičkog pulsa kojega lemilica povlači kako se USB napajanje ne bi ugasilo (x 250ms)" + }, + "SettingsReset": { + "text2": [ + "Tvorničke", + "postavke" + ], + "desc": "Vraćanje svih postavki na tvorničke vrijednosti" + }, + "LanguageSwitch": { + "text2": [ + "Jezik:", + " HR Hrvatski" + ], + "desc": "" + } + } +} \ No newline at end of file diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json index 16fb63b8..12f3419e 100644 --- a/Translations/translation_HU.json +++ b/Translations/translation_HU.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "F", "SettingStartSleepChar": "A", "SettingStartSleepOffChar": "Sz", - "SettingSensitivityOff": "0", - "SettingSensitivityLow": "A", - "SettingSensitivityMedium": "K", - "SettingSensitivityHigh": "M", "SettingLockDisableChar": "K", "SettingLockBoostChar": "B", "SettingLockFullChar": "T" diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json index 79182ea8..89a0e78f 100644 --- a/Translations/translation_IT.json +++ b/Translations/translation_IT.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "S", "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "A", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "B", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "A", "SettingLockDisableChar": "D", "SettingLockBoostChar": "T", "SettingLockFullChar": "C" diff --git a/Translations/translation_JA_JP.json b/Translations/translation_JA_JP.json index d436af80..ec178893 100755 --- a/Translations/translation_JA_JP.json +++ b/Translations/translation_JA_JP.json @@ -38,10 +38,6 @@ "SettingStartSolderingChar": "熱", "SettingStartSleepChar": "待", "SettingStartSleepOffChar": "室", - "SettingSensitivityOff": "×", - "SettingSensitivityLow": "低", - "SettingSensitivityMedium": "中", - "SettingSensitivityHigh": "高", "SettingLockDisableChar": "×", "SettingLockBoostChar": "ブ", "SettingLockFullChar": "全" diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json index 04ac9ed8..0b328c37 100644 --- a/Translations/translation_LT.json +++ b/Translations/translation_LT.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "T", "SettingStartSleepChar": "M", "SettingStartSleepOffChar": "K", - "SettingSensitivityOff": "I", - "SettingSensitivityLow": "Ž", - "SettingSensitivityMedium": "V", - "SettingSensitivityHigh": "A", "SettingLockDisableChar": "I", "SettingLockBoostChar": "T", "SettingLockFullChar": "V" diff --git a/Translations/translation_NB.json b/Translations/translation_NB.json index 43b3010e..175ade83 100644 --- a/Translations/translation_NB.json +++ b/Translations/translation_NB.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "L", "SettingStartSleepChar": "D", "SettingStartSleepOffChar": "R", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", "SettingLockFullChar": "F" diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json index db38745d..7de18816 100644 --- a/Translations/translation_NL.json +++ b/Translations/translation_NL.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "G", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "B", - "SettingSensitivityOff": "U", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "G", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "U", "SettingLockBoostChar": "B", "SettingLockFullChar": "V" diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json index 8201db73..75151c19 100644 --- a/Translations/translation_NL_BE.json +++ b/Translations/translation_NL_BE.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "K", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", "SettingLockFullChar": "F" diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json index 745abb19..82eb53d3 100644 --- a/Translations/translation_PL.json +++ b/Translations/translation_PL.json @@ -17,8 +17,8 @@ }, "messagesWarn": { "CJCCalibrationDone": [ - "Calibration", - "done!" + "Kalibracja", + "wykonana!" ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "T", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "O", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "N", - "SettingSensitivityMedium": "Ś", - "SettingSensitivityHigh": "W", "SettingLockDisableChar": "W", "SettingLockBoostChar": "B", "SettingLockFullChar": "P" @@ -293,7 +289,7 @@ "Kalibracja temperatury", "przy następnym uruchomieniu" ], - "desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)" + "desc": "Kalibracja temperatury przy następnym włączeniu (nie jest wymagana, jeśli różnica temperatur jest mniejsza niż 5°C" }, "VoltageCalibration": { "text2": [ diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json index e4cee4be..7bd4a341 100644 --- a/Translations/translation_PT.json +++ b/Translations/translation_PT.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "S", "SettingStartSleepChar": "H", "SettingStartSleepOffChar": "A", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", "SettingLockFullChar": "F" diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json index 6deb9dda..a19613da 100644 --- a/Translations/translation_RO.json +++ b/Translations/translation_RO.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "S", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "R", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", "SettingLockFullChar": "F" diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index 3e56af03..2907b776 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -17,8 +17,8 @@ }, "messagesWarn": { "CJCCalibrationDone": [ - "Calibration", - "done!" + "Калибровка", + "завершена!" ], "ResetOKMessage": "Сброс OK", "SettingsResetMessage": [ @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "П", "SettingStartSleepChar": "О", "SettingStartSleepOffChar": "К", - "SettingSensitivityOff": "О", - "SettingSensitivityLow": "Н", - "SettingSensitivityMedium": "С", - "SettingSensitivityHigh": "В", "SettingLockDisableChar": "О", "SettingLockBoostChar": "Т", "SettingLockFullChar": "П" @@ -167,14 +163,14 @@ "Чувствительн.", "акселерометра" ], - "desc": "Чувствительность акселерометра (0=Выкл. | 1=Мин. | ... | 9=Макс.)" + "desc": "Чувствительность акселерометра (0=Выкл. | 1=мин. | ... | 9=макс.)" }, "SleepTemperature": { "text2": [ "Темп.", "ожидания" ], - "desc": "Температура режима ожидания" + "desc": "Температура жала в режиме ожидания" }, "SleepTimeout": { "text2": [ @@ -188,21 +184,21 @@ "Таймаут", "выключения" ], - "desc": "Время до отключения паяльника (Минуты)" + "desc": "Время до выключения паяльника (минуты)" }, "HallEffSensitivity": { "text2": [ "Датчик", "Холла" ], - "desc": "Чувствительность датчика Холла к переходу в спящий режим (0=Выкл. | 1=Мин. | ... | 9=Макс.)" + "desc": "Чувствительность датчика Холла к переходу в спящий режим (0=Выкл. | 1=мин. | ... | 9=макс.)" }, "TemperatureUnit": { "text2": [ "Единицы", "температуры" ], - "desc": "Единицы измерения температуры (C=Цельcия | F=Фаренгейта)" + "desc": "Единицы измерения температуры (C=°Цельcия | F=°Фаренгейта)" }, "DisplayRotation": { "text2": [ @@ -227,10 +223,10 @@ }, "ReverseButtonTempChange": { "text2": [ - "Инвертировать", - "кнопки" + "Поменять", + "кнопки+-" ], - "desc": "Инвертировать кнопки изменения температуры" + "desc": "Поменять кнопки изменения температуры" }, "AnimSpeed": { "text2": [ @@ -293,7 +289,7 @@ "Калибровка", "температуры" ], - "desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)" + "desc": "Калибровка температуры (CJC) при следующем включении (не требуется при разнице менее 5°C)" }, "VoltageCalibration": { "text2": [ @@ -338,4 +334,4 @@ "desc": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json index ad6bfd7d..da2545c3 100644 --- a/Translations/translation_SK.json +++ b/Translations/translation_SK.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "Z", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "I", - "SettingSensitivityOff": "Z", - "SettingSensitivityLow": "N", - "SettingSensitivityMedium": "S", - "SettingSensitivityHigh": "V", "SettingLockDisableChar": "Z", "SettingLockBoostChar": "B", "SettingLockFullChar": "P" diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json index 3f259a56..a4bd973a 100644 --- a/Translations/translation_SL.json +++ b/Translations/translation_SL.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "S", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "V", - "SettingSensitivityOff": "U", - "SettingSensitivityLow": "N", - "SettingSensitivityMedium": "S", - "SettingSensitivityHigh": "V", "SettingLockDisableChar": "O", "SettingLockBoostChar": "L", "SettingLockFullChar": "P" diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json index c268f8c2..85bc7856 100644 --- a/Translations/translation_SR_CYRL.json +++ b/Translations/translation_SR_CYRL.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "Л", "SettingStartSleepChar": "С", "SettingStartSleepOffChar": "X", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", "SettingLockFullChar": "F" diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json index 6416e085..fbb17932 100644 --- a/Translations/translation_SR_LATN.json +++ b/Translations/translation_SR_LATN.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "L", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "X", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", "SettingLockFullChar": "F" diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json index 6680841a..c413a104 100644 --- a/Translations/translation_SV.json +++ b/Translations/translation_SV.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "L", "SettingStartSleepChar": "V", "SettingStartSleepOffChar": "R", - "SettingSensitivityOff": "A", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "A", "SettingLockBoostChar": "T", "SettingLockFullChar": "F" diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json index 0a63c7dd..08ccae16 100644 --- a/Translations/translation_TR.json +++ b/Translations/translation_TR.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "L", "SettingStartSleepChar": "U", "SettingStartSleepOffChar": "S", - "SettingSensitivityOff": "K", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "O", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "K", "SettingLockBoostChar": "B", "SettingLockFullChar": "F" diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index fc9f297f..529aed04 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "П", "SettingStartSleepChar": "О", "SettingStartSleepOffChar": "К", - "SettingSensitivityOff": "В", - "SettingSensitivityLow": "Н", - "SettingSensitivityMedium": "С", - "SettingSensitivityHigh": "М", "SettingLockDisableChar": "В", "SettingLockBoostChar": "Т", "SettingLockFullChar": "П" diff --git a/Translations/translation_VI.json b/Translations/translation_VI.json index 67bf683f..c183a826 100644 --- a/Translations/translation_VI.json +++ b/Translations/translation_VI.json @@ -53,10 +53,6 @@ "SettingStartSolderingChar": "S", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "R", - "SettingSensitivityOff": "O", - "SettingSensitivityLow": "L", - "SettingSensitivityMedium": "M", - "SettingSensitivityHigh": "H", "SettingLockDisableChar": "D", "SettingLockBoostChar": "B", "SettingLockFullChar": "F" diff --git a/Translations/translation_YUE_HK.json b/Translations/translation_YUE_HK.json index 8a343953..fb42ebdd 100644 --- a/Translations/translation_YUE_HK.json +++ b/Translations/translation_YUE_HK.json @@ -38,10 +38,6 @@ "SettingStartSolderingChar": "焊", "SettingStartSleepChar": "待", "SettingStartSleepOffChar": "室", - "SettingSensitivityOff": "關", - "SettingSensitivityLow": "低", - "SettingSensitivityMedium": "中", - "SettingSensitivityHigh": "高", "SettingLockDisableChar": "無", "SettingLockBoostChar": "增", "SettingLockFullChar": "全" diff --git a/Translations/translation_ZH_CN.json b/Translations/translation_ZH_CN.json index a005fa84..db7133c0 100644 --- a/Translations/translation_ZH_CN.json +++ b/Translations/translation_ZH_CN.json @@ -38,10 +38,6 @@ "SettingStartSolderingChar": "焊", "SettingStartSleepChar": "待", "SettingStartSleepOffChar": "室", - "SettingSensitivityOff": "关", - "SettingSensitivityLow": "低", - "SettingSensitivityMedium": "中", - "SettingSensitivityHigh": "高", "SettingLockDisableChar": "无", "SettingLockBoostChar": "增", "SettingLockFullChar": "全" diff --git a/Translations/translation_ZH_TW.json b/Translations/translation_ZH_TW.json index 1f2ab233..0b8c5fc9 100644 --- a/Translations/translation_ZH_TW.json +++ b/Translations/translation_ZH_TW.json @@ -38,10 +38,6 @@ "SettingStartSolderingChar": "焊", "SettingStartSleepChar": "待", "SettingStartSleepOffChar": "室", - "SettingSensitivityOff": "關", - "SettingSensitivityLow": "低", - "SettingSensitivityMedium": "中", - "SettingSensitivityHigh": "高", "SettingLockDisableChar": "無", "SettingLockBoostChar": "增", "SettingLockFullChar": "全" diff --git a/Translations/translations_def.js b/Translations/translations_def.js index c9f89af1..dae40ac6 100644 --- a/Translations/translations_def.js +++ b/Translations/translations_def.js @@ -107,9 +107,9 @@ var def = /// "description": "Shown for automatic display rotation." }, { - "id": "SettingFastChar", + "id": "SettingOffChar", "len": 1, - "description": "Shown when a setting is set to a fast value i.e. animation speed" + "description": "Shown when a setting is turned off" }, { "id": "SettingSlowChar", @@ -122,9 +122,14 @@ var def = /// "description": "Shown when a setting is set to a medium value i.e. animation speed" }, { - "id": "SettingOffChar", + "id": "SettingFastChar", "len": 1, - "description": "Shown when a setting is turned off" + "description": "Shown when a setting is set to a fast value i.e. animation speed" + }, + { + "id": "SettingStartNoneChar", + "len": 1, + "description": "Shown when autostart state is to do nothing and go to a normal boot" }, { "id": "SettingStartSolderingChar", @@ -141,31 +146,6 @@ var def = /// "len": 1, "description": "Shown when the auto start state is set to go to an off state, but on movement wake into soldering mode." }, - { - "id": "SettingStartNoneChar", - "len": 1, - "description": "Shown when autostart state is to do nothing and go to a normal boot" - }, - { - "id": "SettingSensitivityOff", - "len": 1, - "description": "Shown when a sensitivity (hall effect sensor) is disabled. Turning off the sensor." - }, - { - "id": "SettingSensitivityLow", - "len": 1, - "description": "Shown when a sensitivity (hall effect) is not very sensitive" - }, - { - "id": "SettingSensitivityMedium", - "len": 1, - "description": "Shown when a sensitivity (hall effect) is average sensitive" - }, - { - "id": "SettingSensitivityHigh", - "len": 1, - "description": "Shown when a sensitivity (hall effect) is highly sensitive" - }, { "id": "SettingLockDisableChar", "len": 1, diff --git a/source/Core/BSP/Miniware/ThermoModel.cpp b/source/Core/BSP/Miniware/ThermoModel.cpp index 1b04bd5f..25376d4e 100644 --- a/source/Core/BSP/Miniware/ThermoModel.cpp +++ b/source/Core/BSP/Miniware/ThermoModel.cpp @@ -125,6 +125,6 @@ const int32_t uVtoDegC[] = { 38137, 500, // }; #endif -const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(uint16_t)); +const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(uVtoDegC[0])); uint32_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) { return Utils::InterpolateLookupTable(uVtoDegC, uVtoDegCItems, tipuVDelta); } diff --git a/source/Core/BSP/Pinecil/BSP.cpp b/source/Core/BSP/Pinecil/BSP.cpp index fa7cb267..5bac313d 100644 --- a/source/Core/BSP/Pinecil/BSP.cpp +++ b/source/Core/BSP/Pinecil/BSP.cpp @@ -72,10 +72,7 @@ void unstick_I2C() { uint8_t getButtonA() { return (gpio_input_bit_get(KEY_A_GPIO_Port, KEY_A_Pin) == SET) ? 1 : 0; } uint8_t getButtonB() { return (gpio_input_bit_get(KEY_B_GPIO_Port, KEY_B_Pin) == SET) ? 1 : 0; } -void reboot() { - // Spin for watchdog - for (;;) {} -} +void reboot() { eclic_system_reset(); } void delay_ms(uint16_t count) { delay_1ms(count); } uint32_t __get_IPSR(void) { diff --git a/source/Core/BSP/Pinecil/ThermoModel.cpp b/source/Core/BSP/Pinecil/ThermoModel.cpp index 846a0a00..fa2cd65d 100644 --- a/source/Core/BSP/Pinecil/ThermoModel.cpp +++ b/source/Core/BSP/Pinecil/ThermoModel.cpp @@ -67,6 +67,6 @@ const int32_t uVtoDegC[] = { }; #endif -const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(uint16_t)); +const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(uVtoDegC[0])); uint32_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) { return Utils::InterpolateLookupTable(uVtoDegC, uVtoDegCItems, tipuVDelta); } diff --git a/source/Core/BSP/Pinecilv2/BSP.cpp b/source/Core/BSP/Pinecilv2/BSP.cpp index 0df95956..eb996bd8 100644 --- a/source/Core/BSP/Pinecilv2/BSP.cpp +++ b/source/Core/BSP/Pinecilv2/BSP.cpp @@ -126,8 +126,7 @@ uint8_t getButtonB() { } void reboot() { - // Spin for watchdog - for (;;) {} + hal_system_reset(); } void delay_ms(uint16_t count) { diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h index c658f63b..28bffb08 100644 --- a/source/Core/Inc/Translation.h +++ b/source/Core/Inc/Translation.h @@ -99,18 +99,14 @@ struct TranslationIndexTable { uint16_t SettingRightChar; uint16_t SettingLeftChar; uint16_t SettingAutoChar; - uint16_t SettingFastChar; + uint16_t SettingOffChar; uint16_t SettingSlowChar; uint16_t SettingMediumChar; - uint16_t SettingOffChar; + uint16_t SettingFastChar; + uint16_t SettingStartNoneChar; uint16_t SettingStartSolderingChar; uint16_t SettingStartSleepChar; uint16_t SettingStartSleepOffChar; - uint16_t SettingStartNoneChar; - uint16_t SettingSensitivityOff; - uint16_t SettingSensitivityLow; - uint16_t SettingSensitivityMedium; - uint16_t SettingSensitivityHigh; uint16_t SettingLockDisableChar; uint16_t SettingLockBoostChar; uint16_t SettingLockFullChar; diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index 048d9212..149f8043 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -71,7 +71,7 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp {1, POWER_PULSE_WAIT_MAX, 1, POWER_PULSE_WAIT_DEFAULT}, // KeepAwakePulseWait {1, POWER_PULSE_DURATION_MAX, 1, POWER_PULSE_DURATION_DEFAULT}, // KeepAwakePulseDuration {360, 900, 1, VOLTAGE_DIV}, // VoltageDiv - {MIN_TEMP_C, MAX_TEMP_F, 10, BOOST_TEMP}, // BoostTemp + {0, MAX_TEMP_F, 10, BOOST_TEMP}, // BoostTemp {MIN_CALIBRATION_OFFSET, 2500, 1, CALIBRATION_OFFSET}, // CalibrationOffset {0, MAX_POWER_LIMIT, POWER_LIMIT_STEPS, POWER_LIMIT}, // PowerLimit {0, 1, 1, REVERSE_BUTTON_TEMP_CHANGE}, // ReverseButtonTempChangeEnabled diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp index a5b79656..71612d36 100644 --- a/source/Core/Src/settingsGUI.cpp +++ b/source/Core/Src/settingsGUI.cpp @@ -682,6 +682,7 @@ static bool setCalibrateVIN(void) { case BUTTON_F_LONG: case BUTTON_B_LONG: saveSettings(); + OLED::clearScreen(); OLED::setCursor(0, 0); OLED::printNumber(getSettingValue(SettingsOptions::VoltageDiv), 3, FontStyle::LARGE); OLED::refresh(); @@ -719,7 +720,8 @@ static void displayPowerPulseDuration(void) { OLED::printNumber(getSettingValue( static bool setResetSettings(void) { if (userConfirmation(translatedString(Tr->SettingsResetWarning))) { resetSettings(); - warnUser(translatedString(Tr->ResetOKMessage), 10 * TICKS_SECOND); + warnUser(translatedString(Tr->ResetOKMessage), 3 * TICKS_SECOND); + reboot(); } return false; } diff --git a/source/Core/Threads/OperatingModes/HomeScreen.cpp b/source/Core/Threads/OperatingModes/HomeScreen.cpp index 0f9182bd..6ce4116a 100644 --- a/source/Core/Threads/OperatingModes/HomeScreen.cpp +++ b/source/Core/Threads/OperatingModes/HomeScreen.cpp @@ -186,7 +186,7 @@ void drawHomeScreen(bool buttonLockout) { // If we have a tip connected draw the temp, if not we leave it blank if (!tipDisconnectedDisplay) { // draw in the temp - if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 260 < 160))) + if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) gui_drawTipTemp(false, FontStyle::LARGE); // draw in the temp } else { // Draw in missing tip symbol @@ -210,4 +210,4 @@ void drawHomeScreen(bool buttonLockout) { GUIDelay(); } } -} \ No newline at end of file +}