Skip to content

Commit 66f7a57

Browse files
flash62auflash62au
committed
Initial Chinese language support
Needed a new define to be able to override the direction font
1 parent 3deb8e3 commit 66f7a57

File tree

5 files changed

+346
-12
lines changed

5 files changed

+346
-12
lines changed

‎WiTcontroller.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3609,7 +3609,7 @@ void writeOledSpeed() {
36093609
// direction
36103610
// needed for new function state format
36113611
u8g2.setFont(FONT_DIRECTION); // medium
3612-
u8g2.drawStr(79,36, sDirection.c_str());
3612+
u8g2.drawUTF8(79,36, sDirection.c_str());
36133613

36143614
// speed
36153615
const char *cSpeed = sSpeed.c_str();

‎change_log.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Change Log
2+
### V1.105
3+
- Initial Chinese language support. Needed a new define to be able to override the direction font
24
### V1.104
3-
- Option to invert the meanaing of the encoder rotation when the loco is reversed ``#define ENCODER_INVERT_ROTATION_WHEN_REVERSED true``
5+
- Option to invert the meaning of the encoder rotation when the loco is reversed ``#define ENCODER_INVERT_ROTATION_WHEN_REVERSED true``
46
### V1.103
57
- Option to bypass the initial WiFi scan ``#define BYPASS_WIFI_SCAN_ON_STARTUP true``
68
### V1.102

‎config_buttons_example.h‎

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,43 @@
480480
//
481481
// German - Deutsche
482482
// #include "language_deutsch.h"
483+
// Italian - Italiano
484+
// #include "language_italiano.h"
485+
// Chinese - 中文
486+
// #include "language_chinese.h"
487+
488+
// *******************************************************************************************************************
489+
// Primary Font override (not recommended other than for use of Chinese characters)
490+
491+
// Any 8 pixel high fonts from here can be used https://github.com/olikraus/u8g2/wiki/fntlist8#8-pixel-height
492+
// Uncomment if and change to the appropriate font if required
493+
// #define FONT_DEFAULT u8g2_font_5x8_tf
494+
495+
// Chinese
496+
// This font is required for Chinese characters
497+
// #define FONT_DEFAULT u8g2_font_boutique_bitmap_7x7_t_gb2312
498+
499+
// Direction Indication Font override (not recommended other than for use of Chinese characters)
500+
// Any font from here can be used https://github.com/olikraus/u8g2/wiki/fntlist8#8-pixel-height
501+
// The default one is 29px high
502+
// Uncomment if and change to the appropriate font if required
503+
// #define FONT_DIRECTION u8g2_font_neuecraft_tr
504+
505+
// Chinese
506+
// This font is required for Chinese characters
507+
508+
// *****
509+
510+
// #define FONT_DIRECTION u8g2_font_boutique_bitmap_9x9_bold_t_gb2312
511+
// Direction Indication Font override (not recommended other than for use of Chinese characters)
512+
// Any font from here can be used https://github.com/olikraus/u8g2/wiki/fntlist8#8-pixel-height
513+
// The default one is 29px high
514+
// Uncomment if and change to the appropriate font if required
515+
// #define FONT_DIRECTION u8g2_font_neuecraft_tr
516+
517+
// Chinese
518+
// This font is required for Chinese characters
519+
// #define FONT_DIRECTION u8g2_font_boutique_bitmap_9x9_bold_t_gb2312
483520

484521
// *******************************************************************************************************************
485522
// Startup Commands
@@ -529,13 +566,6 @@
529566

530567
// #define RESTORE_ACQUIRED_LOCOS false
531568

532-
// *******************************************************************************************************************
533-
// Primary Font override (not recommended)
534-
535-
// Any 8 pixel high fonts from here can be used https://github.com/olikraus/u8g2/wiki/fntlist8#8-pixel-height
536-
// Uncomment if and change to the appropriate font if required
537-
// #define FONT_DEFAULT u8g2_font_5x8_tf
538-
539569
// *******************************************************************************************************************
540570
// Custom App Name
541571

‎language_chinese.h‎

Lines changed: 298 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,298 @@
1+
#ifndef MENU_TEXT_MENU
2+
#define MENU_TEXT_MENU "* 菜单 # 按键定义" // "* Menu # Key Defs"
3+
#endif
4+
#ifndef MENU_TEXT_MENU_HASH_IS_FUNCTIONS
5+
#define MENU_TEXT_MENU_HASH_IS_FUNCTIONS "* 菜单 # Fn" // "* Menu # Fn"
6+
#endif
7+
#ifndef MENU_TEXT_FINISH
8+
#define MENU_TEXT_FINISH " # 完成" // "# Finish"
9+
#endif
10+
#ifndef MENU_TEXT_CANCEL
11+
#define MENU_TEXT_CANCEL "* 取消 " // "* Cancel"
12+
#endif
13+
#ifndef MENU_TEXT_SHOW_DIRECT
14+
#define MENU_TEXT_SHOW_DIRECT " # 直显按键功能" // "# Show Direct"
15+
#endif
16+
#ifndef MENU_TEXT_ROSTER
17+
#define MENU_TEXT_ROSTER "* 取消 0-9 #翻页" // "* Cancel 0-9 #Pg"
18+
#endif
19+
#ifndef MENU_TEXT_TURNOUT_LIST
20+
#define MENU_TEXT_TURNOUT_LIST "* 取消 0-9 #翻页" // "* Cancel 0-9 #Pg"
21+
#endif
22+
#ifndef MENU_TEXT_ROUTE_LIST
23+
#define MENU_TEXT_ROUTE_LIST "* 取消 0-9 #翻页" // "* Cancel 0-9 #Pg"
24+
#endif
25+
#ifndef MENU_TEXT_FUNCTION_LIST
26+
#define MENU_TEXT_FUNCTION_LIST "* 取消 0-9 #翻页" // "* Cancel 0-9 #Pg"
27+
#endif
28+
#ifndef MENU_TEXT_SELECT_WIT_SERVICE
29+
#define MENU_TEXT_SELECT_WIT_SERVICE "0-4 # 进入， 按下旋钮 关闭" // "0-4 # Entry E.btn OFF"
30+
#endif
31+
#ifndef MENU_TEXT_SELECT_WIT_ENTRY
32+
#define MENU_TEXT_SELECT_WIT_ENTRY "0-9 * 返回 #确认 按下旋钮关闭" // "0-9 * Back # Go E.btn OFF"
33+
#endif
34+
#ifndef MENU_TEXT_SELECT_SSIDS
35+
#define MENU_TEXT_SELECT_SSIDS "0-9 # 搜索 按下旋钮关闭" // "0-9 # Search E.btn OFF"
36+
#endif
37+
#ifndef MENU_TEXT_SELECT_SSIDS_FROM_FOUND
38+
#define MENU_TEXT_SELECT_SSIDS_FROM_FOUND "0-4 9 列表 # 翻页 按下旋钮 关闭" // "0-4 9 List # Pg E.btn OFF"
39+
#endif
40+
#ifndef MENU_TEXT_ENTER_SSID_PASSWORD
41+
#define MENU_TEXT_ENTER_SSID_PASSWORD "旋钮选字符 # 确认 * 返回" // "E Chrs E.btn Slct # Go * Bck"
42+
#endif
43+
44+
45+
#ifndef DIRECT_COMMAND_LIST
46+
#define DIRECT_COMMAND_LIST "直接指令" // "Direct Commands"
47+
#endif
48+
#ifndef DIRECTION_FORWARD_TEXT
49+
#define DIRECTION_FORWARD_TEXT "前进" // "Fwd"
50+
#endif
51+
#ifndef DIRECTION_REVERSE_TEXT
52+
#define DIRECTION_REVERSE_TEXT "后退" // "Rev"
53+
#endif
54+
55+
56+
#ifndef MSG_START
57+
#define MSG_START "启动" // "Start"
58+
#endif
59+
#ifndef MSG_BROWSING_FOR_SERVICE
60+
#define MSG_BROWSING_FOR_SERVICE "搜索WiT服务" // "Browsing for WiT services"
61+
#endif
62+
#ifndef MSG_BROWSING_FOR_SSIDS
63+
#define MSG_BROWSING_FOR_SSIDS "搜索无线网络" // "Browsing for SSIDs"
64+
#endif
65+
#ifndef MSG_NO_SSIDS_FOUND
66+
#define MSG_NO_SSIDS_FOUND "未发现无线网络" // "No SSIDs found"
67+
#endif
68+
#ifndef MSG_SSIDS_LISTED
69+
#define MSG_SSIDS_LISTED " 已知无线网络" // "SSIDs listed"
70+
#endif
71+
#ifndef MSG_SSIDS_FOUND
72+
#define MSG_SSIDS_FOUND " 发现无线网络" // "SSIDs found"
73+
#endif
74+
#ifndef MSG_BOUNJOUR_SETUP_FAILED
75+
#define MSG_BOUNJOUR_SETUP_FAILED "监听服务未启动" // "Unable to setup Listener"
76+
#endif
77+
#ifndef MSG_NO_SERVICES_FOUND
78+
#define MSG_NO_SERVICES_FOUND "未发现服务" // "No services found"
79+
#endif
80+
#ifndef MSG_NO_SERVICES_FOUND_ENTRY_REQUIRED
81+
#define MSG_NO_SERVICES_FOUND_ENTRY_REQUIRED "输入WiT服务器IP:端口" // "Enter witServer IP:Port"
82+
#endif
83+
#ifndef MSG_SERVICES_FOUND
84+
#define MSG_SERVICES_FOUND "发现服务器" // "Service(s) found"
85+
#endif
86+
#ifndef MSG_TRYING_TO_CONNECT
87+
#define MSG_TRYING_TO_CONNECT "正在尝试连接" // "Trying to Connect"
88+
#endif
89+
#ifndef MSG_CONNECTED
90+
#define MSG_CONNECTED " 已连接" // "Connected"
91+
#endif
92+
#ifndef MSG_CONNECTING
93+
#define MSG_CONNECTING " 连接中..." // "Connecting..."
94+
#endif
95+
96+
97+
#ifndef MSG_ADDRESS_LABEL
98+
#define MSG_ADDRESS_LABEL "IP地址： " // "IP address:"
99+
#endif
100+
#ifndef MSG_CONNECTION_FAILED
101+
#define MSG_CONNECTION_FAILED "连接失败" // "Connection failed"
102+
#endif
103+
#ifndef MSG_DISCONNECTED
104+
#define MSG_DISCONNECTED "已断开" // "Disconnected"
105+
#endif
106+
#ifndef MSG_AUTO_SLEEP
107+
#define MSG_AUTO_SLEEP "选择超时" // "Waited too long for Select"
108+
#endif
109+
#ifndef MSG_BATTERY_SLEEP
110+
#define MSG_BATTERY_SLEEP "电池电量低" // "Battery critically low"
111+
#endif
112+
#ifndef MSG_START_SLEEP
113+
#define MSG_START_SLEEP "正在关机。 @ 重启" // "Shutting Down. E.btn ON"
114+
#endif
115+
#ifndef MSG_THROTTLE_NUMBER
116+
#define MSG_THROTTLE_NUMBER " 控制器 #" // "Throttle #"
117+
#endif
118+
#ifndef MSG_NO_LOCO_SELECTED
119+
#define MSG_NO_LOCO_SELECTED " 未选择机车" // "No Loco selected"
120+
#endif
121+
#ifndef MSG_ENTER_PASSWORD
122+
#define MSG_ENTER_PASSWORD "输入密码" // "Enter Password"
123+
#endif
124+
#ifndef MSG_GUESSED_EX_CS_WIT_SERVER
125+
#define MSG_GUESSED_EX_CS_WIT_SERVER "发现EX-CS WiT服务器" // "Guessed' EX-CS WiT server"
126+
#endif
127+
#ifndef MSG_BYPASS_WIT_SERVER_SEARCH
128+
#define MSG_BYPASS_WIT_SERVER_SEARCH "跳过WiT服务器搜索" // "Bypass WiT server search"
129+
#endif
130+
#ifndef MSG_NO_FUNCTIONS
131+
#define MSG_NO_FUNCTIONS "功能列表 - 列表为空" // "Function List - No Functions"
132+
#endif
133+
#ifndef MSG_HEARTBEAT_CHECK_ENABLED
134+
#define MSG_HEARTBEAT_CHECK_ENABLED "心跳检测已启用" // "Heartbeat Check Enabled"
135+
#endif
136+
#ifndef MSG_HEARTBEAT_CHECK_DISABLED
137+
#define MSG_HEARTBEAT_CHECK_DISABLED "心跳检测已禁用" // "Heartbeat Check Disabled"
138+
#endif
139+
#ifndef MSG_RECEIVING_SERVER_DETAILS
140+
#define MSG_RECEIVING_SERVER_DETAILS "正在接收服务器数据" // "Getting data from server"
141+
#endif
142+
143+
#ifndef MENU_ITEM_TEXT_TITLE_FUNCTION
144+
#define MENU_ITEM_TEXT_TITLE_FUNCTION "功能" // "Function"
145+
#endif
146+
#ifndef MENU_ITEM_TEXT_TITLE_ADD_LOCO
147+
#define MENU_ITEM_TEXT_TITLE_ADD_LOCO "添加机车" // "Add Loco"
148+
#endif
149+
#ifndef MENU_ITEM_TEXT_TITLE_DROP_LOCO
150+
#define MENU_ITEM_TEXT_TITLE_DROP_LOCO "移除机车" // "Drop Loco"
151+
#endif
152+
#ifndef MENU_ITEM_TEXT_TITLE_TOGGLE_DIRECTION
153+
#define MENU_ITEM_TEXT_TITLE_TOGGLE_DIRECTION "切换方向" // "Toggle Dir"
154+
#endif
155+
#ifndef MENU_ITEM_TEXT_TITLE_SPEED_STEP_MULTIPLIER
156+
#define MENU_ITEM_TEXT_TITLE_SPEED_STEP_MULTIPLIER "速度倍率" // "X Speed Step"
157+
#endif
158+
#ifndef MENU_ITEM_TEXT_TITLE_THROW_POINT
159+
#define MENU_ITEM_TEXT_TITLE_THROW_POINT "道岔转辙" // "Throw Point"
160+
#endif
161+
#ifndef MENU_ITEM_TEXT_TITLE_CLOSE_POINT
162+
#define MENU_ITEM_TEXT_TITLE_CLOSE_POINT "道岔归位" // "Close Point"
163+
#endif
164+
#ifndef MENU_ITEM_TEXT_TITLE_ROUTE
165+
#define MENU_ITEM_TEXT_TITLE_ROUTE "进路" // "Route"
166+
#endif
167+
#ifndef MENU_ITEM_TEXT_TITLE_TRACK_POWER
168+
#define MENU_ITEM_TEXT_TITLE_TRACK_POWER "轨道供电" // "Trk Power"
169+
#endif
170+
#ifndef MENU_ITEM_TEXT_TITLE_EXTRAS
171+
#define MENU_ITEM_TEXT_TITLE_EXTRAS "附加功能" // "Extras"
172+
#endif
173+
#ifndef MENU_ITEM_TEXT_TITLE_HEARTBEAT
174+
#define MENU_ITEM_TEXT_TITLE_HEARTBEAT "心跳检测" // "Heartbeat"
175+
#endif
176+
#ifndef MENU_ITEM_TEXT_TITLE_EDIT_CONSIST
177+
#define MENU_ITEM_TEXT_TITLE_EDIT_CONSIST "编辑重联" // "Edit Consist Facing"
178+
#endif
179+
180+
181+
#ifndef MENU_ITEM_TEXT_MENU_FUNCTION
182+
#define MENU_ITEM_TEXT_MENU_FUNCTION "编号+# 选择 * 取消 # 列表" // "no+# Select * Cancel # List"
183+
#endif
184+
#ifndef MENU_ITEM_TEXT_MENU_ADD_LOCO
185+
#define MENU_ITEM_TEXT_MENU_ADD_LOCO "地址+# 添加 * 取消 # 机车库" // "addr+# Add * Cancel # Roster"
186+
#endif
187+
#ifndef MENU_ITEM_TEXT_MENU_DROP_LOCO
188+
#define MENU_ITEM_TEXT_MENU_DROP_LOCO "地址+# 单删 * 取消 # 全删" // "addr+# One * Cancel # All"
189+
#endif
190+
#ifndef MENU_ITEM_TEXT_MENU_DROP_LOCO_BYINDEX
191+
#define MENU_ITEM_TEXT_MENU_DROP_LOCO_BY_INDEX "编号+# 单删 * 取消 # 全删" // "no+# One * Cancel # All"
192+
#endif
193+
#ifndef MENU_ITEM_TEXT_MENU_TOGGLE_DIRECTION
194+
#define MENU_ITEM_TEXT_MENU_TOGGLE_DIRECTION "# 切换" // "# Toggle"
195+
#endif
196+
#ifndef MENU_ITEM_TEXT_MENU_SPEED_STEP_MULTIPLIER
197+
#define MENU_ITEM_TEXT_MENU_SPEED_STEP_MULTIPLIER "* 取消 # 切换" // "* Cancel # Toggle"
198+
#endif
199+
#ifndef MENU_ITEM_TEXT_MENU_THROW_POINT
200+
#define MENU_ITEM_TEXT_MENU_THROW_POINT "编号+# 转辙 * 取消 # 列表" // "no+# Throw * Cancel # List"
201+
#endif
202+
#ifndef MENU_ITEM_TEXT_MENU_CLOSE_POINT
203+
#define MENU_ITEM_TEXT_MENU_CLOSE_POINT "编号+# 归位 * 取消 # 列表" // "no+# Close * Cancel # List"
204+
#endif
205+
#ifndef MENU_ITEM_TEXT_MENU_ROUTE
206+
#define MENU_ITEM_TEXT_MENU_ROUTE "编号+# 选择 * 取消 # 列表" // "no+# Select * Cancel # List"
207+
#endif
208+
#ifndef MENU_ITEM_TEXT_MENU_TRACK_POWER
209+
#define MENU_ITEM_TEXT_MENU_TRACK_POWER "* 取消 # 切换" // "* Cancel # Toggle"
210+
#endif
211+
#ifndef MENU_ITEM_TEXT_MENU_EXTRAS
212+
#define MENU_ITEM_TEXT_MENU_EXTRAS "选择编号 * 取消" // "no Select * Cancel"
213+
#endif
214+
#ifndef MENU_ITEM_TEXT_MENU_HEARTBEAT
215+
#define MENU_ITEM_TEXT_MENU_HEARTBEAT "* 关闭" // "* Close"
216+
#endif
217+
#ifndef MENU_ITEM_TEXT_MENU_EDIT_CONSIST
218+
#define MENU_ITEM_TEXT_MENU_EDIT_CONSIST "编号 反转方向 * 关闭" // "no Chng Facing * Close"
219+
#endif
220+
221+
222+
#ifndef EXTRA_MENU_TEXT_CHAR_FUNCTION_KEY_TOGGLE
223+
#define EXTRA_MENU_TEXT_CHAR_FUNCTION_KEY_TOGGLE "功能/按键 切换" // "Fnc/Key Tgl"
224+
#endif
225+
#ifndef EXTRA_MENU_TEXT_CHAR_EDIT_CONSIST
226+
#define EXTRA_MENU_TEXT_CHAR_EDIT_CONSIST "编辑重联" // "Edt Consist"
227+
#endif
228+
229+
#ifndef EXTRA_MENU_TEXT_CHAR_HEARTBEAT_TOGGLE
230+
#define EXTRA_MENU_TEXT_CHAR_HEARTBEAT_TOGGLE "心跳 开关" // "Heartbt Tgl"
231+
#endif
232+
#ifndef EXTRA_MENU_TEXT_CHAR_DROP_BEFORE_ACQUIRE_TOGGLE
233+
#define EXTRA_MENU_TEXT_CHAR_DROP_BEFORE_ACQUIRE_TOGGLE "单机车 开关" // "1 loco Tgl"
234+
#endif
235+
#ifndef EXTRA_MENU_TEXT_SAVE_CURRENT_LOCOS
236+
#define EXTRA_MENU_TEXT_SAVE_CURRENT_LOCOS "保存当前机车" // "Save Locos"
237+
#endif
238+
#ifndef EXTRA_MENU_TEXT_CHAR_INCREASE_MAX_THROTTLES
239+
#define EXTRA_MENU_TEXT_CHAR_INCREASE_MAX_THROTTLES "控制器数 +" // "#Throttles +"
240+
#endif
241+
#ifndef EXTRA_MENU_TEXT_CHAR_DECREASE_MAX_THROTTLES
242+
#define EXTRA_MENU_TEXT_CHAR_DECREASE_MAX_THROTTLES "控制器数 -" // "#Throttles -"
243+
#endif
244+
#ifndef EXTRA_MENU_TEXT_CHAR_DISCONNECT
245+
#define EXTRA_MENU_TEXT_CHAR_DISCONNECT "断开WiT连接" // "Disconnect"
246+
#endif
247+
#ifndef EXTRA_MENU_TEXT_CHAR_OFF_SLEEP
248+
#define EXTRA_MENU_TEXT_CHAR_OFF_SLEEP "关机 / 休眠" // "OFF / Sleep"
249+
#endif
250+
251+
252+
#ifndef F0_LABEL
253+
#define F0_LABEL "灯光" // "Light"
254+
#endif
255+
#ifndef F1_LABEL
256+
#define F1_LABEL "铃铛" // "Bell"
257+
#endif
258+
#ifndef F2_LABEL
259+
#define F2_LABEL "喇叭" // "Horn"
260+
#endif
261+
262+
#ifndef CHOSEN_KEYPAD_DISPLAY_PREFIX
263+
#define CHOSEN_KEYPAD_DISPLAY_PREFIX "* 菜单" // "* Menu"
264+
#endif
265+
#ifndef CHOSEN_KEYPAD_DISPLAY_SUFIX
266+
#define CHOSEN_KEYPAD_DISPLAY_SUFIX "# 本键" // "# This"
267+
#endif
268+
269+
#ifndef CHOSEN_KEYPAD_0_DISPLAY_NAME
270+
#define CHOSEN_KEYPAD_0_DISPLAY_NAME "0 灯光" // "0 Lights"
271+
#endif
272+
#ifndef CHOSEN_KEYPAD_1_DISPLAY_NAME
273+
#define CHOSEN_KEYPAD_1_DISPLAY_NAME "1 铃铛" // "1 Bell"
274+
#endif
275+
#ifndef CHOSEN_KEYPAD_2_DISPLAY_NAME
276+
#define CHOSEN_KEYPAD_2_DISPLAY_NAME "2 喇叭" // "2 Horn"
277+
#endif
278+
#ifndef CHOSEN_KEYPAD_3_DISPLAY_NAME
279+
#define CHOSEN_KEYPAD_3_DISPLAY_NAME "3 F3" // "3 F3"
280+
#endif
281+
#ifndef CHOSEN_KEYPAD_4_DISPLAY_NAME
282+
#define CHOSEN_KEYPAD_4_DISPLAY_NAME "4 F4" // "4 F4"
283+
#endif
284+
#ifndef CHOSEN_KEYPAD_5_DISPLAY_NAME
285+
#define CHOSEN_KEYPAD_5_DISPLAY_NAME "5 下一页" // "5 Nxt Ttl"
286+
#endif
287+
#ifndef CHOSEN_KEYPAD_6_DISPLAY_NAME
288+
#define CHOSEN_KEYPAD_6_DISPLAY_NAME "6 速度倍率" // "6 X Spd"
289+
#endif
290+
#ifndef CHOSEN_KEYPAD_7_DISPLAY_NAME
291+
#define CHOSEN_KEYPAD_7_DISPLAY_NAME "7 后退" // "7 Rev"
292+
#endif
293+
#ifndef CHOSEN_KEYPAD_8_DISPLAY_NAME
294+
#define CHOSEN_KEYPAD_8_DISPLAY_NAME "8 紧急停车" // "8 Estop"
295+
#endif
296+
#ifndef CHOSEN_KEYPAD_9_DISPLAY_NAME
297+
#define CHOSEN_KEYPAD_9_DISPLAY_NAME "9 前进" // "9 Fwd"
298+
#endif

‎static.h‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const String appVersion = "v1.104";
1+
const String appVersion = "v1.105";
22
#ifndef CUSTOM_APPNAME
33
const String appName = "WiTcontroller";
44
#else
@@ -533,9 +533,13 @@ const char ssidPasswordBlankChar = 164;
533533
#endif
534534
#define FONT_FUNCTION_INDICATORS u8g2_font_tiny_simon_tr
535535
#define FONT_THROTTLE_NUMBER u8g2_font_neuecraft_tr
536-
#define FONT_PASSWORD u8g2_font_9x15_tf
536+
#ifndef FONT_PASSWORD
537+
#define FONT_PASSWORD u8g2_font_9x15_tf
538+
#endif
537539
#define FONT_SPEED u8g2_font_profont29_mr
538-
#define FONT_DIRECTION u8g2_font_neuecraft_tr
540+
#ifndef FONT_DIRECTION
541+
#define FONT_DIRECTION u8g2_font_neuecraft_tr
542+
#endif
539543
// #define FONT_TRACK_POWER u8g2_font_profont10_tf
540544
#define FONT_NEXT_THROTTLE u8g2_font_6x12_m_symbols
541545
#define FONT_GLYPHS u8g2_font_open_iconic_all_1x_t

0 commit comments

Comments
 (0)