3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Toggle SD Settings

Browse Source 
This includes FlashAir support and SD Sorting type
This commit is contained in:
leptun 2019-08-31 14:55:51 +03:00
parent a821002f02
commit f69035323a
10 changed files with 143 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/messages.c
View File

@ -115,6 +115,11 @@ const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); ////
const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); //// const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); ////
const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); //// const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////
const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); //// const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////
const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////
const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_I1 = ISTR("FlashAir"); ////
const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); ////
const char MSG_SORT_TIME[] PROGMEM_I1 = ISTR("Time"); ////
const char MSG_SORT_ALPHA[] PROGMEM_I1 = ISTR("Alphabet"); ////
//not internationalized messages //not internationalized messages
const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; ////

5
Firmware/messages.h
View File

@ -115,6 +115,11 @@ extern const char MSG_FIRMWARE[];
extern const char MSG_GCODE[]; extern const char MSG_GCODE[];
extern const char MSG_NOZZLE_DIAMETER[]; extern const char MSG_NOZZLE_DIAMETER[];
extern const char MSG_MMU_MODE[]; extern const char MSG_MMU_MODE[];
extern const char MSG_SD_CARD[];
extern const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[];
extern const char MSG_SORT[];
extern const char MSG_SORT_TIME[];
extern const char MSG_SORT_ALPHA[];
//not internationalized messages //not internationalized messages
extern const char MSG_BROWNOUT_RESET[]; extern const char MSG_BROWNOUT_RESET[];

14
Firmware/ultralcd.cpp
View File

@ -5231,9 +5231,9 @@ while (0)
do\ do\
{\ {\
if (card.ToshibaFlashAir_isEnabled())\ if (card.ToshibaFlashAir_isEnabled())\
MENU_ITEM_FUNCTION_P(_i("SD card [flshAir]"), lcd_toshiba_flash_air_compatibility_toggle);/*////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1*/\ MENU_ITEM_TOGGLE_P(_T(MSG_SD_CARD), _T(MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY), lcd_toshiba_flash_air_compatibility_toggle);\
else\ else\
MENU_ITEM_FUNCTION_P(_i("SD card [normal]"), lcd_toshiba_flash_air_compatibility_toggle);/*////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1*/\ MENU_ITEM_TOGGLE_P(_T(MSG_SD_CARD), _T(MSG_NORMAL), lcd_toshiba_flash_air_compatibility_toggle);\
\ \
if (!farm_mode)\ if (!farm_mode)\
{\ {\
@ -5241,9 +5241,9 @@ do\
EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort));\ EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort));\
switch (sdSort)\ switch (sdSort)\
{\ {\
case SD_SORT_TIME: MENU_ITEM_FUNCTION_P(_i("Sort [time]"), lcd_sort_type_set); break;/*////MSG_SORT_TIME c=17 r=1*/\ case SD_SORT_TIME: MENU_ITEM_TOGGLE_P(_T(MSG_SORT), _T(MSG_SORT_TIME), lcd_sort_type_set); break;\
case SD_SORT_ALPHA: MENU_ITEM_FUNCTION_P(_i("Sort [alphabet]"), lcd_sort_type_set); break;/*////MSG_SORT_ALPHA c=17 r=1*/\ case SD_SORT_ALPHA: MENU_ITEM_TOGGLE_P(_T(MSG_SORT), _T(MSG_SORT_ALPHA), lcd_sort_type_set); break;\
default: MENU_ITEM_FUNCTION_P(_i("Sort [none]"), lcd_sort_type_set);/*////MSG_SORT_NONE c=17 r=1*/\ default: MENU_ITEM_TOGGLE_P(_T(MSG_SORT), _T(MSG_NONE), lcd_sort_type_set);\
}\ }\
}\ }\
}\ }\
@ -5253,9 +5253,9 @@ while (0)
do\ do\
{\ {\
if (card.ToshibaFlashAir_isEnabled())\ if (card.ToshibaFlashAir_isEnabled())\
MENU_ITEM_FUNCTION_P(_i("SD card [flshAir]"), lcd_toshiba_flash_air_compatibility_toggle);/*////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1*/\ MENU_ITEM_TOGGLE_P(_T(MSG_SD_CARD), _T(MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY), lcd_toshiba_flash_air_compatibility_toggle);\
else\ else\
MENU_ITEM_FUNCTION_P(_i("SD card [normal]"), lcd_toshiba_flash_air_compatibility_toggle);/*////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1*/\ MENU_ITEM_TOGGLE_P(_T(MSG_SD_CARD), _T(MSG_NORMAL), lcd_toshiba_flash_air_compatibility_toggle);\
}\ }\
while (0) while (0)
#endif // SDCARD_SORT_ALPHA #endif // SDCARD_SORT_ALPHA

