Skip to content

Commit dfa889f

Browse files
redchenjsredchenjs
committed
driver: code cleanup
1 parent d5d06c6 commit dfa889f

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

‎main/src/chip/bt.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ void bt_init(void)
4646
ESP_ERROR_CHECK(esp_bt_controller_mem_release(ESP_BT_MODE_BLE));
4747
#endif
4848

49-
esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
50-
ESP_ERROR_CHECK(esp_bt_controller_init(&bt_cfg));
49+
esp_bt_controller_config_t btc_conf = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
50+
ESP_ERROR_CHECK(esp_bt_controller_init(&btc_conf));
5151
ESP_ERROR_CHECK(esp_bt_controller_enable(ESP_BT_MODE_BTDM));
5252
ESP_ERROR_CHECK(esp_bluedroid_init());
5353
ESP_ERROR_CHECK(esp_bluedroid_enable());

‎main/src/chip/i2s.c

+21-21
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#define I2S0_TAG "i2s-0"
1313
#define I2S1_TAG "i2s-1"
1414

15-
static i2s_config_t i2s_output_config = {
15+
static i2s_config_t output_conf = {
1616
.mode = I2S_MODE_MASTER | I2S_MODE_TX
1717
#if (CONFIG_AUDIO_OUTPUT_I2S_NUM == CONFIG_AUDIO_INPUT_I2S_NUM)
1818
| I2S_MODE_RX
@@ -29,7 +29,7 @@ static i2s_config_t i2s_output_config = {
2929
};
3030

3131
#if !defined(CONFIG_AUDIO_INPUT_NONE) && (CONFIG_AUDIO_OUTPUT_I2S_NUM != CONFIG_AUDIO_INPUT_I2S_NUM)
32-
static i2s_config_t i2s_input_config = {
32+
static i2s_config_t input_conf = {
3333
.mode = I2S_MODE_MASTER | I2S_MODE_RX
3434
#ifdef CONFIG_AUDIO_INPUT_PDM
3535
| I2S_MODE_PDM
@@ -49,12 +49,12 @@ static i2s_config_t i2s_input_config = {
4949
static void i2s0_init(void)
5050
{
5151
#if (CONFIG_AUDIO_OUTPUT_I2S_NUM == 0)
52-
ESP_ERROR_CHECK(i2s_driver_install(I2S_NUM_0, &i2s_output_config, 0, NULL));
52+
ESP_ERROR_CHECK(i2s_driver_install(I2S_NUM_0, &output_conf, 0, NULL));
5353
#else
54-
ESP_ERROR_CHECK(i2s_driver_install(I2S_NUM_0, &i2s_input_config, 0, NULL));
54+
ESP_ERROR_CHECK(i2s_driver_install(I2S_NUM_0, &input_conf, 0, NULL));
5555
#endif
5656

57-
i2s_pin_config_t pin_config = {
57+
i2s_pin_config_t pin_conf = {
5858
#ifndef CONFIG_AUDIO_INPUT_PDM
5959
.bck_io_num = CONFIG_I2S0_BCLK_PIN,
6060
.ws_io_num = CONFIG_I2S0_LRCK_PIN,
@@ -75,13 +75,13 @@ static void i2s0_init(void)
7575
.data_in_num = CONFIG_PDM_DIN_PIN
7676
#endif
7777
};
78-
ESP_ERROR_CHECK(i2s_set_pin(I2S_NUM_0, &pin_config));
78+
ESP_ERROR_CHECK(i2s_set_pin(I2S_NUM_0, &pin_conf));
7979

8080
ESP_LOGI(I2S0_TAG, "initialized, bck: %d, ws: %d, dout: %d, din: %d",
81-
pin_config.bck_io_num,
82-
pin_config.ws_io_num,
83-
pin_config.data_out_num,
84-
pin_config.data_in_num
81+
pin_conf.bck_io_num,
82+
pin_conf.ws_io_num,
83+
pin_conf.data_out_num,
84+
pin_conf.data_in_num
8585
);
8686
}
8787

@@ -97,12 +97,12 @@ static void i2s0_deinit(void)
9797
static void i2s1_init(void)
9898
{
9999
#if (CONFIG_AUDIO_OUTPUT_I2S_NUM == 1)
100-
ESP_ERROR_CHECK(i2s_driver_install(I2S_NUM_1, &i2s_output_config, 0, NULL));
100+
ESP_ERROR_CHECK(i2s_driver_install(I2S_NUM_1, &output_conf, 0, NULL));
101101
#else
102-
ESP_ERROR_CHECK(i2s_driver_install(I2S_NUM_1, &i2s_input_config, 0, NULL));
102+
ESP_ERROR_CHECK(i2s_driver_install(I2S_NUM_1, &input_conf, 0, NULL));
103103
#endif
104104

105-
i2s_pin_config_t pin_config = {
105+
i2s_pin_config_t pin_conf = {
106106
.bck_io_num = CONFIG_I2S1_BCLK_PIN,
107107
.ws_io_num = CONFIG_I2S1_LRCK_PIN,
108108
#ifdef CONFIG_AUDIO_OUTPUT_I2S1
@@ -116,13 +116,13 @@ static void i2s1_init(void)
116116
.data_in_num = -1
117117
#endif
118118
};
119-
ESP_ERROR_CHECK(i2s_set_pin(I2S_NUM_1, &pin_config));
119+
ESP_ERROR_CHECK(i2s_set_pin(I2S_NUM_1, &pin_conf));
120120

121121
ESP_LOGI(I2S1_TAG, "initialized, bck: %d, ws: %d, dout: %d, din: %d",
122-
pin_config.bck_io_num,
123-
pin_config.ws_io_num,
124-
pin_config.data_out_num,
125-
pin_config.data_in_num
122+
pin_conf.bck_io_num,
123+
pin_conf.ws_io_num,
124+
pin_conf.data_out_num,
125+
pin_conf.data_in_num
126126
);
127127
}
128128

@@ -154,10 +154,10 @@ void i2s_output_deinit(void)
154154

155155
void i2s_output_set_sample_rate(unsigned int sample_rate)
156156
{
157-
if (sample_rate != i2s_output_config.sample_rate) {
158-
i2s_output_config.sample_rate = sample_rate;
157+
if (sample_rate != output_conf.sample_rate) {
158+
output_conf.sample_rate = sample_rate;
159159
i2s_zero_dma_buffer(CONFIG_AUDIO_OUTPUT_I2S_NUM);
160-
i2s_set_sample_rates(CONFIG_AUDIO_OUTPUT_I2S_NUM, i2s_output_config.sample_rate);
160+
i2s_set_sample_rates(CONFIG_AUDIO_OUTPUT_I2S_NUM, output_conf.sample_rate);
161161
}
162162
}
163163

‎main/src/chip/spi.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spi_device_handle_t hspi;
2020

2121
void hspi_init(void)
2222
{
23-
spi_bus_config_t buscfg = {
23+
spi_bus_config_t bus_conf = {
2424
.miso_io_num = -1,
2525
.mosi_io_num = CONFIG_SPI_MOSI_PIN,
2626
.sclk_io_num = CONFIG_SPI_SCLK_PIN,
@@ -34,9 +34,9 @@ void hspi_init(void)
3434
.max_transfer_sz = CUBE0414_X * CUBE0414_Y * CUBE0414_Z * 3
3535
#endif
3636
};
37-
ESP_ERROR_CHECK(spi_bus_initialize(HSPI_HOST, &buscfg, 1));
37+
ESP_ERROR_CHECK(spi_bus_initialize(HSPI_HOST, &bus_conf, 1));
3838

39-
spi_device_interface_config_t devcfg = {
39+
spi_device_interface_config_t dev_conf = {
4040
.mode = 0, // SPI mode 0
4141
.spics_io_num = CONFIG_SPI_CS_PIN, // CS pin
4242
#ifdef CONFIG_VFX_OUTPUT_ST7735
@@ -52,13 +52,13 @@ void hspi_init(void)
5252
.queue_size = 2, // we want to be able to queue 2 transactions at a time
5353
.flags = SPI_DEVICE_3WIRE | SPI_DEVICE_HALFDUPLEX
5454
};
55-
ESP_ERROR_CHECK(spi_bus_add_device(HSPI_HOST, &devcfg, &hspi));
55+
ESP_ERROR_CHECK(spi_bus_add_device(HSPI_HOST, &dev_conf, &hspi));
5656

5757
ESP_LOGI(HSPI_TAG, "initialized, sclk: %d, mosi: %d, miso: %d, cs: %d",
58-
buscfg.sclk_io_num,
59-
buscfg.mosi_io_num,
60-
buscfg.miso_io_num,
61-
devcfg.spics_io_num
58+
bus_conf.sclk_io_num,
59+
bus_conf.mosi_io_num,
60+
bus_conf.miso_io_num,
61+
dev_conf.spics_io_num
6262
);
6363
}
6464
#endif

0 commit comments

Comments
 (0)