Skip to content

Commit dc69430

Browse files
committed
vfx: code restruct
1 parent 896b703 commit dc69430

File tree

7 files changed

+319
-308
lines changed

7 files changed

+319
-308
lines changed

main/inc/user/fifo.h

Lines changed: 0 additions & 23 deletions
This file was deleted.

main/inc/user/vfx.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
#include <stdint.h>
1212

13+
extern uint16_t vfx_ctr;
14+
1315
extern void vfx_set_mode(uint8_t mode);
1416
extern uint8_t vfx_get_mode(void);
1517

main/inc/user/vfx_core.h

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* vfx_core.h
3+
*
4+
* Created on: 2019-07-03 20:05
5+
* Author: Jack Chen <redchenjs@live.com>
6+
*/
7+
8+
#ifndef INC_USER_VFX_CORE_H_
9+
#define INC_USER_VFX_CORE_H_
10+
11+
#include <stdint.h>
12+
13+
typedef struct fifo_element {
14+
int16_t data;
15+
struct fifo_element *next;
16+
} fifo_element_t;
17+
18+
extern uint32_t vfx_read_color_from_table(uint16_t color_idx, uint16_t color_ctr);
19+
extern void vfx_write_pixel(uint8_t x, uint8_t y, uint8_t z, uint16_t color_idx, uint16_t color_ctr);
20+
extern void vfx_fill_cube(uint8_t x, uint8_t y, uint8_t z, uint8_t cx, uint8_t cy, uint8_t cz, uint16_t color_idx, uint16_t color_ctr);
21+
extern void vfx_write_cube_bitmap(const uint8_t *bitmap);
22+
extern void vfx_write_layer_bitmap(uint8_t layer, const uint8_t *bitmap);
23+
extern void vfx_write_layer_number(uint8_t num, uint8_t layer, uint16_t color_idx, uint16_t color_ctr);
24+
extern void vfx_clear_cube(void);
25+
26+
extern void vfx_fifo_write(int16_t data);
27+
extern int16_t vfx_fifo_read(void);
28+
extern void vfx_fifo_init(void);
29+
30+
#endif /* INC_USER_VFX_CORE_H_ */

main/src/user/audio_render.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "os/core.h"
1414
#include "chip/i2s.h"
15-
#include "user/fifo.h"
15+
#include "user/vfx_core.h"
1616

1717
esp_err_t i2s_write_wrapper(i2s_port_t i2s_num, const void *src, size_t size, size_t *bytes_written, TickType_t ticks_to_wait)
1818
{
@@ -25,7 +25,7 @@ esp_err_t i2s_write_wrapper(i2s_port_t i2s_num, const void *src, size_t size, si
2525
while (size > 0) {
2626
int16_t data_l = data[idx+3] << 8 | data[idx+2];
2727
int16_t data_r = data[idx+1] << 8 | data[idx];
28-
fifo_write((data_l + data_r) / 2);
28+
vfx_fifo_write((data_l + data_r) / 2);
2929
idx += 4;
3030
size -= 4;
3131
}

main/src/user/fifo.c

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)