Skip to content

Commit 33f9877

Browse files
committed
feat(led_indicator): Modify variable names and remove Chinese comments
1 parent 551261f commit 33f9877

File tree

10 files changed

+20
-24
lines changed

10 files changed

+20
-24
lines changed

components/led/led_indicator/include/led_indicator_gpio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ typedef struct {
3434
* - ESP_OK Success
3535
* - ESP_FAIL Delete fail
3636
*/
37-
led_indicator_handle_t led_indicator_new_gpio_device(const led_config_t *led_config, const led_indicator_gpio_config_t *gpio_cfg);
37+
led_indicator_handle_t led_indicator_new_gpio_device(const led_indicator_config_t *led_config, const led_indicator_gpio_config_t *gpio_cfg);
3838
#ifdef __cplusplus
3939
}
4040
#endif

components/led/led_indicator/include/led_indicator_ledc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ typedef struct {
3333
* - ESP_OK Success
3434
* - ESP_FAIL Delete fail
3535
*/
36-
led_indicator_handle_t led_indicator_new_ledc_device(const led_config_t *led_config, const led_indicator_ledc_config_t *ledc_cfg);
36+
led_indicator_handle_t led_indicator_new_ledc_device(const led_indicator_config_t *led_config, const led_indicator_ledc_config_t *ledc_cfg);
3737

3838
#ifdef __cplusplus
3939
}

components/led/led_indicator/include/led_indicator_rgb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ typedef struct {
4040
* - ESP_OK Success
4141
* - ESP_FAIL Delete fail
4242
*/
43-
led_indicator_handle_t led_indicator_new_rgb_device(const led_config_t *led_config, const led_indicator_rgb_config_t *rgb_cfg);
43+
led_indicator_handle_t led_indicator_new_rgb_device(const led_indicator_config_t *led_config, const led_indicator_rgb_config_t *rgb_cfg);
4444

4545
#ifdef __cplusplus
4646
}

components/led/led_indicator/include/led_indicator_strips.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ typedef struct {
5050
* - ESP_OK Success
5151
* - ESP_FAIL Delete fail
5252
*/
53-
led_indicator_handle_t led_indicator_new_strips_device(const led_config_t *led_config, const led_indicator_strips_config_t *strips_cfg);
53+
led_indicator_handle_t led_indicator_new_strips_device(const led_indicator_config_t *led_config, const led_indicator_strips_config_t *strips_cfg);
5454
#ifdef __cplusplus
5555
}
5656
#endif

components/led/led_indicator/include/led_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ typedef struct _led_indicator_com_config {
106106
typedef struct {
107107
blink_step_t const **blink_lists; /*!< user defined LED blink lists */
108108
uint16_t blink_list_num; /*!< number of blink lists */
109-
} led_config_t;
109+
} led_indicator_config_t;
110110

111111
typedef void *led_indicator_handle_t; /*!< LED indicator operation handle */
112112

components/led/led_indicator/src/led_indicator_gpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static esp_err_t led_indicator_gpio_set_on_off(void *handle, bool on_off)
7272
return gpio_set_level(p_gpio->io_num, on_off);
7373
}
7474

