Merge pull request #4 from tadeubas/develop

Develop

Author: tadeubas

.gitignore

@@ -78,4 +78,6 @@ simulator/sd
 !tests/firmware-v0.0.0.bin
 !tests/firmware-v0.0.0.bin.badsig
 !tests/firmware-v0.0.0.bin.sha256.txt
-!tests/firmware-v0.0.0.bin.sig
+!tests/firmware-v0.0.0.bin.sig
+
+src/kruxsim

README.md

@@ -60,7 +60,8 @@ Note that you can run `poetry install` after making a change to the krux code if
 
 ## Format code
 ```bash
-poetry run black ./src && poetry run black ./tests
+poetry run black ./src
+poetry run black ./tests
 ```
 
 ## Run pylint
@@ -122,6 +123,18 @@ sudo apt install libgl1
 # You are trying to run the simulator on a SO without a GUI (some kind of terminal only or WSL). Try one with GUI!
 ```
 
+Simulator sequences (automatic testing):
+```bash
+# Enter simulator folder:
+cd simulator
+
+# Run all sequences of commands to all devices and all locales
+./generate-all-screenshots.sh
+
+# Run a specific sequence for a specific device (need to have the screenshots and the sd folder with the file settings.json inside)
+poetry run python simulator.py --sequence sequences/about.txt --sd --device maixpy_m5stickv
+```
+
 ## Live debug a device
 If you've made a fresh build and flashed it to your device, you can connect to the device over serial connection with:
 ```bash

i18n/translations/de-DE.json

@@ -118,7 +118,6 @@
     "Signature:\n\n%s": "Unterschrift:\n\n%s",
     "Single-key": "Single-key",
     "TX Pin": "TX Stift",
-    "The settings.json file will keep the changes on the SD card.": "Die settings.json-Datei behält die Änderungen auf der SD-Karte.",
     "Thermal": "Thermisch",
     "Try more?": "Mehr versuchen?",
     "Unit": "Einheit",
@@ -137,5 +136,6 @@
     "Warning:\nIncomplete descriptor": "Warnung:\nUnvollständiger Deskriptor",
     "Word %d": "Wort %d",
     "Words": "Wörter",
-    "Yes": "Ja"
+    "Yes": "Ja",
+    "Your changes will be kept on the SD card.": "Ihre Änderungen werden auf der SD-Karte gespeichert."
 }

i18n/translations/en-US.json

@@ -118,7 +118,6 @@
     "Signature:\n\n%s": "Signature:\n\n%s",
     "Single-key": "Single-key",
     "TX Pin": "TX Pin",
-    "The settings.json file will keep the changes on the SD card.": "The settings.json file will keep the changes on the SD card.",
     "Thermal": "Thermal",
     "Try more?": "Try more?",
     "Unit": "Unit",
@@ -137,5 +136,6 @@
     "Warning:\nIncomplete descriptor": "Warning:\nIncomplete descriptor",
     "Word %d": "Word %d",
     "Words": "Words",
-    "Yes": "Yes"
+    "Yes": "Yes",
+    "Your changes will be kept on the SD card.": "Your changes will be kept on the SD card."
 }

i18n/translations/es-MX.json

@@ -118,7 +118,6 @@
     "Signature:\n\n%s": "Firma:\n\n%s",
     "Single-key": "Single-key",
     "TX Pin": "TX Alfiler",
-    "The settings.json file will keep the changes on the SD card.": "El archivo settings.json guardará los cambios en la tarjeta SD.",
     "Thermal": "Térmico",
     "Try more?": "¿Intentar con mas?",
     "Unit": "Unidad",
@@ -137,5 +136,6 @@
     "Warning:\nIncomplete descriptor": "Advertencia:\ndescriptor incompleto",
     "Word %d": "Palabra %d",
     "Words": "Palabras",
-    "Yes": "Sí"
+    "Yes": "Sí",
+    "Your changes will be kept on the SD card.": "Sus cambios se guardarán en la tarjeta SD."
 }

i18n/translations/fr-FR.json

@@ -118,7 +118,6 @@
     "Signature:\n\n%s": "Signature:\n\n%s",
     "Single-key": "Clé unique",
     "TX Pin": "TX Fiche",
-    "The settings.json file will keep the changes on the SD card.": "Le fichier settings.json conservera les modifications sur la carte SD.",
     "Thermal": "Thermique",
     "Try more?": "Réessayer?",
     "Unit": "Unité",
@@ -137,5 +136,6 @@
     "Warning:\nIncomplete descriptor": "Avertissement :\nDescripteur incomplet",
     "Word %d": "Mot %d",
     "Words": "Mots",
-    "Yes": "Oui"
+    "Yes": "Oui",
+    "Your changes will be kept on the SD card.": "Vos modifications seront conservées sur la carte SD."
 }

i18n/translations/pt-BR.json

@@ -118,7 +118,6 @@
     "Signature:\n\n%s": "Assinatura:\n\n%s",
     "Single-key": "Single-key",
     "TX Pin": "Pino TX",
-    "The settings.json file will keep the changes on the SD card.": "O arquivo settings.json manterá suas alterações no cartão SD.",
     "Thermal": "Térmica",
     "Try more?": "Tentar mais?",
     "Unit": "Unidade",
@@ -137,5 +136,6 @@
     "Warning:\nIncomplete descriptor": "Cuidado:\nDescritor Incompleto",
     "Word %d": "Palavra %d",
     "Words": "Palavras",
-    "Yes": "Sim"
+    "Yes": "Sim",
+    "Your changes will be kept on the SD card.": "Suas alterações serão mantidas no cartão SD."
 }

i18n/translations/vi-VN.json

@@ -118,7 +118,6 @@
     "Signature:\n\n%s": "Chữ ký:\n\n%s",
     "Single-key": "Khóa đơn",
     "TX Pin": "TX Ghim",
-    "The settings.json file will keep the changes on the SD card.": "Tệp settings.json sẽ giữ các thay đổi trên thẻ SD.",
     "Thermal": "Nhiệt",
     "Try more?": "Thử thêm nữa?",
     "Unit": "Đơn vị",
@@ -137,5 +136,6 @@
     "Warning:\nIncomplete descriptor": "Cảnh báo:\nMô tả không đầy đủ",
     "Word %d": "Kí tự %d",
     "Words": "Từ ngữ",
-    "Yes": "Đúng"
+    "Yes": "Đúng",
+    "Your changes will be kept on the SD card.": "Các thay đổi của bạn sẽ được lưu trên thẻ SD."
 }

src/krux/pages/login.py

@@ -49,6 +49,7 @@
 )
 
 SENTINEL_DIGITS = "11111"
+SD_SETTINGS_MSG_DURATION = 2000
 
 D6_STATES = [str(i + 1) for i in range(6)]
 D20_STATES = [str(i + 1) for i in range(20)]
@@ -531,15 +532,17 @@ def settings(self):
             # Check for SD hot-plug
             with SDHandler():
                 self.ctx.display.flash_text(
-                    t("The settings.json file will keep the changes on the SD card."),
+                    t("Your changes will be kept on the SD card."),
                     lcd.WHITE,
+                    duration=SD_SETTINGS_MSG_DURATION,
                 )
         except:
             self.ctx.display.flash_text(
                 t(
                     "Incompatible or missing SD card:\n\nChanges will last until shutdown."
                 ),
                 lcd.WHITE,
+                duration=SD_SETTINGS_MSG_DURATION,
             )
 
         return self.namespace(Settings())()