From 2bd49fc5a6ac5ced4c7fe4224426e3abb134ef98 Mon Sep 17 00:00:00 2001 From: Alexander B Date: Sat, 4 Jan 2025 22:28:40 -0500 Subject: [PATCH] RC --- ESP-IDF_Robot_RC/build/.ninja_lock | 0 ESP-IDF_Robot_RC/build/CMakeFiles/git-data/head-ref | 2 +- ESP-IDF_Robot_RC/main/joystick.h | 10 +++++----- 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 ESP-IDF_Robot_RC/build/.ninja_lock 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 36ce98917..fae1cad24 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 @@ -584b31aada19a08d6a89f83bd543c45bc682046f +4a1c0cb2c3226c7953193e71c207afd5c8f89396 diff --git a/ESP-IDF_Robot_RC/main/joystick.h b/ESP-IDF_Robot_RC/main/joystick.h index eb0b0e2ee..c350feaa0 100644 --- a/ESP-IDF_Robot_RC/main/joystick.h +++ b/ESP-IDF_Robot_RC/main/joystick.h @@ -8,14 +8,14 @@ #include "esp_adc/adc_oneshot.h" static unsigned int x, y; -adc_oneshot_unit_handle_t adc_x_handle, adc_y_handle; +adc_oneshot_unit_handle_t adc_x_handle, adc_y_handle, adc_xy_handle; static esp_err_t joystick_adc_init() { adc_oneshot_unit_init_cfg_t adc_init_config_xy = { .unit_id = ADC_UNIT_1, }; - ESP_ERROR_CHECK(adc_oneshot_new_unit(&adc_init_config_xy, &adc_x_handle)); - ESP_ERROR_CHECK(adc_oneshot_new_unit(&adc_init_config_xy, &adc_y_handle)); + ESP_ERROR_CHECK(adc_oneshot_new_unit(&adc_init_config_xy, &adc_xy_handle)); + //ESP_ERROR_CHECK(adc_oneshot_new_unit(&adc_init_config_xy, &adc_xy_handle)); adc_oneshot_chan_cfg_t config_x = { .bitwidth = SOC_ADC_DIGI_MAX_BITWIDTH, @@ -27,8 +27,8 @@ static esp_err_t joystick_adc_init() { .atten = ADC_ATTEN_DB_11, }; - ESP_ERROR_CHECK(adc_oneshot_config_channel(adc_x_handle, ADC1_CHANNEL_0, &config_x)); - //ESP_ERROR_CHECK(adc_oneshot_config_channel(adc_y_handle, ADC1_CHANNEL_1, &config_y)); + ESP_ERROR_CHECK(adc_oneshot_config_channel(adc_xy_handle, ADC1_CHANNEL_0, &config_x)); + ESP_ERROR_CHECK(adc_oneshot_config_channel(adc_xy_handle, ADC1_CHANNEL_1, &config_y)); return ESP_OK; }