Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-18 02:38:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

apps/graphics/ft80x and apps/examples/ft80x: Fix some compile issues with other configuration options are selected.

Browse source
This commit is contained in:
Gregory Nutt 2018-02-25 18:24:13 -06:00
parent e734ab1b36
commit cccac4932b
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/ft80x/ft80x.h
View file

@ -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

4
graphics/ft80x/ft80x_audio.c
View file

@ -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;
}

7
graphics/ft80x/ft80x_touch.c
View file

@ -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);