Skip to content

Commit 86ad955

Browse files
committed
vfx: update default modes
1 parent d2e479b commit 86ad955

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

main/inc/user/vfx.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ typedef enum {
1919

2020
VFX_MODE_IDX_GIF_MAX,
2121

22-
VFX_MODE_IDX_12_BANDS_R = 0x0A,
23-
VFX_MODE_IDX_12_BANDS_G = 0x0B,
22+
VFX_MODE_IDX_12_BAND_R = 0x0A,
23+
VFX_MODE_IDX_12_BAND_G = 0x0B,
2424
VFX_MODE_IDX_SPECTRUM_R_N = 0x0C,
2525
VFX_MODE_IDX_SPECTRUM_G_N = 0x0D,
2626
VFX_MODE_IDX_SPECTRUM_M_N = 0x0E,
@@ -63,13 +63,13 @@ typedef struct {
6363
} vfx_config_t;
6464

6565
#if defined(CONFIG_VFX_OUTPUT_ST7735) || defined(CONFIG_VFX_OUTPUT_ST7789)
66-
#define DEFAULT_VFX_MODE VFX_MODE_IDX_12_BANDS_G
67-
#define DEFAULT_VFX_SCALE_FACTOR 0xFF
66+
#define DEFAULT_VFX_MODE VFX_MODE_IDX_12_BAND_G
67+
#define DEFAULT_VFX_SCALE_FACTOR 0x00FF
6868
#define DEFAULT_VFX_LIGHTNESS 0x00FF
6969
#define DEFAULT_VFX_BACKLIGHT 0xFF
7070
#else
71-
#define DEFAULT_VFX_MODE VFX_MODE_IDX_FOUNTAIN_H_N
72-
#define DEFAULT_VFX_SCALE_FACTOR 0xFF
71+
#define DEFAULT_VFX_MODE VFX_MODE_IDX_FOUNTAIN_H_L
72+
#define DEFAULT_VFX_SCALE_FACTOR 0x00FF
7373
#define DEFAULT_VFX_LIGHTNESS 0x006F
7474
#define DEFAULT_VFX_BACKLIGHT 0x00
7575
#endif

main/src/user/vfx.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ static void vfx_task(void *pvParameter)
119119
}
120120
break;
121121
}
122-
case VFX_MODE_IDX_12_BANDS_R: // 音樂頻譜-12段-彩虹
123-
case VFX_MODE_IDX_12_BANDS_G: { // 音樂頻譜-12段-漸變
122+
case VFX_MODE_IDX_12_BAND_R: // 音樂頻譜-12段-彩虹
123+
case VFX_MODE_IDX_12_BAND_G: { // 音樂頻譜-12段-漸變
124124
uint16_t color_p = 0;
125125
uint16_t color_h = 0;
126126
uint16_t color_l = vfx.lightness;
@@ -155,7 +155,7 @@ static void vfx_task(void *pvParameter)
155155

156156
xEventGroupSetBits(user_event_group, VFX_FFT_IDLE_BIT);
157157

158-
if (vfx.mode == VFX_MODE_IDX_12_BANDS_R) {
158+
if (vfx.mode == VFX_MODE_IDX_12_BAND_R) {
159159
color_h = 0;
160160
} else {
161161
color_p = color_h;
@@ -189,7 +189,7 @@ static void vfx_task(void *pvParameter)
189189
gdispGFillArea(vfx_gdisp, clear_x, clear_y, clear_cx, clear_cy, Black);
190190
gdispGFillArea(vfx_gdisp, fill_x, fill_y, fill_cx, fill_cy, pixel_color);
191191

192-
if (vfx.mode == VFX_MODE_IDX_12_BANDS_R) {
192+
if (vfx.mode == VFX_MODE_IDX_12_BAND_R) {
193193
color_h += 40;
194194
} else {
195195
if (++color_h == 512) {

0 commit comments

Comments
 (0)