75-
led_indicator_handle_t led_indicator_new_gpio_device(const led_config_t *led_config, const led_indicator_gpio_config_t *gpio_cfg)
75+
led_indicator_handle_t led_indicator_new_gpio_device(const led_indicator_config_t *led_config, const led_indicator_gpio_config_t *gpio_cfg)
7676
{
7777
esp_err_t ret = ESP_OK;
7878
bool if_blink_default_list = false;

components/led/led_indicator/src/led_indicator_ledc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ static esp_err_t led_indicator_ledc_set_brightness(void *channel, uint32_t brigh
118118
return ESP_OK;
119119
}
120120

121-
led_indicator_handle_t led_indicator_new_ledc_device(const led_config_t *led_config, const led_indicator_ledc_config_t *ledc_cfg)
121+
led_indicator_handle_t led_indicator_new_ledc_device(const led_indicator_config_t *led_config, const led_indicator_ledc_config_t *ledc_cfg)
122122
{
123123
esp_err_t ret = ESP_OK;
124124
bool if_blink_default_list = false;

components/led/led_indicator/src/led_indicator_rgb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ static esp_err_t led_indicator_rgb_set_brightness(void *rgb_handle, uint32_t bri
159159
return ESP_OK;
160160
}
161161

162-
led_indicator_handle_t led_indicator_new_rgb_device(const led_config_t *led_config, const led_indicator_rgb_config_t *rgb_cfg)
162+
led_indicator_handle_t led_indicator_new_rgb_device(const led_indicator_config_t *led_config, const led_indicator_rgb_config_t *rgb_cfg)
163163
{
164164
esp_err_t ret = ESP_OK;
165165
bool if_blink_default_list = false;

components/led/led_indicator/src/led_indicator_strips.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ static esp_err_t led_indicator_strips_set_brightness(void *strips, uint32_t ihsv
190190
return ESP_OK;
191191
}
192192

193-
led_indicator_handle_t led_indicator_new_strips_device(const led_config_t *led_config, const led_indicator_strips_config_t *strips_cfg)
193+
led_indicator_handle_t led_indicator_new_strips_device(const led_indicator_config_t *led_config, const led_indicator_strips_config_t *strips_cfg)
194194
{
195195
esp_err_t ret = ESP_OK;
196196
bool if_blink_default_list = false;

components/led/led_indicator/test_apps/main/test_led_indicator.c

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void led_indicator_init()
4141
.gpio_num = LED_IO_NUM_0, /**< num of GPIO */
4242
};
4343

44-
led_config_t config = {
44+
led_indicator_config_t config = {
4545
.blink_lists = (void *)NULL,
4646
.blink_list_num = 0,
4747
};
@@ -122,7 +122,7 @@ void led_indicator_gpio_mode_test_all()
122122
TEST_CASE("blink test all in order", "[LED][indicator]")
123123
{
124124
led_indicator_init();
125-
led_indicator_gpio_mode_test_all();//测试所有状态的正常切换,不涉及优先级。
125+
led_indicator_gpio_mode_test_all();
126126
led_indicator_deinit();
127127
}
128128

@@ -151,7 +151,7 @@ void led_indicator_gpio_mode_preempt()
151151

152152
TEST_CASE("blink test with preempt", "[LED][indicator]")
153153
{
154-
led_indicator_init();//测试高优先级状态能否抢占低优先级,以及抢占后能否恢复。
154+
led_indicator_init();
155155
led_indicator_gpio_mode_preempt();
156156
led_indicator_deinit();
157157
}
@@ -163,7 +163,7 @@ void led_indicator_all_init()
163163
.is_active_level_high = 1,
164164
};
165165

166-
led_config_t config = {
166+
led_indicator_config_t config = {
167167
.blink_lists = NULL,
168168
.blink_list_num = 0,
169169
};
@@ -335,14 +335,10 @@ TEST_CASE("User defined blink", "[LED][indicator]")
335335
.is_active_level_high = 1,
336336
};
337337

338-
led_config_t config = {
338+
led_indicator_config_t config = {
339339
.blink_lists = led_blink_lst,
340340
.blink_list_num = BLINK_NUM,
341341
};
342-
/*
343-
如果 blink_lists 用的是默认的 default_led_indicator_blink_lists,就用 BLINK_FACTORY_RESET 这类枚举。
344-
如果 blink_lists 用的是自定义的 led_blink_lst,就用 BLINK_25_BRIGHTNESS 这类枚举。
345-
*/
346342

347343
led_handle_0 = led_indicator_new_gpio_device(&config, &led_indicator_gpio_config);
348344
TEST_ASSERT_NOT_NULL(led_handle_0);
@@ -373,7 +369,7 @@ TEST_CASE("Preempt blink lists test", "[LED][indicator]")
373369
. is_active_level_high = 1,
374370
};
375371

376-
led_config_t config = {
372+
led_indicator_config_t config = {
377373
.blink_lists = led_blink_lst,
378374
.blink_list_num = BLINK_NUM,
379375
};
@@ -414,7 +410,7 @@ TEST_CASE("breathe test", "[LED][indicator]")
414410
.channel = LEDC_CHANNEL_0,
415411
};
416412

417-
led_config_t config = {
413+
led_indicator_config_t config = {
418414
.blink_lists = led_blink_lst,
419415
.blink_list_num = BLINK_NUM,
420416
};
@@ -460,7 +456,7 @@ TEST_CASE("test led preempt func with breath", "[LED][preempt][breath]")
460456
.channel = LEDC_CHANNEL_0,
461457
};
462458

463-
led_config_t config = {
459+
led_indicator_config_t config = {
464460
.blink_lists = led_blink_lst,
465461
.blink_list_num = BLINK_NUM,
466462
};
@@ -640,7 +636,7 @@ TEST_CASE("TEST LED RGB", "[LED RGB][RGB]")
640636
.blue_channel = LEDC_CHANNEL_2,
641637
};
642638

643-
led_config_t config = {
639+
led_indicator_config_t config = {
644640
.blink_lists = led_rgb_blink_lst,
645641
.blink_list_num = BLINK_RGB_NUM,
646642
};
@@ -762,7 +758,7 @@ TEST_CASE("TEST LED Strips by RGB", "[LED Strips][RGB]")
762758
.led_strip_rmt_cfg = rmt_config,
763759
};
764760

765-
led_config_t config = {
761+
led_indicator_config_t config = {
766762
.blink_lists = led_rgb_blink_lst,
767763
.blink_list_num = BLINK_RGB_NUM,
768764
};
@@ -880,7 +876,7 @@ TEST_CASE("TEST LED RGB control Real time ", "[LED RGB][Real time]")
880876
.led_strip_rmt_cfg = rmt_config,
881877
};
882878

883-
led_config_t config = {
879+
led_indicator_config_t config = {
884880
.blink_lists = led_rgb_blink_lst,
885881
.blink_list_num = BLINK_RGB_NUM,
886882
};

0 commit comments

Comments
 (0)