libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[Renesas]Update tft callback and modify comments

This commit is contained in:
Rbb666 2023-05-05 10:20:19 +08:00 committed by guo
parent ac27da5689
commit bc9fe6d3c8
3 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bsp/renesas/ra6m3-hmi-board/board/lvgl/lv_port_disp.c
View File

@ -46,6 +46,11 @@ static void color_to16_maybe(lv_color16_t *dst, lv_color_t *src)
}
#endif
void _ra_port_display_callback(display_callback_args_t *p_args)
{
/* TFT-Callback */
}
static void disp_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p)
{
#ifdef PKG_USING_ILI9341

10
bsp/renesas/ra6m3-hmi-board/board/ports/avi/player/player.c
View File

@ -2,12 +2,12 @@
#include "avifile.h"
#include "pwm_audio.h"
#include <rthw.h>
#include <dfs_file.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/statfs.h>
#include "lv_demo_video.h"
#include "drv_jpeg.h"
#define DBG_TAG "player"
#define DBG_LVL DBG_INFO
@ -161,11 +161,10 @@ static uint8_t add_video_player(player_t player)
else
{
rt_bool_t flag = RT_FALSE;
/* 遍历播放列表，若不存在则添加进去 */
/* find in list*/
for (int index = 0; index < player->video_num; index++)
{
char *video_name = player->video_list[index];
/* 不等于则查找下一个 */
if (rt_strcmp(player->video_name, video_name))
{
flag = RT_TRUE;
@ -314,8 +313,6 @@ static int player_last(player_t player)
player->song_current = player->video_num;
}
// player->song_time_pass = 0;
rt_hw_interrupt_enable(level);
player->status = PLAYER_LAST;
@ -342,8 +339,6 @@ static int player_next(player_t player)
player->song_current = 1;
}
// player->song_time_pass = 0;
rt_hw_interrupt_enable(level);
player->status = PLAYER_NEXT;
@ -442,7 +437,6 @@ static void player_entry(void *parameter)
if (avi_file.BytesRD >= AVI_file.movi_size)
{
set_audio_wave_value(0);
//------------------------------
player_show(player);
player_next(player);
}

38
bsp/renesas/ra6m3-hmi-board/board/ports/avi/player/player.h
View File

@ -12,6 +12,8 @@
#define PLAYER_H
#include <rtthread.h>
#include <rthw.h>
#include "drv_jpeg.h"
#define PLAYER_SOUND_SIZE_DEFAULT 0
@ -21,12 +23,12 @@
enum PLAYER_STATUS
{
PLAYER_IDLE,
PLAYER_READY, //准备播放
PLAYER_RUNNING, //正在播放
PLAYER_STOP, //播放停止
PLAYER_DELETE, //删除资源
PLAYER_LAST, //播放上一首
PLAYER_NEXT, //播放下一首
PLAYER_READY,
PLAYER_RUNNING,
PLAYER_STOP,
PLAYER_DELETE,
PLAYER_LAST,
PLAYER_NEXT,
};
enum PLAYER_CMD
{
@ -60,27 +62,27 @@ struct audio_ops
struct player
{
enum PLAYER_STATUS status; //当前播放状态
int16_t volume; //声音大小
uint8_t song_current; //正在播放的视频
uint8_t video_num; //视频总数
uint16_t song_time_pass; //已经播放的时间
uint16_t song_time_all; //总播放时间
char * video_list[PLAYER_SONG_NUM_MAX]; //列表
enum PLAYER_STATUS status; /*state*/
int16_t volume; /*Sound Size*/
uint8_t song_current; /*Playing video*/
uint8_t video_num; /*Total number of videos*/
uint16_t song_time_pass; /*Played time*/
uint16_t song_time_all; /*Played all time*/
char * video_list[PLAYER_SONG_NUM_MAX];
char video_name[PLAYER_SONG_NAME_LEN_MAX];
rt_sem_t sem_play; //用于播放状态控制的信号量
rt_thread_t play_thread; //播放的线程
rt_sem_t sem_play;
rt_thread_t play_thread;
struct audio_ops *audio;
decode_drv_t *decode;
};
typedef struct player *player_t;
int player_add_song(player_t player, void *song); //添加歌曲到歌曲列表
int player_start(player_t player); //初始化
int player_add_song(player_t player, void *song);
int player_start(player_t player);
int player_control(player_t player, int cmd, void *arg);
int player_show(player_t player); //打印歌单和当前进度
int player_show(player_t player);
int player_delete(player_t player);
#endif