Skip to content

Commit 4d10fd6

Browse files
redchenjsredchenjs
committed
main: code refactoring
1 parent 02fef33 commit 4d10fd6

File tree

18 files changed

+238
-205
lines changed

18 files changed

+238
-205
lines changed

‎main/Kconfig.projbuild‎

Lines changed: 66 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,36 @@ config ENABLE_VFX
139139
help
140140
Select this to enable Visual Effects Output.
141141

142+
choice AUDIO_INPUT_FFT_CHANNEL
143+
prompt "Audio Input FFT Channel"
144+
default AUDIO_INPUT_FFT_ONLY_LEFT
145+
depends on ENABLE_VFX && !AUDIO_INPUT_NONE
146+
help
147+
Select Audio Input FFT Channel.
148+
149+
config AUDIO_INPUT_FFT_ONLY_LEFT
150+
bool "Left Channel"
151+
config AUDIO_INPUT_FFT_ONLY_RIGHT
152+
bool "Right Channel"
153+
config AUDIO_INPUT_FFT_BOTH
154+
bool "Both Channel"
155+
endchoice
156+
157+
choice BT_AUDIO_FFT_CHANNEL
158+
prompt "Bluetooth Audio FFT Channel"
159+
default BT_AUDIO_FFT_BOTH
160+
depends on ENABLE_VFX
161+
help
162+
Select Bluetooth Audio FFT Channel.
163+
164+
config BT_AUDIO_FFT_ONLY_LEFT
165+
bool "Left Channel"
166+
config BT_AUDIO_FFT_ONLY_RIGHT
167+
bool "Right Channel"
168+
config BT_AUDIO_FFT_BOTH
169+
bool "Both Channel"
170+
endchoice
171+
142172
choice VFX_OUTPUT
143173
prompt "VFX Output Device"
144174
default VFX_OUTPUT_CUBE0414
@@ -156,35 +186,23 @@ config VFX_OUTPUT_CUBE0414
156186
bool "CUBE0414 8x8x8 Music Light Cube"
157187
endchoice
158188

159-
choice BT_AUDIO_FFT_CHANNEL
160-
prompt "Bluetooth Audio FFT Channel"
161-
default BT_AUDIO_FFT_BOTH
162-
depends on ENABLE_VFX
189+
choice LCD_ORIENTATION
190+
prompt "LCD Orientation"
191+
default LCD_ORIENTATION_NORMAL
192+
depends on ENABLE_VFX && !VFX_OUTPUT_WS2812 && !VFX_OUTPUT_CUBE0414
163193
help
164-
Select Bluetooth Audio FFT Channel.
194+
Select LCD orientation.
165195

166-
config BT_AUDIO_FFT_ONLY_LEFT
167-
bool "Left Channel"
168-
config BT_AUDIO_FFT_ONLY_RIGHT
169-
bool "Right Channel"
170-
config BT_AUDIO_FFT_BOTH
171-
bool "Both Channel"
196+
config LCD_ORIENTATION_NORMAL
197+
bool "Normal"
198+
config LCD_ORIENTATION_UPSIDE_DOWN
199+
bool "Upside Down"
172200
endchoice
173201

174-
choice AUDIO_INPUT_FFT_CHANNEL
175-
prompt "Audio Input FFT Channel"
176-
default AUDIO_INPUT_FFT_ONLY_LEFT
177-
depends on ENABLE_VFX && !AUDIO_INPUT_NONE
178-
help
179-
Select Audio Input FFT Channel.
180-
181-
config AUDIO_INPUT_FFT_ONLY_LEFT
182-
bool "Left Channel"
183-
config AUDIO_INPUT_FFT_ONLY_RIGHT
184-
bool "Right Channel"
185-
config AUDIO_INPUT_FFT_BOTH
186-
bool "Both Channel"
187-
endchoice
202+
config LCD_ROTATION_DEGREE
203+
int
204+
default 90 if LCD_ORIENTATION_NORMAL
205+
default 270 if LCD_ORIENTATION_UPSIDE_DOWN
188206

189207
choice LED_LAYER_DIR
190208
prompt "LED Layer Direction"
@@ -224,11 +242,6 @@ config LED_COLOR_GRB
224242
bool "GRB"
225243
endchoice
226244

227-
config WS2812_DIN_PIN
228-
int "WS2812 DIN Pin"
229-
default 18
230-
depends on ENABLE_VFX && VFX_OUTPUT_WS2812
231-
232245
choice CUBE0414_LINE_TYPE
233246
prompt "CUBE0414 Line Type"
234247
default CUBE0414_LINE_S_CURVE
@@ -272,18 +285,33 @@ config CUBE0414_LED_T1L
272285
range 1 255
273286
depends on ENABLE_VFX && VFX_OUTPUT_CUBE0414
274287

