Compare commits

...

53 Commits

Author SHA1 Message Date
Leo
b9f57b29a2 Merge 0ede3ec687 into 40655a9501 2025-02-25 22:01:44 +01:00
Leska
40655a9501 Updated Overall French Translations (#2085)
Some checks failed
Docs / deploy-docs (push) Has been cancelled
CI / build (MHP30) (push) Has been cancelled
CI / build (Pinecil) (push) Has been cancelled
CI / build (Pinecilv2) (push) Has been cancelled
CI / build (S60) (push) Has been cancelled
CI / build (S60P) (push) Has been cancelled
CI / build (T55) (push) Has been cancelled
CI / build (TS100) (push) Has been cancelled
CI / build (TS101) (push) Has been cancelled
CI / build (TS80) (push) Has been cancelled
CI / build (TS80P) (push) Has been cancelled
CI / build_multi-lang (Pinecil) (push) Has been cancelled
CI / build_multi-lang (Pinecilv2) (push) Has been cancelled
CI / tests (push) Has been cancelled
CI / check_c-cpp (push) Has been cancelled
CI / check_python (push) Has been cancelled
CI / check_shell (push) Has been cancelled
CI / check_docs (push) Has been cancelled
CI / upload_metadata (push) Has been cancelled
* Updated French translation.

* Updated

* Update Translations/translation_FR.json (discip)

Co-authored-by: discip <53649486+discip@users.noreply.github.com>

* added missing options

For some reason the following options were missing:
* Cool Down Blink
* Reverse Temp Change Buttons

* Update translation_FR.json

* Update translation_FR.json

---------

Co-authored-by: discip <53649486+discip@users.noreply.github.com>
2025-02-25 18:09:15 +01:00
Ivan Zorin
0ede3ec687 Translation.h: reorder items in SettingsItemIndex properly and add the comment 2025-02-17 20:46:29 +03:00
Ivan Zorin
362713ae56 Translations: clarify the description of the option 2025-02-17 20:00:07 +03:00
Ivan Zorin
768668d78b Refactoring: Buttons - rename revert to swapButtonMenu 2025-02-17 19:50:03 +03:00
Ivan Zorin
d78dcb471d Refactoring: clang-format for comments in settings struct 2025-02-17 19:33:46 +03:00
Ivan Zorin
a7985095ff Refactoring: replace variables with one-letter names 2025-02-17 19:21:34 +03:00
Ivan Zorin
035f3dd205 Refactoring: trying to find a more suitable variable name to check status if swap buttons in menu is enabled 2025-02-17 19:13:48 +03:00
Ivan Zorin
432b583d89 translations_definitions.json: ReverseButtonMenu - extend description a bit 2025-02-17 18:39:00 +03:00
Ivan Zorin
0bd84d9d57 Refactoring: REVERSE_BUTTON_MENU handling and unify comment/section style in configuration.h files for related changes 2025-02-17 18:37:28 +03:00
Ivan Zorin
7e57184b65 Refactoring: unify the names of the variables related to ReverseButtonMenu handling and add the option to the end of the settings struct to avoid the collisions on factory resets 2025-02-17 18:20:55 +03:00
Ivan Zorin
726140d06f Translations/: rename ReverseButtonNav to ReverseButtonMenu 2025-02-17 18:04:59 +03:00
Ivan Zorin
883ef60935 Remove macro from configuration.h files 2025-02-17 17:57:06 +03:00
Ivan Zorin
0e703ca992 Sync 2025-02-12 23:41:35 +03:00
resistancelion
8b60290c7d Summary 2025-02-08 04:41:41 +02:00
Ivan Zorin
bfbd1a533b Sync 2025-02-08 03:35:59 +03:00
Ivan Zorin
904a25add0 Merge branch 'patch-2' of github.com:resistancelion/IronOS into rl-menubuttons 2025-02-07 05:21:36 +03:00
Ivan Zorin
893678797c Sync 2025-02-07 05:19:32 +03:00
resistancelion
ef8c9a6c20 style (6) 2025-01-30 18:49:30 +02:00
resistancelion
b6642ac01b style (5) 2025-01-30 18:47:44 +02:00
resistancelion
9993fc1a19 style(4) 2025-01-30 18:43:03 +02:00
resistancelion
79cb0b5d92 style(3) 2025-01-30 18:40:34 +02:00
resistancelion
5e78168c90 -style 2025-01-30 18:38:17 +02:00
resistancelion
157769b099 -style 2025-01-30 18:33:30 +02:00
resistancelion
e346a7793e Requested change
Now it flips buttons only in menu by default, however i need the other option, so i've added definition "REVERSE_NAV_EVERYWHERE"
2025-01-30 18:30:08 +02:00
resistancelion
68116f7de2 Revert "Reverse Settings.h" 2025-01-30 11:38:52 +02:00
resistancelion
b7bfa3f4cf Reverse Settings.h 2025-01-30 11:16:29 +02:00
Leo
0646c24b09 Code style (11th try) 2025-01-29 06:48:46 +02:00
Leo
248a7b5525 Code style (10th try) 2025-01-29 06:41:58 +02:00
Leo
f882f57b18 Style cleanup (9th try!!!) 2025-01-29 06:35:14 +02:00
Leo
8908c9d687 Style correction (8th TRY) 2025-01-29 06:28:14 +02:00
Leo
54d14b421c Style correction 2025-01-29 06:23:04 +02:00
Ivan Zorin
c8ef810450 translations_definitions.json: expand the description for ReverseButtonNav 2025-01-29 04:25:38 +03:00
Ivan Zorin
80479cc0f5 Translations/: replace tab by spaces for ReverseButtonNav according to code style 2025-01-29 04:22:08 +03:00
Ivan Zorin
759b74812a Sync 2025-01-29 03:12:38 +03:00
Leo
ce86d6594d Update draw_homescreen_simplified (128x32)
Drawer rework, should look ok but testing is required
2025-01-28 16:32:20 +02:00
Leo
b469179058 Update draw_homescreen_simplified.cpp
Code cleanup
2025-01-28 16:31:45 +02:00
Leo
24cb221443 Update draw_homescreen_simplified.cpp
Sorry
2025-01-28 15:50:27 +02:00
Leo
5e5f8581ea Update draw_homescreen_simplified.cpp
Is It fOrMaTtEd EnOuGh??
2025-01-28 15:47:46 +02:00
Leo
719dc6b14d Update draw_homescreen_simplified.cpp
meh(2)
2025-01-28 15:08:06 +02:00
Leo
0f60d737fc Update draw_homescreen_simplified.cpp
meh
2025-01-28 14:44:21 +02:00
Leo
1ed2299ce0 Update draw_homescreen_simplified.cpp
Style corrected
2025-01-28 14:42:24 +02:00
Leo
71551e6db5 Update draw_homescreen_simplified.cpp
Rework of 96x12 drawer, in order to support swapping of setting/heating hints
2025-01-28 14:32:34 +02:00
Leo
031a47c36f Update translation_UK.json
Removed falsefully duplicated entry
2025-01-28 12:41:11 +02:00
Leo
659fa48a05 Entirely moved button flipping to GUIIThread.cpp
I don't know is it better or worse, functions the same
2025-01-26 18:55:55 +02:00
Leo
dfce09413f Removed edits from TemperatureAdjust.cpp, so less code will have changes 2025-01-26 16:51:44 +02:00
Leo
c6cd6983fb Update code format in Settings.cpp 2025-01-26 16:38:13 +02:00
Leo
9546086a3a Merge branch 'dev' into patch-2 2025-01-26 16:33:19 +02:00
Leo
1fb84d5f50 Implemented switching A and B buttons, closing #2034
getButtonState() now have an option int/bool argument to swap the result via XOR
2025-01-26 05:03:46 +02:00
Leo
c229cec87f Update translation_UK.json
Unified a few more sentences to be suitable for a context

Fixed text size to better fit TS101/TS100
2025-01-26 02:35:40 +02:00
Leo
8f37b4cb80 Update translation_UK.json
Spelling corrected + replaced "temperature" with "t°" in few places
2025-01-25 14:59:12 +02:00
Leo
3fc762ce3b Update translation_UK.json
Fixed padding
2025-01-25 14:34:29 +02:00
Leo
4a26abd2c1 Update translation_UK.json
Unified statement to one type of translation ("Sleep mode" instead of "Waiting mode")
Corrected "blink" translation
Shortened phrases for statements ("t° у сек"/"градусів на секунду"; "сек"/"секунд","секунди"; "Хв"/"Хвилин","Хвилини")
Traslated soldering tip type selection menu
2025-01-25 06:21:00 +02:00
52 changed files with 386 additions and 209 deletions

View File

@@ -272,9 +272,13 @@
"description": "Хуткасць гартання тэксту (М=марудна | Х=хутка)"
},
"ReverseButtonTempChange": {
"displayText": "Інвертаваць\nкнопкі",
"displayText": "Інвертаваць\nкнопкі +/-",
"description": "Інвертаваць кнопкі вымярэння тэмпературы"
},
"ReverseButtonMenu": {
"displayText": "Інвертаваць\nкнопкі A/B",
"description": "Інвертаваць кнопкі навігацыі ў меню"
},
"AnimSpeed": {
"displayText": "Хуткасць\nанімацыі",
"description": "Хуткасць анімацыі гузікаў у галоўным меню (Мілісекунды) (Н=Нізкая | С=Сярэдняя | В=Высокая)"

View File

@@ -275,6 +275,10 @@
"displayText": "Размяна\nбутони +/-",
"description": "Обръщане на бутоните + и - за промяна на температурата на човка на поялника"
},
"ReverseButtonMenu": {
"displayText": "Размяна\nбутони А/В",
"description": "Обръщане бутоните А и В за навигация в менютата"
},
"AnimSpeed": {
"displayText": "Скорост на\nанимацията",
"description": "Скорост на анимация на иконата в главното меню (Н=Ниска | C=Средна | B=Висока)"

View File

@@ -275,6 +275,10 @@
"displayText": "Prohodit\ntl. +-?",
"description": "Prohodit tlačítka pro změnu teploty"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\nrychlost",
"description": "Tempo animace ikon v menu (P=pomalu | S=středně | R=rychle)"

View File

@@ -275,6 +275,10 @@
"displayText": "Skift\n+ - tasterne",
"description": "Skift tildeling af knapper til temperaturjustering"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\nHastighed",
"description": "Hastigheden for ikonanimationer i menuen (S=langsomt | M=medium | F=hurtigt)"

View File

@@ -275,6 +275,10 @@
"displayText": "+- Tasten\numkehren",
"description": "Tastenbelegung zur Temperaturänderung umkehren"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\nGeschw.",
"description": "Geschwindigkeit der Icon-Animationen im Menü (L=langsam | M=mittel | S=schnell)"

View File

@@ -275,6 +275,10 @@
"displayText": "Αντιστροφή\nπλήκτρων + -",
"description": "Αντιστροφή διάταξης πλήκτρων στη ρύθμιση θερμοκρασίας"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Ταχύτητα\nκιν. εικονιδ.",
"description": "Ρυθμός κίνησης εικονιδίων στο μενού (Α=αργός | Μ=μέτριος | Γ=γρήγορος)"

View File

@@ -272,9 +272,13 @@
"description": "Scrolling speed of info text (S=slow | F=fast)"
},
"ReverseButtonTempChange": {
"displayText": "Swap\n+ - keys",
"displayText": "Swap\n+/- keys",
"description": "Reverse assignment of buttons for temperature adjustment"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\nspeed",
"description": "Pace of icon animations in menu (S=slow | M=medium | F=fast)"

View File

@@ -275,6 +275,10 @@
"displayText": "Invertir\nbotones +/-",
"description": "Invertir botones de ajuste de temperatura"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\nvelocidad",
"description": "Velocidad de animaciones de iconos en el menú (L=baja | M=media | R=alta)"

View File

@@ -275,6 +275,10 @@
"displayText": "Vaheta\n+ - nupud",
"description": "Temperatuurinuppude asukohtade vahetus"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\nkiirus",
"description": "Menüüikoonide animatsiooni kiirus (A=aeglane | K=keskmine | T=tempokas)"

View File

@@ -275,6 +275,10 @@
"displayText": "Suunnanvaihto\n+ - näppäimille",
"description": "Lämpötilapainikkeiden suunnan vaihtaminen"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Animaation\nnopeus",
"description": "Animaatioiden nopeus valikossa (A=alhainen | K=keskiverto | S=suuri)"

View File

@@ -4,7 +4,7 @@
"tempUnitFahrenheit": false,
"messagesWarn": {
"CalibrationDone": {
"message": "Étalonnage\nterminé!"
"message": "Étalonnage\nterminé !"
},
"ResetOKMessage": {
"message": "Reset OK"
@@ -19,37 +19,37 @@
"message": "USB-PD\nnon détecté !"
},
"LockingKeysString": {
"message": "VERROUIL"
"message": "VERROUIL"
},
"UnlockingKeysString": {
"message": "DEVERROU"
"message": "DEVERROUILLÉ"
},
"WarningKeysLockedString": {
"message": "! VERR. !"
},
"WarningThermalRunaway": {
"message": "Emballement\nthermique"
"message": "Surchauffe\ncritique"
},
"WarningTipShorted": {
"message": "!Tip Shorted!"
"message": "!Court-circuit Panne!"
},
"SettingsCalibrationWarning": {
"message": "Avant de redémarrer, assurez-vous que la panne et la poignée sont à température ambiante !"
},
"CJCCalibrating": {
"message": "Etalonnage\n"
"message": "Étalonnage\n"
},
"SettingsResetWarning": {
"message": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs par défaut ?"
},
"UVLOWarningString": {
"message": "DC FAIBL"
"message": "TENSION FAIBLE"
},
"UndervoltageString": {
"message": "Sous-tension\n"
},
"InputVoltageString": {
"message": "V d'entrée: \n"
"message": "Tension d'entrée:\n"
},
"SleepingAdvancedString": {
"message": "En veille...\n"
@@ -58,10 +58,10 @@
"message": "Panne: \n"
},
"ProfilePreheatString": {
"message": "Preheat\n"
"message": "Préchauffage\n"
},
"ProfileCooldownString": {
"message": "Cooldown\n"
"message": "Refroidissement\n"
},
"DeviceFailedValidationWarning": {
"message": "Votre appareil semble être une contrefaçon !"
@@ -107,22 +107,22 @@
},
"menuValues": {
"USBPDModeDefault": {
"displayText": "Default\nMode"
"displayText": "Mode\npar Défaut"
},
"USBPDModeNoDynamic": {
"displayText": "No\nDynamic"
"displayText": "Non\nDynamique"
},
"USBPDModeSafe": {
"displayText": "Safe\nMode"
"displayText": "Mode\nSafe"
},
"TipTypeAuto": {
"displayText": "Auto\nSense"
"displayText": "Détéction\nAuto."
},
"TipTypeT12Long": {
"displayText": "TS100\nLong"
},
"TipTypeT12Short": {
"displayText": "Pine\nShort"
"displayText": "Pine\nCourt"
},
"TipTypeT12PTS": {
"displayText": "PTS\n200"
@@ -137,11 +137,11 @@
"menuOptions": {
"DCInCutoff": {
"displayText": "Source\nd'alim.",
"description": "Source d'alimentation. Règle la tension de coupure (DC 10V) (S 3.3V par cellules, désactive la limite de puissance)"
"description": "Source d'alimentation. Définit la tension de coupure (DC 10V) (S 3.3V par cellule, désactive la limite de puissance)"
},
"MinVolCell": {
"displayText": "Tension\nminimale",
"description": "Tension minimale autorisée par cellule (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
"description": "Tension minimale autorisée par cellule (3S : 3 - 3.7V | 4-6S : 2.4 - 3.7V)"
},
"QCMaxVoltage": {
"displayText": "Tension\nQC",
@@ -149,18 +149,18 @@
},
"PDNegTimeout": {
"displayText": "Délai\nexpir. PD",
"description": "Délai de la negociation PD par étapes de 100ms pour la compatiblité avec certains chargeurs QC"
"description": "Délai de gociation PD par paliers de 100ms pour la compatibilité avec certains chargeurs QC"
},
"USBPDMode": {
"displayText": "PD\nMode",
"description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
"displayText": "Mode\nPD",
"description": "Aucune dynamique ne désactive EPR & PPS, le mode sécurisé n'utilise pas de résistance de protection"
},
"BoostTemperature": {
"displayText": "Temp.\nboost",
"description": "Température utilisée en \"mode boost\""
},
"AutoStart": {
"displayText": "Chauffer au\ndémarrage",
"displayText": "Chauffer audémarrage",
"description": "A=activé | V=mode veille | O=mode veille à température ambiante"
},
"TempChangeShortStep": {
@@ -177,23 +177,23 @@
},
"ProfilePhases": {
"displayText": "Profile\nPhases",
"description": "Number of phases in profile mode"
"description": "Nombre de phases dans le mode de profile"
},
"ProfilePreheatTemp": {
"displayText": "Preheat\nTemp",
"description": "Preheat to this temperature at the start of profile mode"
"displayText": "Temp.\nPréchauffage",
"description": "Préchauffer à cette température au début du mode de profile"
},
"ProfilePreheatSpeed": {
"displayText": "Preheat\nSpeed",
"description": "Preheat at this rate (degrees per second)"
"displayText": "Vitesse\nPréchauffage",
"description": "Préchauffer à cette vitesse (degrés par seconde)"
},
"ProfilePhase1Temp": {
"displayText": "Phase 1\nTemp",
"description": "Target temperature for the end of this phase"
"displayText": "Temp.\nPhase 1",
"description": "Température séléctionnée pour la fin de cette phase"
},
"ProfilePhase1Duration": {
"displayText": "Phase 1\nDuration",
"description": "Target duration of this phase (seconds)"
"displayText": "Durée\nPhase 1",
"description": "Durée séléctionnée pour cette phase (secondes)"
},
"ProfilePhase2Temp": {
"displayText": "Phase 2\nTemp",
@@ -228,12 +228,12 @@
"description": ""
},
"ProfileCooldownSpeed": {
"displayText": "Cooldown\nSpeed",
"description": "Cooldown at this rate at the end of profile mode (degrees per second)"
"displayText": "Vitesse de\nRefroidissement",
"description": "Refroidissement à ce rythme à la fin du mode profil (degrés par seconde)"
},
"MotionSensitivity": {
"displayText": "Sensibilité\nau mouvement",
"description": "1=peu sensible | ... | 9=très sensible"
"description": "1=très peu sensible | ... | 9=extrêmement sensible"
},
"SleepTemperature": {
"displayText": "Temp.\nveille",
@@ -252,15 +252,15 @@
"description": "Sensibilité du capteur à effet Hall pour la mise en veille (1=peu sensible | ... | 9=très sensible)"
},
"HallEffSleepTimeout": {
"displayText": "HallSensor\nSleepTime",
"displayText": "TempsVeille\nCapteurHall",
"description": "Intervalle avant le démarrage du \"mode veille\" lorsque l'effet Hall est supérieur au seuil"
},
"TemperatureUnit": {
"displayText": "Unité de\ntempérature",
"displayText": "Unité de température",
"description": "C=Celsius | F=Fahrenheit"
},
"DisplayRotation": {
"displayText": "Orientation\nde l'écran",
"displayText": "Orientation de l'écran",
"description": "D=droitier | G=gaucher | A=automatique"
},
"CooldownBlink": {
@@ -268,15 +268,19 @@
"description": "Faire clignoter la température lors du refroidissement tant que la panne est chaude"
},
"ScrollingSpeed": {
"displayText": "Vitesse de\ndéfilement",
"displayText": "Vitesse de défilement",
"description": "Vitesse de défilement du texte (R=rapide | L=lent)"
},
"ReverseButtonTempChange": {
"displayText": "Inverser les\ntouches + -",
"displayText": "Inverser les\ntouches +/-",
"description": "Inverser les boutons d'ajustement de température"
},
"ReverseButtonMenu": {
"displayText": "Inverser les\ntouches A/B",
"description": "Inverser les boutons de navigation du menu"
},
"AnimSpeed": {
"displayText": "Vitesse\nanim. icônes",
"displayText": "Vitesse anim. icônes",
"description": "Vitesse des animations des icônes dans le menu (L=lente | M=moyenne | R=rapide)"
},
"AnimLoop": {
@@ -340,8 +344,8 @@
"description": ""
},
"SolderingTipType": {
"displayText": "Soldering\nTip Type",
"description": "Select the tip type fitted"
"displayText": "Soudure\nType de panne",
"description": "Séléctionner le type de panne utilisé"
}
}
}

View File

@@ -275,6 +275,10 @@
"displayText": "Zamjena\n+ - tipki",
"description": "Zamjenjuje funkciju gornje i donje tipke za podešavanje temperature"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Brzina\nanimacije",
"description": "Brzina animacije ikona u menijima (S=sporo | M=srednje | B=brzo)"

View File

@@ -275,6 +275,10 @@
"displayText": "+/- gomb\nmegfordítása",
"description": "Forrasztó hegy hőmérsékletállító gombok felcserélése"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Animáció\nsebessége",
"description": "Menüikonok animációjának sebessége (L=lassú | K=közepes | Gy=gyors)"

View File

@@ -272,9 +272,13 @@
"description": "Imposta la velocità di scorrimento del testo [L: lenta; V: veloce]"
},
"ReverseButtonTempChange": {
"displayText": "Inversione\ntasti",
"displayText": "Inversione\ntasti +/-",
"description": "Inverti i tasti per aumentare o diminuire la temperatura della punta"
},
"ReverseButtonMenu": {
"displayText": "Inversione\ntasti A/B",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Velocità\nanimazioni",
"description": "Imposta la velocità di riproduzione delle animazioni del menù principale [L: lenta; M: media; V: veloce]"

View File

@@ -275,6 +275,10 @@
"displayText": "キー入れ替え",
"description": "温度設定時に+ボタンと-ボタンを入れ替える"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "動画の速度",
"description": "メニューアイコンのアニメーションの速さ <遅=低速 | 中=中速 | 速=高速>"

View File

@@ -275,6 +275,10 @@
"displayText": "Sukeisti + -\nmygtukus?",
"description": "Sukeisti + - temperatūros keitimo mygtukus vietomis"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Animacijų\ngreitis",
"description": "Paveiksliukų animacijų greitis meniu punktuose (L=Lėtas | V=Vidutinis | G=Greitas)"

View File

@@ -275,6 +275,10 @@
"displayText": "Bytt\n+ - kn.",
"description": "Bytt om på knappene for å stille temperatur"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\nhastighet",
"description": "Hastigheten til animasjonene i menyen (S=slow | M=medium | F=fast)"

View File

@@ -275,6 +275,10 @@
"displayText": "Wissel\n+ - knoppen",
"description": "Wissel de knoppen voor temperatuur controle om"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\nsnelheid",
"description": "Snelheid van de icoon animaties in het menu (Langzaam | Middel | Snel)"

View File

@@ -275,6 +275,10 @@
"displayText": "Wissel\n+ - knoppen",
"description": "Wissel de knoppen voor temperatuur controle"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\nsnelheid",
"description": "Snelheid van de icoon animaties in het menu (T=sloom | M=middel | S=snel)"

View File

@@ -272,9 +272,13 @@
"description": "Szybkość przewijania tekstu"
},
"ReverseButtonTempChange": {
"displayText": "Zamień przyc.\n+ -",
"displayText": "Zamień przyc.\n+/-",
"description": "Zamienia działanie przycisków zmiany temperatury grotu"
},
"ReverseButtonMenu": {
"displayText": "Zamień przyc.\nA/B",
"description": "Zamienia działanie przycisków nawigacyjne menu"
},
"AnimSpeed": {
"displayText": "Prędkosć\nanimacji",
"description": "Prędkość animacji ikon w menu (W: mała | M: średnia | S: duża)"

View File

@@ -272,9 +272,13 @@
"description": "Velocidade a que o texto de ajuda é apresentado"
},
"ReverseButtonTempChange": {
"displayText": "Trocar\nbotões + -",
"displayText": "Trocar\nbotões +/-",
"description": "Inverte o funcionamento dos botões de ajuste da temperatura"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Velocidade\nde animação",
"description": "Velocidade das animações no menu (S=lenta | M=média | F=rápida)"

View File

@@ -272,9 +272,13 @@
"description": "Viteză derulare text cu informatii la (S=lent | F=rapid)"
},
"ReverseButtonTempChange": {
"displayText": "Inversare\n+ - butoane",
"displayText": "Inversare\n+/- butoane",
"description": "Inversarea butoanelor de reglare a temperaturii"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Animaţii\nviteză",
"description": "Ritmul animaţiilor pictogramei din meniu (Î=încet | M=mediu | R=rapid)"

View File

@@ -275,6 +275,10 @@
"displayText": "Поменять\nкнопки +/-",
"description": "Поменять кнопки изменения температуры"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Скорость\nанимации",
"description": "Скорость анимации иконок в главном меню (М=Медленная| С=Средняя | Б=Быстрая)"

View File

@@ -275,6 +275,10 @@
"displayText": "Otočenie\ntlačidiel +/-",
"description": "Prehodenie tlačidiel na nastavovanie teploty"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Rýchlosť\nanimácií",
"description": "Rýchlosť animácií ikoniek v menu (P=pomaly | S=stredne | R=rýchlo)"

View File

@@ -275,6 +275,10 @@
"displayText": "Obrni\ntipki + -?",
"description": "Zamenjaj funkciji gumbov."
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\nspeed",
"description": "Pace of icon animations in menu (P=slow | M=medium | H=fast)"

View File

@@ -275,6 +275,10 @@
"displayText": "Swap\n+ - keys",
"description": "Reverse assignment of buttons for temperature adjustment"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\nspeed",
"description": "Pace of icon animations in menu (С=slow | M=medium | Б=fast)"

View File

@@ -275,6 +275,10 @@
"displayText": "Swap\n+ - keys",
"description": "Reverse assignment of buttons for temperature adjustment"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\nspeed",
"description": "Pace of icon animations in menu (S=slow | M=medium | B=fast)"

View File

@@ -275,6 +275,10 @@
"displayText": "Omvända\n+- knappar",
"description": "Omvänd ordning för temperaturjustering via plus/minus knapparna"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.-\nhastighet",
"description": "Animationshastighet för ikoner i menyer (L=långsam | M=medel | S=snabb)"

View File

@@ -275,6 +275,10 @@
"displayText": "Düğme Yerleri\nRotasyonu",
"description": "\"Düğme Yerleri Rotasyonu\" Sıcaklık ayar düğmelerinin yerini değiştirin"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Animasyon\nHızı",
"description": "Menüdeki simge animasyonlarının hızı (Y=Yavaş | O=Orta | H=Hızlı)"

View File

@@ -34,7 +34,7 @@
"message": "!Жало закорочено!"
},
"SettingsCalibrationWarning": {
"message": "Під час наступного завантаження переконайтеся, що жало і ручка мають кімнатну температуру!"
"message": "Під час наступного завантаження переконайтеся, що жало і ручка мають кімнатну !"
},
"CJCCalibrating": {
"message": "калібрування\n"
@@ -97,7 +97,7 @@
"description": ""
},
"UIMenu": {
"displayText": "Параметри\nінтерфейсу",
"displayText": "Параметри\nвзаємодії",
"description": ""
},
"AdvancedMenu": {
@@ -153,23 +153,23 @@
},
"USBPDMode": {
"displayText": "PD\nРежим",
"description": "Вмикає режими PPS & EPR."
"description": "Вмикає режими PPS & EPR"
},
"BoostTemperature": {
"displayText": "Темпер.\nТурбо",
"description": "Температура \"Турбо\" режиму"
"description": "у \"Турбо\" режимі"
},
"AutoStart": {
"displayText": "Гарячий\nстарт",
"description": "Режим запуску паяльника (П=Пайка | С=Сон | К=Сон при кімн. темп.)"
},
"TempChangeShortStep": {
"displayText": "Зміна темп.\nкоротким",
"description": "Зміна температуру при короткому натисканні!"
"displayText": "Зміна \nкоротким",
"description": "Крок t° при короткому натисканні:"
},
"TempChangeLongStep": {
"displayText": "Зміна темп.\nдовгим",
"description": "Зміна температуру при довгому натисканні!"
"displayText": "Зміна \nдовгим",
"description": "Крок t° при довгому натисканні:"
},
"LockingMode": {
"displayText": "Дозволити\nблок. кнопок",
@@ -180,8 +180,8 @@
"description": "Кількість етапів в режимі профілів"
},
"ProfilePreheatTemp": {
"displayText": "Температура\nПоп.Розігріву",
"description": "Попередньо розігріти до цієї температури на початку режимку профілів"
"displayText": "t° Поперед.\nРозігріву",
"description": "Попередньо розігріти до цієї на початку режимку профілів"
},
"ProfilePreheatSpeed": {
"displayText": "Швидкість\nПоп.Розігріву",
@@ -189,7 +189,7 @@
},
"ProfilePhase1Temp": {
"displayText": "Етап 1\nТемпература",
"description": "Температура на кінці цього етапу"
"description": " на кінці цього етапу"
},
"ProfilePhase1Duration": {
"displayText": "Етап 1\nТривалість",
@@ -233,11 +233,11 @@
},
"MotionSensitivity": {
"displayText": "Чутливість\nдатчику руху",
"description": "Акселерометр (1=мін. чутливості | ... | 9=макс. чутливість)"
"description": "Акселерометр (1=мін. чутливість | ... | 9=макс. чутливість)"
},
"SleepTemperature": {
"displayText": "Темпер.\nсну",
"description": "Температура режиму сну (C° | F°)"
"description": "у режимі сну"
},
"SleepTimeout": {
"displayText": "Тайм-аут\nсну",
@@ -256,8 +256,8 @@
"description": "Проміжок часу до \"часу сну\" за умови спрацювання датчику Холла"
},
"TemperatureUnit": {
"displayText": "Формат темпе-\nратури(C°/F°)",
"description": "Одиниця виміру температури (C=Цельсій | F=Фаренгейт)"
"displayText": "Формат темпе-\nратури(°C/°F)",
"description": "Одиниця виміру (C=Цельсій | F=Фаренгейт)"
},
"DisplayRotation": {
"displayText": "Обертання\nекрану",
@@ -265,15 +265,19 @@
},
"CooldownBlink": {
"displayText": "Показ t° при\nохолодженні",
"description": "Показувати температуру на екрані охолодження, поки жало залишається гарячим, при цьому екран мерехтить"
"description": "Показувати на екрані охолодження, доки жало залишається гарячим, при цьому екран мерехтить"
},
"ScrollingSpeed": {
"displayText": "Швидкість\nтексту",
"description": "Швидкість прокрутки тексту (Н=Низькa | М=Максимальна)"
},
"ReverseButtonTempChange": {
"displayText": "Інвертувати\nкнопки +-?",
"description": "Інвертувати кнопки зміни температури."
"displayText": "Обернути\nкнопки +/-?",
"description": "Обернути кнопки зміни "
},
"ReverseButtonMenu": {
"displayText": "Обернути\nкнопки A/B?",
"description": "Обернути кнопки навігації"
},
"AnimSpeed": {
"displayText": "Швидкість\nанімації",
@@ -288,20 +292,20 @@
"description": "Налаштування контрасту/яскравості OLED екрану"
},
"ColourInversion": {
"displayText": "Інверт\nекрану",
"description": "Інвертувати кольори на OLED екрані"
"displayText": "Обернути\nкольори",
"description": "Обернути кольори на OLED екрані"
},
"LOGOTime": {
"displayText": "Тривалість\nлоготипу при запуску",
"description": "Поточна тривалість показу лого при запуску (сек)"
"displayText": "Тривалість\nекр лого",
"description": "Поточна тривалість лого при запуску (сек)"
},
"AdvancedIdle": {
"displayText": "Детальний ре-\nжим очікуван.",
"description": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані"
"displayText": "Детальний\nрежим сну",
"description": "Показувати детальну інформацію дрібним шрифтом на домашньому екрані"
},
"AdvancedSoldering": {
"displayText": "Детальний\nрежим пайки",
"description": "Показувати детальну інформацію при пайці."
"description": "Показувати детальну інформацію при пайці"
},
"BluetoothLE": {
"displayText": "Bluetooth\n",
@@ -309,19 +313,19 @@
},
"PowerLimit": {
"displayText": "Макс.\nпотуж.",
"description": "Макс. потужність, яку може використовувати паяльник (Ватт)"
"description": "Макс. потужність живлення паяльника (Ватт)"
},
"CalibrateCJC": {
"displayText": "Калібрувати КХС\nпри наступному запуску",
"description": "При наступному запуску буде відкалібровано Компенсацію Холодного Спаю жала (непотрібне при різниці температур < 5°C)"
"displayText": "Калібрація КХС\n",
"description": "При наступному запуску буде відкалібровано Компенсацію Холодного Спаю жала (непотрібне при Δt° < 5°C)"
},
"VoltageCalibration": {
"displayText": "Калібрування\nнапруги",
"description": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
"description": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити"
},
"PowerPulsePower": {
"displayText": "Пульс.\nНавантаж.",
"description": "Деякі PowerBank-и з часом вимк. живлення, якщо пристрій споживає дуже мало енергії)"
"description": "Деякі PowerBank-и з часом вимк. живлення, якщо пристрій споживає замало енергії)"
},
"PowerPulseWait": {
"displayText": "Час між імп.\nнапруги",
@@ -333,14 +337,14 @@
},
"SettingsReset": {
"displayText": "Скинути всі\nналаштування?",
"description": "Скидання всіх параметрів до стандартних значень."
"description": "Скидання всіх параметрів до стандартних значень"
},
"LanguageSwitch": {
"displayText": "Мова:\n UK Українська",
"description": ""
},
"SolderingTipType": {
"displayText": "Тип Жала",
"displayText": "Тип\nЖала",
"description": "Оберіть відповідний тип жала"
}
}

View File

@@ -275,6 +275,10 @@
"displayText": "(+) va (-) tugmalarni\nalmashtirish",
"description": "Harorat o'zgarishi uchun tugmachalarni vazifasini almashish"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Anim.\ntezligi",
"description": "Menyudagi ikonka animatsiyalari tezligini sozlash (S=sekin | O=o'rtacha | T=tez)"

View File

@@ -275,6 +275,10 @@
"displayText": "Đao nguoc\nnút + -",
"description": "Đao nguoc chuc năng các nút đieu chinh nhiet đo"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "Toc đo\nhoat anh",
"description": "Toc đo cua hoat anh menu (S=cham | M=trung bình | F=nhanh)"

View File

@@ -275,6 +275,10 @@
"displayText": "反轉加減掣",
"description": "反轉調校温度時加減掣嘅方向"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "動畫速度",
"description": "功能表圖示動畫嘅速度 <慢=慢速 | 中=中速 | 快=快速>"

View File

@@ -275,6 +275,10 @@
"displayText": "调换加减键",
"description": "调校温度时更换加减键的方向"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "动画速度",
"description": "主菜单中功能图标动画的播放速度 <慢=慢速 | 中=中速 | 快=快速>"

View File

@@ -275,6 +275,10 @@
"displayText": "調換加減鍵",
"description": "調校溫度時調換加減鍵的方向"
},
"ReverseButtonMenu": {
"displayText": "Swap\nA/B keys",
"description": "Reverse assignment of buttons for Settings menu"
},
"AnimSpeed": {
"displayText": "動畫速度",
"description": "功能表圖示動畫的速度 <慢=慢速 | 中=中速 | 快=快速>"

View File

@@ -473,6 +473,12 @@
"maxLen2": 15,
"description": "Swaps which button increments and decrements on temperature change screens."
},
{
"id": "ReverseButtonMenu",
"maxLen": 6,
"maxLen2": 15,
"description": "Swaps which buttons are used as Enter/Change and which as Scroll/Back in the settings menu."
},
{
"id": "AnimSpeed",
"maxLen": 6,

View File

@@ -53,15 +53,18 @@
/**
* OLED Orientation
*
*/
#define ORIENTATION_MODE 0 // 0: Right 1:Left 2:Automatic - Default right
#define MAX_ORIENTATION_MODE 1 // Unlikely to ever change
#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
/**
* Buttons handling
*/
#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
#define REVERSE_BUTTON_MENU 0 // 0:Default 1:Reverse - Reverse the A and B button assignment for Settings menu only
/**
* OLED Brightness
*
*/
#define MIN_BRIGHTNESS 0 // Min OLED brightness selectable
#define MAX_BRIGHTNESS 100 // Max OLED brightness selectable

View File

@@ -53,15 +53,18 @@
/**
* OLED Orientation
*
*/
#define ORIENTATION_MODE 2 // 0: Right 1:Left 2:Automatic - Default Automatic
#define MAX_ORIENTATION_MODE 2 // Up to auto
#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
/**
* Buttons handling
*/
#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
#define REVERSE_BUTTON_MENU 0 // 0:Default 1:Reverse - Reverse the A and B button assignment for Settings menu only
/**
* OLED Brightness
*
*/
#if defined(MODEL_TS101)
#define MIN_BRIGHTNESS 1 // Min OLED brightness selectable

View File

@@ -53,15 +53,18 @@
/**
* OLED Orientation
*
*/
#define ORIENTATION_MODE 2 // 0: Right 1:Left 2:Automatic - Default Automatic
#define MAX_ORIENTATION_MODE 2 // Up to auto
#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
/**
* Buttons handling
*/
#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
#define REVERSE_BUTTON_MENU 0 // 0:Default 1:Reverse - Reverse the A and B button assignment for Settings menu only
/**
* OLED Brightness
*
*/
#define MIN_BRIGHTNESS 0 // Min OLED brightness selectable
#define MAX_BRIGHTNESS 100 // Max OLED brightness selectable

View File

@@ -53,15 +53,18 @@
/**
* OLED Orientation
*
*/
#define ORIENTATION_MODE 2 // 0: Right 1:Left 2:Automatic - Default Automatic
#define MAX_ORIENTATION_MODE 2 // Up to auto
#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
/**
* Buttons handling
*/
#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
#define REVERSE_BUTTON_MENU 0 // 0:Default 1:Reverse - Reverse the A and B button assignment for Settings menu only
/**
* OLED Brightness
*
*/
#define MIN_BRIGHTNESS 1 // Min OLED brightness selectable
#define MAX_BRIGHTNESS 101 // Max OLED brightness selectable

View File

@@ -4,7 +4,6 @@
/**
* Configuration.h
* Define here your default pre settings for S60
*
*/
//===========================================================================
@@ -21,7 +20,6 @@
/**
* OLED Brightness
*
*/
#define MIN_BRIGHTNESS 1 // Min OLED brightness selectable
#define MAX_BRIGHTNESS 101 // Max OLED brightness selectable
@@ -62,11 +60,15 @@
/**
* OLED Orientation
*
*/
#define ORIENTATION_MODE 0 // 0: Right 1:Left (2:Automatic N/A)
#define MAX_ORIENTATION_MODE 1 // Disable auto mode
#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
/**
* Buttons handling
*/
#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
#define REVERSE_BUTTON_MENU 0 // 0:Default 1:Reverse - Reverse the A and B button assignment for Settings menu only
/**
* Temp change settings

View File

@@ -11,7 +11,7 @@
#include <Buttons.hpp>
TickType_t lastButtonTime = 0;
ButtonState getButtonState() {
ButtonState getButtonState(bool swapButtonMenu) {
/*
* Read in the buttons and then determine if a state change needs to occur
*/
@@ -28,8 +28,8 @@ ButtonState getButtonState() {
static TickType_t previousStateChange = 0;
const TickType_t timeout = TICKS_100MS * 4;
uint8_t currentState;
currentState = (getButtonA()) << 0;
currentState |= (getButtonB()) << 1;
currentState = (getButtonA()) << (0 xor swapButtonMenu);
currentState |= (getButtonB()) << (1 xor swapButtonMenu);
if (currentState) {
lastButtonTime = xTaskGetTickCount();

View File

@@ -27,7 +27,8 @@ enum ButtonState {
};
// Returns what buttons are pressed (if any)
ButtonState getButtonState();
ButtonState getButtonState(bool swapButtonMenu = 0);
// Helpers
void waitForButtonPressOrTimeout(TickType_t timeout);
void waitForButtonPress();

View File

@@ -76,8 +76,9 @@ enum SettingsOptions {
ProfileCooldownSpeed = 52, // Maximum allowed cooldown speed in degrees per second
HallEffectSleepTime = 53, // Seconds (/5) timeout to sleep when hall effect over threshold
SolderingTipType = 54, // Selecting the type of soldering tip fitted
ReverseButtonMenu = 55, // Change the A and B button assigment in menus
//
SettingsOptionsLength = 55, // End marker
SettingsOptionsLength = 56, // End marker
};
typedef enum {

View File

@@ -54,6 +54,11 @@ extern const char *DebugMenu[];
extern const char *AccelTypeNames[];
extern const char *PowerSourceNames[];
/* !
* The order of the items inside this enum class SettingsItemIndex
* must be the same as the order of the related items
* in the "menuOptions" section of translations_definitions.json file.
*/
enum class SettingsItemIndex : uint8_t {
DCInCutoff,
MinVolCell,
@@ -90,6 +95,7 @@ enum class SettingsItemIndex : uint8_t {
CooldownBlink,
ScrollingSpeed,
ReverseButtonTempChange,
ReverseButtonMenu,
AnimSpeed,
AnimLoop,
Brightness,

View File

@@ -54,7 +54,7 @@ typedef struct {
} SettingConstants;
static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOptionsLength] = {
//{ min, max, increment, default}
// MIN, MAX, INCREMENT, DEFAULT
{ MIN_TEMP_C, MAX_TEMP_F, 5, SOLDERING_TEMP}, // SolderingTemp
{ MIN_TEMP_C, MAX_TEMP_F, 5, 150}, // SleepTemp
{ 0, 15, 1, SLEEP_TIME}, // SleepTime
@@ -110,6 +110,8 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp
{ 1, 10, 1, 2}, // ProfileCooldownSpeed
{ 0, 12, 1, 0}, // HallEffectSleepTime
{ 0, (tipType_t::TIP_TYPE_MAX - 1) > 0 ? (tipType_t::TIP_TYPE_MAX - 1) : 0, 1, 0}, // SolderingTipType
{ 0, 1, 1, REVERSE_BUTTON_MENU}, // ReverseButtonMenu
// MIN, MAX, INCREMENT, DEFAULT
};
static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength));

View File

@@ -47,6 +47,7 @@ static void displayAdvancedSolderingScreens(void);
static void displayAdvancedIDLEScreens(void);
static void displayScrollSpeed(void);
static void displayReverseButtonTempChangeEnabled(void);
static void displayReverseButtonMenu(void);
static void displayPowerLimit(void);
#ifdef BLE_ENABLED
@@ -395,6 +396,8 @@ const menuitem UIMenu[] = {
{SETTINGS_DESC(SettingsItemIndex::ScrollingSpeed), nullptr, displayScrollSpeed, nullptr, SettingsOptions::DescriptionScrollSpeed, SettingsItemIndex::ScrollingSpeed, 7},
/* Reverse Temp change buttons +/- */
{SETTINGS_DESC(SettingsItemIndex::ReverseButtonTempChange), nullptr, displayReverseButtonTempChangeEnabled, nullptr, SettingsOptions::ReverseButtonTempChangeEnabled, SettingsItemIndex::ReverseButtonTempChange, 7},
/* Reverse menu nav buttons A/B */
{SETTINGS_DESC(SettingsItemIndex::ReverseButtonMenu), nullptr, displayReverseButtonMenu, nullptr, SettingsOptions::ReverseButtonMenu, SettingsItemIndex::ReverseButtonMenu, 7},
/* Animation Speed adjustment */
{SETTINGS_DESC(SettingsItemIndex::AnimSpeed), nullptr, displayAnimationSpeed, nullptr, SettingsOptions::AnimationSpeed, SettingsItemIndex::AnimSpeed, 7},
/* Animation Loop switch */
@@ -480,7 +483,7 @@ static int userConfirmation(const char *message) {
for (;;) {
drawScrollingText(message, xTaskGetTickCount() - tickStart);
ButtonState buttons = getButtonState();
ButtonState buttons = getButtonState(getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled));
switch (buttons) {
case BUTTON_F_SHORT:
// User confirmed
@@ -853,6 +856,8 @@ static void displayScrollSpeed(void) { OLED::print(translatedString((getSettingV
static void displayReverseButtonTempChangeEnabled(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)); }
static void displayReverseButtonMenu(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::ReverseButtonMenu)); }
static void displayAnimationSpeed(void) {
switch (getSettingValue(SettingsOptions::AnimationSpeed)) {
case settingOffSpeed_t::SLOW:
@@ -948,7 +953,7 @@ static void setCalibrateVIN(void) {
OLED::setCursor(0, 8);
OLED::printNumber(getSettingValue(SettingsOptions::VoltageDiv), 3, FontStyle::SMALL);
switch (getButtonState()) {
switch (getButtonState(getSettingValue(SettingsOptions::ReverseButtonMenu))) {
case BUTTON_F_SHORT:
prevSettingValue(SettingsOptions::VoltageDiv);
break;

View File

@@ -41,10 +41,18 @@ OperatingMode currentOperatingMode = OperatingMode::InitialisationDone; // Curre
guiContext context; // Context passed to functions to aid in state during render passes
OperatingMode handle_post_init_state();
OperatingMode guiHandleDraw(void) {
OLED::clearScreen(); // Clear ready for render pass
bool swapButtonMenu = getSettingValue(SettingsOptions::ReverseButtonMenu);
bool swapButtonTemp = getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled);
#ifdef OPT_FULL_BUTTON_REVERSE
bool isTempAdjust = currentOperatingMode == OperatingMode::TemperatureAdjust;
// Read button state
ButtonState buttons = getButtonState((swapButtonTemp && isTempAdjust) || (swapButtonMenu && !swapButtonTemp && !isTempAdjust) || (swapButtonMenu && swapButtonTemp && !isTempAdjust));
#else
ButtonState buttons = getButtonState();
#endif
// Enforce screen on if buttons pressed, movement, hot tip etc
if (buttons != BUTTON_NONE) {
OLED::setDisplayState(OLED::DisplayState::ON);
@@ -110,7 +118,11 @@ OperatingMode guiHandleDraw(void) {
newMode = gui_SolderingSleepingMode(buttons, &context);
break;
case OperatingMode::TemperatureAdjust:
newMode = gui_solderingTempAdjust(buttons, &context);
#ifdef OPT_FULL_BUTTON_REVERSE
newMode = gui_solderingTempAdjust(getButtonState(), &context);
#else
newMode = gui_solderingTempAdjust(getButtonState(swapButtonTemp), &context);
#endif
break;
case OperatingMode::DebugMenuReadout:
newMode = showDebugMenu(buttons, &context);
@@ -119,7 +131,11 @@ OperatingMode guiHandleDraw(void) {
newMode = performCJCC(buttons, &context);
break;
case OperatingMode::SettingsMenu:
newMode = gui_SettingsMenu(buttons, &context);
#ifdef OPT_FULL_BUTTON_REVERSE
newMode = gui_SettingsMenu(getButtonState(), &context);
#else
newMode = gui_SettingsMenu(getButtonState(swapButtonMenu), &context);
#endif
break;
case OperatingMode::InitialisationDone:
newMode = handle_post_init_state();
@@ -138,6 +154,7 @@ OperatingMode guiHandleDraw(void) {
};
return newMode;
}
void guiRenderLoop(void) {
OperatingMode newMode = guiHandleDraw(); // This does the screen drawing

View File

@@ -7,56 +7,49 @@ extern uint8_t buttonBF[sizeof(buttonB)];
extern uint8_t disconnectedTipF[sizeof(disconnectedTip)];
void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) {
bool tempOnDisplay = false;
bool tipDisconnectedDisplay = false;
if (OLED::getRotation()) {
OLED::drawArea(68, 0, 56, 32, buttonAF);
OLED::drawArea(12, 0, 56, 32, buttonBF);
OLED::setCursor(0, 0);
ui_draw_power_source_icon();
} else {
OLED::drawArea(0, 0, 56, 32, buttonA); // Needs to be flipped so button ends up
OLED::drawArea(58, 0, 56, 32, buttonB); // on right side of screen
OLED::setCursor(116, 0);
ui_draw_power_source_icon();
}
tipDisconnectedDisplay = false;
if (tipTemp > 55) {
tempOnDisplay = true;
} else if (tipTemp < 45) {
tempOnDisplay = false;
}
if (isTipDisconnected()) {
tempOnDisplay = false;
tipDisconnectedDisplay = true;
}
if (tempOnDisplay || tipDisconnectedDisplay) {
// draw temp over the start soldering button
// Location changes on screen rotation
if (OLED::getRotation()) {
// in right handed mode we want to draw over the first part
OLED::fillArea(68, 0, 56, 32, 0); // clear the area for the temp
OLED::setCursor(56, 0);
} else {
OLED::fillArea(0, 0, 56, 32, 0); // clear the area
OLED::setCursor(0, 0);
}
// 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() % 1000 < 300))) {
ui_draw_tip_temperature(false, FontStyle::LARGE); // draw in the temp
}
} else {
// Draw in missing tip symbol
if (OLED::getRotation()) {
// in right handed mode we want to draw over the first part
OLED::drawArea(54, 0, 56, 32, disconnectedTipF);
} else {
OLED::drawArea(0, 0, 56, 32, disconnectedTip);
}
}
}
}
bool isFlipped = OLED::getRotation();
bool tipDisconnected = isTipDisconnected();
#ifdef OPT_FULL_BUTTON_REVERSE
bool swapButtonMenu = getSettingValue(SettingsOptions::ReverseButtonMenu);
#endif
// Flip and switch buttons accordingly
#ifdef OPT_FULL_BUTTON_REVERSE
OLED::drawArea(isFlipped ? 68 : 0, 0, 56, 32, isFlipped ? (swapButtonMenu ? buttonBF : buttonAF) : (swapButtonMenu ? buttonB : buttonA));
OLED::drawArea(isFlipped ? 12 : 58, 0, 56, 32, isFlipped ? (swapButtonMenu ? buttonAF : buttonBF) : (swapButtonMenu ? buttonA : buttonB));
#else
OLED::drawArea(isFlipped ? 68 : 0, 0, 56, 32, isFlipped ? buttonAF : buttonA);
OLED::drawArea(isFlipped ? 12 : 58, 0, 56, 32, isFlipped ? buttonBF : buttonB);
#endif
if ((tipTemp > 55) || tipDisconnected) {
// draw temp over the start soldering button
// Location changes on screen rotation and due to button swapping
// in right handed mode we want to draw over the first part
#ifdef OPT_FULL_BUTTON_REVERSE
OLED::fillArea(swapButtonMenu ? (isFlipped ? 26 : 58) : (isFlipped ? 68 : 0), 0, 56, 32, 0); // clear the area
OLED::setCursor(swapButtonMenu ? (isFlipped ? 27 : 59) : (isFlipped ? 56 : 0), 0);
#else
OLED::fillArea(isFlipped ? 68 : 0, 0, 56, 32, 0); // clear the area
OLED::setCursor(isFlipped ? 56 : 0, 0);
#endif
// If tip is disconnected draw the notification, otherwise - the temp
if (tipDisconnected) {
// Draw-in the missing tip symbol
#ifdef OPT_FULL_BUTTON_REVERSE
if (swapButtonMenu) {
OLED::drawArea(isFlipped ? 20 : 54, 0, 56, 32, isFlipped ? disconnectedTipF : disconnectedTip);
} else {
#endif
OLED::drawArea(isFlipped ? 54 : 0, 0, 56, 32, isFlipped ? disconnectedTipF : disconnectedTip);
#ifdef OPT_FULL_BUTTON_REVERSE
}
#endif
} else if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) {
ui_draw_tip_temperature(false, FontStyle::LARGE); // Draw-in the temp
}
}
OLED::setCursor(isFlipped ? 0 : 116, 0);
ui_draw_power_source_icon();
}
#endif

View File

@@ -6,57 +6,49 @@ extern uint8_t buttonBF[sizeof(buttonB)];
extern uint8_t disconnectedTipF[sizeof(disconnectedTip)];
void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) {
bool tempOnDisplay = false;
bool tipDisconnectedDisplay = false;
if (OLED::getRotation()) {
OLED::drawArea(54, 0, 42, 16, buttonAF);
OLED::drawArea(12, 0, 42, 16, buttonBF);
OLED::setCursor(0, 0);
ui_draw_power_source_icon();
} else {
OLED::drawArea(0, 0, 42, 16, buttonA); // Needs to be flipped so button ends up
OLED::drawArea(42, 0, 42, 16, buttonB); // on right side of screen
OLED::setCursor(84, 0);
ui_draw_power_source_icon();
}
tipDisconnectedDisplay = false;
if (tipTemp > 55) {
tempOnDisplay = true;
} else if (tipTemp < 45) {
tempOnDisplay = false;
}
if (isTipDisconnected()) {
tempOnDisplay = false;
tipDisconnectedDisplay = true;
}
if (tempOnDisplay || tipDisconnectedDisplay) {
// draw temp over the start soldering button
// Location changes on screen rotation
if (OLED::getRotation()) {
// in right handed mode we want to draw over the first part
OLED::fillArea(55, 0, 41, 16, 0); // clear the area for the temp
OLED::setCursor(56, 0);
} else {
OLED::fillArea(0, 0, 41, 16, 0); // clear the area
OLED::setCursor(0, 0);
}
// 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() % 1000 < 300))) {
ui_draw_tip_temperature(false, FontStyle::LARGE); // draw in the temp
}
} else {
// Draw in missing tip symbol
if (OLED::getRotation()) {
// in right handed mode we want to draw over the first part
OLED::drawArea(54, 0, 42, 16, disconnectedTipF);
} else {
OLED::drawArea(0, 0, 42, 16, disconnectedTip);
}
}
}
}
bool isFlipped = OLED::getRotation();
bool tipDisconnected = isTipDisconnected();
#ifdef OPT_FULL_BUTTON_REVERSE
bool swapButtonMenu = getSettingValue(SettingsOptions::ReverseButtonMenu);
#endif
// Flip and switch buttons accordingly
#ifdef OPT_FULL_BUTTON_REVERSE
OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? (swapButtonMenu ? buttonBF : buttonAF) : (swapButtonMenu ? buttonB : buttonA));
OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? (swapButtonMenu ? buttonAF : buttonBF) : (swapButtonMenu ? buttonA : buttonB));
#else
OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? buttonAF : buttonA);
OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? buttonBF : buttonB);
#endif
if ((tipTemp > 55) || tipDisconnected) {
// draw temp over the start soldering button
// Location changes on screen rotation and due to button swapping
// in right handed mode we want to draw over the first part
#ifdef OPT_FULL_BUTTON_REVERSE
OLED::fillArea(swapButtonMenu ? (isFlipped ? 14 : 42) : (isFlipped ? 55 : 0), 0, 41, 16, 0); // clear the area
OLED::setCursor(swapButtonMenu ? (isFlipped ? 15 : 43) : (isFlipped ? 56 : 0), 0);
#else
OLED::fillArea(isFlipped ? 55 : 0, 0, 41, 16, 0); // clear the area
OLED::setCursor(isFlipped ? 56 : 0, 0);
#endif
// If tip is disconnected draw the notification, otherwise - the temp
if (tipDisconnected) {
// Draw-in the missing tip symbol
#ifdef OPT_FULL_BUTTON_REVERSE
if (swapButtonMenu) {
OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip);
} else {
#endif
OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip);
#ifdef OPT_FULL_BUTTON_REVERSE
}
#endif
} else if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) {
ui_draw_tip_temperature(false, FontStyle::LARGE); // Draw-in the temp
}
}
OLED::setCursor(isFlipped ? 0 : 84, 0);
ui_draw_power_source_icon();
}
#endif

View File

@@ -54,10 +54,6 @@ OperatingMode gui_solderingTempAdjust(const ButtonState buttonIn, guiContext *cx
if ((PRESS_ACCEL_INTERVAL_MAX - (*autoRepeatAcceleration)) < PRESS_ACCEL_INTERVAL_MIN) {
(*autoRepeatAcceleration) = PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN;
}
// If buttons are flipped; flip the delta
if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {
delta = -delta;
}
if (delta != 0) {
// constrain between the set temp limits, i.e. 10-450 C
int16_t newTemp = getSettingValue(SettingsOptions::SolderingTemp);

View File

@@ -17,7 +17,11 @@ bool shouldShutdown(void) {
}
}
}
#ifdef OPT_FULL_BUTTON_REVERSE
if (getButtonState(getSettingValue(SettingsOptions::ReverseButtonMenu) == BUTTON_B_LONG) { // allow also if back button is pressed long
#else
if (getButtonState() == BUTTON_B_LONG) { // allow also if back button is pressed long
#endif
return true;
}
return false;