Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add lvgl adaptation of touch screen xpt2046 for BSP #6114

Merged
merged 9 commits into from
Jun 29, 2022
Merged

Add lvgl adaptation of touch screen xpt2046 for BSP #6114

merged 9 commits into from
Jun 29, 2022

Conversation

liYony
Copy link
Contributor

@liYony liYony commented Jun 27, 2022

拉取/合并请求描述:(PR description)

[
原BSP的LVGl部分仅适配了电容触摸屏,现加入电阻触摸屏xpt2046驱动,在stm32f407-atk-explorer板子上完成测试.

单独触摸屏测试:

IA7 RJI$X$R5 5D X 4V%0X

配合LVGL测试:

9X08L{}GJ3{M$FAS}J }FPK
]

以下的内容不应该在提交PR时的message修改,修改下述message,PR会被直接关闭。请在提交PR后,浏览器查看PR并对以下检查项逐项check,没问题后逐条在页面上打钩。
The following content must not be changed in the submitted PR message. Otherwise, the PR will be closed immediately. After submitted PR, please use a web browser to visit PR, and check items one by one, and ticked them if no problem.

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 本拉取/合并请求代码是高质量的 Code in this PR is of high quality
  • 本拉取/合并使用formatting等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification

@liYony liYony changed the title Lvglf407 Add lvgl adaptation of touch screen xpt2046 for BSP Jun 27, 2022
@mysterywolf mysterywolf added the +1 Agree +1 label Jun 27, 2022
@Guozhanxin Guozhanxin added the +2 Agree +2 label Jun 28, 2022
};
typedef struct rt_xpt2046 *rt_xpt2046_t;

struct calibrate_args
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

看起来这个校准的操作,并没有很通用,是不是不用加到触摸框架里?

struct calibrate_args cali_args;
cali_args.lcd_name = TFTLCD_DEVICE_NAME;
cali_args.touch_name = TOUCH_DEVICE_NAME;
if (rt_device_control(touch, RT_TOUCH_CTRL_CALIBRATE, (void *)&cali_args) != RT_EOK)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里直接进行触摸校准就好了吧,不用转到框架,再让框架调用校准命令。

@BernardXiong BernardXiong merged commit 5b00165 into RT-Thread:master Jun 29, 2022
@BernardXiong
Copy link
Member

@Guozhanxin 下次类似的,+1(后续一定时间没有+2的,例如5天 - 1周),+2后的,直接合并。如果涉及到内核,组件等一类的,如果觉得有歧义或安稳些的,可以稍等等

@liYony liYony deleted the lvglf407 branch July 8, 2022 06:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
+1 Agree +1 +2 Agree +2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants