sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/examples/pwfb : fix compiling error

Browse Source 
fix compiling warning and error when CONFIG_NX=y, EXAMPLES_PWFB=y and EXAMPLES_PWFB_DEFAULT_FONT=y
fix CI-Precheck for pwfb_motion.c

Signed-off-by: YanXiaowei <yanxiaowei@xiaomi.com>
This commit is contained in:
YanXiaowei 2023-04-10 14:18:42 +08:00 committed by Xiang Xiao
parent 79a111fc1a
commit b2d5d3f51c
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/pwfb/pwfb_events.c
View File

@ -170,8 +170,6 @@ static void pwfb_tb_position(NXTKWINDOW hwnd,
FAR void *arg) FAR void *arg)
{ {
#ifdef CONFIG_EXAMPLES_PWFB_VERBOSE #ifdef CONFIG_EXAMPLES_PWFB_VERBOSE
FAR struct nxeg_state_s *st = (FAR struct nxeg_state_s *)arg;
/* Report the position */ /* Report the position */
printf("pwfb_tb_position: hwnd=%p size=(%d,%d) pos=(%d,%d) " printf("pwfb_tb_position: hwnd=%p size=(%d,%d) pos=(%d,%d) "

12
examples/pwfb/pwfb_internal.h
View File

@ -114,12 +114,12 @@
#ifndef CONFIG_EXAMPLES_PWFB_COLOR3 #ifndef CONFIG_EXAMPLES_PWFB_COLOR3
# if CONFIG_EXAMPLES_PWFB_BPP == 24 || CONFIG_EXAMPLES_PWFB_BPP == 32 # if CONFIG_EXAMPLES_PWFB_BPP == 24 || CONFIG_EXAMPLES_PWFB_BPP == 32
# define CONFIG_EXAMPLES_PWFB_COLOR2 0x00ffecb3 # define CONFIG_EXAMPLES_PWFB_COLOR3 0x00ffecb3
# elif CONFIG_EXAMPLES_PWFB_BPP == 16 # elif CONFIG_EXAMPLES_PWFB_BPP == 16
# define CONFIG_EXAMPLES_PWFB_COLOR2 0xff76 # define CONFIG_EXAMPLES_PWFB_COLOR3 0xff76
# else # else
# define CONFIG_EXAMPLES_PWFB_COLOR2 '3' # define CONFIG_EXAMPLES_PWFB_COLOR3 '3'
# endif # endif
#endif #endif
#ifndef CONFIG_EXAMPLES_PWFB_TBCOLOR #ifndef CONFIG_EXAMPLES_PWFB_TBCOLOR
@ -142,6 +142,10 @@
# endif # endif
#endif #endif
#ifdef CONFIG_EXAMPLES_PWFB_DEFAULT_FONT
# define CONFIG_EXAMPLES_PWFB_FONTID FONTID_DEFAULT
#endif
/* Cursor timing */ /* Cursor timing */
#if CONFIG_EXAMPLES_PWFB_RATECONTROL > 0 #if CONFIG_EXAMPLES_PWFB_RATECONTROL > 0

9
examples/pwfb/pwfb_motion.c
View File

@ -177,7 +177,7 @@ static inline bool pwfb_move_cursor(FAR struct pwfb_state_s *st)
#ifdef CONFIG_EXAMPLES_PWFB_VERBOSE #ifdef CONFIG_EXAMPLES_PWFB_VERBOSE
printf("pwfb_move_cursor: State: %u countdown: %u blinktime: %u\n", printf("pwfb_move_cursor: State: %u countdown: %u blinktime: %u\n",
(unsigned int)st->cursor.state, (unsigned int)st->cursor.countdown, (unsigned int)st->cursor.state, (unsigned int)st->cursor.countdown,
(unsigned int)st->cursor.blinktime; (unsigned int)st->cursor.blinktime);
printf("pwfb_move_cursor: Velocity: (%lx.%04lx,%lx.%04lx)\n", printf("pwfb_move_cursor: Velocity: (%lx.%04lx,%lx.%04lx)\n",
(unsigned long)st->cursor.deltax >> 16, (unsigned long)st->cursor.deltax >> 16,
(unsigned long)st->cursor.deltax & 0xffff, (unsigned long)st->cursor.deltax & 0xffff,
@ -186,12 +186,13 @@ static inline bool pwfb_move_cursor(FAR struct pwfb_state_s *st)
#endif #endif
/* Handle the update based on cursor state */ /* Handle the update based on cursor state */
/* If the state is not PFWB_CURSOR_STATIONARY, then update the cursor /* If the state is not PFWB_CURSOR_STATIONARY, then update the cursor
* position. * position.
*/ */
if (st->cursor.state != PFWB_CURSOR_STATIONARY) if (st->cursor.state != PFWB_CURSOR_STATIONARY)
{ {
/* Update X position */ /* Update X position */
newx = st->cursor.xpos + st->cursor.deltax; newx = st->cursor.xpos + st->cursor.deltax;
@ -258,7 +259,7 @@ static inline bool pwfb_move_cursor(FAR struct pwfb_state_s *st)
return false; return false;
} }
} }
/* Check for state changes */ /* Check for state changes */