Merge branch 'master' into master

TFT/src/User/API/Language/Language.c

@@ -8,6 +8,8 @@
 #include "language_am.h"
 #include "language_cz.h"
 #include "language_es.h"
+#include "language_fr.h"
+
 
 const char *const en_pack[LABEL_NUM]={
   EN_LANGUAGE,
@@ -65,6 +67,7 @@ const char *const en_pack[LABEL_NUM]={
   EN_BAUDRATE_250000,
   EN_RUNOUT_OFF,
   EN_RUNOUT_ON,
+  EN_SMART_RUNOUT_ON,
   EN_PERCENTAGE,
   EN_BABYSTEP,
   EN_PERCENTAGE_SPEED,
@@ -92,7 +95,6 @@ const char *const en_pack[LABEL_NUM]={
   EN_10_PERCENT,
 
   EN_READY,
-  EN_PRINTING,
   EN_BUSY,
   EN_UNCONNECTED,
   EN_DISCONNECT_INFO,
@@ -176,6 +178,7 @@ const char *const cn_pack[LABEL_NUM]={
   CN_BAUDRATE_250000,
   CN_RUNOUT_OFF,
   CN_RUNOUT_ON,
+  CN_SMART_RUNOUT_ON,
   CN_PERCENTAGE,
   CN_BABYSTEP,
   CN_PERCENTAGE_SPEED,
@@ -203,7 +206,6 @@ const char *const cn_pack[LABEL_NUM]={
   CN_10_PERCENT,
 
   CN_READY,
-  CN_PRINTING,
   CN_BUSY,
   CN_UNCONNECTED,
   CN_DISCONNECT_INFO,
@@ -287,6 +289,7 @@ const char *const ru_pack[LABEL_NUM]={
   RU_BAUDRATE_250000,
   RU_RUNOUT_OFF,
   RU_RUNOUT_ON,
+  RU_SMART_RUNOUT_ON,
   RU_PERCENTAGE,
   RU_BABYSTEP,
   RU_PERCENTAGE_SPEED,
@@ -314,7 +317,6 @@ const char *const ru_pack[LABEL_NUM]={
   RU_10_PERCENT,
 
   RU_READY,
-  RU_PRINTING,
   RU_BUSY,
   RU_UNCONNECTED,
   RU_DISCONNECT_INFO,
@@ -398,6 +400,7 @@ const char *const jp_pack[LABEL_NUM]={
   JP_BAUDRATE_250000,
   JP_RUNOUT_OFF,
   JP_RUNOUT_ON,
+  JP_SMART_RUNOUT_ON,
   JP_PERCENTAGE,
   JP_BABYSTEP,
   JP_PERCENTAGE_SPEED,
@@ -425,7 +428,6 @@ const char *const jp_pack[LABEL_NUM]={
   JP_10_PERCENT,
 
   JP_READY,
-  JP_PRINTING,
   JP_BUSY,
   JP_UNCONNECTED,
   JP_DISCONNECT_INFO,
@@ -509,6 +511,7 @@ const char *const am_pack[LABEL_NUM]={
   AM_BAUDRATE_250000,
   AM_RUNOUT_OFF,
   AM_RUNOUT_ON,
+  AM_SMART_RUNOUT_ON,
   AM_PERCENTAGE,
   AM_BABYSTEP,
   AM_PERCENTAGE_SPEED,
@@ -536,7 +539,6 @@ const char *const am_pack[LABEL_NUM]={
   AM_10_PERCENT,
 
   AM_READY,
-  AM_PRINTING,
   AM_BUSY,
   AM_UNCONNECTED,
   AM_DISCONNECT_INFO,
@@ -620,6 +622,7 @@ const char *const de_pack[LABEL_NUM]={
   DE_BAUDRATE_250000,
   DE_RUNOUT_OFF,
   DE_RUNOUT_ON,
+  DE_SMART_RUNOUT_ON,
   DE_PERCENTAGE,
   DE_BABYSTEP,
   DE_PERCENTAGE_SPEED,
@@ -647,7 +650,6 @@ const char *const de_pack[LABEL_NUM]={
   DE_10_PERCENT,
 
   DE_READY,
-  DE_PRINTING,
   DE_BUSY,
   DE_UNCONNECTED,
   DE_DISCONNECT_INFO,
@@ -731,6 +733,7 @@ const char *const cz_pack[LABEL_NUM]={
   CZ_BAUDRATE_250000,
   CZ_RUNOUT_OFF,
   CZ_RUNOUT_ON,
+  CZ_SMART_RUNOUT_ON,
   CZ_PERCENTAGE,
   CZ_BABYSTEP,
   CZ_PERCENTAGE_SPEED,
@@ -758,7 +761,6 @@ const char *const cz_pack[LABEL_NUM]={
   CZ_10_PERCENT,
 
   CZ_READY,
-  CZ_PRINTING,
   CZ_BUSY,
   CZ_UNCONNECTED,
   CZ_DISCONNECT_INFO,
@@ -842,6 +844,7 @@ const char *const es_pack[LABEL_NUM]={
   ES_BAUDRATE_250000,
   ES_RUNOUT_OFF,
   ES_RUNOUT_ON,
+  ES_SMART_RUNOUT_ON,
   ES_PERCENTAGE,
   ES_BABYSTEP,
   ES_PERCENTAGE_SPEED,
@@ -869,7 +872,6 @@ const char *const es_pack[LABEL_NUM]={
   ES_10_PERCENT,
 
   ES_READY,
-  ES_PRINTING,
   ES_BUSY,
   ES_UNCONNECTED,
   ES_DISCONNECT_INFO,
@@ -897,69 +899,124 @@ const char *const es_pack[LABEL_NUM]={
   ES_FILAMENT_RUNOUT
 };
 
+const char *const fr_pack[LABEL_NUM]={
+  FR_LANGUAGE,
+  FR_HEAT,
+  FR_MOVE,
+  FR_HOME,
+  FR_PRINT,
+  FR_EXTRUDE,
+  FR_FAN,
+  FR_SETTINGS,
+  FR_LEVELING,
+  FR_POINT_1,
+  FR_POINT_2,
+  FR_POINT_3,
+  FR_POINT_4,
+  FR_ABL,
+  FR_INC,
+  FR_DEC,
+  FR_NOZZLE,
+  FR_BED,
+  FR_STOP,
+  FR_BACK,
+  FR_PAGE_UP,
+  FR_PAGE_DOWN,
+  FR_PAUSE,
+  FR_RESUME,
+  FR_LOAD,
+  FR_UNLOAD,
+  FR_SLOW_SPEED,
+  FR_NORMAL_SPEED,
+  FR_FAST_SPEED,
+  FR_FAN_FULL_SPEED,
+  FR_FAN_HALF_SPEED,
+  FR_ROTATE_UI,
+  FR_TOUCHSCREFR_ADJUST,
+  FR_MORESETTING,
+  FR_SCREFR_INFO,
+  FR_WHITE,
+  FR_BLACK,
+  FR_BLUE,
+  FR_RED,
+  FR_GREEN,
+  FR_CYAN,
+  FR_YELLOW,
+  FR_BROWN,
+  FR_GRAY,
+  FR_DISCONNECT,
+  FR_BAUDRATE_115200,
+  FR_BAUDRATE_250000,
+  FR_RUNOUT_OFF,
+  FR_RUNOUT_ON,
+  FR_SMART_RUNOUT_ON,
+  FR_PERCENTAGE,
+  FR_BABYSTEP,
+  FR_PERCENTAGE_SPEED,
+  FR_PERCENTAGE_FLOW,
+  FR_VALUE_ZERO,
+  FR_1_DEGREE,
+  FR_5_DEGREE,
+  FR_10_DEGREE,
+  FR_X_INC,
+  FR_Y_INC,
+  FR_Z_INC,
+  FR_X_DEC,
+  FR_Y_DEC,
+  FR_Z_DEC,
+  FR_X_HOME,
+  FR_Y_HOME,
+  FR_Z_HOME,
+  FR_001_MM,
+  FR_01_MM,
+  FR_1_MM,
+  FR_5_MM,
+  FR_10_MM,
+  FR_1_PERCENT,
+  FR_5_PERCENT,
+  FR_10_PERCENT,
 
-bool isCzech(const u8 *const str)
-{
-  if(str[0] == 0xC3 && str[1] >= 0x81 && str[1] <=0xBD)
-    return true;
-  if(str[0] == 0xC4 && str[1] >= 0x8C && str[1] <=0x9B)
-    return true;
-  if(str[0] == 0xC5 && str[1] >= 0x87 && str[1] <=0xBE)
-    return true;
-  return false;
-}
-
-bool isRussia(const u8 *const str)
-{
-  if(str[0]==0xA7)
-  {
-    if(str[1]>=0xA1&&str[1]<=0xF1)
-    return true;
-  }
-  return false;
-}
-
-bool isArmenian(const u8 *const str)
-{
-  if(str[0]==0xA1)
-  {
-    if(str[1]>=0x40&&str[1]<=0x8B)
-    return true;
-  }
-  return false;
-}
-
-u16 my_strlen(const u8 *const str)
-{
-  u16 i=0,len=0;
-
-  while(str[i])
-  {
-    if(isRussia(str+i) || isArmenian(str+i))
-    {
-      i+=2;
-    }
-    else
-    {
-      i++;
-    }
-    len++;
-  }
-  return len;
-}
+  FR_READY,
+  FR_BUSY,
+  FR_UNCONNECTED,
+  FR_DISCONNECT_INFO,
+  FR_LOADING,
+  FR_POWER_FAILED,
+  FR_CONTINUE,
+  FR_CANNEL,
+  FR_ADJUST_TITLE,
+  FR_ADJUST_INFO,
+  FR_ADJUST_OK,
+  FR_ADJUST_FAILED,
+  FR_WARNING,
+  FR_STOP_PRINT,
+  FR_CONFIRM,
+  FR_TFTSD,
+  FR_READ_TFTSD_ERROR,
+  FR_TFTSD_INSERTED,
+  FR_TFTSD_REMOVED,
+  FR_U_DISK,
+  FR_READ_U_DISK_ERROR,
+  FR_U_DISK_INSERTED,
+  FR_U_DISK_REMOVED,
+  FR_ONBOARDSD,
+  FR_READ_ONBOARDSD_ERROR,
+  FR_FILAMENT_RUNOUT
+};
 
 u8 * textSelect(u8 sel)
 {
   switch(infoSettings.language)
   {
     case ENGLISH:   return (u8 *)en_pack[sel];
     case CHINESE:   return (u8 *)cn_pack[sel];
-//    case RUSSIAN:   return (u8 *)ru_pack[sel];
+    case RUSSIAN:   return (u8 *)ru_pack[sel];
     case JAPANESE:  return (u8 *)jp_pack[sel];
+    case ARMENIAN:  return (u8 *)am_pack[sel];
     case GERMAN:    return (u8 *)de_pack[sel];
-//    case ARMENIAN:  return (u8 *)am_pack[sel];
     case CZECH:     return (u8 *)cz_pack[sel];
     case SPAIN:     return (u8 *)es_pack[sel];
+    case FRENCH:    return (u8 *)fr_pack[sel];
 
     default:        return NULL;
   }

TFT/src/User/API/Language/Language.h

@@ -9,12 +9,13 @@ enum
 {
   ENGLISH = 0,
   CHINESE,
-//  RUSSIAN,
+  RUSSIAN,
   JAPANESE,
+  ARMENIAN,
   GERMAN,
-//  ARMENIAN,
   CZECH,
-  SPAIN,  
+  SPAIN,
+  FRENCH,
 
   LANGUAGE_NUM,
 };
@@ -77,6 +78,7 @@ enum
   LABEL_BAUDRATE_250000,
   LABEL_RUNOUT_OFF,
   LABEL_RUNOUT_ON,
+  LABEL_SMART_RUNOUT_ON,
   LABEL_PERCENTAGE,
   LABEL_BABYSTEP,
   LABEL_PERCENTAGE_SPEED,
@@ -104,7 +106,6 @@ enum
   LABEL_10_PERCENT,
 
   LABEL_READY,
-  LABEL_PRINTING,
   LABEL_BUSY,
   LABEL_UNCONNECTED,
   LABEL_DISCONNECT_INFO,
@@ -136,11 +137,6 @@ enum
   LABEL_NUM,
 };
 
-
-bool isCzech(const u8 *const str);
-bool isRussia(const u8 *const str);
-bool isArmenian(const u8 *const str);
-u16 my_strlen(const u8 *const str);
 u8 * textSelect(u8 sel);
 
 #endif