275-
config DEVICE_RST_PIN
276-
int "Device RST Pin"
288+
config WS2812_DIN_PIN
289+
int "WS2812 DIN Pin"
290+
default 18
291+
depends on ENABLE_VFX && VFX_OUTPUT_WS2812
292+
293+
config DEV_RST_PIN
294+
int "DEV RST Pin"
277295
default 14
278-
depends on ENABLE_VFX && !VFX_OUTPUT_WS2812
296+
depends on ENABLE_VFX && VFX_OUTPUT_CUBE0414
279297

280-
config DEVICE_DC_PIN
281-
int "Device DC Pin"
298+
config DEV_DC_PIN
299+
int "DEV DC Pin"
282300
default 23
283-
depends on ENABLE_VFX && !VFX_OUTPUT_WS2812
301+
depends on ENABLE_VFX && VFX_OUTPUT_CUBE0414
302+
303+
config LCD_RST_PIN
304+
int "LCD RST Pin"
305+
default 14
306+
depends on ENABLE_VFX && !VFX_OUTPUT_WS2812 && !VFX_OUTPUT_CUBE0414
307+
308+
config LCD_DC_PIN
309+
int "LCD DC Pin"
310+
default 23
311+
depends on ENABLE_VFX && !VFX_OUTPUT_WS2812 && !VFX_OUTPUT_CUBE0414
284312

285-
config DEVICE_BL_PIN
286-
int "Device BL Pin"
313+
config LCD_BL_PIN
314+
int "LCD BL Pin"
287315
default 4
288316
depends on ENABLE_VFX && !VFX_OUTPUT_WS2812 && !VFX_OUTPUT_CUBE0414
289317

‎main/inc/core/os.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
#include "freertos/event_groups.h"
1313