23
lang/lang_en.txt
View File

@ -649,11 +649,11 @@
#MSG_WIZARD_RERUN c=20 r=7 #MSG_WIZARD_RERUN c=20 r=7
"Running Wizard will delete current calibration results and start from the beginning. Continue?" "Running Wizard will delete current calibration results and start from the beginning. Continue?"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 #MSG_SD_CARD
"SD card [normal]" "SD card"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
"SD card [flshAir]" "FlashAir"
# #
"Right" "Right"
@ -703,17 +703,20 @@
#MSG_FILE_CNT c=20 r=4 #MSG_FILE_CNT c=20 r=4
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
#MSG_SORT_NONE c=17 r=1 #MSG_SORT
"Sort [none]" "Sort"
#MSG_SORT_TIME c=17 r=1 #MSG_NONE
"Sort [time]" "None"
#MSG_SORT_TIME
"Time"
# #
"Severe skew" "Severe skew"
#MSG_SORT_ALPHA c=17 r=1 #MSG_SORT_ALPHA
"Sort [alphabet]" "Alphabet"
#MSG_SORTING c=20 r=1 #MSG_SORTING c=20 r=1
"Sorting files" "Sorting files"

32
lang/lang_en_cz.txt
View File

@ -866,13 +866,13 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?" "Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Spusteni Pruvodce vymaze ulozene vysledky vsech kalibraci a spusti kalibracni proces od zacatku. Pokracovat?" "Spusteni Pruvodce vymaze ulozene vysledky vsech kalibraci a spusti kalibracni proces od zacatku. Pokracovat?"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 #MSG_SD_CARD
"SD card [normal]" "SD card"
"\x00" "\x00"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
"SD card [flshAir]" "FlashAir"
"SD card [FlshAir]" "\x00"
# #
"Right" "Right"
@ -938,21 +938,25 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100." "Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100."
#MSG_SORT_NONE c=17 r=1 #MSG_SORT
"Sort [none]" "Sort"
"Trideni [Zadne]" "Trideni"
#MSG_SORT_TIME c=17 r=1 #MSG_NONE
"Sort [time]" "None"
"Trideni [cas]" "Zadne"
#MSG_SORT_TIME
"Time"
"Cas"
# #
"Severe skew" "Severe skew"
"Tezke zkoseni" "Tezke zkoseni"
#MSG_SORT_ALPHA c=17 r=1 #MSG_SORT_ALPHA
"Sort [alphabet]" "Alphabet"
"Trideni [Abeceda]" "Abeceda"
#MSG_SORTING c=20 r=1 #MSG_SORTING c=20 r=1
"Sorting files" "Sorting files"

34
lang/lang_en_de.txt
View File

@ -866,13 +866,13 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?" "Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Der Assistent wird die aktuellen Kalibrierungsdaten loeschen und von vorne beginnen. Weiterfahren?" "Der Assistent wird die aktuellen Kalibrierungsdaten loeschen und von vorne beginnen. Weiterfahren?"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 #MSG_SD_CARD
"SD card [normal]" "SD card"
"SD Karte [normal]" "SD Karte"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
"SD card [flshAir]" "FlashAir"
"SD Karte[flshAir]" "\x00"
# #
"Right" "Right"
@ -938,21 +938,25 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100." "Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100."
#MSG_SORT_NONE c=17 r=1 #MSG_SORT
"Sort [none]" "Sort"
"Sort. [Keine]" "Sort."
#MSG_SORT_TIME c=17 r=1 #MSG_NONE
"Sort [time]" "None"
"Sort. [Zeit]" "Keine"
#MSG_SORT_TIME
"Time"
"Zeit"
# #
"Severe skew" "Severe skew"
"Schwerer Schraeglauf" "Schwerer Schraeglauf"
#MSG_SORT_ALPHA c=17 r=1 #MSG_SORT_ALPHA
"Sort [alphabet]" "Alphabet"
"Sort. [Alphabet]" "\x00"
#MSG_SORTING c=20 r=1 #MSG_SORTING c=20 r=1
"Sorting files" "Sorting files"

34
lang/lang_en_es.txt
View File

