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 b/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/HEAD old mode 100644 new mode 100755 index b870d8262..6c0d519de --- a/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/HEAD +++ b/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/HEAD @@ -1 +1 @@ -ref: refs/heads/main +9d7f2d69f50d1288526d4f1027108e314e8c879f diff --git a/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/grabRef.cmake b/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/grabRef.cmake index aa43618f9..002f05dfc 100755 --- a/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/grabRef.cmake +++ b/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/grabRef.cmake @@ -18,7 +18,7 @@ set(HEAD_HASH) file(READ "/home/alex/github/ESP-Nodes/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/HEAD" HEAD_CONTENTS LIMIT 1024) string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS) -set(GIT_DIR "/home/alex/github/ESP-Nodes/.git") +set(GIT_DIR "/home/alex/esp/v5.3.2/esp-idf/.git") # handle git-worktree if(EXISTS "${GIT_DIR}/commondir") file(READ "${GIT_DIR}/commondir" GIT_DIR_NEW LIMIT 1024) diff --git a/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/head-ref b/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/head-ref old mode 100644 new mode 100755 index fae1cad24..6c0d519de --- a/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/head-ref +++ b/ESP-IDF_Robot_RC/build/CMakeFiles/git-data/head-ref @@ -1 +1 @@ -4a1c0cb2c3226c7953193e71c207afd5c8f89396 +9d7f2d69f50d1288526d4f1027108e314e8c879f diff --git a/ESP-IDF_Robot_RC/main/espnow_example_main.c b/ESP-IDF_Robot_RC/main/espnow_example_main.c index c5f9c9c71..fc670aa1b 100755 --- a/ESP-IDF_Robot_RC/main/espnow_example_main.c +++ b/ESP-IDF_Robot_RC/main/espnow_example_main.c @@ -127,7 +127,7 @@ static void rc_send_data_task (void *arg) { void app_main(void) { joystick_adc_init(); - //xTaskCreate(joystick_task, "RC", 2048, NULL, 5, NULL); + xTaskCreate(joystick_task, "RC", 2048, NULL, 5, NULL); // Initialize NVS to store Wi-Fi configurations esp_err_t ret = nvs_flash_init(); diff --git a/ESP-IDF_Robot_RC/main/joystick.h b/ESP-IDF_Robot_RC/main/joystick.h index ca9bb842d..9fa4e18d2 100644 --- a/ESP-IDF_Robot_RC/main/joystick.h +++ b/ESP-IDF_Robot_RC/main/joystick.h @@ -34,8 +34,8 @@ static esp_err_t joystick_adc_init() { static void joystick_get_raw_xy() { - //ESP_ERROR_CHECK(adc_oneshot_read(adc1_x_handle, ADC1_CHANNEL_0, x)); - //ESP_ERROR_CHECK(adc_oneshot_read(adc1_y_handle, ADC1_CHANNEL_1, y)); + ESP_ERROR_CHECK(adc_oneshot_read(adc1_xy_handle, ADC1_CHANNEL_0, x)); + ESP_ERROR_CHECK(adc_oneshot_read(adc1_xy_handle, ADC1_CHANNEL_1, y)); ESP_LOGI("(x,y)", "( %d, %d )", x, y); }