1414
typedef enum user_event_group_bits {
15-
OS_PWR_SLEEP_BIT = BIT0,
16-
OS_PWR_RESET_BIT = BIT1,
15+
OS_PWR_DUMMY_BIT = 0x00,
16+
OS_PWR_RESET_BIT = BIT0,
17+
OS_PWR_SLEEP_BIT = BIT1,
1718

1819
BT_A2DP_IDLE_BIT = BIT2,
1920
BT_A2DP_DATA_BIT = BIT3,
@@ -38,8 +39,8 @@ typedef enum user_event_group_bits {
3839

3940
extern EventGroupHandle_t user_event_group;
4041

41-
extern void os_pwr_sleep_wait(EventBits_t bits);
4242
extern void os_pwr_reset_wait(EventBits_t bits);
43+
extern void os_pwr_sleep_wait(EventBits_t bits);
4344

4445
extern void os_init(void);
4546

‎main/inc/user/audio_player.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#ifndef INC_USER_AUDIO_PLAYER_H_
99
#define INC_USER_AUDIO_PLAYER_H_
1010

11-
1211
typedef enum {
1312
MP3_FILE_IDX_CONNECTED = 0x00,
1413
MP3_FILE_IDX_DISCONNECTED = 0x01,

‎main/inc/user/led.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#ifndef INC_USER_LED_H_
99
#define INC_USER_LED_H_
1010

11-
1211
typedef enum {
1312
LED_MODE_IDX_BLINK_S1 = 0x00,
1413
LED_MODE_IDX_BLINK_S0 = 0x01,

‎main/inc/user/vfx.h‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,20 @@ extern GDisplay *vfx_gdisp;
8080
extern float vfx_fft_input[FFT_N];
8181
extern float vfx_fft_output[FFT_N];
8282

83-
#ifndef CONFIG_VFX_OUTPUT_CUBE0414
84-
#ifdef CONFIG_VFX_OUTPUT_ST7735
85-
// ani0.gif
86-
extern const char ani0_160x80_gif_ptr[] asm("_binary_ani0_160x80_gif_start");
87-
extern const char ani0_160x80_gif_end[] asm("_binary_ani0_160x80_gif_end");
88-
// ani1.gif
89-
extern const char ani1_160x80_gif_ptr[] asm("_binary_ani1_160x80_gif_start");
90-
extern const char ani1_160x80_gif_end[] asm("_binary_ani1_160x80_gif_end");
91-
#else
92-
// ani0.gif
93-
extern const char ani0_240x135_gif_ptr[] asm("_binary_ani0_240x135_gif_start");
94-
extern const char ani0_240x135_gif_end[] asm("_binary_ani0_240x135_gif_end");
95-
// ani1.gif
96-
extern const char ani1_240x135_gif_ptr[] asm("_binary_ani1_240x135_gif_start");
97-
extern const char ani1_240x135_gif_end[] asm("_binary_ani1_240x135_gif_end");
98-
#endif
83+
#ifdef CONFIG_VFX_OUTPUT_ST7735
84+
// ani0.gif
85+
extern const char ani0_160x80_gif_ptr[] asm("_binary_ani0_160x80_gif_start");
86+
extern const char ani0_160x80_gif_end[] asm("_binary_ani0_160x80_gif_end");
87+
// ani1.gif
88+
extern const char ani1_160x80_gif_ptr[] asm("_binary_ani1_160x80_gif_start");
89+
extern const char ani1_160x80_gif_end[] asm("_binary_ani1_160x80_gif_end");
90+
#else
91+
// ani0.gif
92+
extern const char ani0_240x135_gif_ptr[] asm("_binary_ani0_240x135_gif_start");
93+
extern const char ani0_240x135_gif_end[] asm("_binary_ani0_240x135_gif_end");
94+
// ani1.gif
95+
extern const char ani1_240x135_gif_ptr[] asm("_binary_ani1_240x135_gif_start");
96+
extern const char ani1_240x135_gif_end[] asm("_binary_ani1_240x135_gif_end");
9997
#endif
10098

10199
extern void vfx_set_conf(vfx_config_t *cfg);

‎main/src/board/cube0414.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@ void cube0414_init_board(void)
2828
memset(hspi_trans, 0x00, sizeof(hspi_trans));
2929

3030
gpio_config_t io_conf = {
31-
.pin_bit_mask = BIT64(CONFIG_DEVICE_DC_PIN) | BIT64(CONFIG_DEVICE_RST_PIN),
31+
.pin_bit_mask = BIT64(CONFIG_DEV_DC_PIN) | BIT64(CONFIG_DEV_RST_PIN),
3232
.mode = GPIO_MODE_OUTPUT,
3333
.pull_up_en = false,
3434
.pull_down_en = false,
3535
.intr_type = GPIO_INTR_DISABLE
3636
};
3737
gpio_config(&io_conf);
3838

39-
ESP_LOGI(TAG, "initialized, dc: %d, rst: %d", CONFIG_DEVICE_DC_PIN, CONFIG_DEVICE_RST_PIN);
39+
ESP_LOGI(TAG, "initialized, dc: %d, rst: %d", CONFIG_DEV_DC_PIN, CONFIG_DEV_RST_PIN);
4040
}
4141

4242
void cube0414_setpin_dc(spi_transaction_t *t)
4343
{
44-
gpio_set_level(CONFIG_DEVICE_DC_PIN, (int)t->user);
44+
gpio_set_level(CONFIG_DEV_DC_PIN, (int)t->user);
4545
}
4646

4747
void cube0414_setpin_reset(uint8_t val)
4848
{
49-
gpio_set_level(CONFIG_DEVICE_RST_PIN, val);
49+
gpio_set_level(CONFIG_DEV_RST_PIN, val);
5050
}
5151

5252
void cube0414_write_cmd(uint8_t cmd)

‎main/src/board/st7735.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void st7735_init_board(void)
2929
memset(hspi_trans, 0x00, sizeof(hspi_trans));
3030

3131
gpio_config_t io_conf = {
32-
.pin_bit_mask = BIT64(CONFIG_DEVICE_DC_PIN) | BIT64(CONFIG_DEVICE_RST_PIN),
32+
.pin_bit_mask = BIT64(CONFIG_LCD_DC_PIN) | BIT64(CONFIG_LCD_RST_PIN),
3333
.mode = GPIO_MODE_OUTPUT,
3434
.pull_up_en = false,
3535
.pull_down_en = false,
@@ -49,7 +49,7 @@ void st7735_init_board(void)
4949
ledc_channel_config_t ledc_channel = {
5050
.channel = LEDC_CHANNEL_0,
5151
.duty = 0,
52-
.gpio_num = CONFIG_DEVICE_BL_PIN,
52+
.gpio_num = CONFIG_LCD_BL_PIN,
5353
.speed_mode = LEDC_HIGH_SPEED_MODE,
5454
.hpoint = 0,
5555
.timer_sel = LEDC_TIMER_0
@@ -58,7 +58,7 @@ void st7735_init_board(void)
5858

5959
ledc_fade_func_install(0);
6060

61-
ESP_LOGI(TAG, "initialized, bl: %d, dc: %d, rst: %d", CONFIG_DEVICE_BL_PIN, CONFIG_DEVICE_DC_PIN, CONFIG_DEVICE_RST_PIN);
61+
ESP_LOGI(TAG, "initialized, bl: %d, dc: %d, rst: %d", CONFIG_LCD_BL_PIN, CONFIG_LCD_DC_PIN, CONFIG_LCD_RST_PIN);
6262
}
6363

6464
void st7735_set_backlight(uint8_t val)
@@ -69,12 +69,12 @@ void st7735_set_backlight(uint8_t val)
6969

7070
void st7735_setpin_dc(spi_transaction_t *t)
7171
{
72-
gpio_set_level(CONFIG_DEVICE_DC_PIN, (int)t->user);
72+
gpio_set_level(CONFIG_LCD_DC_PIN, (int)t->user);
7373
}
7474

7575
void st7735_setpin_reset(uint8_t val)
7676
{
77-
gpio_set_level(CONFIG_DEVICE_RST_PIN, val);
77+
gpio_set_level(CONFIG_LCD_RST_PIN, val);
7878
}
7979

8080
void st7735_write_cmd(uint8_t cmd)

‎main/src/board/st7789.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void st7789_init_board(void)
2929
memset(hspi_trans, 0x00, sizeof(hspi_trans));
3030

3131
gpio_config_t io_conf = {
32-
.pin_bit_mask = BIT64(CONFIG_DEVICE_DC_PIN) | BIT64(CONFIG_DEVICE_RST_PIN),
32+
.pin_bit_mask = BIT64(CONFIG_LCD_DC_PIN) | BIT64(CONFIG_LCD_RST_PIN),
3333
.mode = GPIO_MODE_OUTPUT,
3434
.pull_up_en = false,
3535
.pull_down_en = false,
@@ -49,7 +49,7 @@ void st7789_init_board(void)
4949
ledc_channel_config_t ledc_channel = {
5050
.channel = LEDC_CHANNEL_0,
5151
.duty = 0,
52-
.gpio_num = CONFIG_DEVICE_BL_PIN,
52+
.gpio_num = CONFIG_LCD_BL_PIN,
5353
.speed_mode = LEDC_HIGH_SPEED_MODE,
5454
.hpoint = 0,
5555
.timer_sel = LEDC_TIMER_0
@@ -58,7 +58,7 @@ void st7789_init_board(void)
5858

5959
ledc_fade_func_install(0);
6060

61-
ESP_LOGI(TAG, "initialized, bl: %d, dc: %d, rst: %d", CONFIG_DEVICE_BL_PIN, CONFIG_DEVICE_DC_PIN, CONFIG_DEVICE_RST_PIN);
61+
ESP_LOGI(TAG, "initialized, bl: %d, dc: %d, rst: %d", CONFIG_LCD_BL_PIN, CONFIG_LCD_DC_PIN, CONFIG_LCD_RST_PIN);
6262
}
6363

6464
void st7789_set_backlight(uint8_t val)
@@ -69,12 +69,12 @@ void st7789_set_backlight(uint8_t val)
6969

7070
void st7789_setpin_dc(spi_transaction_t *t)
7171
{
72-
gpio_set_level(CONFIG_DEVICE_DC_PIN, (int)t->user);
72+
gpio_set_level(CONFIG_LCD_DC_PIN, (int)t->user);
7373
}
7474

7575
void st7789_setpin_reset(uint8_t val)
7676
{
77-
gpio_set_level(CONFIG_DEVICE_RST_PIN, val);
77+
gpio_set_level(CONFIG_LCD_RST_PIN, val);
7878
}
7979

8080
void st7789_write_cmd(uint8_t cmd)

‎main/src/chip/spi.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ void hspi_init(void)
2727
.quadwp_io_num = -1,
2828
.quadhd_io_num = -1,
2929
#ifdef CONFIG_VFX_OUTPUT_ST7735
30-
.max_transfer_sz = ST7735_SCREEN_WIDTH*ST7735_SCREEN_HEIGHT*2
30+
.max_transfer_sz = ST7735_SCREEN_WIDTH * ST7735_SCREEN_HEIGHT * 2
3131
#elif defined(CONFIG_VFX_OUTPUT_ST7789)
32-
.max_transfer_sz = ST7789_SCREEN_WIDTH*ST7789_SCREEN_HEIGHT*2
32+
.max_transfer_sz = ST7789_SCREEN_WIDTH * ST7789_SCREEN_HEIGHT * 2
3333
#else
34-
.max_transfer_sz = CUBE0414_X*CUBE0414_Y*CUBE0414_Z*3
34+
.max_transfer_sz = CUBE0414_X * CUBE0414_Y * CUBE0414_Z * 3
3535
#endif
3636
};
3737
ESP_ERROR_CHECK(spi_bus_initialize(HSPI_HOST, &buscfg, 1));

0 commit comments

Comments
 (0)