Skip to content

Commit 2b1a960

Browse files
dc42dc42
committed
1.21 release candidate
Fixed layout on 4.3" screen Saving and restarting is now done automatically
1 parent c185edd commit 2b1a960

File tree

9 files changed

+43
-133
lines changed

9 files changed

+43
-133
lines changed

‎src/Bugs.txt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,14 @@
3232
- [done] Directories with only a few files, https://www.duet3d.com/forum/thread.php?pid=42305#p42305
3333

3434
1.21 release:
35-
- Light/Dark popup covers Save & Restart button, https://www.duet3d.com/forum/thread.php?pid=42495#p42495
36-
- [done, test] If you use macro subfolders then Control page macros are displayed incorrectly if you go into a macro subfolder, https://www.duet3d.com/forum/thread.php?pid=44644#p44644
37-
- [done apart from translations] Support new status letter 'O' (powered off)
38-
- [done, test] Add last modified date/time to file info popup (have a PR for this)
39-
- Add print time to file info popup
40-
- Add colour gradient test pattern on setup page
35+
- [done] Light/Dark popup covers Save & Restart button, https://www.duet3d.com/forum/thread.php?pid=42495#p42495
36+
- [done] If you use macro subfolders then Control page macros are displayed incorrectly if you go into a macro subfolder, https://www.duet3d.com/forum/thread.php?pid=44644#p44644
37+
- [done] Support new status letter 'O' (powered off)
38+
- [done] Add last modified date/time to file info popup (have a PR for this)
39+
- [done] Add print time to file info popup
40+
- [done] Add colour gradient test pattern on setup page
4141
- [done] Add support for Marlin firmware type
42+
- [done] Settings are saved and restarts done automatically
4243

4344
Optional PIN code for access (mrehorstdmd)
4445
Feature request: coordinates on the Move screen

‎src/Events.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ enum Event : uint8_t
4343
evKeyboard,
4444

4545
// Setup functions
46-
evCalTouch, evSetBaudRate, evInvertX, evInvertY, evAdjustBaudRate, evSetVolume, evSaveSettings, evAdjustVolume, evReset,
46+
evCalTouch, evSetBaudRate, evInvertX, evInvertY, evAdjustBaudRate, evSetVolume, evAdjustVolume, evReset,
4747

4848
evYes,
4949
evCancel,
@@ -60,7 +60,7 @@ enum Event : uint8_t
6060
evBrighter, evDimmer,
6161
evSetDimmingType,
6262

63-
evRestart, evEmergencyStop,
63+
evEmergencyStop,
6464

6565
evJogZ, evCloseAlert
6666

‎src/PanelDue.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -467,11 +467,6 @@ void CalibrateTouch()
467467
mgr.Refresh(true);
468468
}
469469

470-
bool IsSaveAndRestartNeeded()
471-
{
472-
return nvData.language != savedNvData.language || nvData.colourScheme != savedNvData.colourScheme;
473-
}
474-
475470
bool IsSaveNeeded()
476471
{
477472
return nvData != savedNvData;
@@ -534,14 +529,19 @@ void SetVolume(uint32_t newVolume)
534529
nvData.touchVolume = newVolume;
535530
}
536531

537-
void SetColourScheme(uint32_t newColours)
532+
bool SetColourScheme(uint32_t newColours)
538533
{
534+
const bool ret = (newColours != nvData.colourScheme);
539535
nvData.colourScheme = newColours;
536+
return ret;
540537
}
541538

542-
void SetLanguage(uint32_t newLanguage)
539+
// Set the language, returning true if it has changed
540+
bool SetLanguage(uint32_t newLanguage)
543541
{
542+
const bool ret = (newLanguage != nvData.language);
544543
nvData.language = newLanguage;
544+
return ret;
545545
}
546546

547547
uint32_t GetBaudRate()
@@ -578,7 +578,6 @@ void SaveSettings()
578578
nvData.Save();
579579
// To make sure it worked, load the settings again
580580
savedNvData.Load();
581-
UI::CheckSettingsAreSaved();
582581
}
583582

584583
// This is called when the status changes

‎src/PanelDue.hpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,15 @@ extern void CalibrateTouch();
4141
// Functions called from module UserInterface to manipulate non-volatile settings and associated hardware
4242
extern void FactoryReset();
4343
extern void SaveSettings();
44-
extern bool IsSaveAndRestartNeeded();
4544
extern bool IsSaveNeeded();
4645
extern void MirrorDisplay();
4746
extern void InvertDisplay();
4847
extern void SetBaudRate(uint32_t rate);
4948
extern void SetBrightness(int percent);
5049
extern void RestoreBrightness();
5150
extern void SetVolume(uint32_t newVolume);
52-
extern void SetColourScheme(uint32_t newColours);
53-
extern void SetLanguage(uint32_t newLanguage);
51+
extern bool SetColourScheme(uint32_t newColours);
52+
extern bool SetLanguage(uint32_t newLanguage);
5453
extern uint32_t GetBaudRate();
5554
extern int GetBrightness();
5655
extern uint32_t GetVolume();

