piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Added CN/TW translations, reduced TW text size to fit firmware, TX16 BOR tweak (#1776)

Browse Source 
* Added CN/TW translation and reduced TW text size

Added CN/TW translation and reduced TW text size.
Because the TW text causes the firmware to exceed the flash size, reduce the text size.

* Modify the STM32 BOR level on TX16S to avoid system failure in extreme cases

Modify the STM32 BOR level on TX16S to avoid system failure in extreme cases.

* Update cn.h.txt

* Update tw.h.txt
This commit is contained in:
zyren
2022-04-01 10:46:09 +10:00
committed by GitHub
parent dbb9a5e4b2
commit 8a988b7f88
5 changed files with 63 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/fonts/CMakeLists.txt
+3 -1
View File
@@ -32,8 +32,10 @@ add_truetype_font_target(17 17 ${subset} none "${FONT_ARGS}")
add_truetype_font_target(17en 17 en none "${FONT_ARGS}")
add_truetype_font_target(bold17 17 ${subset} bold "${FONT_ARGS}")
add_truetype_font_target(24 24 ${subset} none "${FONT_ARGS}")
if( (${subset} STREQUAL "cn") OR (${subset} STREQUAL "tw"))
if(${subset} STREQUAL "cn")
add_truetype_font_target(32 30 ${subset} bold "${FONT_ARGS}")
elseif(${subset} STREQUAL "tw")
add_truetype_font_target(32 24 ${subset} bold "${FONT_ARGS}")
else()
add_truetype_font_target(32 32 ${subset} bold "${FONT_ARGS}")
endif()
radio/src/targets/horus/CMakeLists.txt
+4
View File
@@ -106,6 +106,10 @@ if (PCB STREQUAL X10)
set(AUX2_SERIAL ON)
endif()
set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC}
../../thirdparty/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c
)
elseif (PCBREV STREQUAL T18)
set(FLAVOUR t18)
set(LUA_EXPORT lua_export_t16)
radio/src/targets/horus/board.cpp
+11
View File
@@ -159,6 +159,17 @@ void boardInit()
BACKLIGHT_RCC_APB2Periph,
ENABLE);
#if defined(RADIO_TX16S)
if (FLASH_OB_GetBOR() != OB_BOR_LEVEL3)
{
FLASH_OB_Unlock();
FLASH_OB_BORConfig(OB_BOR_LEVEL3);
FLASH_OB_Launch();
FLASH_OB_Lock();
}
#endif
pwrInit();
pwrOn();
delaysInit();
radio/src/translations/cn.h.txt
+21 -21
View File
@@ -110,7 +110,7 @@
#define LEN_CURVE_TYPES "\006"
#define TR_CURVE_TYPES "标准\0 " "自定义"
#define LEN_ADCFILTERVALUES "\002"
#define LEN_ADCFILTERVALUES "\004"
#define TR_ADCFILTERVALUES "全局""禁用" "开启"
#define LEN_RETA123 "\001"
@@ -769,8 +769,8 @@
#define TR_TEMP_CALIB "温度校准"
#define TR_TIME "时间"
#define TR_MAXBAUDRATE "最大带宽"
#define TR_BAUDRATE "Baudrate"
#define TR_SAMPLE_MODE "Sample Mode"
#define TR_BAUDRATE "波特率"
#define TR_SAMPLE_MODE "采样模式"
#define LEN_SAMPLE_MODES "\006"
#define TR_SAMPLE_MODES "Normal""OneBit"
#define TR_BLUETOOTH "蓝牙"
@@ -782,14 +782,14 @@
#define TR_BLUETOOTH_BAUDRATE "蓝牙带宽"
#define LEN_BLUETOOTH_MODES "\004"
#define TR_BLUETOOTH_MODES "---\0" "回传" "教练"
#define TR_SELECT_TEMPLATE_FOLDER "SELECT A TEMPLATE FOLDER:"
#define TR_SELECT_TEMPLATE "SELECT A MODEL TEMPLATE:"
#define TR_NO_TEMPLATES "No model templates were found in this folder"
#define TR_SAVE_TEMPLATE "Save as template"
#define TR_BLANK_MODEL "Blank Model"
#define TR_BLANK_MODEL_INFO "Create a blank model"
#define TR_FILE_EXISTS "FILE ALREADY EXISTS"
#define TR_ASK_OVERWRITE "Do you want to overwrite?"
#define TR_SELECT_TEMPLATE_FOLDER "选择一个模板文件夹:"
#define TR_SELECT_TEMPLATE "选择一个模板:"
#define TR_NO_TEMPLATES "在此文件夹中未找到模型模板"
#define TR_SAVE_TEMPLATE "存储为模板"
#define TR_BLANK_MODEL "空白模型"
#define TR_BLANK_MODEL_INFO "创建一个空白模型"
#define TR_FILE_EXISTS "文件已存在"
#define TR_ASK_OVERWRITE "是否覆盖?"
#define TR_SD_INFO_TITLE "存储卡详情"
#define TR_SD_TYPE "类型:"
@@ -808,13 +808,13 @@
#define TR_MONTH "月"
#define TR_DAY "日"
#define TR_ROTARY_ENCODER "滚轮"
#define TR_INVERT_ROTARY "Invert Rotary"
#define TR_INVERT_ROTARY "滚轮反向"
#define TR_CHANNELS_MONITOR "通道查看器"
#define TR_MIXERS_MONITOR "混控查看器"
#define TR_PATH_TOO_LONG "路径太长"
#define TR_VIEW_TEXT "查看文本"
#define TR_FLASH_BOOTLOADER "更新引导程序"
#define TR_FLASH_DEVICE TR("Flash device","Flash device")
#define TR_FLASH_DEVICE TR("Flash device","刷新设备")
#define TR_FLASH_EXTERNAL_DEVICE TR("Flash S.Port", "从 S.Port 端口更新外设固件")
#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA"
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA"
@@ -823,12 +823,12 @@
#define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA"
#define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "刷新蓝牙模块")
#define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit"
#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "Device not responding")
#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.")
#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "Device data refused")
#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "Device access problem")
#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "Device file refused")
#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "Device file sig.")
#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "设备无响应")
#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "设备文件错误")
#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "设备数据被拒绝")
#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "无法访问设备")
#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "设备文件被拒绝")
#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "错误的文件签名")
#define TR_CURRENT_VERSION "当前版本: "
#define TR_FLASH_INTERNAL_MODULE "更新内置模块固件"
#define TR_FLASH_INTERNAL_MULTI "更新内置多协议模块固件"
@@ -1004,8 +1004,8 @@
#define TR_SPORT_UPDATE_POWER_MODES "自动""开启"
#define TR_NO_TELEMETRY_SCREENS "无回传页面"
#define TR_TOUCH_PANEL "触摸屏:"
#define TR_FILE_SIZE "File size"
#define TR_FILE_OPEN "Open anyway?"
#define TR_FILE_SIZE "文件大小"
#define TR_FILE_OPEN "还要打开文件吗?"
// Horus and Taranis column headers
#define TR_PHASES_HEADERS_NAME "名称"
radio/src/translations/tw.h.txt
+24 -16
View File
@@ -110,7 +110,7 @@
#define LEN_CURVE_TYPES "\006"
#define TR_CURVE_TYPES "標準\0 " "自定義"
#define LEN_ADCFILTERVALUES "\002"
#define LEN_ADCFILTERVALUES "\004"
#define TR_ADCFILTERVALUES "全局""禁用" "开启"
#define LEN_RETA123 "\001"
@@ -472,9 +472,9 @@
#define TR_BEEPCOUNTDOWN INDENT "倒數"
#define TR_PERSISTENT TR(INDENT "Persist.", INDENT "關機保持")
#define TR_BACKLIGHT_LABEL "背光"
#define TR_BLDELAY INDENT "Duration"
#define TR_GHOST_MENU_LABEL "GHOST MENU"
#define TR_STATUS "Status"
#define TR_BLDELAY INDENT "Duration"
#define TR_BLONBRIGHTNESS "背光開"
#define TR_BLOFFBRIGHTNESS "背光關"
#define TR_KEYS_BACKLIGHT "按鍵背光"
@@ -769,19 +769,10 @@
#define TR_TEMP_CALIB "溫度校準"
#define TR_TIME "時間"
#define TR_MAXBAUDRATE "最大帶寬"
#define TR_BAUDRATE "Baudrate"
#define TR_SAMPLE_MODE "Sample Mode"
#define TR_BAUDRATE "波特率"
#define TR_SAMPLE_MODE "採樣模式"
#define LEN_SAMPLE_MODES "\006"
#define TR_SAMPLE_MODES "Normal""OneBit"
#define TR_SELECT_TEMPLATE_FOLDER "SELECT A TEMPLATE FOLDER:"
#define TR_SELECT_TEMPLATE "SELECT A MODEL TEMPLATE:"
#define TR_NO_TEMPLATES "No model templates were found in this folder"
#define TR_SAVE_TEMPLATE "Save as template"
#define TR_BLANK_MODEL "Blank Model"
#define TR_BLANK_MODEL_INFO "Create a blank model"
#define TR_FILE_EXISTS "FILE ALREADY EXISTS"
#define TR_ASK_OVERWRITE "Do you want to overwrite?"
#define TR_BLUETOOTH "藍牙"
#define TR_BLUETOOTH_DISC "發現"
#define TR_BLUETOOTH_INIT "初始化"
@@ -791,6 +782,14 @@
#define TR_BLUETOOTH_BAUDRATE "藍牙帶寬"
#define LEN_BLUETOOTH_MODES "\004"
#define TR_BLUETOOTH_MODES "---\0" "回傳" "教練"
#define TR_SELECT_TEMPLATE_FOLDER "選擇一個樣板檔案夾:"
#define TR_SELECT_TEMPLATE "選擇一個樣板:"
#define TR_NO_TEMPLATES "在此檔案夾中未找到模型樣板"
#define TR_SAVE_TEMPLATE "存儲為樣板"
#define TR_BLANK_MODEL "空白模型"
#define TR_BLANK_MODEL_INFO "創建一個空白模型"
#define TR_FILE_EXISTS "文件已存在"
#define TR_ASK_OVERWRITE "是否覆蓋?"
#define TR_SD_INFO_TITLE "存儲卡詳情"
#define TR_SD_TYPE "類型:"
@@ -809,12 +808,13 @@
#define TR_MONTH "月"
#define TR_DAY "日"
#define TR_ROTARY_ENCODER "滾輪"
#define TR_INVERT_ROTARY "Invert Rotary"
#define TR_INVERT_ROTARY "滾輪反向"
#define TR_CHANNELS_MONITOR "通道查看器"
#define TR_MIXERS_MONITOR "混控查看器"
#define TR_PATH_TOO_LONG "路徑太長"
#define TR_VIEW_TEXT "查看文本"
#define TR_FLASH_BOOTLOADER "更新引導程序"
#define TR_FLASH_DEVICE TR("Flash device","刷新設備")
#define TR_FLASH_EXTERNAL_DEVICE TR("Flash S.Port", "從 S.Port端口更新外設備韌體")
#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA"
#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA"
@@ -823,6 +823,12 @@
#define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA"
#define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "刷新藍牙模塊")
#define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit"
#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "設備無響應")
#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "設備文件錯誤")
#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "設備數據被拒絕")
#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "無法訪問設備")
#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "設備文件被拒絕")
#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "錯誤的文件簽名")
#define TR_CURRENT_VERSION "當前版本: "
#define TR_FLASH_INTERNAL_MODULE "更新內置模塊韌體"
#define TR_FLASH_INTERNAL_MULTI "更新內置多協議模塊韌體"
@@ -998,6 +1004,8 @@
#define TR_SPORT_UPDATE_POWER_MODES "自動""開啟"
#define TR_NO_TELEMETRY_SCREENS "無回傳頁面"
#define TR_TOUCH_PANEL "觸摸屏:"
#define TR_FILE_SIZE "文件大小"
#define TR_FILE_OPEN "還要打開文件嗎?"
// Horus and Taranis column headers
#define TR_PHASES_HEADERS_NAME "名稱"
@@ -1105,9 +1113,9 @@
#define TR_ONLYPOSITIVE "正向"
#define TR_FILTER "濾波"
#define TR_TELEMETRYFULL TR("All slots full!", "回傳項目已滿!")
#define TR_SERVOS_OK "Servos OK"
#define TR_SERVOS_OK "Servos OK"
#define TR_SERVOS_KO "Servos KO"
#define TR_INVERTED_SERIAL INDENT "反向"
#define TR_INVERTED_SERIAL INDENT "反向"
#define TR_IGNORE_INSTANCE TR(INDENT "No inst.", INDENT "忽略ID鑑別")
#define TR_DISCOVER_SENSORS "掃描新的回傳項目"
#define TR_STOP_DISCOVER_SENSORS "停止掃描"