feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/small_fixes_from_github' into 'master'

Browse Source 
Small fixes by users from GitHub

See merge request !1620
This commit is contained in:
Jiang Jiang Jian
2017-12-01 19:21:10 +08:00
parent 58e60401a2 0f2d417a74
commit 7ec7352534
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/driver/include/driver/rtc_io.h
View File

@@ -47,9 +47,9 @@ typedef struct {
} rtc_gpio_desc_t; } rtc_gpio_desc_t;
typedef enum { typedef enum {
RTC_GPIO_MODE_INPUT_ONLY , /*!< Pad output */ RTC_GPIO_MODE_INPUT_ONLY , /*!< Pad input */
RTC_GPIO_MODE_OUTPUT_ONLY, /*!< Pad input */ RTC_GPIO_MODE_OUTPUT_ONLY, /*!< Pad output */
RTC_GPIO_MODE_INPUT_OUTUT, /*!< Pad pull output + input */ RTC_GPIO_MODE_INPUT_OUTPUT, /*!< Pad pull input + output */
RTC_GPIO_MODE_DISABLED, /*!< Pad (output + input) disable */ RTC_GPIO_MODE_DISABLED, /*!< Pad (output + input) disable */
} rtc_gpio_mode_t; } rtc_gpio_mode_t;

2
components/driver/rtc_module.c
View File

@@ -286,7 +286,7 @@ esp_err_t rtc_gpio_set_direction(gpio_num_t gpio_num, rtc_gpio_mode_t mode)
rtc_gpio_output_enable(gpio_num); rtc_gpio_output_enable(gpio_num);
rtc_gpio_input_disable(gpio_num); rtc_gpio_input_disable(gpio_num);
break; break;
case RTC_GPIO_MODE_INPUT_OUTUT: case RTC_GPIO_MODE_INPUT_OUTPUT:
rtc_gpio_output_enable(gpio_num); rtc_gpio_output_enable(gpio_num);
rtc_gpio_input_enable(gpio_num); rtc_gpio_input_enable(gpio_num);
break; break;

4
examples/storage/nvs_rw_value/main/nvs_value_example_main.c
View File

@@ -41,7 +41,7 @@ void app_main()
// Read // Read
printf("Reading restart counter from NVS ... "); printf("Reading restart counter from NVS ... ");
int32_t restart_counter = 0; // value will default to 0, if not set yet in NVS int32_t restart_counter = 0; // value will default to 0, if not set yet in NVS
err = nvs_get_i32(my_handle, "restart_conter", &restart_counter); err = nvs_get_i32(my_handle, "restart_counter", &restart_counter);
switch (err) { switch (err) {
case ESP_OK: case ESP_OK:
printf("Done\n"); printf("Done\n");
@@ -57,7 +57,7 @@ void app_main()
// Write // Write
printf("Updating restart counter in NVS ... "); printf("Updating restart counter in NVS ... ");
restart_counter++; restart_counter++;
err = nvs_set_i32(my_handle, "restart_conter", restart_counter); err = nvs_set_i32(my_handle, "restart_counter", restart_counter);
printf((err != ESP_OK) ? "Failed!\n" : "Done\n"); printf((err != ESP_OK) ? "Failed!\n" : "Done\n");
// Commit written value. // Commit written value.