diff --git a/examples/ft80x/ft80x.h b/examples/ft80x/ft80x.h index c702a7344..9943538fd 100644 --- a/examples/ft80x/ft80x.h +++ b/examples/ft80x/ft80x.h @@ -165,10 +165,10 @@ int ft80x_coproc_dial(int fd, FAR struct ft80x_dlbuffer_s *buffer); int ft80x_coproc_toggle(int fd, FAR struct ft80x_dlbuffer_s *buffer); int ft80x_coproc_number(int fd, FAR struct ft80x_dlbuffer_s *buffer); int ft80x_coproc_calibrate(int fd, FAR struct ft80x_dlbuffer_s *buffer); -#ifndef CONFIG_EXAMPLES_FT80X_EXCLUDE_BITMAPS int ft80x_coproc_spinner(int fd, FAR struct ft80x_dlbuffer_s *buffer); -#endif +#ifndef CONFIG_EXAMPLES_FT80X_EXCLUDE_BITMAPS int ft80x_coproc_screensaver(int fd, FAR struct ft80x_dlbuffer_s *buffer); +#endif int ft80x_coproc_logo(int fd, FAR struct ft80x_dlbuffer_s *buffer); #undef EXTERN diff --git a/graphics/ft80x/ft80x_audio.c b/graphics/ft80x/ft80x_audio.c index acc89e79d..ce4c0e6d8 100644 --- a/graphics/ft80x/ft80x_audio.c +++ b/graphics/ft80x/ft80x_audio.c @@ -154,7 +154,7 @@ int ft80x_audio_playfile(int fd, FAR struct ft80x_dlbuffer_s *buffer, readlen = remaining; /* Clip to the amount that will fit into the display buffer (which we - * are re-purposing for audio data for now) + * are re-purposing for audio data buffer for now) */ if (readlen > MAX_DLBUFFER) @@ -168,7 +168,7 @@ int ft80x_audio_playfile(int fd, FAR struct ft80x_dlbuffer_s *buffer, if (nread < 0) { ret = -errno; - ft80x_err("ERROR: open of %s failed: %d\n", filepath, ret); + ft80x_err("ERROR: read from %s failed: %d\n", filepath, ret); goto errout_with_fd; } diff --git a/graphics/ft80x/ft80x_touch.c b/graphics/ft80x/ft80x_touch.c index c62908241..775ef50f9 100644 --- a/graphics/ft80x/ft80x_touch.c +++ b/graphics/ft80x/ft80x_touch.c @@ -76,7 +76,12 @@ int ft80x_touch_gettransform(int fd, FAR uint32_t matrix[6]) /* Read FT80X_REG_TOUCH_TRANSFORM_A through FT80X_REG_TOUCH_TRANSFORM_F */ +#ifdef CONFIG_LCD_FT800 ret = ft80x_getregs(fd, FT80X_REG_TOUCH_TRANSFORM_A, 6, matrix); +#else + ret = ft80x_getregs(fd, FT80X_REG_CTOUCH_TRANSFORM_A, 6, matrix); +#endif + if (ret < 0) { ft80x_err("ERROR: ft80x_getregs failed: %d\n", ret); @@ -320,7 +325,7 @@ int ft80x_touch_info(int fd, FAR struct ft80x_touchinfo_s *info) #elif defined(CONFIG_LCD_FT801) /* Read REG_CTOUCH_TAG */ - ret = ft80x_getreg8(fd, FT80X_REG_CTOUCH_TAG, &tag); + ret = ft80x_getreg8(fd, FT80X_REG_CTOUCH_TAG, &info->tag); if (ret < 0) { ft80x_err("ERROR: ft80x_getreg8 failed: %d\n", ret);