‎src/Strings.hpp‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,9 @@ struct StringTable
6666

6767
// Misc
6868
CSTRING confirmFactoryReset;
69-
CSTRING confirmRestart;
7069
CSTRING confirmFileDelete;
7170
CSTRING areYouSure;
7271
CSTRING touchTheSpot;
73-
CSTRING settingsNotSavedText;
74-
CSTRING restartNeededText;
75-
CSTRING restartRequired;
76-
CSTRING restartNow;
7772
CSTRING moveHead;
7873
CSTRING extrusionAmount;
7974
CSTRING extrusionSpeed;
@@ -160,14 +155,9 @@ const StringTable LanguageTables[numLanguages] =
160155

161156
// Misc
162157
"Confirm factory reset",
163-
"Confirm restart",
164158
"Confirm file delete",
165159
"Are you sure?",
166160
"Touch the spot",
167-
"Some settings are not saved!",
168-
"Touch Save & Restart to use new settings",
169-
"Restart required",
170-
"Restart now?",
171161
"Move head",
172162
"Extrusion amount (mm)",
173163
"Speed (mm/s)",
@@ -273,14 +263,9 @@ const StringTable LanguageTables[numLanguages] =
273263

274264
// Misc
275265
"Alle Einstellungen zurücksetzen",
276-
"Das Gerät wird neu gestartet",
277266
"Die Datei wird gelöscht",
278267
"Sind sie sicher?",
279268
"Bitte auf den Punkt tippen",
280-
"Einige Einstellungen sind nicht gesichert!",
281-
"Zum Übernehmen der Änderung 'Sichern & Reboot' drücken",
282-
"Neustarten erforderlich",
283-
"Jetzt neu starten?",
284269
"Kopf bewegen",
285270
"Extrusionsmenge (mm)",
286271
"Geschwindigkeit (mm/s)",
@@ -386,14 +371,9 @@ const StringTable LanguageTables[numLanguages] =
386371

387372
// Misc
388373
"Confirmer le réinitialisation de l'imprimante",
389-
"Confirm Redémarrage",
390374
"Confirm suppression fichier",
391375
"Vous êtes sûre?",
392376
"Appuyer sur le point",
393-
"Certains réglages ne sont pas sauvegardés!",
394-
"Appuyer sur Sauvegarde et Redémarrage pour utiliser les nouveaux réglages",
395-
"Restart required",
396-
"Restart now?",
397377
"Mouvement de la tête",
398378
"Quantité de Matiére extrudée (mm)",
399379
"Vitesse (mm/s)",
@@ -499,14 +479,9 @@ const StringTable LanguageTables[numLanguages] =
499479

500480
// Misc
501481
"Skutečně obnovit tovární nastavení?",
502-
"Restartovat?",
503482
"Skutečně smazat?",
504483
"Určitě?",
505484
"Dotkněte se bodu",
506-
"Některá nastavení nejsou uložena!",
507-
"Zvolte Uložit a Restart pro dokončení",
508-
"Vyžadován restart",
509-
"Restartovat nyní?",
510485
"Posun hlavy",
511486
"Množství (mm)",
512487
"Rychlost (mm/s)",
@@ -585,8 +560,8 @@ const StringTable LanguageTables[numLanguages] =
585560

586561
// Print page
587562
"Extrusor" THIN_SPACE "%",
588-
"Velocidad ", // note space at end
589-
"Ventilador ", // note space at end
563+
"Veloc. ", // note space at end. "Velocidad" is too long.
564+
"Ventil. ", // note space at end. "Ventilador" is too lonh.
590565
"Tiempo restante: ",
591566
"archivo ", // note space at end
592567
", filamento ", // note space at end
@@ -596,7 +571,7 @@ const StringTable LanguageTables[numLanguages] =
596571
"Micro paso", // Literal translation of baby step it's very odd in spanish...
597572
"Resumir",
598573
"Cancelar",
599-
"Fijar", // "Establecer" would be more correct, but it's longer.
574+
"Fijar", // "Establecer" would be more correct, but it's longer.
600575

601576
// Setup page
602577
"Volumen ", // note space at end
@@ -612,14 +587,9 @@ const StringTable LanguageTables[numLanguages] =
612587

613588
// Misc
614589
"Confirma restablecimiento de fábrica",
615-
"Confirma reiniciar",
616590
"Confirma borrar archivo",
617591
"Está seguro?",
618592
"Tocar el punto",
619-
"Algunos parámetros no están guardados!",
620-
"Toca Guardar y Reiniciar para usar los nuevos parámetros",
621-
"Reinicio requerido",
622-
"Reiniciar ahora?",
623593
"Mover cabezal",
624594
"Cantidad de extrusión (mm)",
625595
"Velocidad (mm/s)",

0 commit comments

Comments
 (0)