Merge pull request solosky#196 from solosky/develop

solosky · web-flow · commit 25a624323ec9 · 2024-01-13T10:32:58.000+08:00
2.9.3
diff --git a/fw/application/Makefile b/fw/application/Makefile
@@ -9,7 +9,7 @@ U8G2_ROOT := ../components/u8g2/csrc
 CHAMELEON_ROOT :=$(COMP_DIR)/chameleon-ultra/firmware
 
 APP_VERSION ?= 1
-RELEASE ?= 1
+RELEASE ?= 0
 BOARD ?= OLED
 
 $(OUTPUT_DIRECTORY)/pixljs.out: \
@@ -202,6 +202,7 @@ SRC_FILES += \
   $(PROJ_DIR)/mui/u8g2_font_likeminecraft_te.c \
   $(PROJ_DIR)/mui/u8g2_font_siji_t_6x10.c \
   $(PROJ_DIR)/mui/u8g2_font_wqy12_t_gb2312a.c \
+  $(PROJ_DIR)/mui/u8g2_font_wqy12_t_gb2312a_lite.c \
   $(PROJ_DIR)/mui/mui_core.c \
   $(PROJ_DIR)/mui/mui_canvas.c \
   $(PROJ_DIR)/mui/mui_event.c \
@@ -608,7 +609,7 @@ CFLAGS += -DBOARD_$(BOARD)
 ifneq ($(RELEASE), 1)
 CFLAGS += -DDEBUG
 CFLAGS += -DEBUG_NRF
-CFLAGS += -DU8G2_USE_LARGE_GB2312_FONT
+# CFLAGS += -DU8G2_USE_LARGE_GB2312_FONT
 else
 CFLAGS += -DNDEBUG
 CFLAGS += -DU8G2_USE_LARGE_GB2312_FONT
diff --git a/fw/application/openocd/rtt.cfg b/fw/application/openocd/rtt.cfg
@@ -1,5 +1,5 @@
 adapter driver cmsis-dap
-adapter serial 1234567890
+# adapter serial 1234567890
 transport select swd
 source [find target/nrf52.cfg]
 adapter speed 10000
diff --git a/fw/application/src/app/chameleon/port/fds_utils.c b/fw/application/src/app/chameleon/port/fds_utils.c
@@ -22,10 +22,11 @@ static void fds_map_file_name(uint16_t id, uint16_t key, char *path) {
     }
 }
 
-bool fds_read_sync(uint16_t id, uint16_t key, uint16_t max_length, uint8_t *buffer) {
+bool fds_read_sync(uint16_t id, uint16_t key, uint16_t* max_length, uint8_t *buffer) {
     char path[VFS_MAX_PATH_LEN];
     fds_map_file_name(id, key, path);
-    int32_t bytes_read = vfs_get_default_driver()->read_file_data(path, buffer, max_length);
+    int32_t bytes_read = vfs_get_default_driver()->read_file_data(path, buffer, *max_length);
+    *max_length = bytes_read;
     NRF_LOG_INFO("fds_read_sync: id=%X, key=%d, bytes_read=%d", id, key, bytes_read);
     return bytes_read > 0;
 }
diff --git a/fw/application/src/i18n/de_DE.c b/fw/application/src/i18n/de_DE.c
@@ -1,9 +1,9 @@
 #include "string_id.h"
-const char * lang_de_DE[_L_COUNT] = {
+const char * const lang_de_DE[_L_COUNT] = {
     [_L_ON] = "AN",
-    [_L_OFF] = "AUF",
+    [_L_OFF] = "AUS",
     [_L_ON_F] = "[AN]",
-    [_L_OFF_F] = "[AUF]",
+    [_L_OFF_F] = "[AUS]",
     [_L_BACK] = "Zurück",
     [_L_ERR] = "Fehler",
     [_L_ERR_CODE] = "Fehlercode",
diff --git a/fw/application/src/i18n/en_US.c b/fw/application/src/i18n/en_US.c
@@ -1,5 +1,5 @@
 #include "string_id.h"
-const char * lang_en_US[_L_COUNT] = {
+const char * const lang_en_US[_L_COUNT] = {
     [_L_ON] = "ON",
     [_L_OFF] = "OFF",
     [_L_ON_F] = "[ON]",
diff --git a/fw/application/src/i18n/es_ES.c b/fw/application/src/i18n/es_ES.c
@@ -1,5 +1,5 @@
 #include "string_id.h"
-const char * lang_es_ES[_L_COUNT] = {
+const char * const lang_es_ES[_L_COUNT] = {
     [_L_ON] = "SI",
     [_L_OFF] = "NO",
     [_L_ON_F] = "[SI]",
diff --git a/fw/application/src/i18n/fr_FR.c b/fw/application/src/i18n/fr_FR.c
@@ -1,5 +1,5 @@
 #include "string_id.h"
-const char * lang_fr_FR[_L_COUNT] = {
+const char * const lang_fr_FR[_L_COUNT] = {
     [_L_ON] = "ACTIVÉ",
     [_L_OFF] = "DÉSACTIVÉ",
     [_L_ON_F] = "[ACTIVÉ]",
diff --git a/fw/application/src/i18n/hu_HU.c b/fw/application/src/i18n/hu_HU.c
@@ -1,5 +1,5 @@
 #include "string_id.h"
-const char * lang_hu_HU[_L_COUNT] = {
+const char * const lang_hu_HU[_L_COUNT] = {
     [_L_ON] = "BE",
     [_L_OFF] = "KI",
     [_L_ON_F] = "[BE]",
diff --git a/fw/application/src/i18n/ja_JP.c b/fw/application/src/i18n/ja_JP.c
@@ -1,5 +1,5 @@
 #include "string_id.h"
-const char * lang_ja_JP[_L_COUNT] = {
+const char * const lang_ja_JP[_L_COUNT] = {
     [_L_ON] = "オン",
     [_L_OFF] = "オフ",
     [_L_ON_F] = "[オン]",
diff --git a/fw/application/src/i18n/language.c b/fw/application/src/i18n/language.c
@@ -1,64 +1,61 @@
 
 #include "language.h"
 
-
 typedef struct {
-    const char** strings;
+    const char **strings;
 } LanguageData;
 
-LanguageData languageData[LANGUAGE_COUNT] = {
-    [LANGUAGE_ZH_HANS] = { .strings = lang_zh_Hans },
-    [LANGUAGE_EN_US] = { .strings = lang_en_US },
-    [LANGUAGE_ZH_TW] = { .strings = lang_zh_TW },
-    [LANGUAGE_ES_ES] = { .strings = lang_es_ES },
-    [LANGUAGE_HU_HU] = { .strings = lang_hu_HU },
-    [LANGUAGE_DE_DE] = { .strings = lang_de_DE },
-    [LANGUAGE_FR_FR] = { .strings = lang_fr_FR },
-    [LANGUAGE_NL_NL] = { .strings = lang_nl_NL },
-    [LANGUAGE_PT_BR] = { .strings = lang_pt_BR },
-    [LANGUAGE_JA_JP] = { .strings = lang_ja_JP },
-    [LANGUAGE_PT_PT] = { .strings = lang_pt_PT },
+const LanguageData const languageData[LANGUAGE_COUNT] = {
+    [LANGUAGE_ZH_HANS] = {.strings = lang_zh_Hans}, [LANGUAGE_EN_US] = {.strings = lang_en_US},
+    [LANGUAGE_ZH_TW] = {.strings = lang_zh_TW},     [LANGUAGE_ES_ES] = {.strings = lang_es_ES},
+    [LANGUAGE_HU_HU] = {.strings = lang_hu_HU},     [LANGUAGE_DE_DE] = {.strings = lang_de_DE},
+    [LANGUAGE_FR_FR] = {.strings = lang_fr_FR},     [LANGUAGE_NL_NL] = {.strings = lang_nl_NL},
+    [LANGUAGE_PT_BR] = {.strings = lang_pt_BR},     [LANGUAGE_JA_JP] = {.strings = lang_ja_JP},
+    [LANGUAGE_PT_PT] = {.strings = lang_pt_PT},
 };
 
 // 当前语言设置 (Current language setting)
 Language currentLanguage = LANGUAGE_ZH_HANS;
 
-
-const char* getLangString(L_StringID stringID) {
-    const char* string = languageData[currentLanguage].strings[stringID];
+const char *getLangString(L_StringID stringID) {
+    if (stringID >= _L_COUNT) {
+        return "@@STR@@";
+    }
+    if (currentLanguage >= LANGUAGE_COUNT) {
+        return lang_en_US[stringID];
+    }
+    const char *string = languageData[currentLanguage].strings[stringID];
     return string && strlen(string) > 0 ? string : lang_en_US[stringID];
 }
 
-void setLanguage(Language lang) {
-   currentLanguage = lang;
-}
+void setLanguage(Language lang) { currentLanguage = lang; }
 
-const char* getLangDesc(Language lang){
-    if(lang == LANGUAGE_ZH_HANS){
+const char *getLangDesc(Language lang) {
+    if (lang == LANGUAGE_ZH_HANS) {
         return "简体中文";
-    }else if(lang == LANGUAGE_EN_US){
+    } else if (lang == LANGUAGE_EN_US) {
         return "English";
-    }else if(lang == LANGUAGE_ZH_TW){
+    } else if (lang == LANGUAGE_ZH_TW) {
         return "繁體中文(臺灣)";
-    }else if(lang == LANGUAGE_ES_ES){
-        return  "Español";
-    }else if(lang == LANGUAGE_HU_HU){
-        return  "Magyar";
-    }else if(lang == LANGUAGE_DE_DE){
-        return  "Deutsch";
-    }else if(lang == LANGUAGE_FR_FR){
-        return  "Français";
-    }else if(lang == LANGUAGE_NL_NL){
-        return  "Dutch (Nederlands)";
-    }else if(lang == LANGUAGE_PT_BR){
-        return  "Português(Brazil)";
-    }else if(lang == LANGUAGE_JA_JP){
-        return  "日本語";
-    }else if(lang == LANGUAGE_PT_PT){
-        return  "Português(Portugal)";
+    } else if (lang == LANGUAGE_ES_ES) {
+        return "Español";
+    } else if (lang == LANGUAGE_HU_HU) {
+        return "Magyar";
+    } else if (lang == LANGUAGE_DE_DE) {
+        return "Deutsch";
+    } else if (lang == LANGUAGE_FR_FR) {
+        return "Français";
+    } else if (lang == LANGUAGE_NL_NL) {
+        return "Dutch (Nederlands)";
+    } else if (lang == LANGUAGE_PT_BR) {
+        return "Português(Brazil)";
+    } else if (lang == LANGUAGE_JA_JP) {
+        return "日本語";
+    } else if (lang == LANGUAGE_PT_PT) {
+        return "Português(Portugal)";
+    } else {
+        return "@@LANG@@";
     }
 }
 
-Language getLanguage() {
-    return currentLanguage;
-}
+Language getLanguage() { return currentLanguage; }
diff --git a/fw/application/src/i18n/nl_NL.c b/fw/application/src/i18n/nl_NL.c
@@ -1,5 +1,5 @@
 #include "string_id.h"
-const char * lang_nl_NL[_L_COUNT] = {
+const char * const lang_nl_NL[_L_COUNT] = {
     [_L_ON] = "AAN",
     [_L_OFF] = "UIT",
     [_L_ON_F] = "[AAN]",
diff --git a/fw/application/src/i18n/pt_BR.c b/fw/application/src/i18n/pt_BR.c
@@ -1,5 +1,5 @@
 #include "string_id.h"
-const char * lang_pt_BR[_L_COUNT] = {
+const char * const lang_pt_BR[_L_COUNT] = {
     [_L_ON] = "LIGADO",
     [_L_OFF] = "DESLIGADO",
     [_L_ON_F] = "[LIGADO]",
diff --git a/fw/application/src/i18n/pt_PT.c b/fw/application/src/i18n/pt_PT.c
@@ -1,5 +1,5 @@
 #include "string_id.h"
-const char * lang_pt_PT[_L_COUNT] = {
+const char * const lang_pt_PT[_L_COUNT] = {
     [_L_ON] = "SIM",
     [_L_OFF] = "NÃO",
     [_L_ON_F] = "[SIM]",
diff --git a/fw/application/src/i18n/zh_Hans.c b/fw/application/src/i18n/zh_Hans.c
@@ -1,5 +1,5 @@
 #include "string_id.h"
-const char * lang_zh_Hans[_L_COUNT] = {
+const char * const lang_zh_Hans[_L_COUNT] = {
     [_L_ON] = "开",
     [_L_OFF] = "关",
     [_L_ON_F] = "[开]",
diff --git a/fw/application/src/i18n/zh_TW.c b/fw/application/src/i18n/zh_TW.c
@@ -1,5 +1,5 @@
 #include "string_id.h"
-const char * lang_zh_TW[_L_COUNT] = {
+const char * const lang_zh_TW[_L_COUNT] = {
     [_L_ON] = "開",
     [_L_OFF] = "關",
     [_L_ON_F] = "[開]",
diff --git a/fw/application/src/main.c b/fw/application/src/main.c
@@ -93,8 +93,8 @@
 #include "hal_spi_flash.h"
 
 #include "cache.h"
-#include "settings.h"
 #include "i18n/language.h"
+#include "settings.h"
 
 #define APP_SCHED_MAX_EVENT_SIZE 4 /**< Maximum size of scheduler events. */
 #define APP_SCHED_QUEUE_SIZE 16    /**< Maximum number of events in the scheduler queue. */
@@ -104,7 +104,6 @@
 
 #define APP_SHUTDOWN_HANDLER_PRIORITY 1
 
-
 int8_t g_usb_led_marquee_enable = 0; /** dummy for chameleon */
 
 // #define SPI_FLASH
@@ -166,8 +165,6 @@ static bool shutdown_handler(nrf_pwr_mgmt_evt_t event) {
         // save settings
         settings_save();
 
-
-
         hal_spi_flash_sleep();
 
         err_code = bsp_wakeup_button_enable(BTN_ID_SLEEP);
@@ -260,7 +257,7 @@ int main(void) {
     err_code = ntag_emu_init(&default_ntag215);
     APP_ERROR_CHECK(err_code);
 
-    //cache_clean(); //FOR TESTING
+    // cache_clean(); //FOR TESTING
     check_wakeup_src();
 
     err_code = settings_init();
@@ -277,11 +274,8 @@ int main(void) {
 
     NRF_LOG_DEBUG("init done");
 
-    if (p_settings->language >= LANGUAGE_COUNT) {
-        p_settings->language = LANGUAGE_EN_US;
-    }
     setLanguage(p_settings->language);
-    
+
     mui_t *p_mui = mui();
     mui_init(p_mui);
 
diff --git a/fw/application/src/mui/mui_anim.c b/fw/application/src/mui/mui_anim.c
@@ -6,7 +6,7 @@
 #define LV_ANIM_RESOLUTION 1024
 #define LV_ANIM_RES_SHIFT 10
 
-#define MUI_ANIM_TICK_INTERVAL_MS 50
+#define MUI_ANIM_TICK_INTERVAL_MS 20
 #define MUI_ANIM_REPEAT_INFINITE 0xFFFF
 
 
diff --git a/fw/application/src/mui/u8g2_font_wqy12_t_gb2312a_lite.c b/fw/application/src/mui/u8g2_font_wqy12_t_gb2312a_lite.c
diff --git a/fw/application/src/mui/view/mui_list_view.c b/fw/application/src/mui/view/mui_list_view.c
diff --git a/fw/application/src/mui/view/mui_list_view.h b/fw/application/src/mui/view/mui_list_view.h
diff --git a/fw/components/chameleon-ultra b/fw/components/chameleon-ultra
diff --git a/fw/data/i18n.csv b/fw/data/i18n.csv
diff --git a/fw/scripts/i18n_gen.py b/fw/scripts/i18n_gen.py

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,11 @@ static void fds_map_file_name(uint16_t id, uint16_t key, char *path) {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`-bool fds_read_sync(uint16_t id, uint16_t key, uint16_t max_length, uint8_t *buffer) {`
	`25`	`+bool fds_read_sync(uint16_t id, uint16_t key, uint16_t* max_length, uint8_t *buffer) {`
`26`	`26`	`char path[VFS_MAX_PATH_LEN];`
`27`	`27`	`fds_map_file_name(id, key, path);`
`28`		`- int32_t bytes_read = vfs_get_default_driver()->read_file_data(path, buffer, max_length);`
	`28`	`+ int32_t bytes_read = vfs_get_default_driver()->read_file_data(path, buffer, *max_length);`
	`29`	`+ *max_length = bytes_read;`
`29`	`30`	`NRF_LOG_INFO("fds_read_sync: id=%X, key=%d, bytes_read=%d", id, key, bytes_read);`
`30`	`31`	`return bytes_read > 0;`
`31`	`32`	`}`