Fix Menu / RC2

#214
New Icons
Fix Hold to scroll timer with a lockout
Fix Menu lengths

New French Translation Closes #228

Fix confirmation message scroll speed
Fix translations.cpp
This commit is contained in:
Ben V. Brown
2018-03-14 23:21:29 +11:00
parent fcfa44a949
commit 0d2bfb9a29
11 changed files with 123 additions and 100 deletions

View File

@@ -326,8 +326,6 @@ static void gui_solderingTempAdjust() {
}
}
static int gui_showTipTempWarning() {
for (;;) {
uint16_t tipTemp = tipMeasurementToC(getTipRawTemp(0));
@@ -659,7 +657,7 @@ void startGUITask(void const *argument) {
uint8_t animationStep = 0;
uint8_t tempWarningState = 0;
bool buttonLockout = false;
HAL_IWDG_Refresh(&hiwdg);
switch (systemSettings.OrientationMode) {
case 0:
@@ -705,12 +703,17 @@ void startGUITask(void const *argument) {
ButtonState buttons = getButtonState();
if (tempWarningState == 2)
buttons = BUTTON_F_SHORT;
if (buttons != BUTTON_NONE && buttonLockout)
buttons = BUTTON_NONE;
else
buttonLockout=false;
switch (buttons) {
case BUTTON_NONE:
// Do nothing
break;
case BUTTON_BOTH:
// Not used yet
//In multi-language this might be used to reset language on a long hold or some such
break;
case BUTTON_B_LONG:
@@ -743,6 +746,7 @@ void startGUITask(void const *argument) {
lcd.displayOnOff(true); // turn lcd on
enterSettingsMenu(); // enter the settings menu
saveSettings();
buttonLockout = true;
setCalibrationOffset(systemSettings.CalibrationOffset); // ensure cal offset is applied
break;
default: