diff --git a/ESP-IDF_Robot_RC/build/.ninja_lock b/ESP-IDF_Robot_RC/build/.ninja_lock new file mode 100644 index 000000000..e69de29bb diff --git a/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/head-ref b/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/head-ref index 2e4bd0554..a416d16a2 100644 --- a/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/head-ref +++ b/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/head-ref @@ -1 +1 @@ -3e8cd1e22a34272ff254d9e3cc7ae1a3da1321d6 +0f2e53e6a0525fd42f3690d3992e14524685146f diff --git a/ESP-IDF_Robot_RC/main/joystick.h b/ESP-IDF_Robot_RC/main/joystick.h index 53c8d5516..d490a9d29 100644 --- a/ESP-IDF_Robot_RC/main/joystick.h +++ b/ESP-IDF_Robot_RC/main/joystick.h @@ -8,7 +8,7 @@ #include "esp_adc/adc_oneshot.h" static unsigned int x, y; -adc_oneshot_unit_handle_t adc1_x_handle, adc1_y_handle; +adc_oneshot_unit_handle_t adc_x_handle, adc_y_handle; static esp_err_t joystick_adc_init() { adc_oneshot_unit_init_cfg_t adc_init_config_x = { @@ -17,16 +17,16 @@ static esp_err_t joystick_adc_init() { adc_oneshot_unit_init_cfg_t adc_init_config_y = { .unit_id = ADC_UNIT_2, }; - ESP_ERROR_CHECK(adc_oneshot_new_unit(&adc_init_config_x, &adc1_x_handle)); - ESP_ERROR_CHECK(adc_oneshot_new_unit(&adc_init_config_y, &adc1_y_handle)); + ESP_ERROR_CHECK(adc_oneshot_new_unit(&adc_init_config_x, &adc_x_handle)); + //ESP_ERROR_CHECK(adc_oneshot_new_unit(&adc_init_config_y, &adc_y_handle)); adc_oneshot_chan_cfg_t config = { .bitwidth = SOC_ADC_DIGI_MAX_BITWIDTH, .atten = ADC_ATTEN_DB_11, }; - ESP_ERROR_CHECK(adc_oneshot_config_channel(adc1_x_handle, ADC1_CHANNEL_0, &config)); - ESP_ERROR_CHECK(adc_oneshot_config_channel(adc1_y_handle, ADC1_CHANNEL_1, &config)); + ESP_ERROR_CHECK(adc_oneshot_config_channel(adc_x_handle, ADC1_CHANNEL_0, &config)); + //ESP_ERROR_CHECK(adc_oneshot_config_channel(adc_y_handle, ADC1_CHANNEL_1, &config)); return ESP_OK; }