Compare commits
8 Commits
195f0a9e2b
...
277462a8fe
| Author | SHA1 | Date | |
|---|---|---|---|
| 277462a8fe | |||
| 64fec3a19e | |||
| 0b874a5c86 | |||
| 3d57e6416a | |||
| 988fe11914 | |||
| b424c04a01 | |||
| d02e33d97b | |||
| 6ca70d2580 |
@@ -11,6 +11,14 @@ project(new_kbd)
|
||||
zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc)
|
||||
zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/events)
|
||||
|
||||
zephyr_compile_definitions(
|
||||
LV_LVGL_H_INCLUDE_SIMPLE=1
|
||||
LV_FONT_MONTSERRAT_14=0
|
||||
LV_FONT_UNSCII_8=0
|
||||
LV_FONT_DEFAULT=\&ui_font_keyboard_small_18
|
||||
"LV_FONT_CUSTOM_DECLARE=LV_FONT_DECLARE(ui_font_keyboard_small_18) LV_FONT_DECLARE(ui_font_keyboard_time_48)"
|
||||
)
|
||||
|
||||
target_compile_definitions(app PRIVATE
|
||||
APP_HID_KEYMAP_DEF_PATH=\"hid_keymap_def.h\"
|
||||
)
|
||||
@@ -28,16 +36,22 @@ target_sources(app PRIVATE
|
||||
src/events/keyboard_led_event.c
|
||||
src/events/mode_event.c
|
||||
src/events/qdec_step_event.c
|
||||
src/events/time_sync_event.c
|
||||
src/modules/battery_module.c
|
||||
src/modules/ble_adv_ctrl_module.c
|
||||
src/modules/ble_battery_module.c
|
||||
src/modules/ble_bond_module.c
|
||||
src/modules/ble_time_sync_module.c
|
||||
src/modules/ble_slot_ctrl_module.c
|
||||
src/modules/display_module.c
|
||||
src/modules/hid_tx_manager_module.c
|
||||
src/modules/keyboard_module.c
|
||||
src/modules/led_state_module.c
|
||||
src/modules/mode_switch_module.c
|
||||
src/modules/qdec_module.c
|
||||
src/modules/time_manager_module.c
|
||||
src/modules/usb_hid_module.c
|
||||
src/modules/ble_hid_module.c
|
||||
src/ui/fonts/ui_font_keyboard_small_18.c
|
||||
src/ui/fonts/ui_font_keyboard_time_48.c
|
||||
)
|
||||
|
||||
28
app.overlay
28
app.overlay
@@ -1,6 +1,14 @@
|
||||
#include <zephyr/dt-bindings/gpio/gpio.h>
|
||||
|
||||
/ {
|
||||
chosen {
|
||||
zephyr,display = &st7789v3;
|
||||
};
|
||||
|
||||
aliases {
|
||||
backlight = &backlight;
|
||||
};
|
||||
|
||||
zephyr,user {
|
||||
vbat-en-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
|
||||
io-channels = <&adc 5>, <&adc 7>;
|
||||
@@ -78,3 +86,23 @@
|
||||
qdec: &qdec {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi3 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&mipi_dbi {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&st7789v3 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pwm_leds {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pwm0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
791
docs/lvgl_zephyr_porting_notes.md
Normal file
791
docs/lvgl_zephyr_porting_notes.md
Normal file
@@ -0,0 +1,791 @@
|
||||
# 基于 Zephyr 的 LVGL 移植说明
|
||||
|
||||
## 1. 目标
|
||||
|
||||
本文档记录 `new_kbd` 项目在 `atguigu_mini_keyboard/nrf52840` 板卡上调通 LCD 与 LVGL 的过程，重点覆盖以下内容:
|
||||
|
||||
- 板级设备树需要满足的显示与背光条件
|
||||
- 如何先用最基础的 Zephyr `display` 子系统验证硬件链路
|
||||
- 如何切回 Zephyr 自带的 LVGL 适配层
|
||||
- 当前项目已经落地的关键配置
|
||||
- 常见问题与排查顺序
|
||||
|
||||
本文档对应的工程位置:
|
||||
|
||||
- 应用目录: `E:\projects\new_kbd`
|
||||
- 板卡目录: `E:\extra\boards\atguigu\atguigu_mini_keyboard`
|
||||
|
||||
---
|
||||
|
||||
## 2. 硬件链路确认
|
||||
|
||||
当前板卡上的显示相关资源如下:
|
||||
|
||||
- 面板驱动: `sitronix,st7789v`
|
||||
- 总线: `mipi-dbi-spi`
|
||||
- 显示节点: `st7789v3`
|
||||
- 背光: `pwm_leds/backlight`
|
||||
- 背光 PWM 输出: `pwm0`
|
||||
|
||||
板级 DTS 中的关键节点在:
|
||||
|
||||
- [atguigu_mini_keyboard.dts](E:\extra\boards\atguigu\atguigu_mini_keyboard\atguigu_mini_keyboard.dts)
|
||||
- [atguigu_mini_keyboard-pinctrl.dtsi](E:\extra\boards\atguigu\atguigu_mini_keyboard\atguigu_mini_keyboard-pinctrl.dtsi)
|
||||
|
||||
当前已经确认:
|
||||
|
||||
- 屏幕本身可以通过 Zephyr `display_write()` 正常显示颜色切换画面
|
||||
- 背光不是普通 GPIO 开关，而是 `pwm-leds` 设备
|
||||
- `p0.13` 与当前 LCD 使能无关，已经从显示路径里移除
|
||||
|
||||
这意味着:
|
||||
|
||||
- SPI/MIPI DBI 链路是通的
|
||||
- ST7789V 初始化参数至少在当前板上可用
|
||||
- 背光控制链路是通的
|
||||
- 后续如果 LVGL 出现黑屏，优先怀疑的是 LVGL 初始化、线程模型或对象刷新，而不是底层显示驱动
|
||||
|
||||
---
|
||||
|
||||
## 3. 设备树要求
|
||||
|
||||
应用侧 overlay 在:
|
||||
|
||||
- [app.overlay](E:\projects\new_kbd\app.overlay)
|
||||
|
||||
当前与显示相关的关键要求有三条:
|
||||
|
||||
### 3.1 选择显示设备
|
||||
|
||||
必须在 `chosen` 中指定:
|
||||
|
||||
```dts
|
||||
/ {
|
||||
chosen {
|
||||
zephyr,display = &st7789v3;
|
||||
};
|
||||
};
|
||||
```
|
||||
|
||||
否则 Zephyr 的 `display` 子系统和 LVGL 模块都找不到目标显示设备。
|
||||
|
||||
### 3.2 打开显示控制器和面板节点
|
||||
|
||||
应用 overlay 中需要显式把下面这些节点设为 `okay`:
|
||||
|
||||
```dts
|
||||
&spi2 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&mipi_dbi {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&st7789v3 {
|
||||
status = "okay";
|
||||
};
|
||||
```
|
||||
|
||||
### 3.3 打开 PWM 背光
|
||||
|
||||
当前背光不是由显示驱动自动管理，而是走 LED/PWM 子系统，所以还需要:
|
||||
|
||||
```dts
|
||||
/ {
|
||||
aliases {
|
||||
backlight = &backlight;
|
||||
};
|
||||
};
|
||||
|
||||
&pwm_leds {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pwm0 {
|
||||
status = "okay";
|
||||
};
|
||||
```
|
||||
|
||||
这样应用代码里可以通过 `LED_DT_SPEC_GET(DT_NODELABEL(backlight))` 拿到背光设备，再调用 `led_set_brightness_dt()` 设亮度。
|
||||
|
||||
---
|
||||
|
||||
## 4. 先验证裸显示，再切回 LVGL
|
||||
|
||||
这次移植采用了两阶段策略:
|
||||
|
||||
### 4.1 第一阶段: 先验证 Zephyr `display` 子系统
|
||||
|
||||
在这个阶段，应用不启用 LVGL，而是直接调用:
|
||||
|
||||
- `display_get_capabilities()`
|
||||
- `display_blanking_off()`
|
||||
- `display_write()`
|
||||
|
||||
通过 RGB565 彩条整屏写入，确认:
|
||||
|
||||
- 面板已经真正收到像素数据
|
||||
- 刷新链路不是空转
|
||||
- 背光与显示内容是解耦的
|
||||
|
||||
这个阶段已经验证成功，屏幕可以正常显示颜色切换画面。
|
||||
|
||||
### 4.2 第二阶段: 切回 Zephyr 自带 LVGL 适配层
|
||||
|
||||
在确认底层链路没问题后，再恢复 LVGL。这样如果再次黑屏，就可以把排查范围收缩到:
|
||||
|
||||
- LVGL 是否真的初始化成功
|
||||
- UI 是否在正确线程创建
|
||||
- 对象是否被正确刷新
|
||||
- `display_blanking_off()` 与背光使能时机是否正确
|
||||
|
||||
这个两阶段方法是这次调试中最关键的分界线。
|
||||
|
||||
---
|
||||
|
||||
## 5. 当前 LVGL 方案
|
||||
|
||||
当前项目使用的是 Zephyr 自带的 LVGL 移植，不再手写 `lv_timer_handler()` 主循环。
|
||||
|
||||
相关应用代码在:
|
||||
|
||||
- [display_module.c](E:\projects\new_kbd\src\modules\display_module.c)
|
||||
|
||||
当前方案要点如下:
|
||||
|
||||
### 5.1 使用 Zephyr 自带的 LVGL 自动初始化
|
||||
|
||||
依赖 `CONFIG_LV_Z_AUTO_INIT=y`，由 Zephyr 在应用启动前完成:
|
||||
|
||||
- `lv_init()`
|
||||
- display 注册
|
||||
- 渲染缓冲区创建
|
||||
- LVGL 核心初始化
|
||||
|
||||
因此应用层不需要再手动调用 `lvgl_init()`。
|
||||
|
||||
### 5.2 使用 Zephyr 的 LVGL workqueue
|
||||
|
||||
依赖 `CONFIG_LV_Z_RUN_LVGL_ON_WORKQUEUE=y`。
|
||||
|
||||
这样 LVGL 核心 `lv_timer_handler()` 由 Zephyr 模块自己调度，应用层不再手动驱动 LVGL 时钟。
|
||||
|
||||
应用里如果还需要定期更新 UI，当前做法是:
|
||||
|
||||
- 自己维护一个 `k_work_delayable`
|
||||
- 通过 `lvgl_get_workqueue()` 把这个 work 投递到 LVGL 专用 workqueue
|
||||
- 在 work 回调里 `lvgl_lock()` 后访问 LVGL API
|
||||
|
||||
这样做的原因是:
|
||||
|
||||
- 避免 UI 更新逻辑和 LVGL 核心不在同一执行上下文
|
||||
- 避免对象创建、样式更新与内部刷新竞争
|
||||
- 对当前板子来说，这是比“任意线程加锁直接操作 LVGL”更保守、更容易稳定的方案
|
||||
|
||||
### 5.3 先开背光，再创建 UI
|
||||
|
||||
当前时序是:
|
||||
|
||||
1. `display_blanking_off()`
|
||||
2. `display_backlight_init()`
|
||||
3. 将显示模块标记为 ready
|
||||
4. 立即在 LVGL workqueue 上调度一次 UI 更新
|
||||
|
||||
背光初始化通过 `pwm-leds` 完成，不再依赖额外 GPIO。
|
||||
|
||||
### 5.4 当前 UI 验证策略
|
||||
|
||||
为了避免“画面有了但刚好看不见”的误判，当前 UI 使用了高对比度方案:
|
||||
|
||||
- 背景色在两种颜色之间切换
|
||||
- 标题为 `Zephyr LVGL running`
|
||||
- 计数文本为 `tick N`
|
||||
|
||||
如果这三项都能显示，基本可以判定 LVGL 渲染链路已经正常工作。
|
||||
|
||||
---
|
||||
|
||||
## 6. 当前关键配置
|
||||
|
||||
应用配置文件在:
|
||||
|
||||
- [prj.conf](E:\projects\new_kbd\prj.conf)
|
||||
|
||||
当前与 LVGL/显示相关的关键配置如下:
|
||||
|
||||
```conf
|
||||
CONFIG_DISPLAY=y
|
||||
CONFIG_MIPI_DBI=y
|
||||
CONFIG_ST7789V=y
|
||||
|
||||
CONFIG_LVGL=y
|
||||
CONFIG_LV_CONF_MINIMAL=y
|
||||
CONFIG_LV_BUILD_EXAMPLES=n
|
||||
CONFIG_LV_BUILD_DEMOS=n
|
||||
CONFIG_LV_USE_LABEL=y
|
||||
CONFIG_LV_FONT_MONTSERRAT_14=y
|
||||
|
||||
CONFIG_LV_Z_AUTO_INIT=y
|
||||
CONFIG_LV_Z_BITS_PER_PIXEL=16
|
||||
CONFIG_LV_Z_LVGL_MUTEX=y
|
||||
CONFIG_LV_Z_RUN_LVGL_ON_WORKQUEUE=y
|
||||
CONFIG_LV_Z_MEM_POOL_SIZE=16384
|
||||
```
|
||||
|
||||
各项含义:
|
||||
|
||||
- `CONFIG_LV_Z_BITS_PER_PIXEL=16`
|
||||
与 ST7789V 当前 `RGB565` 像素格式对应，避免渲染缓冲格式不匹配
|
||||
|
||||
- `CONFIG_LV_Z_LVGL_MUTEX=y`
|
||||
提供 `lvgl_lock()` / `lvgl_unlock()`，确保应用层访问 LVGL API 时有统一互斥保护
|
||||
|
||||
- `CONFIG_LV_Z_RUN_LVGL_ON_WORKQUEUE=y`
|
||||
让 Zephyr 自动维护 LVGL 核心执行循环，不需要应用手动跑 `lv_timer_handler()`
|
||||
|
||||
- `CONFIG_LV_Z_MEM_POOL_SIZE=16384`
|
||||
作为当前最小可工作的内存池配置
|
||||
|
||||
---
|
||||
|
||||
## 7. 构建方式
|
||||
|
||||
当前构建已不再默认强制使用 `-Og`，而是遵从工程自身配置。
|
||||
|
||||
当前工程已经启用:
|
||||
|
||||
```conf
|
||||
CONFIG_SIZE_OPTIMIZATIONS=y
|
||||
```
|
||||
|
||||
因此默认会走 size optimization，适合当前 OTA 分区大小约束。
|
||||
|
||||
### 7.1 当前构建 skill 的行为
|
||||
|
||||
`ncs-fresh-build` skill 已经调整为:
|
||||
|
||||
- 不再默认注入 `CONFIG_DEBUG_OPTIMIZATIONS=y`
|
||||
- 默认构建目录为项目根下的 `build`
|
||||
- 如果项目下已有 `build` 且带构建元数据，则执行 `resume build`
|
||||
- 如果不存在，则在项目根下创建 `build`
|
||||
|
||||
也就是说，当前默认构建输出目录是:
|
||||
|
||||
- `E:\projects\new_kbd\build`
|
||||
|
||||
### 7.2 当前已验证的构建结果
|
||||
|
||||
在当前 LVGL 配置下，系统构建通过，成功产出:
|
||||
|
||||
- `merged.hex`
|
||||
- `dfu_application.zip`
|
||||
|
||||
最近一次 LVGL 镜像的资源占用约为:
|
||||
|
||||
- FLASH: `437780 / 482816`
|
||||
- RAM: `96052 / 256 KB`
|
||||
|
||||
说明在当前 OTA 分区布局下，LVGL 版本仍然可以装下。
|
||||
|
||||
---
|
||||
|
||||
## 8. 当前显示模块代码结构
|
||||
|
||||
当前显示模块入口在:
|
||||
|
||||
- [display_module.c](E:\projects\new_kbd\src\modules\display_module.c)
|
||||
|
||||
整体逻辑如下:
|
||||
|
||||
1. 等待 `main` 模块进入 `MODULE_STATE_READY`
|
||||
2. 检查显示设备是否 ready
|
||||
3. 读取显示能力并打印日志
|
||||
4. 调用 `display_blanking_off()`
|
||||
5. 初始化背光 PWM 亮度
|
||||
6. 将模块标记为 initialized
|
||||
7. 把第一个 UI 更新 work 投递到 LVGL workqueue
|
||||
8. 后续每秒更新一次背景与计数文本
|
||||
|
||||
这种结构的好处是:
|
||||
|
||||
- 显示模块与主应用启动顺序解耦
|
||||
- LVGL 核心循环交给 Zephyr 模块维护
|
||||
- 应用只负责自己的 UI 逻辑
|
||||
- 以后如果要继续扩展页面，也可以沿用同样的工作队列模型
|
||||
|
||||
---
|
||||
|
||||
## 9. 常见问题与排查顺序
|
||||
|
||||
### 9.1 背光亮，但完全黑屏
|
||||
|
||||
先不要怀疑 LVGL，先切回裸 `display_write()` 测试版本。
|
||||
|
||||
如果裸显示也黑屏，优先检查:
|
||||
|
||||
- `zephyr,display` 是否指向正确节点
|
||||
- `spi2` / `mipi_dbi` / `st7789v3` 是否都为 `okay`
|
||||
- ST7789V 初始化参数是否匹配当前屏
|
||||
- 面板 offset / colmod / madctl 是否正确
|
||||
|
||||
### 9.2 裸 `display_write()` 正常，但 LVGL 黑屏
|
||||
|
||||
优先检查:
|
||||
|
||||
- `CONFIG_LV_Z_RUN_LVGL_ON_WORKQUEUE` 是否启用
|
||||
- 应用是否仍在手动调用 `lv_timer_handler()`
|
||||
- UI 更新是否发生在错误线程
|
||||
- 是否遗漏 `lvgl_lock()`
|
||||
- 文本和背景颜色是否刚好一致
|
||||
|
||||
### 9.3 背光不亮
|
||||
|
||||
优先检查:
|
||||
|
||||
- `backlight` alias 是否存在
|
||||
- `&pwm_leds` 是否启用
|
||||
- `&pwm0` 是否启用
|
||||
- `pwm0_default` 的 pinctrl 是否正确
|
||||
- 应用是否真的调用了 `led_set_brightness_dt()`
|
||||
|
||||
### 9.4 构建能过，但镜像塞不进 OTA 分区
|
||||
|
||||
优先检查:
|
||||
|
||||
- 是否误用了 `-Og`
|
||||
- `CONFIG_SIZE_OPTIMIZATIONS` 是否生效
|
||||
- 是否启用了不必要的 LVGL demos/examples
|
||||
- 字体、部件和日志级别是否过大
|
||||
|
||||
---
|
||||
|
||||
## 10. 后续建议
|
||||
|
||||
如果后续继续完善显示功能，建议按下面顺序推进:
|
||||
|
||||
1. 先固定当前最小可工作 UI，不要同时引入太多控件
|
||||
2. 增加 RTT 日志，确认 LVGL 初始化和周期更新是否稳定
|
||||
3. 再逐步接入输入设备或更复杂页面
|
||||
4. 最后再考虑动画、图片资源和更大的字体
|
||||
|
||||
对当前项目来说，最重要的经验是:
|
||||
|
||||
- 先把底层 `display` 写屏跑通
|
||||
- 再把问题收敛到 LVGL
|
||||
- 最后再处理更高层的 UI 逻辑
|
||||
|
||||
这样可以显著降低显示移植的排查成本。
|
||||
|
||||
---
|
||||
|
||||
## 11. ST7789V 设备树参数详细说明
|
||||
|
||||
当前板上显示节点位于:
|
||||
|
||||
- [atguigu_mini_keyboard.dts](E:\extra\boards\atguigu\atguigu_mini_keyboard\atguigu_mini_keyboard.dts)
|
||||
|
||||
典型配置如下:
|
||||
|
||||
```dts
|
||||
st7789v3: st7789v@0 {
|
||||
compatible = "sitronix,st7789v";
|
||||
status = "disabled";
|
||||
reg = <0>;
|
||||
mipi-max-frequency = <32000000>;
|
||||
width = <320>;
|
||||
height = <172>;
|
||||
x-offset = <0>;
|
||||
y-offset = <34>;
|
||||
vcom = <0x2b>;
|
||||
gctrl = <0x35>;
|
||||
vrhs = <0x11>;
|
||||
vdvs = <0x20>;
|
||||
mdac = <0x60>;
|
||||
lcm = <0x2c>;
|
||||
colmod = <0x55>;
|
||||
gamma = <0x01>;
|
||||
porch-param = [ 0c 0c 00 33 33 ];
|
||||
cmd2en-param = [ 5a 69 02 01 ];
|
||||
pwctrl1-param = [ a4 a1 ];
|
||||
pvgam-param = [ d0 00 02 07 0a 28 32 44 42 06 0e 12 14 17 ];
|
||||
nvgam-param = [ d0 00 02 07 0a 28 31 54 47 0e 1c 17 1b 1e ];
|
||||
ram-param = [ 00 f0 ];
|
||||
rgb-param = [ c0 02 14 ];
|
||||
mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE";
|
||||
};
|
||||
```
|
||||
|
||||
下面按类别说明这些参数的意义。
|
||||
|
||||
### 11.1 设备身份与总线绑定
|
||||
|
||||
#### `compatible = "sitronix,st7789v"`
|
||||
|
||||
作用:
|
||||
|
||||
- 告诉 Zephyr 使用 ST7789V 显示驱动
|
||||
- 绑定文件来自 [sitronix,st7789v.yaml](C:\ncs\v3.2.3\zephyr\dts\bindings\display\sitronix,st7789v.yaml)
|
||||
- 驱动实现位于 [display_st7789v.c](C:\ncs\v3.2.3\zephyr\drivers\display\display_st7789v.c)
|
||||
|
||||
如果这个 `compatible` 不对，后续所有参数即使写对也不会被正确解释。
|
||||
|
||||
#### `reg = <0>`
|
||||
|
||||
作用:
|
||||
|
||||
- 这是该显示器在父 `mipi_dbi` 总线上的片选号/地址索引
|
||||
- 对 SPI 模式来说，它最终会映射到父 SPI 控制器 `cs-gpios` 数组中的第几个片选
|
||||
|
||||
当前值是 `0`，表示使用父 SPI 控制器的第 0 个 CS。
|
||||
|
||||
#### `mipi-mode = "MIPI_DBI_MODE_SPI_4WIRE"`
|
||||
|
||||
作用:
|
||||
|
||||
- 指定 ST7789V 通过 MIPI DBI Type-C 的 4 线 SPI 模式工作
|
||||
- 命令/数据区分不是靠 9-bit SPI，而是靠单独的 `dc-gpios`
|
||||
|
||||
这对当前板子很重要，因为板上已经专门引出了 DC GPIO。
|
||||
|
||||
#### `mipi-max-frequency = <32000000>`
|
||||
|
||||
作用:
|
||||
|
||||
- 指定面板接口希望使用的最高 SPI 时钟
|
||||
- 这个值会进入 `struct spi_config.frequency`
|
||||
- 最终实际频率还会受底层 SPI 控制器实例上限限制
|
||||
|
||||
当前项目中:
|
||||
|
||||
- 面板这里写的是 `32 MHz`
|
||||
- 底层已经把 LCD 切到 `spi3`
|
||||
- `spi3` 是 nRF52840 上支持 `32 MHz` 的高速 SPIM 实例
|
||||
|
||||
因此这个值现在是有效的，不再像早期挂在 `spi2` 时那样被 SoC 侧 `8 MHz` 上限卡住。
|
||||
|
||||
---
|
||||
|
||||
### 11.2 分辨率与有效显示窗口
|
||||
|
||||
#### `width = <320>`
|
||||
|
||||
作用:
|
||||
|
||||
- Zephyr `display_get_capabilities()` 返回的水平分辨率
|
||||
- LVGL 也会按这个宽度创建显示对象和渲染缓冲
|
||||
|
||||
在当前横屏模式下，宽度已经从竖屏时的 `172` 改为 `320`。
|
||||
|
||||
#### `height = <172>`
|
||||
|
||||
作用:
|
||||
|
||||
- Zephyr `display_get_capabilities()` 返回的垂直分辨率
|
||||
- 决定应用层看到的逻辑屏高
|
||||
|
||||
在当前横屏模式下，高度已经从竖屏时的 `320` 改为 `172`。
|
||||
|
||||
#### `x-offset = <0>`
|
||||
|
||||
作用:
|
||||
|
||||
- 指定 LCD 实际可视窗口在 ST7789V GRAM 中的列偏移
|
||||
- 驱动在写入时，会把应用层传入的 `x` 坐标再加上这个偏移
|
||||
|
||||
对应驱动代码:
|
||||
|
||||
- `st7789v_set_lcd_margins()`
|
||||
- `st7789v_set_mem_area()`
|
||||
|
||||
#### `y-offset = <34>`
|
||||
|
||||
作用:
|
||||
|
||||
- 指定 LCD 实际可视窗口在 ST7789V GRAM 中的行偏移
|
||||
- 驱动会把应用层传入的 `y` 坐标再加上这个偏移
|
||||
|
||||
为什么横屏时从 `x-offset=34` 变成 `y-offset=34`:
|
||||
|
||||
- 这块屏的物理可视区域不是完整的 240x320，而是裁剪出来的 `172x320`
|
||||
- 当通过 `mdac` 做 XY 轴交换后，原来沿 X 方向的裁剪，需要同步转移到 Y 方向
|
||||
|
||||
这是横屏改造里最容易遗漏的一点。如果只改 `width/height` 和 `mdac`，不改 offset，画面通常会出现:
|
||||
|
||||
- 偏移错位
|
||||
- 局部黑边
|
||||
- 显示越界
|
||||
|
||||
---
|
||||
|
||||
### 11.3 方向控制
|
||||
|
||||
#### `mdac = <0x60>`
|
||||
|
||||
作用:
|
||||
|
||||
- 对应 ST7789V 的 `MADCTL` 寄存器，即 Memory Data Access Control
|
||||
- 用于控制:
|
||||
- X/Y 轴交换
|
||||
- 左右镜像
|
||||
- 上下镜像
|
||||
- RGB/BGR 顺序
|
||||
|
||||
对应驱动里的寄存器命令:
|
||||
|
||||
- `ST7789V_CMD_MADCTL`
|
||||
|
||||
当前值 `0x60` 的核心意义是:
|
||||
|
||||
- 打开 `MV`，进行 XY 轴交换
|
||||
- 再配合镜像位，把竖屏坐标系旋转为横屏
|
||||
|
||||
对当前项目来说，`mdac` 是“横竖屏切换的核心参数”。
|
||||
|
||||
如果上板后发现:
|
||||
|
||||
- 画面已经横过来，但方向反了
|
||||
- 或左右/上下镜像不对
|
||||
|
||||
通常只需要继续调整 `mdac`，而不一定需要再动 `width/height`。
|
||||
|
||||
---
|
||||
|
||||
### 11.4 面板电气与模拟参数
|
||||
|
||||
下面这几项大多属于“面板电气初始化参数”，通常来自原厂例程、模组 demo、已有验证过的初始化序列，或者靠经验调通。
|
||||
|
||||
它们的共同特点是:
|
||||
|
||||
- 不建议随便改
|
||||
- 改错后往往不是“完全不亮”，而是
|
||||
- 偏色
|
||||
- 闪烁
|
||||
- 对比度差
|
||||
- 稳定性差
|
||||
- 局部异常
|
||||
|
||||
#### `vcom = <0x2b>`
|
||||
|
||||
作用:
|
||||
|
||||
- VCOM 电压相关设置
|
||||
- 影响液晶驱动偏置和整体显示稳定性
|
||||
|
||||
常见现象:
|
||||
|
||||
- 值不合适时，可能出现闪烁、灰阶异常、残影或对比度不自然
|
||||
|
||||
#### `gctrl = <0x35>`
|
||||
|
||||
作用:
|
||||
|
||||
- Gate Control，控制面板栅极驱动相关参数
|
||||
|
||||
它更接近面板扫描电路的底层设置，一般按已知可工作配置保留。
|
||||
|
||||
#### `vrhs = <0x11>`
|
||||
|
||||
作用:
|
||||
|
||||
- VRH setting，电压参考相关参数之一
|
||||
|
||||
#### `vdvs = <0x20>`
|
||||
|
||||
作用:
|
||||
|
||||
- VDV setting，和驱动电压微调相关
|
||||
|
||||
注意:
|
||||
|
||||
- 驱动里只有同时存在 `vrhs` 和 `vdvs` 时，才会开启对应的 `VDVVRHEN` 流程
|
||||
|
||||
#### `lcm = <0x2c>`
|
||||
|
||||
作用:
|
||||
|
||||
- LCM control，面板控制相关寄存器值
|
||||
|
||||
一般与模组硬件特性绑定，不建议脱离原配置单独尝试。
|
||||
|
||||
#### `gamma = <0x01>`
|
||||
|
||||
作用:
|
||||
|
||||
- Gamma curve 选择
|
||||
- 会影响亮度过渡、灰阶、色彩观感
|
||||
|
||||
---
|
||||
|
||||
### 11.5 像素格式与颜色相关
|
||||
|
||||
#### `colmod = <0x55>`
|
||||
|
||||
作用:
|
||||
|
||||
- 对应 `COLMOD`，即 Interface Pixel Format
|
||||
- 决定总线传输的像素位宽
|
||||
|
||||
当前值 `0x55` 表示 `RGB565 / 16-bit` 模式，这与当前软件配置完全一致:
|
||||
|
||||
- `CONFIG_ST7789V_RGB565=y`
|
||||
- `CONFIG_LV_Z_BITS_PER_PIXEL=16`
|
||||
|
||||
如果这里和软件配置不匹配，常见现象包括:
|
||||
|
||||
- 颜色错乱
|
||||
- 红蓝交换
|
||||
- 图像看起来像“马赛克”或数据错位
|
||||
|
||||
#### `ram-param = [ 00 f0 ]`
|
||||
|
||||
作用:
|
||||
|
||||
- 对应 `RAMCTRL`
|
||||
- 控制显示 RAM 访问的一些底层行为
|
||||
|
||||
这类参数通常和像素格式、总线模式、厂商推荐初始化序列成组使用。
|
||||
|
||||
#### `rgb-param = [ c0 02 14 ]`
|
||||
|
||||
作用:
|
||||
|
||||
- 对应 `RGBCTRL`
|
||||
- 设置 RGB 接口/时序相关参数
|
||||
|
||||
虽然当前走的是 SPI MIPI DBI，不是传统 RGB 并口，但 ST7789V 仍要求这组寄存器初始化。
|
||||
|
||||
---
|
||||
|
||||
### 11.6 时序与前后肩参数
|
||||
|
||||
#### `porch-param = [ 0c 0c 00 33 33 ]`
|
||||
|
||||
作用:
|
||||
|
||||
- 对应 `PORCTRL`
|
||||
- 设置 porch，也就是显示时序中的前后肩、空白区参数
|
||||
|
||||
这些参数会影响:
|
||||
|
||||
- 帧时序稳定性
|
||||
- 扫描边界
|
||||
- 某些情况下的闪烁或边缘异常
|
||||
|
||||
这组值一般与具体模组匹配，建议保留已有验证值。
|
||||
|
||||
---
|
||||
|
||||
### 11.7 扩展命令与电源控制参数
|
||||
|
||||
#### `cmd2en-param = [ 5a 69 02 01 ]`
|
||||
|
||||
作用:
|
||||
|
||||
- 对应 `CMD2EN`
|
||||
- 开启 ST7789V 扩展命令页
|
||||
|
||||
如果这一步配置错误，后面某些扩展寄存器写入可能根本不会生效。
|
||||
|
||||
#### `pwctrl1-param = [ a4 a1 ]`
|
||||
|
||||
作用:
|
||||
|
||||
- 对应 `PWCTRL1`
|
||||
- 电源控制相关参数
|
||||
|
||||
这会影响面板驱动供电行为和显示稳定性。
|
||||
|
||||
---
|
||||
|
||||
### 11.8 Gamma 曲线表
|
||||
|
||||
#### `pvgam-param = [ d0 00 02 07 0a 28 32 44 42 06 0e 12 14 17 ]`
|
||||
|
||||
作用:
|
||||
|
||||
- 对应 `PVGAMCTRL`
|
||||
- Positive Voltage Gamma Control 参数表
|
||||
|
||||
#### `nvgam-param = [ d0 00 02 07 0a 28 31 54 47 0e 1c 17 1b 1e ]`
|
||||
|
||||
作用:
|
||||
|
||||
- 对应 `NVGAMCTRL`
|
||||
- Negative Voltage Gamma Control 参数表
|
||||
|
||||
这两组参数共同决定:
|
||||
|
||||
- 亮暗过渡
|
||||
- 色调倾向
|
||||
- 灰阶表现
|
||||
|
||||
调这些参数通常属于“画质微调”，不是基础 bring-up 阶段的首选手段。除非当前已经能稳定显示，只是观感明显不对，否则不建议优先改这里。
|
||||
|
||||
---
|
||||
|
||||
### 11.9 这些参数里最关键、最常改的是哪些
|
||||
|
||||
在实际移植中，最常需要改的是下面这几项:
|
||||
|
||||
- `width`
|
||||
- `height`
|
||||
- `x-offset`
|
||||
- `y-offset`
|
||||
- `mdac`
|
||||
- `mipi-max-frequency`
|
||||
- `colmod`
|
||||
|
||||
其中:
|
||||
|
||||
- `width/height/x-offset/y-offset/mdac`
|
||||
主要决定方向、有效显示区域和坐标映射
|
||||
|
||||
- `mipi-max-frequency`
|
||||
主要决定带宽上限
|
||||
|
||||
- `colmod`
|
||||
主要决定像素格式是否与软件配置匹配
|
||||
|
||||
而像下面这些:
|
||||
|
||||
- `vcom`
|
||||
- `gctrl`
|
||||
- `vrhs`
|
||||
- `vdvs`
|
||||
- `lcm`
|
||||
- `gamma`
|
||||
- `porch-param`
|
||||
- `cmd2en-param`
|
||||
- `pwctrl1-param`
|
||||
- `pvgam-param`
|
||||
- `nvgam-param`
|
||||
- `ram-param`
|
||||
- `rgb-param`
|
||||
|
||||
更像是“面板模组初始化模板的一部分”，通常是在已有可工作基础上尽量保持不动。
|
||||
|
||||
---
|
||||
|
||||
### 11.10 当前项目的实用建议
|
||||
|
||||
对当前这块屏来说，后续如果还要继续调整显示方向或显示区域，建议按下面顺序操作:
|
||||
|
||||
1. 先改 `mdac`
|
||||
2. 再配套检查 `width/height`
|
||||
3. 最后再修 `x-offset/y-offset`
|
||||
|
||||
不要一上来同时改所有寄存器，否则很难判断到底是哪一项导致了:
|
||||
|
||||
- 图像颠倒
|
||||
- 画面偏移
|
||||
- 部分区域黑边
|
||||
- 写入越界
|
||||
|
||||
对当前项目，真正应该高频修改的设备树参数，其实主要就是这 5 项:
|
||||
|
||||
- `width`
|
||||
- `height`
|
||||
- `x-offset`
|
||||
- `y-offset`
|
||||
- `mdac`
|
||||
68
inc/time_manager.h
Normal file
68
inc/time_manager.h
Normal file
@@ -0,0 +1,68 @@
|
||||
#ifndef TIME_MANAGER_H__
|
||||
#define TIME_MANAGER_H__
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*
|
||||
* 时间同步来源保持传输无关：
|
||||
* - BLE/USB/手动设置都复用同一套枚举；
|
||||
* - 后续如果新增其他同步链路，只需要补枚举值，不需要改事件语义。
|
||||
*/
|
||||
enum time_sync_source {
|
||||
TIME_SYNC_SOURCE_NONE = 0,
|
||||
TIME_SYNC_SOURCE_BLE,
|
||||
TIME_SYNC_SOURCE_USB,
|
||||
TIME_SYNC_SOURCE_MANUAL,
|
||||
};
|
||||
|
||||
/*
|
||||
* 时间同步更新载荷：
|
||||
* - utc_ms 统一使用 UTC 毫秒时间戳，避免内部状态受本地时区影响；
|
||||
* - timezone_min 记录“显示层”所需的时区偏移，当前不拆 DST；
|
||||
* - accuracy_ms 允许上位机表达这次校时的可信度，未知时传 0 即可。
|
||||
*/
|
||||
struct time_sync_update {
|
||||
uint64_t utc_ms;
|
||||
int16_t timezone_min;
|
||||
uint32_t accuracy_ms;
|
||||
enum time_sync_source source;
|
||||
};
|
||||
|
||||
/*
|
||||
* 时间快照用于提供给显示、日志或后续 USB/调试接口：
|
||||
* - synchronized=true 表示当前开机周期内已经收到有效校时；
|
||||
* - has_persisted_time=true 仅表示 flash 里存过一次历史校时，不代表当前时间仍然可信；
|
||||
* - ready=false 表示 time_manager 还没等到 settings_loader 完成初始化。
|
||||
*/
|
||||
struct time_manager_snapshot {
|
||||
uint64_t utc_ms;
|
||||
int16_t timezone_min;
|
||||
uint32_t accuracy_ms;
|
||||
enum time_sync_source source;
|
||||
bool ready;
|
||||
bool synchronized;
|
||||
bool has_persisted_time;
|
||||
};
|
||||
|
||||
/* 返回当前模块是否已经完成初始化，供同步入口快速拒绝“过早写入”。 */
|
||||
bool time_manager_is_ready(void);
|
||||
|
||||
/*
|
||||
* 获取当前时间快照：
|
||||
* - 返回 0：snapshot 已填充；
|
||||
* - 返回 -EINVAL：参数为空；
|
||||
* - 返回 -EAGAIN：模块未 ready；
|
||||
* - 返回 -ENODATA：当前开机周期尚未完成有效校时。
|
||||
*/
|
||||
int time_manager_get_snapshot(struct time_manager_snapshot *snapshot);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* TIME_MANAGER_H__ */
|
||||
33
inc/time_sync_protocol.h
Normal file
33
inc/time_sync_protocol.h
Normal file
@@ -0,0 +1,33 @@
|
||||
#ifndef TIME_SYNC_PROTOCOL_H__
|
||||
#define TIME_SYNC_PROTOCOL_H__
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include <zephyr/sys/util.h>
|
||||
|
||||
/*
|
||||
* 统一定义时间同步协议帧格式，方便 BLE/USB 两条链路共享：
|
||||
*
|
||||
* byte 0 : version
|
||||
* byte 1 : flags
|
||||
* byte 2-3 : timezone_min (little-endian, int16)
|
||||
* byte 4-11: utc_ms (little-endian, uint64)
|
||||
* byte 12-15: accuracy_ms (little-endian, uint32)
|
||||
*/
|
||||
#define TIME_SYNC_PROTOCOL_VERSION 1U
|
||||
#define TIME_SYNC_PROTOCOL_PAYLOAD_SIZE 16U
|
||||
|
||||
#define TIME_SYNC_PROTOCOL_OFFSET_VERSION 0U
|
||||
#define TIME_SYNC_PROTOCOL_OFFSET_FLAGS 1U
|
||||
#define TIME_SYNC_PROTOCOL_OFFSET_TIMEZONE 2U
|
||||
#define TIME_SYNC_PROTOCOL_OFFSET_UTC_MS 4U
|
||||
#define TIME_SYNC_PROTOCOL_OFFSET_ACCURACY_MS 12U
|
||||
|
||||
/*
|
||||
* 预留 flags 字段：
|
||||
* - 当前版本只要求时区字段有效；
|
||||
* - 后续如果要加 DST、闰秒或来源质量扩展，可以继续复用这个字节。
|
||||
*/
|
||||
#define TIME_SYNC_PROTOCOL_FLAG_TIMEZONE_VALID BIT(0)
|
||||
|
||||
#endif /* TIME_SYNC_PROTOCOL_H__ */
|
||||
43
prj.conf
43
prj.conf
@@ -5,19 +5,21 @@ CONFIG_ASSERT=y
|
||||
CONFIG_ASSERT_VERBOSE=y
|
||||
CONFIG_RESET_ON_FATAL_ERROR=n
|
||||
CONFIG_FAULT_DUMP=2
|
||||
CONFIG_SIZE_OPTIMIZATIONS=y
|
||||
|
||||
CONFIG_ZCBOR=y
|
||||
CONFIG_BOOTLOADER_MCUBOOT=y
|
||||
CONFIG_MCUMGR=y
|
||||
CONFIG_MCUMGR_TRANSPORT_BT=y
|
||||
CONFIG_MCUMGR_GRP_IMG=y
|
||||
CONFIG_MCUMGR_GRP_OS=y
|
||||
CONFIG_IMG_MANAGER=y
|
||||
CONFIG_STREAM_FLASH=y
|
||||
CONFIG_ZCBOR=n
|
||||
CONFIG_BOOTLOADER_MCUBOOT=n
|
||||
CONFIG_MCUMGR=n
|
||||
CONFIG_MCUMGR_TRANSPORT_BT=n
|
||||
CONFIG_MCUMGR_GRP_IMG=n
|
||||
CONFIG_MCUMGR_GRP_OS=n
|
||||
CONFIG_IMG_MANAGER=n
|
||||
CONFIG_STREAM_FLASH=n
|
||||
|
||||
CONFIG_BT=y
|
||||
CONFIG_BT_PERIPHERAL=y
|
||||
CONFIG_BT_SMP=y
|
||||
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
|
||||
CONFIG_BT_DEVICE_NAME="new_kbd"
|
||||
CONFIG_BT_DEVICE_APPEARANCE=961
|
||||
CONFIG_BT_MAX_CONN=1
|
||||
@@ -32,6 +34,10 @@ CONFIG_BT_SETTINGS=y
|
||||
|
||||
CONFIG_CAF_BLE_STATE=y
|
||||
CONFIG_CAF_BLE_ADV=y
|
||||
CONFIG_CAF_BLE_ADV_FAST_ADV=y
|
||||
CONFIG_CAF_BLE_ADV_FAST_INT_MIN=0x0030
|
||||
CONFIG_CAF_BLE_ADV_FAST_INT_MAX=0x0060
|
||||
CONFIG_CAF_BLE_ADV_FAST_ADV_TIMEOUT=180
|
||||
CONFIG_CAF_MODULE_SUSPEND_EVENTS=y
|
||||
CONFIG_CAF_SETTINGS_LOADER=y
|
||||
CONFIG_BT_ADV_PROV_FLAGS=y
|
||||
@@ -78,5 +84,26 @@ CONFIG_ADC=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_IP5305=y
|
||||
CONFIG_SENSOR=y
|
||||
CONFIG_DISPLAY=y
|
||||
CONFIG_MIPI_DBI=y
|
||||
CONFIG_ST7789V=y
|
||||
CONFIG_LVGL=y
|
||||
CONFIG_LV_CONF_MINIMAL=y
|
||||
CONFIG_LV_COLOR_16_SWAP=y
|
||||
CONFIG_LV_BUILD_EXAMPLES=n
|
||||
CONFIG_LV_BUILD_DEMOS=n
|
||||
CONFIG_LV_USE_LABEL=y
|
||||
CONFIG_LV_USE_FLEX=y
|
||||
CONFIG_LV_USE_FONT_COMPRESSED=y
|
||||
CONFIG_LV_TXT_ENC_UTF8=y
|
||||
CONFIG_LV_Z_AUTO_INIT=y
|
||||
CONFIG_LV_Z_VDB_SIZE=25
|
||||
CONFIG_LV_Z_BITS_PER_PIXEL=16
|
||||
CONFIG_LV_Z_LVGL_MUTEX=y
|
||||
CONFIG_LV_Z_RUN_LVGL_ON_WORKQUEUE=y
|
||||
CONFIG_LV_Z_LVGL_WORKQUEUE_STACK_SIZE=8192
|
||||
CONFIG_LV_Z_FLUSH_THREAD=y
|
||||
CONFIG_LV_Z_DOUBLE_VDB=y
|
||||
CONFIG_LV_Z_MEM_POOL_SIZE=16384
|
||||
|
||||
CONFIG_SEGGER_RTT_BUFFER_SIZE_UP=4096
|
||||
|
||||
37
src/events/time_sync_event.c
Normal file
37
src/events/time_sync_event.c
Normal file
@@ -0,0 +1,37 @@
|
||||
#include "time_sync_event.h"
|
||||
|
||||
/* 统一输出来源字符串，便于日志快速确认是哪条链路在校时。 */
|
||||
static const char *time_sync_source_name(enum time_sync_source source)
|
||||
{
|
||||
switch (source) {
|
||||
case TIME_SYNC_SOURCE_NONE:
|
||||
return "none";
|
||||
case TIME_SYNC_SOURCE_BLE:
|
||||
return "ble";
|
||||
case TIME_SYNC_SOURCE_USB:
|
||||
return "usb";
|
||||
case TIME_SYNC_SOURCE_MANUAL:
|
||||
return "manual";
|
||||
default:
|
||||
return "unknown";
|
||||
}
|
||||
}
|
||||
|
||||
/* 事件日志聚焦关键信息：来源、时区和 UTC 毫秒时间戳。 */
|
||||
static void log_time_sync_event(const struct app_event_header *aeh)
|
||||
{
|
||||
const struct time_sync_event *event = cast_time_sync_event(aeh);
|
||||
const struct time_sync_update *update = time_sync_event_get_update(event);
|
||||
|
||||
APP_EVENT_MANAGER_LOG(aeh,
|
||||
"src=%s tz=%d utc_ms=%llu acc=%u",
|
||||
time_sync_source_name(update->source),
|
||||
update->timezone_min,
|
||||
(unsigned long long)update->utc_ms,
|
||||
update->accuracy_ms);
|
||||
}
|
||||
|
||||
APP_EVENT_TYPE_DEFINE(time_sync_event,
|
||||
log_time_sync_event,
|
||||
NULL,
|
||||
APP_EVENT_FLAGS_CREATE(APP_EVENT_TYPE_FLAGS_INIT_LOG_ENABLE));
|
||||
35
src/events/time_sync_event.h
Normal file
35
src/events/time_sync_event.h
Normal file
@@ -0,0 +1,35 @@
|
||||
#ifndef TIME_SYNC_EVENT_H__
|
||||
#define TIME_SYNC_EVENT_H__
|
||||
|
||||
#include <app_event_manager.h>
|
||||
#include <app_event_manager_profiler_tracer.h>
|
||||
|
||||
#include "time_manager.h"
|
||||
|
||||
/*
|
||||
* time_sync_event 是“同步入口 -> time_manager”的统一事件：
|
||||
* - BLE/USB/本地设置都提交同一类事件；
|
||||
* - time_manager 是唯一消费者，也是唯一能修改运行时钟状态的模块。
|
||||
*/
|
||||
struct time_sync_event {
|
||||
struct app_event_header header;
|
||||
struct time_sync_update update;
|
||||
};
|
||||
|
||||
APP_EVENT_TYPE_DECLARE(time_sync_event);
|
||||
|
||||
static inline void time_sync_event_submit(const struct time_sync_update *update)
|
||||
{
|
||||
struct time_sync_event *event = new_time_sync_event();
|
||||
|
||||
event->update = *update;
|
||||
APP_EVENT_SUBMIT(event);
|
||||
}
|
||||
|
||||
static inline const struct time_sync_update *time_sync_event_get_update(
|
||||
const struct time_sync_event *event)
|
||||
{
|
||||
return &event->update;
|
||||
}
|
||||
|
||||
#endif /* TIME_SYNC_EVENT_H__ */
|
||||
@@ -215,6 +215,23 @@ static void disconnect_le_conn_cb(struct bt_conn *conn, void *user_data)
|
||||
}
|
||||
}
|
||||
|
||||
static void mark_le_conn_found_cb(struct bt_conn *conn, void *user_data)
|
||||
{
|
||||
bool *found = user_data;
|
||||
|
||||
ARG_UNUSED(conn);
|
||||
*found = true;
|
||||
}
|
||||
|
||||
static bool has_any_le_conn(void)
|
||||
{
|
||||
bool found = false;
|
||||
|
||||
bt_conn_foreach(BT_CONN_TYPE_LE, mark_le_conn_found_cb, &found);
|
||||
|
||||
return found;
|
||||
}
|
||||
|
||||
struct peer_bond_lookup {
|
||||
const bt_addr_le_t *peer_addr;
|
||||
bool found;
|
||||
@@ -532,7 +549,16 @@ static bool app_event_handler(const struct app_event_header *aeh)
|
||||
if (bond.state == BLE_BOND_STATE_STANDBY) {
|
||||
bond.state = BLE_BOND_STATE_IDLE;
|
||||
module_set_state(MODULE_STATE_READY);
|
||||
submit_peer_op_event(PEER_OPERATION_SELECTED, bond.storage.cur_peer_id);
|
||||
/*
|
||||
* If a LE link survived suspend, keep it untouched. CAF ble_adv
|
||||
* treats PEER_OPERATION_SELECTED as a real identity switch and
|
||||
* will disconnect the current peer. If no link exists, re-emit
|
||||
* the selection so advertising resumes on the selected slot.
|
||||
*/
|
||||
if (!has_any_le_conn()) {
|
||||
submit_peer_op_event(PEER_OPERATION_SELECTED,
|
||||
bond.storage.cur_peer_id);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -52,11 +52,6 @@ static bool ble_hid_is_connected(void)
|
||||
return ble_hid.link.conn != NULL;
|
||||
}
|
||||
|
||||
static bool ble_hid_is_active(void)
|
||||
{
|
||||
return ble_hid.policy.ble_mode_selected && ble_hid_is_connected();
|
||||
}
|
||||
|
||||
static bool ble_hid_is_boot_mode(void)
|
||||
{
|
||||
return ble_hid.link.protocol_mode == BT_HIDS_PM_BOOT;
|
||||
@@ -232,7 +227,12 @@ static void handle_ble_peer_event(const struct ble_peer_event *event)
|
||||
|
||||
static bool handle_hid_tx_event(const struct hid_tx_event *event)
|
||||
{
|
||||
if (!ble_hid_is_active()) {
|
||||
if (!ble_hid.policy.ble_mode_selected) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!ble_hid_is_connected()) {
|
||||
hid_tx_done_event_submit(event->kind, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -242,6 +242,7 @@ static bool handle_hid_tx_event(const struct hid_tx_event *event)
|
||||
int err;
|
||||
|
||||
if (!ble_hid_is_boot_mode()) {
|
||||
hid_tx_done_event_submit(HID_TX_KIND_BOOT, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -263,6 +264,7 @@ static bool handle_hid_tx_event(const struct hid_tx_event *event)
|
||||
}
|
||||
|
||||
if (!ble_hid_is_report_mode()) {
|
||||
hid_tx_done_event_submit(HID_TX_KIND_REPORT, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
175
src/modules/ble_time_sync_module.c
Normal file
175
src/modules/ble_time_sync_module.c
Normal file
@@ -0,0 +1,175 @@
|
||||
#include <errno.h>
|
||||
|
||||
#include <zephyr/bluetooth/gatt.h>
|
||||
#include <zephyr/sys/byteorder.h>
|
||||
|
||||
#include <app_event_manager.h>
|
||||
|
||||
#define MODULE ble_time_sync
|
||||
#include <caf/events/module_state_event.h>
|
||||
|
||||
#include "time_manager.h"
|
||||
#include "time_sync_event.h"
|
||||
#include "time_sync_protocol.h"
|
||||
|
||||
#include <zephyr/logging/log.h>
|
||||
LOG_MODULE_REGISTER(MODULE, LOG_LEVEL_INF);
|
||||
|
||||
#define BT_UUID_TIME_SYNC_SERVICE_VAL \
|
||||
BT_UUID_128_ENCODE(0x0b7f5000, 0x38d2, 0x4f62, 0x8f6f, 0x36c4fd73a110)
|
||||
#define BT_UUID_TIME_SYNC_WRITE_CHAR_VAL \
|
||||
BT_UUID_128_ENCODE(0x0b7f5001, 0x38d2, 0x4f62, 0x8f6f, 0x36c4fd73a110)
|
||||
|
||||
#define BT_UUID_TIME_SYNC_SERVICE \
|
||||
BT_UUID_DECLARE_128(BT_UUID_TIME_SYNC_SERVICE_VAL)
|
||||
#define BT_UUID_TIME_SYNC_WRITE_CHAR \
|
||||
BT_UUID_DECLARE_128(BT_UUID_TIME_SYNC_WRITE_CHAR_VAL)
|
||||
|
||||
struct ble_time_sync_ctx {
|
||||
bool ble_stack_ready;
|
||||
bool time_manager_ready;
|
||||
bool module_ready;
|
||||
};
|
||||
|
||||
static struct ble_time_sync_ctx ble_time_sync;
|
||||
|
||||
/* 统一检查协议版本和长度，避免在回调里分散出现偏移判断。 */
|
||||
static bool ble_time_sync_payload_is_valid(const uint8_t *buf, uint16_t len)
|
||||
{
|
||||
if (!buf || (len != TIME_SYNC_PROTOCOL_PAYLOAD_SIZE)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (buf[TIME_SYNC_PROTOCOL_OFFSET_VERSION] != TIME_SYNC_PROTOCOL_VERSION) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((buf[TIME_SYNC_PROTOCOL_OFFSET_FLAGS] &
|
||||
TIME_SYNC_PROTOCOL_FLAG_TIMEZONE_VALID) == 0U) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* 把私有 GATT payload 解码为统一的 time_sync_update：
|
||||
* - BLE 只负责协议适配；
|
||||
* - 传输无关的时间语义都转成公共结构体后再交给事件层。
|
||||
*/
|
||||
static void ble_time_sync_decode_payload(const uint8_t *buf,
|
||||
struct time_sync_update *update)
|
||||
{
|
||||
update->utc_ms = sys_get_le64(&buf[TIME_SYNC_PROTOCOL_OFFSET_UTC_MS]);
|
||||
update->timezone_min =
|
||||
(int16_t)sys_get_le16(&buf[TIME_SYNC_PROTOCOL_OFFSET_TIMEZONE]);
|
||||
update->accuracy_ms =
|
||||
sys_get_le32(&buf[TIME_SYNC_PROTOCOL_OFFSET_ACCURACY_MS]);
|
||||
update->source = TIME_SYNC_SOURCE_BLE;
|
||||
}
|
||||
|
||||
/*
|
||||
* GATT 写回调必须尽量短：
|
||||
* - 不支持 offset/prepare write，避免被拆成长写事务；
|
||||
* - 校验和解码完成后直接提交统一事件，不在这里做耗时存储。
|
||||
*/
|
||||
static ssize_t write_time_sync(struct bt_conn *conn,
|
||||
const struct bt_gatt_attr *attr,
|
||||
const void *buf,
|
||||
uint16_t len,
|
||||
uint16_t offset,
|
||||
uint8_t flags)
|
||||
{
|
||||
struct time_sync_update update;
|
||||
|
||||
ARG_UNUSED(conn);
|
||||
ARG_UNUSED(attr);
|
||||
|
||||
if (!ble_time_sync.module_ready || !time_manager_is_ready()) {
|
||||
return BT_GATT_ERR(BT_ATT_ERR_UNLIKELY);
|
||||
}
|
||||
|
||||
if (offset != 0U) {
|
||||
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
|
||||
}
|
||||
|
||||
if ((flags & BT_GATT_WRITE_FLAG_PREPARE) != 0U) {
|
||||
return BT_GATT_ERR(BT_ATT_ERR_ATTRIBUTE_NOT_LONG);
|
||||
}
|
||||
|
||||
if (!ble_time_sync_payload_is_valid(buf, len)) {
|
||||
return BT_GATT_ERR(BT_ATT_ERR_VALUE_NOT_ALLOWED);
|
||||
}
|
||||
|
||||
ble_time_sync_decode_payload(buf, &update);
|
||||
time_sync_event_submit(&update);
|
||||
|
||||
LOG_INF("Accepted BLE time sync utc_ms=%llu tz=%d acc=%u",
|
||||
(unsigned long long)update.utc_ms,
|
||||
update.timezone_min,
|
||||
update.accuracy_ms);
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
BT_GATT_SERVICE_DEFINE(ble_time_sync_svc,
|
||||
BT_GATT_PRIMARY_SERVICE(BT_UUID_TIME_SYNC_SERVICE),
|
||||
BT_GATT_CHARACTERISTIC(BT_UUID_TIME_SYNC_WRITE_CHAR,
|
||||
BT_GATT_CHRC_WRITE |
|
||||
BT_GATT_CHRC_WRITE_WITHOUT_RESP,
|
||||
BT_GATT_PERM_WRITE_ENCRYPT,
|
||||
NULL,
|
||||
write_time_sync,
|
||||
NULL),
|
||||
);
|
||||
|
||||
/*
|
||||
* 只有 BLE 栈和 time_manager 都 ready 后，才把模块状态标记为 READY：
|
||||
* - 虽然静态 GATT service 会跟随蓝牙栈注册；
|
||||
* - 但真正是否接受写入，仍由 module_ready 再做一层保护。
|
||||
*/
|
||||
static void ble_time_sync_update_ready_state(void)
|
||||
{
|
||||
bool should_be_ready = ble_time_sync.ble_stack_ready &&
|
||||
ble_time_sync.time_manager_ready;
|
||||
|
||||
if (should_be_ready == ble_time_sync.module_ready) {
|
||||
return;
|
||||
}
|
||||
|
||||
ble_time_sync.module_ready = should_be_ready;
|
||||
module_set_state(should_be_ready ? MODULE_STATE_READY : MODULE_STATE_STANDBY);
|
||||
|
||||
LOG_INF("BLE time sync %s", should_be_ready ? "ready" : "standby");
|
||||
}
|
||||
|
||||
/* 模块依赖只来自 ble_state 和 time_manager，两者 READY 顺序不做假设。 */
|
||||
static bool handle_module_state_event(const struct module_state_event *event)
|
||||
{
|
||||
if (check_state(event, MODULE_ID(ble_state), MODULE_STATE_READY)) {
|
||||
ble_time_sync.ble_stack_ready = true;
|
||||
ble_time_sync_update_ready_state();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (check_state(event, MODULE_ID(time_manager), MODULE_STATE_READY)) {
|
||||
ble_time_sync.time_manager_ready = true;
|
||||
ble_time_sync_update_ready_state();
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool app_event_handler(const struct app_event_header *aeh)
|
||||
{
|
||||
if (is_module_state_event(aeh)) {
|
||||
return handle_module_state_event(cast_module_state_event(aeh));
|
||||
}
|
||||
|
||||
__ASSERT_NO_MSG(false);
|
||||
return false;
|
||||
}
|
||||
|
||||
APP_EVENT_LISTENER(MODULE, app_event_handler);
|
||||
APP_EVENT_SUBSCRIBE(MODULE, module_state_event);
|
||||
706
src/modules/display_module.c
Normal file
706
src/modules/display_module.c
Normal file
@@ -0,0 +1,706 @@
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
|
||||
#include <zephyr/device.h>
|
||||
#include <zephyr/devicetree.h>
|
||||
#include <zephyr/drivers/display.h>
|
||||
#include <zephyr/drivers/led.h>
|
||||
#include <zephyr/kernel.h>
|
||||
|
||||
#include <app_event_manager.h>
|
||||
#include <lvgl.h>
|
||||
#include <lvgl_zephyr.h>
|
||||
|
||||
#define MODULE display
|
||||
#include <caf/events/button_event.h>
|
||||
#include <caf/events/module_state_event.h>
|
||||
#include <caf/events/power_event.h>
|
||||
|
||||
#include "battery_status_event.h"
|
||||
#include "keyboard_led_event.h"
|
||||
#include "mode_event.h"
|
||||
#include "time_manager.h"
|
||||
|
||||
#include <zephyr/logging/log.h>
|
||||
LOG_MODULE_REGISTER(MODULE, LOG_LEVEL_INF);
|
||||
|
||||
#define DISPLAY_UPDATE_PERIOD_MS 1000
|
||||
#define DISPLAY_IDLE_TIMEOUT_MIN 1
|
||||
#define DISPLAY_BACKLIGHT_BRIGHTNESS 100
|
||||
#define DISPLAY_DEMO_BASE_YEAR 2026
|
||||
#define DISPLAY_DEMO_BASE_MONTH 3
|
||||
#define DISPLAY_DEMO_BASE_DAY 27
|
||||
#define DISPLAY_DEMO_BASE_HOUR 14
|
||||
#define DISPLAY_DEMO_BASE_MIN 28
|
||||
#define DISPLAY_DEMO_BASE_SEC 36
|
||||
#define DISPLAY_SYMBOL_PLUG "\xEF\x87\xA6" /* U+F1E6, custom plug glyph in ui_font_keyboard_small_18 */
|
||||
|
||||
LV_FONT_DECLARE(ui_font_keyboard_small_18);
|
||||
LV_FONT_DECLARE(ui_font_keyboard_time_48);
|
||||
|
||||
enum display_status_id
|
||||
{
|
||||
DISPLAY_STATUS_USB = 0,
|
||||
DISPLAY_STATUS_BLE,
|
||||
DISPLAY_STATUS_NUMLOCK,
|
||||
DISPLAY_STATUS_CAPSLOCK,
|
||||
DISPLAY_STATUS_COUNT,
|
||||
};
|
||||
|
||||
enum display_pm_state
|
||||
{
|
||||
DISPLAY_PM_STATE_ACTIVE = 0,
|
||||
DISPLAY_PM_STATE_OFF,
|
||||
};
|
||||
|
||||
struct display_ui_state
|
||||
{
|
||||
lv_color_t theme_color;
|
||||
lv_color_t inactive_border_color;
|
||||
uint8_t battery_level;
|
||||
mode_type_t mode;
|
||||
uint8_t led_mask;
|
||||
uint8_t battery_flags;
|
||||
bool status_enabled[DISPLAY_STATUS_COUNT];
|
||||
lv_obj_t *status_badges[DISPLAY_STATUS_COUNT];
|
||||
lv_obj_t *status_labels[DISPLAY_STATUS_COUNT];
|
||||
lv_obj_t *battery_icon;
|
||||
lv_obj_t *battery_label;
|
||||
lv_obj_t *battery_state_label;
|
||||
lv_obj_t *date_label;
|
||||
lv_obj_t *time_label;
|
||||
};
|
||||
|
||||
struct display_ctx
|
||||
{
|
||||
const struct device *dev;
|
||||
struct display_capabilities caps;
|
||||
struct k_work_delayable update_work;
|
||||
struct k_work_delayable idle_work;
|
||||
struct display_ui_state ui;
|
||||
uint32_t tick_count;
|
||||
enum display_pm_state pm_state;
|
||||
bool initialized;
|
||||
};
|
||||
|
||||
static struct display_ctx disp = {
|
||||
.dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_display)),
|
||||
.ui.theme_color = LV_COLOR_MAKE(0x4C, 0xC9, 0xF0),
|
||||
.ui.inactive_border_color = LV_COLOR_MAKE(0xA0, 0xA7, 0xB4),
|
||||
.ui.battery_level = 15U,
|
||||
.ui.battery_flags = 0U,
|
||||
.ui.mode = MODE_TYPE_USB,
|
||||
.ui.status_enabled = {true, true, false, true},
|
||||
.pm_state = DISPLAY_PM_STATE_OFF,
|
||||
};
|
||||
|
||||
static const struct led_dt_spec display_backlight =
|
||||
LED_DT_SPEC_GET(DT_NODELABEL(backlight));
|
||||
|
||||
static const char *const g_status_texts[DISPLAY_STATUS_COUNT] = {
|
||||
LV_SYMBOL_USB,
|
||||
LV_SYMBOL_BLUETOOTH,
|
||||
"1",
|
||||
"A",
|
||||
};
|
||||
|
||||
static void display_refresh_all_locked(void);
|
||||
|
||||
static void display_schedule_update(k_timeout_t delay)
|
||||
{
|
||||
#ifdef CONFIG_LV_Z_RUN_LVGL_ON_WORKQUEUE
|
||||
k_work_schedule_for_queue(lvgl_get_workqueue(), &disp.update_work, delay);
|
||||
#else
|
||||
k_work_reschedule(&disp.update_work, delay);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void display_schedule_idle_timeout(k_timeout_t delay)
|
||||
{
|
||||
k_work_reschedule(&disp.idle_work, delay);
|
||||
}
|
||||
|
||||
/* 背光初始化独立处理，避免 UI 创建逻辑里混入硬件使能细节。 */
|
||||
static int display_backlight_set(uint8_t brightness)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!led_is_ready_dt(&display_backlight))
|
||||
{
|
||||
LOG_WRN("Display backlight device not ready");
|
||||
return 0;
|
||||
}
|
||||
|
||||
err = led_set_brightness_dt(&display_backlight, brightness);
|
||||
if (err)
|
||||
{
|
||||
LOG_ERR("Failed to set backlight brightness(%u): %d", brightness, err);
|
||||
return err;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static bool display_is_active(void)
|
||||
{
|
||||
return disp.pm_state == DISPLAY_PM_STATE_ACTIVE;
|
||||
}
|
||||
|
||||
/* 只负责保活屏幕空闲计时，不隐式点亮屏幕。 */
|
||||
static void display_kick_idle_timer(void)
|
||||
{
|
||||
if (!disp.initialized || !display_is_active())
|
||||
return;
|
||||
|
||||
display_schedule_idle_timeout(K_MINUTES(DISPLAY_IDLE_TIMEOUT_MIN));
|
||||
}
|
||||
|
||||
/* 熄屏时同时关闭刷新和背光，并将模块状态切到 OFF。 */
|
||||
static void display_sleep(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!disp.initialized || !display_is_active())
|
||||
return;
|
||||
|
||||
(void)k_work_cancel_delayable(&disp.update_work);
|
||||
(void)k_work_cancel_delayable(&disp.idle_work);
|
||||
|
||||
err = display_blanking_on(disp.dev);
|
||||
if (err)
|
||||
LOG_WRN("Display blanking on failed: %d", err);
|
||||
|
||||
(void)display_backlight_set(0U);
|
||||
disp.pm_state = DISPLAY_PM_STATE_OFF;
|
||||
module_set_state(MODULE_STATE_OFF);
|
||||
}
|
||||
|
||||
/* 唤醒屏幕后立刻刷新 UI，并重新启动定时刷新和空闲超时。 */
|
||||
static void display_wake(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!disp.initialized)
|
||||
return;
|
||||
|
||||
if (display_is_active()) {
|
||||
display_kick_idle_timer();
|
||||
return;
|
||||
}
|
||||
|
||||
err = display_blanking_off(disp.dev);
|
||||
if (err)
|
||||
LOG_WRN("Display blanking off failed: %d", err);
|
||||
|
||||
(void)display_backlight_set(DISPLAY_BACKLIGHT_BRIGHTNESS);
|
||||
|
||||
lvgl_lock();
|
||||
display_refresh_all_locked();
|
||||
lvgl_unlock();
|
||||
|
||||
disp.pm_state = DISPLAY_PM_STATE_ACTIVE;
|
||||
display_schedule_update(K_NO_WAIT);
|
||||
display_kick_idle_timer();
|
||||
module_set_state(MODULE_STATE_READY);
|
||||
}
|
||||
|
||||
static void display_idle_timeout_fn(struct k_work *work)
|
||||
{
|
||||
ARG_UNUSED(work);
|
||||
|
||||
display_sleep();
|
||||
}
|
||||
|
||||
/* 电量颜色与 PC 原型保持一致，顶部状态区能快速表达健康度。 */
|
||||
static lv_color_t display_get_battery_color(uint8_t battery_level)
|
||||
{
|
||||
if (battery_level > 70U)
|
||||
return lv_color_hex(0x8BD450);
|
||||
|
||||
if (battery_level >= 20U)
|
||||
return lv_color_hex(0xF4D35E);
|
||||
|
||||
return lv_color_hex(0xE63946);
|
||||
}
|
||||
|
||||
/* 电池图标由精简图标字体提供，不再依赖 LVGL 内建字体资源。 */
|
||||
static const char *display_get_battery_symbol(uint8_t battery_level)
|
||||
{
|
||||
if (battery_level > 85U)
|
||||
return LV_SYMBOL_BATTERY_FULL;
|
||||
|
||||
if (battery_level > 60U)
|
||||
return LV_SYMBOL_BATTERY_3;
|
||||
|
||||
if (battery_level > 35U)
|
||||
return LV_SYMBOL_BATTERY_2;
|
||||
|
||||
if (battery_level >= 20U)
|
||||
return LV_SYMBOL_BATTERY_1;
|
||||
|
||||
return LV_SYMBOL_BATTERY_EMPTY;
|
||||
}
|
||||
|
||||
/* 模式事件只需要驱动 USB/BLE 两个 badge，2.4G 模式两者都灭。 */
|
||||
static void display_update_mode_state(mode_type_t mode)
|
||||
{
|
||||
disp.ui.mode = mode;
|
||||
disp.ui.status_enabled[DISPLAY_STATUS_USB] = (mode == MODE_TYPE_USB);
|
||||
disp.ui.status_enabled[DISPLAY_STATUS_BLE] = (mode == MODE_TYPE_BLE);
|
||||
}
|
||||
|
||||
/* 最新原型只显示 NumLock 和 CapsLock，不再展示 ScrollLock。 */
|
||||
static void display_update_keyboard_led_state(uint8_t led_mask)
|
||||
{
|
||||
disp.ui.led_mask = led_mask;
|
||||
disp.ui.status_enabled[DISPLAY_STATUS_NUMLOCK] =
|
||||
(led_mask & KEYBOARD_LED_MASK_NUM_LOCK) != 0U;
|
||||
disp.ui.status_enabled[DISPLAY_STATUS_CAPSLOCK] =
|
||||
(led_mask & KEYBOARD_LED_MASK_CAPS_LOCK) != 0U;
|
||||
}
|
||||
|
||||
/* 底部状态条的亮灭与边框颜色联动更新，保持原型机视觉语言。 */
|
||||
static void display_refresh_status_bar_locked(void)
|
||||
{
|
||||
for (uint32_t i = 0; i < DISPLAY_STATUS_COUNT; i++)
|
||||
{
|
||||
lv_obj_t *badge = disp.ui.status_badges[i];
|
||||
lv_obj_t *label = disp.ui.status_labels[i];
|
||||
bool active = disp.ui.status_enabled[i];
|
||||
|
||||
if (!badge || !label)
|
||||
continue;
|
||||
|
||||
lv_obj_set_style_border_width(badge, 4, 0);
|
||||
lv_obj_set_style_border_color(badge,
|
||||
active ? disp.ui.theme_color : disp.ui.inactive_border_color,
|
||||
0);
|
||||
lv_obj_set_style_bg_color(badge,
|
||||
active ? lv_color_hex(0x1D2735) : lv_color_hex(0x161A20),
|
||||
0);
|
||||
lv_obj_set_style_text_color(label,
|
||||
active ? lv_color_white() : lv_color_hex(0x7C8798),
|
||||
0);
|
||||
}
|
||||
}
|
||||
|
||||
/* 电池图标、百分比和状态图标分开更新，便于独立配色。 */
|
||||
static void display_refresh_battery_locked(void)
|
||||
{
|
||||
char battery_text[8];
|
||||
lv_color_t battery_color;
|
||||
const char *state_symbol = "";
|
||||
lv_color_t state_color = lv_color_white();
|
||||
|
||||
if (!disp.ui.battery_icon || !disp.ui.battery_label || !disp.ui.battery_state_label)
|
||||
return;
|
||||
|
||||
battery_color = display_get_battery_color(disp.ui.battery_level);
|
||||
snprintk(battery_text, sizeof(battery_text), "%u%%", disp.ui.battery_level);
|
||||
|
||||
if ((disp.ui.battery_flags & BATTERY_STATUS_FLAG_FULL) != 0U)
|
||||
{
|
||||
state_symbol = DISPLAY_SYMBOL_PLUG;
|
||||
state_color = lv_color_hex(0x4C9EF5);
|
||||
}
|
||||
else if ((disp.ui.battery_flags & BATTERY_STATUS_FLAG_CHARGING) != 0U)
|
||||
{
|
||||
state_symbol = LV_SYMBOL_CHARGE;
|
||||
state_color = lv_color_hex(0xF4D35E);
|
||||
}
|
||||
|
||||
lv_label_set_text(disp.ui.battery_icon,
|
||||
display_get_battery_symbol(disp.ui.battery_level));
|
||||
lv_obj_set_style_text_color(disp.ui.battery_icon, battery_color, 0);
|
||||
lv_label_set_text(disp.ui.battery_label, battery_text);
|
||||
lv_label_set_text(disp.ui.battery_state_label, state_symbol);
|
||||
lv_obj_set_style_text_color(disp.ui.battery_state_label, state_color, 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* 时间优先显示 time_manager 的真实快照。
|
||||
* 如果当前尚未同步，则退回到固定基准上的 demo 时间，保证 UI 结构始终可见。
|
||||
*/
|
||||
static void display_refresh_datetime_locked(void)
|
||||
{
|
||||
struct time_manager_snapshot snapshot;
|
||||
char date_text[16];
|
||||
char time_text[16];
|
||||
int err = time_manager_get_snapshot(&snapshot);
|
||||
|
||||
if (!disp.ui.date_label || !disp.ui.time_label)
|
||||
return;
|
||||
|
||||
if (!err)
|
||||
{
|
||||
time_t local_seconds;
|
||||
struct tm tm_buf;
|
||||
struct tm *tm_info;
|
||||
|
||||
local_seconds = (time_t)(snapshot.utc_ms / 1000ULL) +
|
||||
(time_t)((int32_t)snapshot.timezone_min * 60);
|
||||
tm_info = gmtime_r(&local_seconds, &tm_buf);
|
||||
|
||||
if (tm_info)
|
||||
{
|
||||
unsigned int year = (unsigned int)(tm_info->tm_year + 1900);
|
||||
unsigned int month = (unsigned int)(tm_info->tm_mon + 1);
|
||||
unsigned int day = (unsigned int)tm_info->tm_mday;
|
||||
unsigned int hour = (unsigned int)tm_info->tm_hour;
|
||||
unsigned int minute = (unsigned int)tm_info->tm_min;
|
||||
unsigned int second = (unsigned int)tm_info->tm_sec;
|
||||
|
||||
snprintk(date_text, sizeof(date_text), "%04u/%02u/%02u",
|
||||
year, month, day);
|
||||
snprintk(time_text, sizeof(time_text), "%02u:%02u:%02u",
|
||||
hour, minute, second);
|
||||
lv_label_set_text(disp.ui.date_label, date_text);
|
||||
lv_label_set_text(disp.ui.time_label, time_text);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
uint32_t seconds = disp.tick_count;
|
||||
uint32_t hour = (DISPLAY_DEMO_BASE_HOUR + (seconds / 3600U)) % 24U;
|
||||
uint32_t minute = (DISPLAY_DEMO_BASE_MIN + ((seconds / 60U) % 60U)) % 60U;
|
||||
uint32_t second = (DISPLAY_DEMO_BASE_SEC + (seconds % 60U)) % 60U;
|
||||
|
||||
snprintk(date_text, sizeof(date_text), "%04d/%02d/%02d",
|
||||
DISPLAY_DEMO_BASE_YEAR,
|
||||
DISPLAY_DEMO_BASE_MONTH,
|
||||
DISPLAY_DEMO_BASE_DAY);
|
||||
snprintk(time_text, sizeof(time_text), "%02u:%02u:%02u",
|
||||
hour, minute, second);
|
||||
lv_label_set_text(disp.ui.date_label, date_text);
|
||||
lv_label_set_text(disp.ui.time_label, time_text);
|
||||
}
|
||||
}
|
||||
|
||||
/* 一次性把缓存状态刷到 UI，避免控件创建与状态恢复互相耦合。 */
|
||||
static void display_refresh_all_locked(void)
|
||||
{
|
||||
display_refresh_status_bar_locked();
|
||||
display_refresh_battery_locked();
|
||||
display_refresh_datetime_locked();
|
||||
}
|
||||
|
||||
/* 状态 badge 保持原型尺寸和圆角，确保在 320x172 面板上视觉一致。 */
|
||||
static void display_create_status_chip_locked(lv_obj_t *parent, enum display_status_id id)
|
||||
{
|
||||
lv_obj_t *badge = lv_obj_create(parent);
|
||||
lv_obj_t *label;
|
||||
|
||||
lv_obj_remove_style_all(badge);
|
||||
lv_obj_set_size(badge, 50, 32);
|
||||
lv_obj_set_style_radius(badge, 10, 0);
|
||||
lv_obj_set_style_bg_opa(badge, LV_OPA_COVER, 0);
|
||||
lv_obj_set_style_pad_all(badge, 0, 0);
|
||||
|
||||
label = lv_label_create(badge);
|
||||
lv_label_set_text(label, g_status_texts[id]);
|
||||
lv_obj_set_width(label, LV_PCT(100));
|
||||
lv_obj_set_style_text_font(label, &ui_font_keyboard_small_18, 0);
|
||||
lv_obj_set_style_text_align(label, LV_TEXT_ALIGN_CENTER, 0);
|
||||
lv_obj_center(label);
|
||||
|
||||
disp.ui.status_badges[id] = badge;
|
||||
disp.ui.status_labels[id] = label;
|
||||
}
|
||||
|
||||
/* UI 直接内联到 display_module，保留原型布局而不引入额外 ui 抽象层。 */
|
||||
static void display_create_ui_locked(void)
|
||||
{
|
||||
lv_obj_t *screen = lv_screen_active();
|
||||
lv_obj_t *content;
|
||||
lv_obj_t *top_row;
|
||||
lv_obj_t *battery_wrap;
|
||||
lv_obj_t *middle_row;
|
||||
lv_obj_t *bottom_row;
|
||||
|
||||
lv_obj_clean(screen);
|
||||
lv_obj_set_style_bg_color(screen, lv_color_hex(0x0F1115), 0);
|
||||
lv_obj_set_style_bg_grad_color(screen, lv_color_hex(0x1A1F29), 0);
|
||||
lv_obj_set_style_bg_grad_dir(screen, LV_GRAD_DIR_VER, 0);
|
||||
lv_obj_set_style_bg_opa(screen, LV_OPA_COVER, 0);
|
||||
lv_obj_set_style_text_color(screen, lv_color_white(), 0);
|
||||
lv_obj_set_style_pad_all(screen, 0, 0);
|
||||
lv_obj_set_scrollbar_mode(screen, LV_SCROLLBAR_MODE_OFF);
|
||||
|
||||
content = lv_obj_create(screen);
|
||||
lv_obj_remove_style_all(content);
|
||||
lv_obj_set_size(content, LV_PCT(100), LV_PCT(100));
|
||||
lv_obj_set_style_bg_color(content, lv_color_hex(0x0F1115), 0);
|
||||
lv_obj_set_style_bg_opa(content, LV_OPA_TRANSP, 0);
|
||||
lv_obj_set_style_pad_left(content, 14, 0);
|
||||
lv_obj_set_style_pad_right(content, 14, 0);
|
||||
lv_obj_set_style_pad_top(content, 8, 0);
|
||||
lv_obj_set_style_pad_bottom(content, 8, 0);
|
||||
lv_obj_set_layout(content, LV_LAYOUT_FLEX);
|
||||
lv_obj_set_flex_flow(content, LV_FLEX_FLOW_COLUMN);
|
||||
lv_obj_set_flex_align(content,
|
||||
LV_FLEX_ALIGN_START,
|
||||
LV_FLEX_ALIGN_CENTER,
|
||||
LV_FLEX_ALIGN_CENTER);
|
||||
|
||||
top_row = lv_obj_create(content);
|
||||
lv_obj_remove_style_all(top_row);
|
||||
lv_obj_set_width(top_row, LV_PCT(100));
|
||||
lv_obj_set_flex_grow(top_row, 1);
|
||||
lv_obj_set_style_bg_color(top_row, lv_color_hex(0x0F1115), 0);
|
||||
lv_obj_set_style_bg_opa(top_row, LV_OPA_TRANSP, 0);
|
||||
lv_obj_set_layout(top_row, LV_LAYOUT_FLEX);
|
||||
lv_obj_set_flex_flow(top_row, LV_FLEX_FLOW_ROW);
|
||||
lv_obj_set_flex_align(top_row,
|
||||
LV_FLEX_ALIGN_SPACE_BETWEEN,
|
||||
LV_FLEX_ALIGN_CENTER,
|
||||
LV_FLEX_ALIGN_CENTER);
|
||||
|
||||
disp.ui.date_label = lv_label_create(top_row);
|
||||
lv_obj_set_style_text_font(disp.ui.date_label, &ui_font_keyboard_small_18, 0);
|
||||
lv_obj_set_style_text_color(disp.ui.date_label, lv_color_hex(0xD8DEE9), 0);
|
||||
|
||||
battery_wrap = lv_obj_create(top_row);
|
||||
lv_obj_remove_style_all(battery_wrap);
|
||||
lv_obj_set_width(battery_wrap, LV_SIZE_CONTENT);
|
||||
lv_obj_set_layout(battery_wrap, LV_LAYOUT_FLEX);
|
||||
lv_obj_set_flex_flow(battery_wrap, LV_FLEX_FLOW_ROW);
|
||||
lv_obj_set_flex_align(battery_wrap,
|
||||
LV_FLEX_ALIGN_CENTER,
|
||||
LV_FLEX_ALIGN_CENTER,
|
||||
LV_FLEX_ALIGN_CENTER);
|
||||
lv_obj_set_style_pad_column(battery_wrap, 4, 0);
|
||||
|
||||
disp.ui.battery_icon = lv_label_create(battery_wrap);
|
||||
lv_obj_set_style_text_font(disp.ui.battery_icon, &ui_font_keyboard_small_18, 0);
|
||||
|
||||
disp.ui.battery_label = lv_label_create(battery_wrap);
|
||||
lv_obj_set_style_text_font(disp.ui.battery_label, &ui_font_keyboard_small_18, 0);
|
||||
lv_obj_set_style_text_color(disp.ui.battery_label, lv_color_hex(0xD8DEE9), 0);
|
||||
|
||||
disp.ui.battery_state_label = lv_label_create(battery_wrap);
|
||||
lv_obj_set_style_text_font(disp.ui.battery_state_label, &ui_font_keyboard_small_18, 0);
|
||||
|
||||
middle_row = lv_obj_create(content);
|
||||
lv_obj_remove_style_all(middle_row);
|
||||
lv_obj_set_width(middle_row, LV_PCT(100));
|
||||
lv_obj_set_flex_grow(middle_row, 2);
|
||||
lv_obj_set_style_bg_color(middle_row, lv_color_hex(0x0F1115), 0);
|
||||
lv_obj_set_style_bg_opa(middle_row, LV_OPA_TRANSP, 0);
|
||||
|
||||
disp.ui.time_label = lv_label_create(middle_row);
|
||||
lv_obj_set_style_text_font(disp.ui.time_label, &ui_font_keyboard_time_48, 0);
|
||||
lv_obj_set_style_text_color(disp.ui.time_label, lv_color_white(), 0);
|
||||
lv_obj_center(disp.ui.time_label);
|
||||
|
||||
bottom_row = lv_obj_create(content);
|
||||
lv_obj_remove_style_all(bottom_row);
|
||||
lv_obj_set_width(bottom_row, LV_PCT(100));
|
||||
lv_obj_set_flex_grow(bottom_row, 1);
|
||||
lv_obj_set_style_bg_color(bottom_row, lv_color_hex(0x0F1115), 0);
|
||||
lv_obj_set_style_bg_opa(bottom_row, LV_OPA_TRANSP, 0);
|
||||
lv_obj_set_layout(bottom_row, LV_LAYOUT_FLEX);
|
||||
lv_obj_set_flex_flow(bottom_row, LV_FLEX_FLOW_ROW);
|
||||
lv_obj_set_flex_align(bottom_row,
|
||||
LV_FLEX_ALIGN_CENTER,
|
||||
LV_FLEX_ALIGN_CENTER,
|
||||
LV_FLEX_ALIGN_CENTER);
|
||||
lv_obj_set_style_pad_column(bottom_row, 6, 0);
|
||||
|
||||
for (uint32_t i = 0; i < DISPLAY_STATUS_COUNT; i++)
|
||||
display_create_status_chip_locked(bottom_row, (enum display_status_id)i);
|
||||
|
||||
display_refresh_all_locked();
|
||||
}
|
||||
|
||||
/* 周期刷新只负责时间区域；状态图标改为事件驱动，避免无谓重绘。 */
|
||||
static void display_update_work_fn(struct k_work *work)
|
||||
{
|
||||
ARG_UNUSED(work);
|
||||
|
||||
if (!disp.initialized)
|
||||
return;
|
||||
|
||||
if (!display_is_active())
|
||||
return;
|
||||
|
||||
disp.tick_count++;
|
||||
|
||||
lvgl_lock();
|
||||
display_refresh_datetime_locked();
|
||||
lvgl_unlock();
|
||||
|
||||
display_schedule_update(K_MSEC(DISPLAY_UPDATE_PERIOD_MS));
|
||||
}
|
||||
|
||||
/* 显示初始化完成后，后续 UI 更新全部通过事件和定时刷新驱动。 */
|
||||
static int display_init(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!device_is_ready(disp.dev))
|
||||
{
|
||||
LOG_ERR("Display device not ready");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
display_get_capabilities(disp.dev, &disp.caps);
|
||||
LOG_INF("Display caps: %ux%u fmt=%d",
|
||||
disp.caps.x_resolution,
|
||||
disp.caps.y_resolution,
|
||||
disp.caps.current_pixel_format);
|
||||
|
||||
k_work_init_delayable(&disp.update_work, display_update_work_fn);
|
||||
k_work_init_delayable(&disp.idle_work, display_idle_timeout_fn);
|
||||
disp.tick_count = 0U;
|
||||
|
||||
err = display_blanking_off(disp.dev);
|
||||
if (err)
|
||||
{
|
||||
LOG_ERR("Display blanking off failed: %d", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
err = display_backlight_set(DISPLAY_BACKLIGHT_BRIGHTNESS);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
lvgl_lock();
|
||||
display_create_ui_locked();
|
||||
lvgl_unlock();
|
||||
|
||||
disp.initialized = true;
|
||||
disp.pm_state = DISPLAY_PM_STATE_ACTIVE;
|
||||
display_schedule_update(K_NO_WAIT);
|
||||
display_kick_idle_timer();
|
||||
LOG_INF("Display UI initialized");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 电池事件只缓存最新 SOC，UI 若已就绪则立即刷新顶部电池区域。 */
|
||||
static bool handle_battery_status_event(const struct battery_status_event *event)
|
||||
{
|
||||
disp.ui.battery_level = battery_status_event_get_soc(event);
|
||||
disp.ui.battery_flags = battery_status_event_get_flags(event);
|
||||
|
||||
if (!disp.initialized)
|
||||
return false;
|
||||
|
||||
if (!display_is_active())
|
||||
return false;
|
||||
|
||||
lvgl_lock();
|
||||
display_refresh_battery_locked();
|
||||
lvgl_unlock();
|
||||
return false;
|
||||
}
|
||||
|
||||
/* 模式事件只影响 USB/BLE 两个 badge 的亮灭。 */
|
||||
static bool handle_mode_event(const struct mode_event *event)
|
||||
{
|
||||
display_update_mode_state(event->mode_type);
|
||||
|
||||
if (!disp.initialized)
|
||||
return false;
|
||||
|
||||
if (!display_is_active())
|
||||
return false;
|
||||
|
||||
lvgl_lock();
|
||||
display_refresh_status_bar_locked();
|
||||
lvgl_unlock();
|
||||
return false;
|
||||
}
|
||||
|
||||
/* NumLock/CapsLock/ScrollLock 变化后，底部三个状态 badge 立即更新。 */
|
||||
static bool handle_keyboard_led_event(const struct keyboard_led_event *event)
|
||||
{
|
||||
display_update_keyboard_led_state(keyboard_led_event_get_mask(event));
|
||||
|
||||
if (!disp.initialized)
|
||||
return false;
|
||||
|
||||
if (!display_is_active())
|
||||
return false;
|
||||
|
||||
lvgl_lock();
|
||||
display_refresh_status_bar_locked();
|
||||
lvgl_unlock();
|
||||
return false;
|
||||
}
|
||||
|
||||
/* 任意按钮事件都可点亮屏幕并重置 1 分钟空闲计时。 */
|
||||
static bool handle_button_event(const struct button_event *event)
|
||||
{
|
||||
ARG_UNUSED(event);
|
||||
|
||||
display_wake();
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool handle_power_down_event(void)
|
||||
{
|
||||
display_sleep();
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool handle_wake_up_event(void)
|
||||
{
|
||||
display_wake();
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool handle_module_state_event(const struct module_state_event *event)
|
||||
{
|
||||
if (!check_state(event, MODULE_ID(main), MODULE_STATE_READY))
|
||||
return false;
|
||||
|
||||
if (!display_init())
|
||||
{
|
||||
module_set_state(MODULE_STATE_READY);
|
||||
}
|
||||
else
|
||||
{
|
||||
module_set_state(MODULE_STATE_ERROR);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool app_event_handler(const struct app_event_header *aeh)
|
||||
{
|
||||
if (is_module_state_event(aeh))
|
||||
return handle_module_state_event(cast_module_state_event(aeh));
|
||||
|
||||
if (is_battery_status_event(aeh))
|
||||
return handle_battery_status_event(cast_battery_status_event(aeh));
|
||||
|
||||
if (is_mode_event(aeh))
|
||||
return handle_mode_event(cast_mode_event(aeh));
|
||||
|
||||
if (is_keyboard_led_event(aeh))
|
||||
return handle_keyboard_led_event(cast_keyboard_led_event(aeh));
|
||||
|
||||
if (is_button_event(aeh))
|
||||
return handle_button_event(cast_button_event(aeh));
|
||||
|
||||
if (is_power_down_event(aeh))
|
||||
return handle_power_down_event();
|
||||
|
||||
if (is_wake_up_event(aeh))
|
||||
return handle_wake_up_event();
|
||||
|
||||
__ASSERT_NO_MSG(false);
|
||||
return false;
|
||||
}
|
||||
|
||||
APP_EVENT_LISTENER(MODULE, app_event_handler);
|
||||
APP_EVENT_SUBSCRIBE(MODULE, module_state_event);
|
||||
APP_EVENT_SUBSCRIBE(MODULE, battery_status_event);
|
||||
APP_EVENT_SUBSCRIBE(MODULE, mode_event);
|
||||
APP_EVENT_SUBSCRIBE(MODULE, keyboard_led_event);
|
||||
APP_EVENT_SUBSCRIBE(MODULE, button_event);
|
||||
APP_EVENT_SUBSCRIBE_EARLY(MODULE, power_down_event);
|
||||
APP_EVENT_SUBSCRIBE(MODULE, wake_up_event);
|
||||
407
src/modules/time_manager_module.c
Normal file
407
src/modules/time_manager_module.c
Normal file
@@ -0,0 +1,407 @@
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <zephyr/kernel.h>
|
||||
#include <zephyr/settings/settings.h>
|
||||
#include <zephyr/spinlock.h>
|
||||
|
||||
#include <app_event_manager.h>
|
||||
|
||||
#define MODULE time_manager
|
||||
#include <caf/events/module_state_event.h>
|
||||
#include <caf/events/power_event.h>
|
||||
|
||||
#include "time_manager.h"
|
||||
#include "time_sync_event.h"
|
||||
|
||||
#include <zephyr/logging/log.h>
|
||||
LOG_MODULE_REGISTER(MODULE, LOG_LEVEL_INF);
|
||||
|
||||
#define TIME_MANAGER_SAVE_DELAY_MS 1000
|
||||
#define TIME_MANAGER_STORAGE_KEY "state"
|
||||
|
||||
/*
|
||||
* 持久化数据只记录“最近一次成功校时”的元数据：
|
||||
* - 它可以帮助我们知道设备曾经被校时过；
|
||||
* - 但由于当前没有独立 RTC，重启后不能把这份数据当作“当前仍准确”的时间。
|
||||
*/
|
||||
struct time_manager_storage_data {
|
||||
uint64_t utc_ms;
|
||||
int16_t timezone_min;
|
||||
uint32_t accuracy_ms;
|
||||
uint8_t source;
|
||||
uint8_t valid_marker;
|
||||
};
|
||||
|
||||
struct time_manager_ctx {
|
||||
struct k_spinlock lock;
|
||||
struct k_work_delayable save_work;
|
||||
struct time_manager_storage_data persisted;
|
||||
uint64_t base_utc_ms;
|
||||
int64_t base_uptime_ms;
|
||||
int16_t timezone_min;
|
||||
uint32_t accuracy_ms;
|
||||
enum time_sync_source source;
|
||||
bool ready;
|
||||
bool synchronized;
|
||||
bool has_persisted_time;
|
||||
bool storage_dirty;
|
||||
bool storage_loaded;
|
||||
};
|
||||
|
||||
static struct time_manager_ctx time_ctx;
|
||||
|
||||
/* 统一判断来源是否合法，避免把损坏配置或“未设置来源”写进时间状态。 */
|
||||
static bool time_manager_source_is_valid(enum time_sync_source source)
|
||||
{
|
||||
switch (source) {
|
||||
case TIME_SYNC_SOURCE_BLE:
|
||||
case TIME_SYNC_SOURCE_USB:
|
||||
case TIME_SYNC_SOURCE_MANUAL:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/* 对时区做保守校验，避免异常包把显示层带到离谱偏移。 */
|
||||
static bool time_manager_timezone_is_valid(int16_t timezone_min)
|
||||
{
|
||||
return (timezone_min >= -(24 * 60)) && (timezone_min <= (24 * 60));
|
||||
}
|
||||
|
||||
/*
|
||||
* 保存工作在系统工作队列里执行：
|
||||
* - 这样 GATT 写回调和事件派发路径都只做内存更新；
|
||||
* - 真正可能触发 flash 擦写的 settings_save_one 被挪到异步上下文。
|
||||
*/
|
||||
static int time_manager_store_state(const struct time_manager_storage_data *storage)
|
||||
{
|
||||
char key[] = MODULE_NAME "/" TIME_MANAGER_STORAGE_KEY;
|
||||
int err = settings_save_one(key, storage, sizeof(*storage));
|
||||
|
||||
if (err) {
|
||||
LOG_ERR("Failed to save time state err=%d", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
LOG_INF("Stored time state src=%u utc_ms=%llu",
|
||||
storage->source,
|
||||
(unsigned long long)storage->utc_ms);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* 从运行态复制一份稳定快照，再在锁外执行 flash 写入：
|
||||
* - 锁内只做小块 memcpy，避免长时间持锁；
|
||||
* - 即使保存失败，也不回滚内存时间状态，避免影响当前功能。
|
||||
*/
|
||||
static void time_manager_save_work_fn(struct k_work *work)
|
||||
{
|
||||
struct time_manager_storage_data storage;
|
||||
bool should_store;
|
||||
k_spinlock_key_t key;
|
||||
|
||||
ARG_UNUSED(work);
|
||||
|
||||
key = k_spin_lock(&time_ctx.lock);
|
||||
should_store = time_ctx.storage_dirty && time_ctx.has_persisted_time;
|
||||
storage = time_ctx.persisted;
|
||||
time_ctx.storage_dirty = false;
|
||||
k_spin_unlock(&time_ctx.lock, key);
|
||||
|
||||
if (!should_store) {
|
||||
return;
|
||||
}
|
||||
|
||||
(void)time_manager_store_state(&storage);
|
||||
}
|
||||
|
||||
/*
|
||||
* 把一次同步结果写入运行态：
|
||||
* - base_utc_ms + base_uptime_ms 组成当前时间基准；
|
||||
* - persisted 只保存“最近一次同步结果”，后续异步落盘。
|
||||
*/
|
||||
static void time_manager_apply_update(const struct time_sync_update *update)
|
||||
{
|
||||
k_spinlock_key_t key = k_spin_lock(&time_ctx.lock);
|
||||
|
||||
time_ctx.base_utc_ms = update->utc_ms;
|
||||
time_ctx.base_uptime_ms = k_uptime_get();
|
||||
time_ctx.timezone_min = update->timezone_min;
|
||||
time_ctx.accuracy_ms = update->accuracy_ms;
|
||||
time_ctx.source = update->source;
|
||||
time_ctx.synchronized = true;
|
||||
time_ctx.has_persisted_time = true;
|
||||
time_ctx.persisted.utc_ms = update->utc_ms;
|
||||
time_ctx.persisted.timezone_min = update->timezone_min;
|
||||
time_ctx.persisted.accuracy_ms = update->accuracy_ms;
|
||||
time_ctx.persisted.source = (uint8_t)update->source;
|
||||
time_ctx.persisted.valid_marker = 1U;
|
||||
time_ctx.storage_dirty = true;
|
||||
|
||||
k_spin_unlock(&time_ctx.lock, key);
|
||||
|
||||
/*
|
||||
* 保存延迟 1 秒：
|
||||
* - 避免未来 BLE/USB 连续校时时反复触发 flash 写入；
|
||||
* - 也避免在同步入口上下文里直接阻塞等待存储完成。
|
||||
*/
|
||||
k_work_reschedule(&time_ctx.save_work, K_MSEC(TIME_MANAGER_SAVE_DELAY_MS));
|
||||
|
||||
LOG_INF("Time synchronized src=%u tz=%d utc_ms=%llu acc=%u",
|
||||
update->source,
|
||||
update->timezone_min,
|
||||
(unsigned long long)update->utc_ms,
|
||||
update->accuracy_ms);
|
||||
}
|
||||
|
||||
/*
|
||||
* settings 子系统回调只负责恢复原始持久化结构：
|
||||
* - 不在这里决定“当前时间是否有效”；
|
||||
* - 运行态初始化放到 settings_loader ready 之后统一完成。
|
||||
*/
|
||||
static int settings_set(const char *key,
|
||||
size_t len_rd,
|
||||
settings_read_cb read_cb,
|
||||
void *cb_arg)
|
||||
{
|
||||
ssize_t rc;
|
||||
|
||||
if (strcmp(key, TIME_MANAGER_STORAGE_KEY) != 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (len_rd != sizeof(time_ctx.persisted)) {
|
||||
LOG_WRN("Time state size mismatch got=%u expect=%u",
|
||||
(uint32_t)len_rd,
|
||||
sizeof(time_ctx.persisted));
|
||||
time_ctx.storage_loaded = false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
rc = read_cb(cb_arg, &time_ctx.persisted, sizeof(time_ctx.persisted));
|
||||
time_ctx.storage_loaded = (rc == sizeof(time_ctx.persisted));
|
||||
|
||||
if (!time_ctx.storage_loaded) {
|
||||
LOG_WRN("Time state read failed rc=%d", (int)rc);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
SETTINGS_STATIC_HANDLER_DEFINE(time_manager,
|
||||
MODULE_NAME,
|
||||
NULL,
|
||||
settings_set,
|
||||
NULL,
|
||||
NULL);
|
||||
|
||||
/*
|
||||
* settings 恢复完成后初始化运行态：
|
||||
* - 有持久化历史仅表示“以前同步过”，不能直接把时间标记成有效；
|
||||
* - 当前 boot 仍然需要新的同步事件来建立可信时间基准。
|
||||
*/
|
||||
static void time_manager_init_after_settings_loaded(void)
|
||||
{
|
||||
k_spinlock_key_t key = k_spin_lock(&time_ctx.lock);
|
||||
|
||||
time_ctx.ready = true;
|
||||
time_ctx.synchronized = false;
|
||||
time_ctx.source = TIME_SYNC_SOURCE_NONE;
|
||||
time_ctx.base_utc_ms = 0U;
|
||||
time_ctx.base_uptime_ms = 0;
|
||||
time_ctx.timezone_min = 0;
|
||||
time_ctx.accuracy_ms = 0U;
|
||||
time_ctx.has_persisted_time = time_ctx.storage_loaded &&
|
||||
(time_ctx.persisted.valid_marker == 1U) &&
|
||||
time_manager_source_is_valid(
|
||||
(enum time_sync_source)time_ctx.persisted.source) &&
|
||||
time_manager_timezone_is_valid(
|
||||
time_ctx.persisted.timezone_min);
|
||||
time_ctx.storage_dirty = false;
|
||||
|
||||
k_spin_unlock(&time_ctx.lock, key);
|
||||
|
||||
if (time_ctx.has_persisted_time) {
|
||||
LOG_INF("Loaded persisted time metadata tz=%d src=%u utc_ms=%llu",
|
||||
time_ctx.persisted.timezone_min,
|
||||
time_ctx.persisted.source,
|
||||
(unsigned long long)time_ctx.persisted.utc_ms);
|
||||
} else {
|
||||
LOG_INF("No valid persisted time metadata");
|
||||
}
|
||||
|
||||
module_set_state(MODULE_STATE_READY);
|
||||
}
|
||||
|
||||
/*
|
||||
* 校时事件入口只做快速校验和内存更新：
|
||||
* - 数据格式错误直接丢弃；
|
||||
* - flash 持久化交给延迟工作处理。
|
||||
*/
|
||||
static bool handle_time_sync_event(const struct time_sync_event *event)
|
||||
{
|
||||
const struct time_sync_update *update = time_sync_event_get_update(event);
|
||||
|
||||
if (!time_ctx.ready) {
|
||||
LOG_WRN("Drop time sync before manager ready");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!time_manager_source_is_valid(update->source)) {
|
||||
LOG_WRN("Drop time sync invalid source=%u", update->source);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!time_manager_timezone_is_valid(update->timezone_min)) {
|
||||
LOG_WRN("Drop time sync invalid timezone=%d", update->timezone_min);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (update->utc_ms == 0U) {
|
||||
LOG_WRN("Drop time sync utc_ms=0");
|
||||
return false;
|
||||
}
|
||||
|
||||
time_manager_apply_update(update);
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* 掉电前尽量把最后一次同步结果落盘：
|
||||
* - 如果没有脏数据，立即返回；
|
||||
* - 如果有待保存数据，则同步执行一次保存，降低突然掉电时的丢失概率。
|
||||
*/
|
||||
static bool handle_power_down_event(void)
|
||||
{
|
||||
struct time_manager_storage_data storage;
|
||||
bool should_store;
|
||||
k_spinlock_key_t key;
|
||||
|
||||
if (!time_manager_is_ready()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
(void)k_work_cancel_delayable(&time_ctx.save_work);
|
||||
|
||||
key = k_spin_lock(&time_ctx.lock);
|
||||
should_store = time_ctx.storage_dirty && time_ctx.has_persisted_time;
|
||||
storage = time_ctx.persisted;
|
||||
time_ctx.storage_dirty = false;
|
||||
k_spin_unlock(&time_ctx.lock, key);
|
||||
|
||||
if (!should_store) {
|
||||
return false;
|
||||
}
|
||||
|
||||
(void)time_manager_store_state(&storage);
|
||||
return false;
|
||||
}
|
||||
|
||||
/* 仅在 settings_loader 完成后宣布 READY，保证外部读取到的是稳定状态。 */
|
||||
static bool handle_module_state_event(const struct module_state_event *event)
|
||||
{
|
||||
if (!check_state(event, MODULE_ID(settings_loader), MODULE_STATE_READY)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (time_ctx.ready) {
|
||||
return false;
|
||||
}
|
||||
|
||||
k_work_init_delayable(&time_ctx.save_work, time_manager_save_work_fn);
|
||||
time_manager_init_after_settings_loaded();
|
||||
return false;
|
||||
}
|
||||
|
||||
bool time_manager_is_ready(void)
|
||||
{
|
||||
k_spinlock_key_t key = k_spin_lock(&time_ctx.lock);
|
||||
bool ready = time_ctx.ready;
|
||||
|
||||
k_spin_unlock(&time_ctx.lock, key);
|
||||
return ready;
|
||||
}
|
||||
|
||||
/*
|
||||
* 获取快照时只复制一次基准，再在锁外计算当前 UTC：
|
||||
* - 这样不会让调用者在锁里做时间换算；
|
||||
* - 也避免 64 位字段在 32 位 MCU 上被撕裂读取。
|
||||
*/
|
||||
int time_manager_get_snapshot(struct time_manager_snapshot *snapshot)
|
||||
{
|
||||
uint64_t base_utc_ms;
|
||||
int64_t base_uptime_ms;
|
||||
int16_t timezone_min;
|
||||
uint32_t accuracy_ms;
|
||||
enum time_sync_source source;
|
||||
bool ready;
|
||||
bool synchronized;
|
||||
bool has_persisted_time;
|
||||
k_spinlock_key_t key;
|
||||
int64_t elapsed_ms;
|
||||
|
||||
if (!snapshot) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
key = k_spin_lock(&time_ctx.lock);
|
||||
ready = time_ctx.ready;
|
||||
synchronized = time_ctx.synchronized;
|
||||
has_persisted_time = time_ctx.has_persisted_time;
|
||||
base_utc_ms = time_ctx.base_utc_ms;
|
||||
base_uptime_ms = time_ctx.base_uptime_ms;
|
||||
timezone_min = time_ctx.timezone_min;
|
||||
accuracy_ms = time_ctx.accuracy_ms;
|
||||
source = time_ctx.source;
|
||||
k_spin_unlock(&time_ctx.lock, key);
|
||||
|
||||
snapshot->ready = ready;
|
||||
snapshot->synchronized = synchronized;
|
||||
snapshot->has_persisted_time = has_persisted_time;
|
||||
snapshot->timezone_min = timezone_min;
|
||||
snapshot->accuracy_ms = accuracy_ms;
|
||||
snapshot->source = source;
|
||||
snapshot->utc_ms = 0U;
|
||||
|
||||
if (!ready) {
|
||||
return -EAGAIN;
|
||||
}
|
||||
|
||||
if (!synchronized) {
|
||||
return -ENODATA;
|
||||
}
|
||||
|
||||
elapsed_ms = k_uptime_get() - base_uptime_ms;
|
||||
if (elapsed_ms < 0) {
|
||||
elapsed_ms = 0;
|
||||
}
|
||||
|
||||
snapshot->utc_ms = base_utc_ms + (uint64_t)elapsed_ms;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static bool app_event_handler(const struct app_event_header *aeh)
|
||||
{
|
||||
if (is_module_state_event(aeh)) {
|
||||
return handle_module_state_event(cast_module_state_event(aeh));
|
||||
}
|
||||
|
||||
if (is_time_sync_event(aeh)) {
|
||||
return handle_time_sync_event(cast_time_sync_event(aeh));
|
||||
}
|
||||
|
||||
if (is_power_down_event(aeh)) {
|
||||
return handle_power_down_event();
|
||||
}
|
||||
|
||||
__ASSERT_NO_MSG(false);
|
||||
return false;
|
||||
}
|
||||
|
||||
APP_EVENT_LISTENER(MODULE, app_event_handler);
|
||||
APP_EVENT_SUBSCRIBE(MODULE, module_state_event);
|
||||
APP_EVENT_SUBSCRIBE(MODULE, time_sync_event);
|
||||
APP_EVENT_SUBSCRIBE_EARLY(MODULE, power_down_event);
|
||||
@@ -711,11 +711,17 @@ static bool handle_wake_up_event(void)
|
||||
|
||||
static bool handle_hid_tx_event(const struct hid_tx_event *event)
|
||||
{
|
||||
if (!g_usb_hid.policy.usb_mode_selected || !usb_hid_stack_is_active())
|
||||
if (!g_usb_hid.policy.usb_mode_selected)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!usb_hid_stack_is_active())
|
||||
{
|
||||
submit_usb_tx_done(event->kind, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (event->kind == HID_TX_KIND_BOOT)
|
||||
{
|
||||
const uint8_t *payload = hid_tx_event_get_data(event);
|
||||
@@ -724,6 +730,7 @@ static bool handle_hid_tx_event(const struct hid_tx_event *event)
|
||||
|
||||
if (g_usb_hid.current_protocol != HID_PROTO_BOOT)
|
||||
{
|
||||
submit_usb_tx_done(HID_TX_KIND_BOOT, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -762,6 +769,7 @@ static bool handle_hid_tx_event(const struct hid_tx_event *event)
|
||||
*/
|
||||
if (g_usb_hid.current_protocol != HID_PROTO_REPORT)
|
||||
{
|
||||
submit_usb_tx_done(HID_TX_KIND_REPORT, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
379
src/ui/fonts/ui_font_keyboard_small_18.c
Normal file
379
src/ui/fonts/ui_font_keyboard_small_18.c
Normal file
@@ -0,0 +1,379 @@
|
||||
/*******************************************************************************
|
||||
* Size: 18 px
|
||||
* Bpp: 4
|
||||
* Opts: --format lvgl --output E:\projects\lvgl\lv_port_pc_vscode\src\ui\fonts\ui_font_keyboard_small_18.c --size 18 --bpp 4 --lv-font-name ui_font_keyboard_small_18 --font E:\projects\lvgl\lv_port_pc_vscode\external\ttf\MapleMono-NF-CN-Medium.ttf --range 0x30-0x39 --symbols AS/% --font E:\projects\lvgl\lv_port_pc_vscode\lvgl\scripts\built_in_font\FontAwesome5-Solid+Brands+Regular.woff --range 0xF0E7-0xF0E7 --range 0xF240-0xF240 --range 0xF241-0xF241 --range 0xF242-0xF242 --range 0xF243-0xF243 --range 0xF244-0xF244 --range 0xF1E6-0xF1E6 --range 0xF287-0xF287 --range 0xF293-0xF293
|
||||
******************************************************************************/
|
||||
|
||||
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
|
||||
#include "lvgl.h"
|
||||
#else
|
||||
#include "lvgl/lvgl.h"
|
||||
#endif
|
||||
|
||||
#ifndef UI_FONT_KEYBOARD_SMALL_18
|
||||
#define UI_FONT_KEYBOARD_SMALL_18 1
|
||||
#endif
|
||||
|
||||
#if UI_FONT_KEYBOARD_SMALL_18
|
||||
|
||||
/*-----------------
|
||||
* BITMAPS
|
||||
*----------------*/
|
||||
|
||||
/*Store the image of the glyphs*/
|
||||
static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
/* U+0025 "%" */
|
||||
0x6, 0xef, 0xb1, 0x0, 0x90, 0xe, 0x40, 0x92,
|
||||
0xc0, 0x17, 0x63, 0xb0, 0xdd, 0x1a, 0x3, 0x22,
|
||||
0xc, 0x3, 0xc5, 0x23, 0x41, 0x61, 0xb8, 0x69,
|
||||
0x41, 0x42, 0x7, 0x20, 0x69, 0x71, 0xa8, 0x1,
|
||||
0x37, 0x7d, 0x8b, 0xcc, 0x84, 0x2, 0x3d, 0x39,
|
||||
0x84, 0x6d, 0x0, 0xb8, 0x9d, 0x8f, 0xd4, 0xcc,
|
||||
0xe, 0x4a, 0xc0, 0x81, 0xe0, 0xc3, 0x1, 0x66,
|
||||
0x4, 0x4, 0x2, 0xc1, 0x2, 0x23, 0x5c, 0x81,
|
||||
0x47, 0xb7, 0x0, 0x69, 0x98, 0xb4, 0x0,
|
||||
|
||||
/* U+002F "/" */
|
||||
0x0, 0xf4, 0x79, 0x0, 0x79, 0x80, 0x80, 0x39,
|
||||
0x45, 0x40, 0x3d, 0xc1, 0xc0, 0x1c, 0x28, 0x48,
|
||||
0x1, 0xcc, 0xa, 0x1, 0xea, 0xa, 0x0, 0xe3,
|
||||
0x23, 0x20, 0xe, 0xa0, 0xa0, 0xf, 0x38, 0x30,
|
||||
0x7, 0x28, 0xa8, 0x7, 0xb8, 0x38, 0x3, 0x85,
|
||||
0x9, 0x0, 0x39, 0x81, 0x40, 0x3d, 0x41, 0x40,
|
||||
0x1c, 0x64, 0x64, 0x1, 0xcc, 0x12, 0x1, 0xe0,
|
||||
|
||||
/* U+0030 "0" */
|
||||
0x0, 0x46, 0xfe, 0xb0, 0x5, 0x4e, 0x45, 0x4c,
|
||||
0x1, 0xa8, 0xf6, 0xe0, 0x38, 0xd0, 0x40, 0x81,
|
||||
0x98, 0x1d, 0x41, 0x0, 0x14, 0x61, 0xe2, 0x4,
|
||||
0x38, 0xa2, 0x6, 0x61, 0x2f, 0x33, 0x68, 0x9,
|
||||
0x8e, 0x8b, 0x60, 0x80, 0x88, 0x1, 0x12, 0xe,
|
||||
0x6, 0xa0, 0xee, 0x0, 0x78, 0x65, 0x3, 0x8,
|
||||
0x1a, 0x82, 0x1a, 0x8f, 0x6e, 0x4, 0x88, 0x53,
|
||||
0x89, 0x12, 0x58, 0x0,
|
||||
|
||||
/* U+0031 "1" */
|
||||
0x0, 0x1e, 0x7c, 0x80, 0x66, 0xc3, 0x7, 0x0,
|
||||
0x92, 0x42, 0x80, 0x40, 0x31, 0xea, 0x88, 0x6,
|
||||
0x4c, 0x20, 0xf, 0xff, 0x82, 0x66, 0x42, 0x19,
|
||||
0x89, 0x23, 0x38, 0x0, 0x66, 0x50,
|
||||
|
||||
/* U+0032 "2" */
|
||||
0x7, 0xdf, 0xf6, 0xc8, 0x82, 0x41, 0x10, 0xc9,
|
||||
0xb4, 0x12, 0x37, 0x59, 0xc4, 0x68, 0xe, 0x40,
|
||||
0x1, 0xa0, 0x20, 0xf, 0x70, 0x10, 0x7, 0x13,
|
||||
0xa, 0x0, 0x61, 0xf0, 0xb0, 0xc, 0x38, 0x50,
|
||||
0xa0, 0x10, 0xe1, 0x3b, 0x80, 0x21, 0xc2, 0x78,
|
||||
0x0, 0x87, 0x9, 0xe0, 0x3, 0x59, 0x2, 0xe6,
|
||||
0x66, 0xd0, 0x1, 0x19, 0xef,
|
||||
|
||||
/* U+0033 "3" */
|
||||
0x1a, 0xef, 0xf5, 0xa0, 0x1, 0x54, 0x6, 0x29,
|
||||
0x6a, 0x9, 0x9d, 0x9d, 0x21, 0x20, 0x3, 0x0,
|
||||
0x98, 0x4, 0x3, 0x86, 0x41, 0x0, 0x3, 0x9b,
|
||||
0xcc, 0xb2, 0x1, 0x19, 0x0, 0x15, 0x80, 0x3,
|
||||
0xff, 0x50, 0xc9, 0x0, 0x72, 0xc8, 0x20, 0x7,
|
||||
0xbc, 0x0, 0x28, 0x1, 0x13, 0x2, 0xd5, 0xfe,
|
||||
0x6e, 0x85, 0x4e, 0x14, 0x4c, 0x8e, 0x68, 0x0,
|
||||
|
||||
/* U+0034 "4" */
|
||||
0x0, 0xed, 0xe1, 0x0, 0xf4, 0x90, 0xa8, 0x7,
|
||||
0x1b, 0x0, 0x7e, 0xe1, 0x30, 0xf, 0x41, 0x43,
|
||||
0x0, 0x71, 0xb9, 0xb0, 0x7, 0xbc, 0x3c, 0x3,
|
||||
0xce, 0x6c, 0x60, 0x1e, 0x80, 0x4c, 0xc2, 0x4,
|
||||
0xd0, 0x20, 0x11, 0x98, 0x40, 0x90, 0x2f, 0xff,
|
||||
0x28, 0x5f, 0x0, 0x7f, 0xf1, 0x34, 0x18, 0x0,
|
||||
|
||||
/* U+0035 "5" */
|
||||
0xb, 0xff, 0xf0, 0x82, 0x1, 0x19, 0xc8, 0x22,
|
||||
0x2, 0xdc, 0xca, 0xc0, 0x21, 0x0, 0xfc, 0x20,
|
||||
0x1e, 0x10, 0x2f, 0xf6, 0xb8, 0x5, 0x8, 0x62,
|
||||
0x51, 0x60, 0x7, 0xbc, 0xec, 0x14, 0x30, 0xe,
|
||||
0x39, 0x5, 0x0, 0xf7, 0x80, 0x5, 0x0, 0x22,
|
||||
0x60, 0x5a, 0xbf, 0xcd, 0xd0, 0xa9, 0xc2, 0x89,
|
||||
0x91, 0x22, 0x80,
|
||||
|
||||
/* U+0036 "6" */
|
||||
0x0, 0x86, 0xbd, 0x0, 0x30, 0xe2, 0xc2, 0x0,
|
||||
0x6d, 0x2b, 0x70, 0xc, 0xe7, 0x28, 0x1, 0xd0,
|
||||
0x88, 0x78, 0x40, 0x3, 0x0, 0x36, 0x1e, 0xe8,
|
||||
0x34, 0x1b, 0x3f, 0x9, 0x51, 0x83, 0x8c, 0xe,
|
||||
0x3, 0x4c, 0xc, 0x2, 0x70, 0x23, 0x0, 0xe1,
|
||||
0x1, 0x70, 0x90, 0xa, 0x3, 0x20, 0x1b, 0xb3,
|
||||
0xd0, 0xd8, 0xb5, 0x40, 0xc5, 0xf0, 0x0,
|
||||
|
||||
/* U+0037 "7" */
|
||||
0xdf, 0xff, 0x91, 0x6, 0x7c, 0x0, 0xc9, 0xcc,
|
||||
0xe3, 0xb, 0x0, 0xe2, 0x33, 0x80, 0x3a, 0xc2,
|
||||
0x80, 0x3c, 0xc0, 0xc0, 0x1c, 0xc0, 0xc0, 0x1e,
|
||||
0xb0, 0xb0, 0xe, 0x42, 0x42, 0x0, 0xee, 0xe,
|
||||
0x0, 0xe1, 0x51, 0x50, 0xe, 0x90, 0x60, 0xf,
|
||||
0x10, 0xc8, 0x6,
|
||||
|
||||
/* U+0038 "8" */
|
||||
0x1, 0xae, 0xfe, 0x80, 0x0, 0xfa, 0x81, 0x8b,
|
||||
0xe0, 0x30, 0xaf, 0x67, 0x91, 0xa7, 0x87, 0x80,
|
||||
0x48, 0x0, 0xb0, 0x92, 0x3, 0x71, 0x43, 0xb1,
|
||||
0xdf, 0xc2, 0xd0, 0x6, 0x90, 0x98, 0x1a, 0x3,
|
||||
0xb3, 0x3b, 0x39, 0x21, 0x28, 0x24, 0x0, 0x3e,
|
||||
0x1a, 0x60, 0x1c, 0xe0, 0x68, 0x12, 0x1, 0x40,
|
||||
0x6c, 0xb, 0x76, 0x7a, 0x13, 0x96, 0x28, 0x18,
|
||||
0xb6, 0x0,
|
||||
|
||||
/* U+0039 "9" */
|
||||
0x2, 0xae, 0xfe, 0x91, 0x2, 0xd5, 0x33, 0x3,
|
||||
0x60, 0x40, 0x46, 0xe7, 0x21, 0x33, 0x83, 0x80,
|
||||
0x50, 0x18, 0x1, 0xe1, 0x1, 0x60, 0x50, 0xa,
|
||||
0x0, 0x7c, 0x2a, 0xe7, 0x50, 0x35, 0x28, 0x91,
|
||||
0xd5, 0x1, 0x1, 0x77, 0xfa, 0x94, 0xcc, 0x1,
|
||||
0xdc, 0x10, 0x1, 0xd4, 0x6c, 0x80, 0x10, 0xda,
|
||||
0xa4, 0x80, 0x66, 0x47, 0xb0, 0x8,
|
||||
|
||||
/* U+0041 "A" */
|
||||
0x0, 0xd7, 0xf0, 0x1, 0xf1, 0xa0, 0x38, 0x7,
|
||||
0xc8, 0x8, 0x8, 0x1, 0xeb, 0x8, 0xd, 0x0,
|
||||
0xe1, 0x34, 0x31, 0x40, 0xe, 0x40, 0xc0, 0x42,
|
||||
0x20, 0x6, 0xc0, 0x40, 0xc0, 0x40, 0xc, 0xe2,
|
||||
0x60, 0x81, 0x80, 0x11, 0x8, 0xbf, 0xda, 0xa,
|
||||
0x1, 0x20, 0x23, 0xbc, 0x60, 0x60, 0xd, 0x9,
|
||||
0x88, 0xa4, 0x2c, 0x0, 0x84, 0x40, 0x9, 0x1,
|
||||
0x0, 0x41, 0x40, 0x30, 0xa0, 0x80,
|
||||
|
||||
/* U+0053 "S" */
|
||||
0x1, 0x9e, 0xfd, 0x70, 0xb, 0x18, 0xc, 0xa2,
|
||||
0x81, 0x49, 0x3b, 0x38, 0x94, 0x48, 0x34, 0x0,
|
||||
0x3f, 0x22, 0x41, 0xa0, 0x11, 0x30, 0x29, 0xa7,
|
||||
0x4a, 0x80, 0x6c, 0x83, 0x6a, 0xe4, 0x0, 0x9f,
|
||||
0x75, 0x3, 0x64, 0x1, 0x89, 0xe4, 0x29, 0xa8,
|
||||
0x3, 0x10, 0xf, 0xac, 0x80, 0x5c, 0x1f, 0x60,
|
||||
0xdd, 0x9e, 0xa4, 0xc5, 0xaa, 0x6, 0x2d, 0x80,
|
||||
|
||||
/* U+F0E7 "" */
|
||||
0x0, 0x57, 0xff, 0x50, 0x7, 0x94, 0x3, 0x84,
|
||||
0x3, 0x84, 0x3, 0xda, 0x1, 0xc4, 0x1, 0xe7,
|
||||
0x0, 0xe6, 0x0, 0xe4, 0x10, 0xe, 0xd0, 0xe,
|
||||
0x15, 0x59, 0x0, 0x4, 0x1, 0xcb, 0x55, 0x59,
|
||||
0x83, 0x0, 0x7f, 0x19, 0x80, 0x80, 0x3f, 0xbc,
|
||||
0x3, 0xfe, 0x53, 0x0, 0x7e, 0xed, 0x80, 0x1a,
|
||||
0xc0, 0x21, 0x22, 0x9c, 0x2, 0x81, 0x0, 0xfb,
|
||||
0x0, 0x2, 0xe0, 0x1f, 0x90, 0x1, 0x60, 0x1f,
|
||||
0xc6, 0x6, 0xa0, 0x1f, 0x8c, 0x1, 0xe0, 0x1f,
|
||||
0xc8, 0xc, 0x60, 0x1f, 0xe1, 0x80, 0xf, 0xf3,
|
||||
0xf0, 0x80, 0x78,
|
||||
|
||||
/* U+F1E6 "" */
|
||||
0x0, 0x25, 0x10, 0x6, 0x79, 0x0, 0xef, 0x55,
|
||||
0x0, 0x68, 0x63, 0x0, 0xce, 0x1e, 0x1, 0xe7,
|
||||
0x0, 0xff, 0xe9, 0x9, 0x4c, 0x61, 0x16, 0x88,
|
||||
0x38, 0x87, 0x6d, 0x45, 0xee, 0xe8, 0x86, 0x73,
|
||||
0x80, 0x7f, 0xf0, 0xb8, 0x40, 0x3f, 0xd0, 0xe2,
|
||||
0x60, 0x1f, 0xe2, 0x0, 0x30, 0x7, 0xf9, 0x80,
|
||||
0x1a, 0x1, 0xfc, 0x26, 0x0, 0x63, 0x0, 0xfd,
|
||||
0x60, 0x1b, 0x4c, 0x3, 0xd2, 0xa0, 0x18, 0x72,
|
||||
0x4c, 0x0, 0xda, 0xc0, 0x1f, 0x35, 0x0, 0xc9,
|
||||
0x0, 0x7f, 0xf6, 0x5e, 0xf4, 0x3, 0xc0,
|
||||
|
||||
/* U+F240 "" */
|
||||
0x4, 0x4f, 0xfe, 0x38, 0x80, 0x2a, 0xef, 0xff,
|
||||
0x8f, 0xe2, 0xa, 0x1, 0xff, 0xc7, 0x14, 0x0,
|
||||
0xaf, 0xff, 0xff, 0x88, 0x0, 0xa3, 0x0, 0xab,
|
||||
0xff, 0xff, 0x84, 0x1, 0x98, 0x3, 0xff, 0x8f,
|
||||
0x80, 0x1f, 0xfc, 0xa3, 0x10, 0xf, 0xfe, 0x4c,
|
||||
0x8, 0x7, 0x7b, 0xbf, 0xff, 0x8, 0x1c, 0x3,
|
||||
0x8c, 0x73, 0x3f, 0xf8, 0x4a, 0x0, 0x34, 0x0,
|
||||
0x45, 0xdf, 0xff, 0xe, 0x80, 0x12, 0x32, 0x20,
|
||||
0x1f, 0xfc, 0x64, 0x50,
|
||||
|
||||
/* U+F241 "" */
|
||||
0x4, 0x4f, 0xfe, 0x38, 0x80, 0x2a, 0xef, 0xff,
|
||||
0x8f, 0xe2, 0xa, 0x1, 0xff, 0xc7, 0x14, 0x0,
|
||||
0xaf, 0xff, 0xff, 0x88, 0x0, 0xa3, 0x0, 0xb7,
|
||||
0xff, 0xfc, 0xc0, 0x1f, 0x30, 0x7, 0xff, 0x1f,
|
||||
0x0, 0x3f, 0xf9, 0x46, 0x20, 0x1f, 0xfc, 0x98,
|
||||
0x10, 0xe, 0xb7, 0x7f, 0xf2, 0x80, 0x67, 0x0,
|
||||
0xe3, 0x2c, 0xcf, 0xf3, 0xa2, 0x4a, 0x0, 0x34,
|
||||
0x0, 0x45, 0xdf, 0xff, 0xe, 0x80, 0x12, 0x32,
|
||||
0x20, 0x1f, 0xfc, 0x64, 0x50,
|
||||
|
||||
/* U+F242 "" */
|
||||
0x4, 0x4f, 0xfe, 0x38, 0x80, 0x2a, 0xef, 0xff,
|
||||
0x8f, 0xe2, 0xa, 0x1, 0xff, 0xc7, 0x14, 0x0,
|
||||
0xaf, 0xff, 0xff, 0x88, 0x0, 0xa3, 0x0, 0xb3,
|
||||
0xff, 0xe1, 0x0, 0xff, 0x30, 0x7, 0xff, 0x1f,
|
||||
0x0, 0x3f, 0xf9, 0x46, 0x20, 0x1f, 0xfc, 0x98,
|
||||
0x10, 0xe, 0xa7, 0x7f, 0x84, 0x3, 0xe7, 0x0,
|
||||
0xe3, 0x2c, 0xcf, 0x91, 0x3e, 0x50, 0x1, 0xa0,
|
||||
0x2, 0x2e, 0xff, 0xf8, 0x74, 0x0, 0x91, 0x91,
|
||||
0x0, 0xff, 0xe3, 0x22, 0x80,
|
||||
|
||||
/* U+F243 "" */
|
||||
0x4, 0x4f, 0xfe, 0x38, 0x80, 0x2a, 0xef, 0xff,
|
||||
0x8f, 0xe2, 0xa, 0x1, 0xff, 0xc7, 0x14, 0x0,
|
||||
0xaf, 0xff, 0xff, 0x88, 0x0, 0xa3, 0x0, 0xa7,
|
||||
0xfe, 0xe0, 0xf, 0xfe, 0x13, 0x0, 0x7f, 0xf1,
|
||||
0xf0, 0x3, 0xff, 0x94, 0x62, 0x1, 0xff, 0xc9,
|
||||
0x81, 0x0, 0xed, 0x77, 0xa4, 0x3, 0xfe, 0x70,
|
||||
0xe, 0x30, 0xcc, 0x8d, 0x13, 0xfc, 0xa0, 0x3,
|
||||
0x40, 0x4, 0x5d, 0xff, 0xf0, 0xe8, 0x1, 0x23,
|
||||
0x22, 0x1, 0xff, 0xc6, 0x45, 0x0,
|
||||
|
||||
/* U+F244 "" */
|
||||
0x4, 0x4f, 0xfe, 0x38, 0x80, 0x2a, 0xef, 0xff,
|
||||
0x8f, 0xe2, 0xa, 0x1, 0xff, 0xc7, 0x14, 0x0,
|
||||
0xaf, 0xff, 0xff, 0x88, 0x0, 0xa3, 0x0, 0xff,
|
||||
0xe5, 0x30, 0x7, 0xff, 0x1f, 0x0, 0x3f, 0xf9,
|
||||
0x46, 0x20, 0x1f, 0xfc, 0x98, 0x10, 0xf, 0xfe,
|
||||
0x4b, 0x80, 0x71, 0xa2, 0x7f, 0xf0, 0xd4, 0x0,
|
||||
0x68, 0x0, 0x8b, 0xbf, 0xfe, 0x1d, 0x0, 0x24,
|
||||
0x64, 0x40, 0x3f, 0xf8, 0xc8, 0xa0,
|
||||
|
||||
/* U+F287 "" */
|
||||
0x0, 0xff, 0xe0, 0x3c, 0x8, 0x7, 0xff, 0x14,
|
||||
0x9a, 0x61, 0xf0, 0x3, 0xff, 0x88, 0x9b, 0xc,
|
||||
0x0, 0x20, 0xf, 0xfe, 0x25, 0x3f, 0x68, 0x84,
|
||||
0x0, 0x7f, 0x88, 0x3, 0x30, 0x40, 0x17, 0x7b,
|
||||
0x80, 0x7e, 0x3e, 0xde, 0x30, 0x5, 0xc8, 0x7,
|
||||
0xf1, 0x50, 0x80, 0x3c, 0x40, 0x79, 0x24, 0x88,
|
||||
0xab, 0xff, 0x73, 0x81, 0x80, 0x45, 0x6c, 0x15,
|
||||
0x5f, 0xe8, 0x0, 0x42, 0xa8, 0x2, 0x5f, 0xfc,
|
||||
0x88, 0xff, 0xfb, 0x1, 0x35, 0x69, 0x8d, 0xa8,
|
||||
0x3, 0x42, 0x18, 0x7, 0x8a, 0xac, 0x80, 0x13,
|
||||
0x92, 0x1, 0xc6, 0x90, 0x5, 0x77, 0x28, 0xa8,
|
||||
0x7, 0xff, 0x6, 0x52, 0x6d, 0x12, 0xd0, 0xf,
|
||||
0xfe, 0x19, 0x61, 0x20, 0x7, 0xff, 0x20, 0xef,
|
||||
0x80, 0x3f, 0xf9, 0x47, 0xff, 0x40, 0x7, 0x0,
|
||||
|
||||
/* U+F293 "" */
|
||||
0x0, 0x85, 0xef, 0x75, 0x70, 0x40, 0x1c, 0xbd,
|
||||
0x8, 0x4, 0x8f, 0xac, 0x1, 0x25, 0x0, 0x56,
|
||||
0xe0, 0x14, 0xa0, 0x2, 0x80, 0x3a, 0x1c, 0x2,
|
||||
0x90, 0x41, 0x0, 0xf4, 0x30, 0x0, 0x8f, 0x0,
|
||||
0x12, 0x80, 0x1, 0xc9, 0x60, 0x2, 0x18, 0x5,
|
||||
0x68, 0x2, 0x44, 0xc0, 0x7, 0x30, 0x2, 0x56,
|
||||
0xd0, 0x34, 0x68, 0x0, 0x46, 0x1, 0x52, 0x90,
|
||||
0xe, 0x80, 0x4e, 0x1, 0xd2, 0x0, 0x51, 0x0,
|
||||
0xc6, 0x1, 0x16, 0x80, 0x1d, 0x80, 0x30, 0x80,
|
||||
0xf, 0x9, 0x42, 0x64, 0xa0, 0x7, 0x60, 0x7,
|
||||
0x2e, 0x18, 0x31, 0xc0, 0x0, 0xb0, 0x1, 0xf6,
|
||||
0x2, 0x14, 0x38, 0x0, 0xf7, 0x0, 0x10, 0x6,
|
||||
0x7c, 0x10, 0x3, 0x8b, 0x0, 0x71, 0x60, 0x80,
|
||||
0x18, 0x42, 0x50, 0x2, 0xdc, 0x10, 0x1, 0x40,
|
||||
0x5, 0x74, 0x60, 0xa2, 0x4, 0xfa, 0x20, 0x19,
|
||||
0x73, 0xfb, 0x9f, 0xb0, 0x1, 0x0
|
||||
};
|
||||
|
||||
|
||||
/*---------------------
|
||||
* GLYPH DESCRIPTION
|
||||
*--------------------*/
|
||||
|
||||
static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
||||
{.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
|
||||
{.bitmap_index = 0, .adv_w = 173, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 71, .adv_w = 173, .box_w = 9, .box_h = 17, .ofs_x = 1, .ofs_y = -2},
|
||||
{.bitmap_index = 127, .adv_w = 173, .box_w = 9, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 187, .adv_w = 173, .box_w = 9, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 217, .adv_w = 173, .box_w = 9, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 270, .adv_w = 173, .box_w = 9, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 326, .adv_w = 173, .box_w = 10, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 374, .adv_w = 173, .box_w = 9, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 425, .adv_w = 173, .box_w = 9, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 480, .adv_w = 173, .box_w = 9, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 523, .adv_w = 173, .box_w = 9, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 581, .adv_w = 173, .box_w = 9, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 635, .adv_w = 173, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 697, .adv_w = 173, .box_w = 9, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 753, .adv_w = 180, .box_w = 13, .box_h = 19, .ofs_x = -1, .ofs_y = -3},
|
||||
{.bitmap_index = 836, .adv_w = 216, .box_w = 14, .box_h = 19, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 915, .adv_w = 360, .box_w = 23, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 983, .adv_w = 360, .box_w = 23, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 1052, .adv_w = 360, .box_w = 23, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 1121, .adv_w = 360, .box_w = 23, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 1191, .adv_w = 360, .box_w = 23, .box_h = 12, .ofs_x = 0, .ofs_y = 1},
|
||||
{.bitmap_index = 1253, .adv_w = 360, .box_w = 23, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 1365, .adv_w = 252, .box_w = 14, .box_h = 19, .ofs_x = 1, .ofs_y = -3}
|
||||
};
|
||||
|
||||
/*---------------------
|
||||
* CHARACTER MAPPING
|
||||
*--------------------*/
|
||||
|
||||
static const uint16_t unicode_list_0[] = {
|
||||
0x0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0x10,
|
||||
0x11, 0x12, 0x13, 0x14, 0x1c, 0x2e, 0xf0c2, 0xf1c1,
|
||||
0xf21b, 0xf21c, 0xf21d, 0xf21e, 0xf21f, 0xf262, 0xf26e
|
||||
};
|
||||
|
||||
/*Collect the unicode lists and glyph_id offsets*/
|
||||
static const lv_font_fmt_txt_cmap_t cmaps[] =
|
||||
{
|
||||
{
|
||||
.range_start = 37, .range_length = 62063, .glyph_id_start = 1,
|
||||
.unicode_list = unicode_list_0, .glyph_id_ofs_list = NULL, .list_length = 23, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
/*--------------------
|
||||
* ALL CUSTOM DATA
|
||||
*--------------------*/
|
||||
|
||||
#if LVGL_VERSION_MAJOR == 8
|
||||
/*Store all the custom data of the font*/
|
||||
static lv_font_fmt_txt_glyph_cache_t cache;
|
||||
#endif
|
||||
|
||||
#if LVGL_VERSION_MAJOR >= 8
|
||||
static const lv_font_fmt_txt_dsc_t font_dsc = {
|
||||
#else
|
||||
static lv_font_fmt_txt_dsc_t font_dsc = {
|
||||
#endif
|
||||
.glyph_bitmap = glyph_bitmap,
|
||||
.glyph_dsc = glyph_dsc,
|
||||
.cmaps = cmaps,
|
||||
.kern_dsc = NULL,
|
||||
.kern_scale = 0,
|
||||
.cmap_num = 1,
|
||||
.bpp = 4,
|
||||
.kern_classes = 0,
|
||||
.bitmap_format = 1,
|
||||
#if LVGL_VERSION_MAJOR == 8
|
||||
.cache = &cache
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
||||
/*-----------------
|
||||
* PUBLIC FONT
|
||||
*----------------*/
|
||||
|
||||
/*Initialize a public general font descriptor*/
|
||||
#if LVGL_VERSION_MAJOR >= 8
|
||||
const lv_font_t ui_font_keyboard_small_18 = {
|
||||
#else
|
||||
lv_font_t ui_font_keyboard_small_18 = {
|
||||
#endif
|
||||
.get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/
|
||||
.get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/
|
||||
.line_height = 19, /*The maximum line height required by the font*/
|
||||
.base_line = 3, /*Baseline measured from the bottom of the line*/
|
||||
#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
|
||||
.subpx = LV_FONT_SUBPX_NONE,
|
||||
#endif
|
||||
#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
|
||||
.underline_position = -3,
|
||||
.underline_thickness = 1,
|
||||
#endif
|
||||
.dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
|
||||
#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
|
||||
.fallback = NULL,
|
||||
#endif
|
||||
.user_data = NULL,
|
||||
};
|
||||
|
||||
|
||||
|
||||
#endif /*#if UI_FONT_KEYBOARD_SMALL_18*/
|
||||
|
||||
455
src/ui/fonts/ui_font_keyboard_time_48.c
Normal file
455
src/ui/fonts/ui_font_keyboard_time_48.c
Normal file
@@ -0,0 +1,455 @@
|
||||
/*******************************************************************************
|
||||
* Size: 48 px
|
||||
* Bpp: 4
|
||||
* Opts: --format lvgl --output E:\projects\lvgl\lv_port_pc_vscode\src\ui\fonts\ui_font_keyboard_time_48.c --size 48 --bpp 4 --lv-font-name ui_font_keyboard_time_48 --font E:\projects\lvgl\lv_port_pc_vscode\external\ttf\MapleMono-NF-CN-SemiBold.ttf --range 0x30-0x39 --symbols :
|
||||
******************************************************************************/
|
||||
|
||||
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
|
||||
#include "lvgl.h"
|
||||
#else
|
||||
#include "lvgl/lvgl.h"
|
||||
#endif
|
||||
|
||||
#ifndef UI_FONT_KEYBOARD_TIME_48
|
||||
#define UI_FONT_KEYBOARD_TIME_48 1
|
||||
#endif
|
||||
|
||||
#if UI_FONT_KEYBOARD_TIME_48
|
||||
|
||||
/*-----------------
|
||||
* BITMAPS
|
||||
*----------------*/
|
||||
|
||||
/*Store the image of the glyphs*/
|
||||
static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
/* U+0030 "0" */
|
||||
0x0, 0xfc, 0xb5, 0xbf, 0xf6, 0xd2, 0x80, 0x7f,
|
||||
0xf0, 0x97, 0xa9, 0x48, 0x2, 0x25, 0xae, 0x40,
|
||||
0xf, 0xfa, 0x28, 0x40, 0x3f, 0x86, 0xdc, 0x3,
|
||||
0xfa, 0x1c, 0x3, 0xff, 0x83, 0xe, 0x1, 0xf2,
|
||||
0x38, 0x7, 0xff, 0xe, 0xc, 0x3, 0xd2, 0x1,
|
||||
0xe5, 0xab, 0x94, 0x0, 0xf7, 0x80, 0x73, 0x10,
|
||||
0x7, 0x5d, 0x2a, 0x35, 0xc8, 0x7, 0x1a, 0x0,
|
||||
0x6a, 0x0, 0xe8, 0x40, 0xe, 0x65, 0x0, 0xee,
|
||||
0x0, 0x88, 0xc0, 0x31, 0x38, 0x7, 0xd6, 0x1,
|
||||
0xca, 0x20, 0x4, 0x0, 0xeb, 0x0, 0xfc, 0x2a,
|
||||
0x1, 0xca, 0x0, 0xc0, 0xe, 0x70, 0xf, 0xce,
|
||||
0xa0, 0x1c, 0x60, 0x7, 0x0, 0xc6, 0x20, 0x1f,
|
||||
0x4c, 0x0, 0x7b, 0x0, 0x4, 0x1, 0x94, 0x3,
|
||||
0xc3, 0x6c, 0x1, 0xf3, 0x0, 0x80, 0x77, 0x0,
|
||||
0x71, 0x62, 0x0, 0x7e, 0x30, 0x20, 0xe, 0x20,
|
||||
0xc, 0x98, 0x40, 0x1f, 0xc2, 0xe, 0x1, 0xc2,
|
||||
0x1, 0x35, 0x88, 0x7, 0xfc, 0x22, 0x0, 0xe7,
|
||||
0x0, 0x44, 0x80, 0x79, 0x60, 0x3, 0x8c, 0x3,
|
||||
0xf5, 0xb8, 0x7, 0xa2, 0x84, 0x3, 0xff, 0x80,
|
||||
0xd8, 0x80, 0x1e, 0xa7, 0x1, 0x0, 0xe3, 0x10,
|
||||
0xe, 0xa3, 0x0, 0xe1, 0xc5, 0x0, 0xfe, 0x70,
|
||||
0xf, 0xf8, 0xfc, 0xc0, 0x2e, 0x0, 0xe1, 0x20,
|
||||
0xf, 0xf2, 0xe0, 0x80, 0x63, 0x0, 0xc2, 0x2,
|
||||
0x1, 0xfc, 0xf4, 0x1, 0xe7, 0x0, 0xc4, 0x0,
|
||||
0x20, 0xf, 0xa6, 0x0, 0x3e, 0x20, 0xc, 0xc0,
|
||||
0x7, 0x0, 0xe1, 0xc6, 0x0, 0xf9, 0x0, 0x3b,
|
||||
0x0, 0x18, 0x1, 0xd0, 0x60, 0x1f, 0xb4, 0x3,
|
||||
0x94, 0x0, 0x80, 0x1d, 0x60, 0x1f, 0x85, 0x80,
|
||||
0x30, 0x98, 0x0, 0x8c, 0x3, 0x13, 0x80, 0x7d,
|
||||
0x60, 0x1c, 0xc0, 0x1a, 0x80, 0x3a, 0x10, 0x3,
|
||||
0x9d, 0x40, 0x3a, 0x80, 0x33, 0x10, 0x7, 0x5d,
|
||||
0x2a, 0x35, 0xc0, 0x7, 0x29, 0x0, 0x77, 0x0,
|
||||
0x79, 0x6a, 0xe5, 0x0, 0x3d, 0x0, 0x1e, 0x38,
|
||||
0x0, 0xff, 0xe1, 0xd1, 0x0, 0x7c, 0xf0, 0x1,
|
||||
0xff, 0xc1, 0xa5, 0x0, 0xfe, 0x7a, 0x10, 0xf,
|
||||
0xe2, 0xc5, 0x0, 0xff, 0x97, 0xa5, 0x48, 0x0,
|
||||
0x24, 0xd7, 0xa6, 0x1, 0xe0,
|
||||
|
||||
/* U+0031 "1" */
|
||||
0x0, 0xfc, 0xb7, 0xdf, 0xd6, 0x60, 0x1f, 0xfc,
|
||||
0x31, 0xca, 0x41, 0x1, 0x4c, 0x30, 0xf, 0xfe,
|
||||
0xa, 0x79, 0x80, 0x7d, 0x20, 0x1f, 0xfc, 0x7,
|
||||
0xb1, 0x0, 0xfc, 0xe0, 0x1f, 0xe1, 0xb8, 0x0,
|
||||
0xff, 0xe4, 0xe, 0x20, 0x7, 0xff, 0x26, 0x8,
|
||||
0x3, 0xca, 0x1, 0xff, 0xc3, 0x40, 0xe, 0x1b,
|
||||
0xa4, 0x0, 0xff, 0xe1, 0x18, 0x6, 0x3f, 0x40,
|
||||
0x10, 0xf, 0xfe, 0x11, 0x0, 0x4b, 0x82, 0x1,
|
||||
0xff, 0xc5, 0x90, 0x2a, 0xa0, 0x7, 0xff, 0x1d,
|
||||
0x7f, 0x54, 0x3, 0xff, 0xfe, 0x1, 0xff, 0xff,
|
||||
0x0, 0xff, 0xff, 0x80, 0x7f, 0xff, 0xc0, 0x3f,
|
||||
0xff, 0xe0, 0x1f, 0xfe, 0xa4, 0x55, 0xf9, 0x80,
|
||||
0x31, 0xaa, 0xf8, 0x40, 0x19, 0x75, 0x5f, 0x18,
|
||||
0x6, 0x1a, 0xaf, 0x71, 0x9c, 0x1, 0xff, 0xc9,
|
||||
0x96, 0x0, 0xff, 0xe5, 0xb, 0x80, 0x7f, 0xf2,
|
||||
0x88, 0x90, 0x20, 0x1f, 0xfc, 0x74, 0x80,
|
||||
|
||||
/* U+0032 "2" */
|
||||
0x0, 0xc2, 0xd5, 0x9d, 0xff, 0x76, 0xd3, 0x90,
|
||||
0x7, 0xf0, 0xcf, 0x4a, 0x98, 0x80, 0x42, 0x4b,
|
||||
0x1b, 0x64, 0x1, 0xe1, 0xf6, 0x0, 0xff, 0xe0,
|
||||
0xa6, 0xa8, 0x7, 0x58, 0x80, 0x7f, 0xf1, 0x29,
|
||||
0x0, 0x32, 0x0, 0x7f, 0xf1, 0xa8, 0x40, 0x24,
|
||||
0x0, 0xe5, 0x9c, 0xdc, 0xa6, 0x0, 0xf0, 0xb0,
|
||||
0x5, 0x66, 0x0, 0x7e, 0xa6, 0x32, 0x35, 0x9e,
|
||||
0x30, 0xe, 0xa0, 0x8, 0x73, 0x1d, 0x2, 0x1,
|
||||
0xf0, 0xe8, 0x7, 0x10, 0x7, 0x18, 0x80, 0x7f,
|
||||
0x85, 0x80, 0x38, 0xc0, 0x3f, 0xf8, 0xb8, 0x1,
|
||||
0xff, 0xcb, 0x10, 0xf, 0xfe, 0x59, 0x0, 0x71,
|
||||
0x0, 0x7f, 0xf1, 0x74, 0x3, 0x8, 0x80, 0x3f,
|
||||
0xf8, 0x86, 0x80, 0x19, 0xc0, 0x3f, 0xf8, 0xbe,
|
||||
0x1, 0xd4, 0x1, 0xff, 0xc4, 0x83, 0x0, 0xc8,
|
||||
0x60, 0x1f, 0xfc, 0x35, 0x70, 0xe, 0x80, 0xf,
|
||||
0xfe, 0x1a, 0x50, 0x7, 0x39, 0x80, 0x7f, 0xf0,
|
||||
0x8e, 0xc0, 0x38, 0xe0, 0x3, 0xff, 0x84, 0x78,
|
||||
0x1, 0xc5, 0xa0, 0x1f, 0xfc, 0x23, 0xc0, 0xe,
|
||||
0x1f, 0x10, 0xf, 0xfe, 0x9, 0xe0, 0x7, 0xe,
|
||||
0x90, 0x7, 0xff, 0x4, 0xf0, 0x3, 0x87, 0x4c,
|
||||
0x3, 0xff, 0x82, 0x78, 0x1, 0xc3, 0xa6, 0x1,
|
||||
0xff, 0xc1, 0x3c, 0x0, 0xe1, 0xd3, 0x0, 0xff,
|
||||
0xe0, 0x9e, 0x0, 0x70, 0xe9, 0x80, 0x7f, 0xf0,
|
||||
0x4f, 0x0, 0x38, 0x74, 0xc0, 0x3f, 0xf8, 0x27,
|
||||
0x80, 0x1c, 0x3a, 0x60, 0x1f, 0xfc, 0x13, 0xc0,
|
||||
0xe, 0x1d, 0x30, 0xf, 0xfe, 0x9, 0x60, 0x7,
|
||||
0x95, 0xd1, 0x3f, 0xc6, 0x20, 0xa, 0x0, 0xf9,
|
||||
0x2e, 0xff, 0xec, 0xe8, 0x2, 0x0, 0xff, 0xe4,
|
||||
0xb8, 0x98, 0x7, 0xff, 0x28, 0xe8, 0x3, 0xff,
|
||||
0x94, 0x47, 0x66, 0x1, 0xff, 0xc6, 0x2b, 0x0,
|
||||
|
||||
/* U+0033 "3" */
|
||||
0x0, 0xcb, 0x39, 0xdf, 0xf7, 0x64, 0xa8, 0x7,
|
||||
0xf9, 0xfe, 0x98, 0xc4, 0x2, 0x13, 0x6a, 0xf8,
|
||||
0x0, 0xf9, 0x60, 0x3, 0xff, 0x82, 0xfa, 0x40,
|
||||
0x1d, 0xc0, 0x1f, 0xfc, 0x32, 0xc2, 0x0, 0xc4,
|
||||
0x1, 0xff, 0xc4, 0x1e, 0x0, 0xd6, 0x1, 0x96,
|
||||
0x2e, 0xd5, 0x6, 0x1, 0xe3, 0x30, 0x4, 0x58,
|
||||
0xcf, 0xd4, 0xe8, 0x85, 0x7c, 0xb1, 0x0, 0xeb,
|
||||
0x0, 0xc7, 0x30, 0x20, 0x1f, 0x26, 0x80, 0x71,
|
||||
0x80, 0x7f, 0xf1, 0xc, 0x80, 0x33, 0x80, 0x7f,
|
||||
0xf1, 0x44, 0x3, 0x38, 0x7, 0xff, 0x10, 0x4c,
|
||||
0x3, 0x10, 0x7, 0xff, 0x12, 0xc0, 0x3b, 0x0,
|
||||
0x3f, 0xf8, 0x47, 0x8a, 0x1, 0x85, 0x40, 0x3f,
|
||||
0x12, 0x21, 0xa3, 0x30, 0x60, 0x1d, 0x60, 0x1f,
|
||||
0xe, 0xea, 0xed, 0x2e, 0x60, 0x1e, 0x85, 0x0,
|
||||
0xfa, 0x48, 0x3, 0xfc, 0xb8, 0xe0, 0x1f, 0x84,
|
||||
0x3, 0xfe, 0x49, 0x20, 0xf, 0xde, 0x1, 0xff,
|
||||
0xa, 0xec, 0x0, 0x7c, 0xcc, 0x0, 0xff, 0xe0,
|
||||
0xbc, 0x0, 0x7d, 0x3f, 0xf7, 0x6d, 0xc2, 0x0,
|
||||
0x79, 0xcc, 0x3, 0xfc, 0x24, 0x8f, 0x78, 0x40,
|
||||
0x1d, 0x20, 0x1f, 0xfc, 0x33, 0xc2, 0x0, 0xca,
|
||||
0x1, 0xff, 0xc4, 0x1b, 0x0, 0xe3, 0x0, 0xff,
|
||||
0xe2, 0x28, 0x7, 0x38, 0x7, 0xff, 0x11, 0xc0,
|
||||
0x38, 0x40, 0x3f, 0xf8, 0x84, 0x1, 0xc2, 0x1,
|
||||
0xff, 0xc4, 0xd0, 0xe, 0x60, 0xf, 0xfe, 0x1a,
|
||||
0xa0, 0x6, 0x12, 0x4, 0xba, 0x50, 0xf, 0xe6,
|
||||
0xa0, 0xe, 0x70, 0x4b, 0x45, 0xaf, 0xb8, 0x64,
|
||||
0x42, 0xc6, 0xc8, 0x7, 0xac, 0x38, 0x3, 0x91,
|
||||
0xe6, 0xed, 0x4e, 0x40, 0x1e, 0x82, 0x1, 0x0,
|
||||
0xff, 0xe3, 0x2b, 0x80, 0x3c, 0x3, 0xff, 0x8a,
|
||||
0xf4, 0x1, 0x26, 0x28, 0x7, 0xff, 0x5, 0x32,
|
||||
0x0, 0x38, 0xeb, 0xed, 0xd0, 0x84, 0x2, 0x24,
|
||||
0x8d, 0xb3, 0x0, 0xe0,
|
||||
|
||||
/* U+0034 "4" */
|
||||
0x0, 0xff, 0xe1, 0x26, 0x7f, 0xa8, 0x40, 0x3f,
|
||||
0xf8, 0xe7, 0x66, 0x0, 0x5d, 0x0, 0xff, 0xe3,
|
||||
0xf0, 0x7, 0x19, 0x0, 0x7f, 0xf1, 0x5c, 0x80,
|
||||
0x3c, 0xc0, 0x1f, 0xfc, 0x42, 0x80, 0xf, 0xfe,
|
||||
0x67, 0x0, 0x7f, 0xf3, 0x18, 0xc0, 0x3f, 0xf9,
|
||||
0x63, 0x20, 0x1f, 0xfc, 0xca, 0x0, 0xff, 0xe6,
|
||||
0x2a, 0x0, 0x61, 0x0, 0xff, 0xe3, 0xd, 0x80,
|
||||
0x66, 0xa0, 0xf, 0xfe, 0x35, 0x88, 0x4, 0x30,
|
||||
0x1, 0xff, 0xc6, 0x45, 0x0, 0xd0, 0x20, 0x1f,
|
||||
0xfc, 0x69, 0x0, 0xc4, 0xc0, 0x1f, 0xfc, 0x68,
|
||||
0x20, 0xd, 0xc0, 0x1f, 0xfc, 0x63, 0x70, 0xc,
|
||||
0xa6, 0x1, 0xff, 0xc6, 0xe0, 0xe, 0xb0, 0xf,
|
||||
0xfe, 0x33, 0x90, 0x6, 0x81, 0x0, 0xff, 0xe2,
|
||||
0x94, 0x0, 0x62, 0x70, 0xf, 0xfe, 0x37, 0x0,
|
||||
0x74, 0x80, 0x7f, 0xf1, 0x98, 0xc0, 0x32, 0x20,
|
||||
0x3, 0xff, 0x8a, 0x32, 0x1, 0xc2, 0x3f, 0x0,
|
||||
0x78, 0x46, 0x0, 0x9c, 0x3, 0xcb, 0xdd, 0xeb,
|
||||
0x0, 0xea, 0xee, 0x94, 0x4, 0x3, 0xff, 0x94,
|
||||
0x36, 0x2, 0x1, 0xff, 0xcb, 0x10, 0x71, 0x0,
|
||||
0xff, 0xe5, 0x8, 0xe, 0xa0, 0x7, 0xff, 0x20,
|
||||
0xa8, 0x0, 0x77, 0xff, 0xff, 0x58, 0x7, 0x5f,
|
||||
0xfb, 0x50, 0x3, 0xff, 0xfe, 0x1, 0xff, 0xe0,
|
||||
0x70, 0xe, 0x70, 0xf, 0xfe, 0x39, 0x0, 0x71,
|
||||
0x0, 0x7f, 0xf1, 0xc6, 0x88, 0x6, 0x84, 0x3,
|
||||
0x80,
|
||||
|
||||
/* U+0035 "5" */
|
||||
0x0, 0x93, 0x3f, 0xff, 0xf8, 0x74, 0x1, 0x92,
|
||||
0xcc, 0x3, 0xff, 0x86, 0xae, 0x1, 0x78, 0x7,
|
||||
0xff, 0x1b, 0x40, 0x25, 0x0, 0xff, 0xe3, 0x10,
|
||||
0x7, 0xff, 0x24, 0x68, 0x3, 0xf9, 0xee, 0xff,
|
||||
0xd9, 0xc4, 0x1, 0xf9, 0x21, 0x13, 0xfc, 0x60,
|
||||
0x1f, 0xe2, 0x0, 0xff, 0xff, 0x80, 0x7f, 0xf1,
|
||||
0x8, 0x3, 0xff, 0x94, 0x8a, 0x20, 0x1f, 0xfc,
|
||||
0x9a, 0xef, 0xf7, 0x64, 0xa8, 0x7, 0xf1, 0x80,
|
||||
0x7f, 0x9, 0xb5, 0x7c, 0x0, 0x7c, 0xc0, 0x1f,
|
||||
0xfc, 0x27, 0xd2, 0x0, 0xef, 0x0, 0xff, 0xe1,
|
||||
0x96, 0x8, 0x6, 0x4b, 0x30, 0xf, 0xfe, 0x10,
|
||||
0xd0, 0x7, 0x26, 0x7f, 0xee, 0xca, 0x61, 0x0,
|
||||
0xf2, 0x20, 0x3, 0xfc, 0x26, 0xb3, 0xd0, 0x1,
|
||||
0xee, 0x0, 0xff, 0xe1, 0xbd, 0x0, 0x72, 0x80,
|
||||
0x7f, 0xf1, 0x15, 0x40, 0x1c, 0x40, 0x1f, 0xfc,
|
||||
0x4f, 0x0, 0xe6, 0x0, 0xff, 0xe2, 0x30, 0x7,
|
||||
0x8, 0x7, 0xff, 0x11, 0xc0, 0x3f, 0xf9, 0x44,
|
||||
0x1, 0xc2, 0x1, 0xff, 0xc4, 0xa0, 0xe, 0x60,
|
||||
0xf, 0xfe, 0x1a, 0x98, 0x6, 0x12, 0x4, 0xba,
|
||||
0x50, 0xf, 0xe6, 0xa0, 0xe, 0x60, 0x4b, 0x45,
|
||||
0xaf, 0xb8, 0x64, 0x42, 0xc6, 0xc8, 0x7, 0xa4,
|
||||
0x38, 0x3, 0x91, 0xe6, 0xed, 0x4e, 0x40, 0x1e,
|
||||
0x81, 0x1, 0x0, 0xff, 0xe3, 0x33, 0x80, 0x3c,
|
||||
0x3, 0xff, 0x8a, 0xf2, 0x1, 0x26, 0x28, 0x7,
|
||||
0xff, 0x5, 0x32, 0x0, 0x38, 0xeb, 0xed, 0xd0,
|
||||
0x84, 0x2, 0x25, 0x8d, 0xb3, 0x0, 0xe0,
|
||||
|
||||
/* U+0036 "6" */
|
||||
0x0, 0xff, 0xe0, 0x14, 0xf7, 0xf2, 0x0, 0x7f,
|
||||
0xf1, 0xa3, 0x58, 0x40, 0x60, 0x3, 0xff, 0x8b,
|
||||
0x6e, 0x1, 0xc8, 0x1, 0xff, 0xc3, 0x1c, 0x40,
|
||||
0xe, 0x88, 0x0, 0x7f, 0xf0, 0x87, 0xc, 0x3,
|
||||
0x16, 0x38, 0x7, 0xff, 0xf, 0x48, 0x3, 0x26,
|
||||
0x18, 0x7, 0xff, 0xe, 0x4c, 0x3, 0x2d, 0x88,
|
||||
0x7, 0xff, 0xd, 0x58, 0x3, 0x2d, 0x0, 0x7f,
|
||||
0xf1, 0x6, 0xc0, 0x31, 0xd0, 0x7, 0xff, 0x16,
|
||||
0x4, 0x2, 0x1d, 0x0, 0xff, 0xe2, 0x93, 0x0,
|
||||
0x6b, 0x10, 0xf, 0xfe, 0x2d, 0x80, 0x65, 0x50,
|
||||
0x7, 0xff, 0x14, 0x58, 0x3, 0x40, 0x13, 0xe7,
|
||||
0x7f, 0xb6, 0x50, 0x3, 0xf3, 0x0, 0x66, 0x29,
|
||||
0xd8, 0x31, 0x0, 0x13, 0x5d, 0x84, 0x3, 0xd4,
|
||||
0x1, 0xb7, 0x4c, 0x1, 0xfc, 0x9e, 0x40, 0x18,
|
||||
0x88, 0x1, 0x14, 0x90, 0x7, 0xfc, 0x3e, 0x1,
|
||||
0x90, 0x3, 0x11, 0x0, 0x6, 0xf0, 0xc6, 0x1,
|
||||
0xe2, 0x80, 0xb, 0x0, 0x3c, 0x59, 0x88, 0x79,
|
||||
0xcd, 0x30, 0xe, 0x60, 0x9, 0xc0, 0x38, 0xf4,
|
||||
0xc0, 0x38, 0xb0, 0xc0, 0x30, 0xa8, 0x0, 0x80,
|
||||
0x3b, 0x80, 0x3f, 0xb8, 0x3, 0xb0, 0x4, 0x3,
|
||||
0x94, 0x80, 0x3f, 0x89, 0x0, 0x32, 0x81, 0x80,
|
||||
0x77, 0x80, 0x7f, 0xd8, 0x1, 0x88, 0x4, 0x3,
|
||||
0x9c, 0x3, 0xfe, 0x20, 0xc, 0x20, 0x1f, 0x18,
|
||||
0x7, 0xff, 0x30, 0xc0, 0x3f, 0xf8, 0xc4, 0x1,
|
||||
0xce, 0x1, 0xff, 0x68, 0x6, 0x20, 0x10, 0xe,
|
||||
0xe0, 0xf, 0xf9, 0x40, 0x33, 0x80, 0x10, 0x3,
|
||||
0x22, 0x0, 0x3f, 0x9c, 0x80, 0x36, 0x0, 0x34,
|
||||
0x3, 0xad, 0x0, 0x3e, 0x68, 0x0, 0xe7, 0x0,
|
||||
0x30, 0x80, 0x75, 0xd2, 0x90, 0x92, 0xdc, 0x80,
|
||||
0x73, 0x8, 0x5, 0x60, 0x1e, 0x5a, 0xde, 0xda,
|
||||
0x40, 0xe, 0x18, 0x0, 0xca, 0xc0, 0x1f, 0xfc,
|
||||
0x5d, 0x10, 0xe, 0x97, 0x0, 0xff, 0xe1, 0xe,
|
||||
0x18, 0x7, 0xd1, 0x86, 0x1, 0xff, 0x37, 0x98,
|
||||
0x7, 0xf1, 0xe6, 0x1d, 0x4, 0x2, 0x25, 0x9e,
|
||||
0x91, 0x0, 0xe0,
|
||||
|
||||
/* U+0037 "7" */
|
||||
0x8, 0xff, 0xff, 0xe3, 0xd9, 0x82, 0x38, 0x7,
|
||||
0xff, 0x1d, 0x30, 0x8c, 0x3, 0xff, 0x95, 0x44,
|
||||
0x1, 0xff, 0xca, 0x35, 0x30, 0xf, 0xfe, 0x48,
|
||||
0x86, 0x62, 0xef, 0xff, 0x83, 0x20, 0x1e, 0xd0,
|
||||
0x1, 0xa2, 0x7f, 0xf0, 0x58, 0x40, 0x39, 0x80,
|
||||
0x3f, 0xf8, 0x86, 0x20, 0x19, 0x44, 0x3, 0xff,
|
||||
0x89, 0x20, 0x1d, 0x20, 0x1f, 0xfc, 0x41, 0x50,
|
||||
0xc, 0x46, 0x1, 0xff, 0xc4, 0x90, 0xe, 0xb0,
|
||||
0xf, 0xfe, 0x2b, 0x0, 0x73, 0x0, 0x7f, 0xf1,
|
||||
0x14, 0x40, 0x33, 0x0, 0x7f, 0xf1, 0x64, 0x3,
|
||||
0xac, 0x3, 0xff, 0x88, 0x66, 0x0, 0xc8, 0x40,
|
||||
0x1f, 0xfc, 0x49, 0x0, 0xef, 0x0, 0xff, 0xe2,
|
||||
0xa, 0x80, 0x62, 0x40, 0xf, 0xfe, 0x23, 0x0,
|
||||
0x75, 0x0, 0x7f, 0xf1, 0x64, 0x3, 0x98, 0x3,
|
||||
0xff, 0x88, 0xa2, 0x1, 0x94, 0x40, 0x3f, 0xf8,
|
||||
0x92, 0x1, 0xd2, 0x1, 0xff, 0xc4, 0x23, 0x0,
|
||||
0xc6, 0x60, 0xf, 0xfe, 0x25, 0x80, 0x74, 0x80,
|
||||
0x7f, 0xf1, 0x5, 0x80, 0x30, 0xa8, 0x7, 0xff,
|
||||
0x11, 0x80, 0x39, 0x80, 0x3f, 0xf8, 0xb4, 0x1,
|
||||
0xd2, 0x1, 0xff, 0xc4, 0x42, 0x0, 0xc8, 0x20,
|
||||
0x1f, 0xfc, 0x4f, 0x0, 0xef, 0x0, 0xff, 0xe2,
|
||||
0x12, 0x0, 0x62, 0x40, 0xf, 0xfe, 0x25, 0x80,
|
||||
0x75, 0x80, 0x7f, 0xf1, 0x58, 0x3, 0x98, 0x3,
|
||||
0xff, 0x88, 0xc0, 0x1c, 0xc0, 0x1f, 0xfc, 0x5a,
|
||||
0x0, 0xeb, 0x0, 0xff, 0xe5, 0x21, 0x0, 0x7f,
|
||||
0xf1, 0x60, 0x80, 0xb, 0x40, 0x1f, 0xfc, 0x0,
|
||||
|
||||
/* U+0038 "8" */
|
||||
0x0, 0xf8, 0xe2, 0xfb, 0xfe, 0xdb, 0x72, 0x0,
|
||||
0xff, 0xe0, 0x1e, 0x61, 0xd0, 0x40, 0x22, 0x48,
|
||||
0xda, 0x20, 0xf, 0xe8, 0xc3, 0x0, 0xff, 0x97,
|
||||
0x54, 0x3, 0xe8, 0x70, 0xf, 0xfe, 0x1d, 0x28,
|
||||
0x7, 0x1b, 0x80, 0x7f, 0xf1, 0x68, 0x40, 0x34,
|
||||
0x0, 0x78, 0xe2, 0xae, 0x9c, 0x80, 0x3d, 0x20,
|
||||
0x10, 0xa0, 0x7, 0x4e, 0x3a, 0xa2, 0xc6, 0xb0,
|
||||
0x7, 0x28, 0x4, 0x40, 0x1c, 0xac, 0x1, 0xf4,
|
||||
0x98, 0x6, 0x20, 0x9, 0xc0, 0x3b, 0xc0, 0x3f,
|
||||
0xac, 0x3, 0x84, 0x0, 0xe0, 0x1c, 0x20, 0x1f,
|
||||
0xfc, 0x31, 0x0, 0x18, 0x7, 0x18, 0x7, 0xf6,
|
||||
0x80, 0x62, 0x0, 0xca, 0x1, 0xa0, 0x80, 0x3e,
|
||||
0x45, 0x0, 0xd4, 0x1, 0xa0, 0x3, 0xb6, 0xc,
|
||||
0x0, 0x29, 0x36, 0x1, 0x85, 0xc0, 0x31, 0x50,
|
||||
0x7, 0x3e, 0x7f, 0xba, 0xd8, 0x3, 0xe, 0x80,
|
||||
0x79, 0x70, 0x80, 0x3f, 0xf8, 0x29, 0x86, 0x1,
|
||||
0xf1, 0xec, 0x88, 0x7, 0xf1, 0xe5, 0x90, 0x7,
|
||||
0xe2, 0xb9, 0x10, 0xf, 0xe3, 0xca, 0x10, 0xf,
|
||||
0x97, 0x50, 0x3, 0xff, 0x82, 0xbe, 0x60, 0x1c,
|
||||
0x94, 0x1, 0xc5, 0x15, 0x74, 0xe2, 0x1, 0x87,
|
||||
0x48, 0x3, 0x50, 0x7, 0x4e, 0xba, 0xa2, 0xc7,
|
||||
0x38, 0x6, 0x19, 0x0, 0x9c, 0x40, 0x34, 0xb0,
|
||||
0x7, 0xd0, 0xc0, 0x19, 0x10, 0x0, 0xb0, 0xc,
|
||||
0x6c, 0x1, 0xfd, 0x0, 0x1d, 0xa0, 0x26, 0x1,
|
||||
0xac, 0x3, 0xfc, 0x2a, 0x1, 0x90, 0x8, 0x3,
|
||||
0x8c, 0x3, 0xfe, 0xd0, 0xc, 0x40, 0xe0, 0x1f,
|
||||
0xfc, 0xc7, 0x0, 0xe2, 0x0, 0xff, 0xb4, 0x3,
|
||||
0xc4, 0x1, 0xd4, 0x1, 0xff, 0x20, 0x6, 0x10,
|
||||
0x12, 0x0, 0xc6, 0xa0, 0x1f, 0xd2, 0x20, 0x19,
|
||||
0x0, 0xa, 0x1, 0xd4, 0xc0, 0x1f, 0x43, 0x0,
|
||||
0x77, 0x80, 0x24, 0x3, 0xd3, 0xae, 0xa8, 0xb1,
|
||||
0xce, 0x1, 0xc4, 0xa0, 0x1, 0x90, 0xf, 0x14,
|
||||
0x55, 0xd3, 0x88, 0x7, 0xb8, 0x3, 0x33, 0x0,
|
||||
0x3f, 0xf8, 0xb2, 0x60, 0x1d, 0x2e, 0x1, 0xff,
|
||||
0xc3, 0xa6, 0x0, 0xfa, 0x31, 0x0, 0x3f, 0xe5,
|
||||
0xe5, 0x0, 0xfe, 0x3b, 0xd8, 0x41, 0x0, 0x89,
|
||||
0x67, 0xa8, 0x40, 0x38,
|
||||
|
||||
/* U+0039 "9" */
|
||||
0x0, 0xf8, 0xa2, 0xfb, 0xfe, 0xda, 0x61, 0x0,
|
||||
0xff, 0xe0, 0x1e, 0x6b, 0xa0, 0x80, 0x44, 0xb3,
|
||||
0xd4, 0x20, 0x1f, 0xd1, 0x86, 0x1, 0xff, 0x2f,
|
||||
0x28, 0x7, 0xd2, 0xe0, 0x1f, 0xfc, 0x3a, 0x50,
|
||||
0xe, 0x66, 0x0, 0x7f, 0xf1, 0x68, 0x80, 0x34,
|
||||
0x0, 0x79, 0xaf, 0xb9, 0xb4, 0x80, 0x1e, 0x90,
|
||||
0x9, 0xc4, 0x3, 0x16, 0xca, 0x8, 0x89, 0x6e,
|
||||
0xc0, 0x1c, 0x86, 0x0, 0xb0, 0xc, 0x38, 0x40,
|
||||
0x1f, 0x25, 0x0, 0x75, 0x80, 0xc, 0x3, 0x30,
|
||||
0x80, 0x7f, 0x29, 0x80, 0x64, 0x2, 0x0, 0xeb,
|
||||
0x0, 0xff, 0xac, 0x3, 0x10, 0x8, 0x7, 0x10,
|
||||
0x7, 0xfc, 0x40, 0x18, 0x40, 0x3e, 0x30, 0xf,
|
||||
0xfe, 0x30, 0x80, 0x73, 0x0, 0x7f, 0xda, 0x1,
|
||||
0xe2, 0x0, 0xed, 0x0, 0xff, 0x94, 0x3, 0xe3,
|
||||
0x0, 0xcc, 0x20, 0x1f, 0xce, 0x40, 0x18, 0x80,
|
||||
0x16, 0x1, 0xda, 0x20, 0x1f, 0x34, 0x0, 0x70,
|
||||
0x80, 0x18, 0x3, 0x8f, 0xdc, 0xc0, 0x2, 0x97,
|
||||
0x20, 0x1e, 0x60, 0x0, 0xb0, 0x7, 0xc, 0x67,
|
||||
0xfb, 0xad, 0x0, 0x2, 0x1, 0xb4, 0x2, 0x93,
|
||||
0x0, 0xff, 0xe0, 0xc8, 0x80, 0x64, 0x0, 0xda,
|
||||
0x80, 0x1f, 0xe1, 0xc1, 0x0, 0xe3, 0x0, 0xc3,
|
||||
0x72, 0x40, 0x1f, 0x3f, 0x9d, 0x0, 0x65, 0x0,
|
||||
0xf9, 0xb7, 0x26, 0x21, 0x39, 0xf0, 0x2a, 0x40,
|
||||
0x1b, 0x80, 0x3f, 0x8d, 0x9d, 0xcc, 0x60, 0x14,
|
||||
0x0, 0x62, 0x40, 0xf, 0xfe, 0x2b, 0x90, 0x6,
|
||||
0xb0, 0xf, 0xfe, 0x29, 0x40, 0x6, 0x16, 0x0,
|
||||
0xff, 0xe2, 0xf0, 0x7, 0x58, 0x7, 0xff, 0x16,
|
||||
0x4c, 0x3, 0x1a, 0x80, 0x7f, 0xf1, 0x1d, 0x80,
|
||||
0x3b, 0x80, 0x3f, 0xf8, 0x8f, 0x0, 0x1d, 0x24,
|
||||
0x1, 0xff, 0xc3, 0x88, 0x0, 0x73, 0x30, 0x3,
|
||||
0xff, 0x84, 0x36, 0xe0, 0x1c, 0xb2, 0x1, 0xff,
|
||||
0xc2, 0x2c, 0x40, 0xe, 0x5a, 0x0, 0xff, 0xe1,
|
||||
0xf9, 0x0, 0x73, 0xd0, 0x7, 0xff, 0x10, 0x80,
|
||||
0x3a, 0xa0, 0x3, 0xff, 0x8b, 0x22, 0x4, 0xfc,
|
||||
0xa0, 0x1f, 0xf0,
|
||||
|
||||
/* U+003A ":" */
|
||||
0x0, 0xff, 0xe0, 0xd, 0x77, 0xf4, 0x0, 0x43,
|
||||
0xea, 0x20, 0x2f, 0x80, 0xb, 0x10, 0xe, 0x37,
|
||||
0x5, 0x0, 0xfa, 0xc0, 0x3f, 0x84, 0x3, 0xf8,
|
||||
0x41, 0x40, 0x3e, 0xb0, 0xb1, 0x0, 0xe3, 0x70,
|
||||
0x1f, 0x61, 0x1, 0x7c, 0x0, 0x86, 0x7b, 0xfa,
|
||||
0x0, 0x3f, 0xff, 0xc3, 0x5d, 0xfd, 0x0, 0x10,
|
||||
0xfa, 0x88, 0xb, 0xe0, 0x2, 0xc4, 0x3, 0x8d,
|
||||
0xc1, 0x40, 0x3e, 0xb0, 0xf, 0xe1, 0x0, 0xfe,
|
||||
0x10, 0x50, 0xf, 0xa8, 0x2c, 0x40, 0x38, 0xd8,
|
||||
0x7, 0xd8, 0x40, 0x5f, 0x0
|
||||
};
|
||||
|
||||
|
||||
/*---------------------
|
||||
* GLYPH DESCRIPTION
|
||||
*--------------------*/
|
||||
|
||||
static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
||||
{.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
|
||||
{.bitmap_index = 0, .adv_w = 461, .box_w = 25, .box_h = 35, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 293, .adv_w = 461, .box_w = 24, .box_h = 35, .ofs_x = 3, .ofs_y = 0},
|
||||
{.bitmap_index = 420, .adv_w = 461, .box_w = 24, .box_h = 35, .ofs_x = 3, .ofs_y = 0},
|
||||
{.bitmap_index = 660, .adv_w = 461, .box_w = 23, .box_h = 35, .ofs_x = 3, .ofs_y = 0},
|
||||
{.bitmap_index = 912, .adv_w = 461, .box_w = 26, .box_h = 35, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 1105, .adv_w = 461, .box_w = 23, .box_h = 35, .ofs_x = 3, .ofs_y = 0},
|
||||
{.bitmap_index = 1312, .adv_w = 461, .box_w = 25, .box_h = 35, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 1587, .adv_w = 461, .box_w = 24, .box_h = 35, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 1795, .adv_w = 461, .box_w = 25, .box_h = 35, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2087, .adv_w = 461, .box_w = 25, .box_h = 35, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2362, .adv_w = 461, .box_w = 10, .box_h = 27, .ofs_x = 9, .ofs_y = 0}
|
||||
};
|
||||
|
||||
/*---------------------
|
||||
* CHARACTER MAPPING
|
||||
*--------------------*/
|
||||
|
||||
|
||||
|
||||
/*Collect the unicode lists and glyph_id offsets*/
|
||||
static const lv_font_fmt_txt_cmap_t cmaps[] =
|
||||
{
|
||||
{
|
||||
.range_start = 48, .range_length = 11, .glyph_id_start = 1,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
/*--------------------
|
||||
* ALL CUSTOM DATA
|
||||
*--------------------*/
|
||||
|
||||
#if LVGL_VERSION_MAJOR == 8
|
||||
/*Store all the custom data of the font*/
|
||||
static lv_font_fmt_txt_glyph_cache_t cache;
|
||||
#endif
|
||||
|
||||
#if LVGL_VERSION_MAJOR >= 8
|
||||
static const lv_font_fmt_txt_dsc_t font_dsc = {
|
||||
#else
|
||||
static lv_font_fmt_txt_dsc_t font_dsc = {
|
||||
#endif
|
||||
.glyph_bitmap = glyph_bitmap,
|
||||
.glyph_dsc = glyph_dsc,
|
||||
.cmaps = cmaps,
|
||||
.kern_dsc = NULL,
|
||||
.kern_scale = 0,
|
||||
.cmap_num = 1,
|
||||
.bpp = 4,
|
||||
.kern_classes = 0,
|
||||
.bitmap_format = 1,
|
||||
#if LVGL_VERSION_MAJOR == 8
|
||||
.cache = &cache
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
||||
/*-----------------
|
||||
* PUBLIC FONT
|
||||
*----------------*/
|
||||
|
||||
/*Initialize a public general font descriptor*/
|
||||
#if LVGL_VERSION_MAJOR >= 8
|
||||
const lv_font_t ui_font_keyboard_time_48 = {
|
||||
#else
|
||||
lv_font_t ui_font_keyboard_time_48 = {
|
||||
#endif
|
||||
.get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/
|
||||
.get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/
|
||||
.line_height = 35, /*The maximum line height required by the font*/
|
||||
.base_line = 0, /*Baseline measured from the bottom of the line*/
|
||||
#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
|
||||
.subpx = LV_FONT_SUBPX_NONE,
|
||||
#endif
|
||||
#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
|
||||
.underline_position = -7,
|
||||
.underline_thickness = 2,
|
||||
#endif
|
||||
.dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
|
||||
#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
|
||||
.fallback = NULL,
|
||||
#endif
|
||||
.user_data = NULL,
|
||||
};
|
||||
|
||||
|
||||
|
||||
#endif /*#if UI_FONT_KEYBOARD_TIME_48*/
|
||||
|
||||
Reference in New Issue
Block a user