riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16480 from aabadie/pr/tests/touch_dev_enh

Browse Source 
tests/touch_dev: improve genericity by using auto_init_screen module
This commit is contained in:
Alexandre Abadie 2021-05-19 12:24:28 +02:00 committed by GitHub
commit 9c749bc214
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/touch_dev/Makefile
View File

@ -3,7 +3,7 @@ include ../Makefile.tests_common
DISABLE_MODULE += test_utils_interactive_sync
USEMODULE += stmpe811
USEMODULE += auto_init_screen
USEMODULE += touch_dev
USEMODULE += xtimer

32
tests/touch_dev/main.c
View File

@ -25,13 +25,10 @@
#include "touch_dev.h"
#if IS_USED(MODULE_STMPE811)
#include "stmpe811.h"
#include "stmpe811_params.h"
#include "stmpe811_touch_dev.h"
#include "test_utils/expect.h"
static stmpe811_t stmpe811;
#endif
static void _touch_event_cb(void *arg)
{
@ -41,22 +38,29 @@ static void _touch_event_cb(void *arg)
int main(void)
{
stmpe811_init(&stmpe811, &stmpe811_params[0], _touch_event_cb, NULL);
/* Use the first screen */
touch_dev_reg_t *touch_dev = touch_dev_reg_find_screen(0);
if (!touch_dev) {
puts("No screen found!");
return -1;
}
touch_dev_t *dev = (touch_dev_t *)&stmpe811;
dev->driver = &stmpe811_touch_dev_driver;
touch_dev_set_touch_event_callback(touch_dev->dev, _touch_event_cb, NULL);
uint16_t xmax = touch_dev_width(dev);
uint16_t ymax = touch_dev_height(dev);
#if IS_USED(MODULE_STMPE811)
uint16_t xmax = touch_dev_width(touch_dev->dev);
uint16_t ymax = touch_dev_height(touch_dev->dev);
expect(xmax == stmpe811.params.xmax);
expect(ymax == stmpe811.params.ymax);
stmpe811_t *stmpe811 = (stmpe811_t *)touch_dev->dev;
expect(xmax == stmpe811->params.xmax);
expect(ymax == stmpe811->params.ymax);
#endif
uint8_t last_touches = touch_dev_touches(dev, NULL, 1);
uint8_t last_touches = touch_dev_touches(touch_dev->dev, NULL, 1);
while (1) {
touch_t touches[1];
uint8_t current_touches = touch_dev_touches(dev, touches, 1);
uint8_t current_touches = touch_dev_touches(touch_dev->dev, touches, 1);
if (current_touches != last_touches) {
if (current_touches == 0) {