@ -866,13 +866,13 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?" "Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Ejecutar el Wizard borrara los valores de calibracion actuales y comenzara de nuevo. Continuar?" "Ejecutar el Wizard borrara los valores de calibracion actuales y comenzara de nuevo. Continuar?"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 #MSG_SD_CARD
"SD card [normal]" "SD card"
"Tarj. SD [normal]" "Tarj. SD"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
"SD card [flshAir]" "FlashAir"
"Tarj. SD[FlshAir]" "\x00"
# #
"Right" "Right"
@ -938,21 +938,25 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. " "Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. "
#MSG_SORT_NONE c=17 r=1 #MSG_SORT
"Sort [none]" "Sort"
"Ordenar [nada]" "Ordenar"
#MSG_SORT_TIME c=17 r=1 #MSG_NONE
"Sort [time]" "None"
"Ordenar [Fecha]" "Nada"
#MSG_SORT_TIME
"Time"
"Fecha"
# #
"Severe skew" "Severe skew"
"Inclinacion severa" "Inclinacion severa"
#MSG_SORT_ALPHA c=17 r=1 #MSG_SORT_ALPHA
"Sort [alphabet]" "Alphabet"
"Ordenar [alfabet]" "Alfabet"
#MSG_SORTING c=20 r=1 #MSG_SORTING c=20 r=1
"Sorting files" "Sorting files"

34
lang/lang_en_fr.txt
View File

@ -866,13 +866,13 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?" "Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Lancer l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer ?" "Lancer l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer ?"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 #MSG_SD_CARD
"SD card [normal]" "SD card"
"Carte SD [normal]" "Carte SD"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
"SD card [flshAir]" "FlashAir"
"Carte SD [flashAir]" "\x00"
# #
"Right" "Right"
@ -938,21 +938,25 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier." "Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier."
#MSG_SORT_NONE c=17 r=1 #MSG_SORT
"Sort [none]" "Sort"
"Tri : [aucun]" "Tri"
#MSG_SORT_TIME c=17 r=1 #MSG_NONE
"Sort [time]" "None"
"Tri [heure]" "Aucun"
#MSG_SORT_TIME
"Time"
"Heure"
# #
"Severe skew" "Severe skew"
"Deviation severe" "Deviation severe"
#MSG_SORT_ALPHA c=17 r=1 #MSG_SORT_ALPHA
"Sort [alphabet]" "Alphabet"
"Tri [alphabet]" "\x00"
#MSG_SORTING c=20 r=1 #MSG_SORTING c=20 r=1
"Sorting files" "Sorting files"

34
lang/lang_en_it.txt
View File

@ -866,13 +866,13 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?" "Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Se avvi il Wizard perderai la calibrazione preesistente e dovrai ricominciare dall'inizio. Continuare?" "Se avvi il Wizard perderai la calibrazione preesistente e dovrai ricominciare dall'inizio. Continuare?"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 #MSG_SD_CARD
"SD card [normal]" "SD card"
"Mem. SD [normale]" "Mem. SD"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
"SD card [flshAir]" "FlashAir"
"Mem. SD [flshAir]" "\x00"
# #
"Right" "Right"
@ -938,21 +938,25 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati." "Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati."
#MSG_SORT_NONE c=17 r=1 #MSG_SORT
"Sort [none]" "Sort"
"Ordina [none]" "Ordina"
#MSG_SORT_TIME c=17 r=1 #MSG_NONE
"Sort [time]" "None"
"Ordina [time]" "\x00"
#MSG_SORT_TIME
"Time"
"\x00"
# #
"Severe skew" "Severe skew"
"Disassamento grave" "Disassamento grave"
#MSG_SORT_ALPHA c=17 r=1 #MSG_SORT_ALPHA
"Sort [alphabet]" "Alphabet"
"Ordine [alfabet]" "Alfabet"
#MSG_SORTING c=20 r=1 #MSG_SORTING c=20 r=1
"Sorting files" "Sorting files"

34
lang/lang_en_pl.txt
View File

@ -866,13 +866,13 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?" "Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Wlaczenie Asystenta usunie obecne dane kalibracyjne i zacznie od poczatku. Kontynuowac?" "Wlaczenie Asystenta usunie obecne dane kalibracyjne i zacznie od poczatku. Kontynuowac?"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 #MSG_SD_CARD
"SD card [normal]" "SD card"
"Karta SD [normal]" "Karta SD"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
"SD card [flshAir]" "FlashAir"
"Karta SD[FlshAir]" "\x00"
# #
"Right" "Right"
@ -938,21 +938,25 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100." "Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100."
#MSG_SORT_NONE c=17 r=1 #MSG_SORT
"Sort [none]" "Sort"
"Sortuj [brak]" "Sortuj"
#MSG_SORT_TIME c=17 r=1 #MSG_NONE
"Sort [time]" "None"
"Sortuj [czas]" "Brak"
#MSG_SORT_TIME
"Time"
"Czas"
# #
"Severe skew" "Severe skew"
"Znaczny skos" "Znaczny skos"
#MSG_SORT_ALPHA c=17 r=1 #MSG_SORT_ALPHA
"Sort [alphabet]" "Alphabet"
"Sortuj [alfabet]" "Alfabet"
#MSG_SORTING c=20 r=1 #MSG_SORTING c=20 r=1
"Sorting files" "Sorting files"