From e098ab6c7af4007423781c72c4dea09926f314f4 Mon Sep 17 00:00:00 2001 From: der_zaske Date: Sun, 2 Feb 2025 18:31:45 +0100 Subject: [PATCH] fixed a small bug in ADC.c and ASC.h --- .gitignore | 0 CMakeLists.txt | 0 README.md | 0 components/ssd1306/CMakeLists.txt | 0 components/ssd1306/Kconfig.projbuild | 0 components/ssd1306/include/font8x8_basic.h | 0 components/ssd1306/include/ssd1306.h | 0 components/ssd1306/ssd1306.c | 0 components/ssd1306/ssd1306_i2c_legacy.c | 0 components/ssd1306/ssd1306_i2c_new.c | 0 components/ssd1306/ssd1306_spi.c | 0 dependencies.lock | 0 generate_pins_header.py | 0 main/ADC.c | 2 +- main/CMakeLists.txt | 0 main/GPIO.c | 0 main/Kconfig.projbuild | 0 main/app_main.c | 0 main/functions.c | 0 main/idf_component.yml | 0 main/include/ADC.h | 5 +---- main/include/GPIO.h | 0 main/include/functions.h | 0 main/include/mcpwm.h | 0 main/mcpwm.c | 0 old_functions.c | 0 old_functions.h | 0 parsed_pins.h | 0 sdkconfig | 0 sdkconfig.old | 0 30 files changed, 2 insertions(+), 5 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 CMakeLists.txt mode change 100644 => 100755 README.md mode change 100644 => 100755 components/ssd1306/CMakeLists.txt mode change 100644 => 100755 components/ssd1306/Kconfig.projbuild mode change 100644 => 100755 components/ssd1306/include/font8x8_basic.h mode change 100644 => 100755 components/ssd1306/include/ssd1306.h mode change 100644 => 100755 components/ssd1306/ssd1306.c mode change 100644 => 100755 components/ssd1306/ssd1306_i2c_legacy.c mode change 100644 => 100755 components/ssd1306/ssd1306_i2c_new.c mode change 100644 => 100755 components/ssd1306/ssd1306_spi.c mode change 100644 => 100755 dependencies.lock mode change 100644 => 100755 generate_pins_header.py mode change 100644 => 100755 main/ADC.c mode change 100644 => 100755 main/CMakeLists.txt mode change 100644 => 100755 main/GPIO.c mode change 100644 => 100755 main/Kconfig.projbuild mode change 100644 => 100755 main/app_main.c mode change 100644 => 100755 main/functions.c mode change 100644 => 100755 main/idf_component.yml mode change 100644 => 100755 main/include/ADC.h mode change 100644 => 100755 main/include/GPIO.h mode change 100644 => 100755 main/include/functions.h mode change 100644 => 100755 main/include/mcpwm.h mode change 100644 => 100755 main/mcpwm.c mode change 100644 => 100755 old_functions.c mode change 100644 => 100755 old_functions.h mode change 100644 => 100755 parsed_pins.h mode change 100644 => 100755 sdkconfig mode change 100644 => 100755 sdkconfig.old diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/components/ssd1306/CMakeLists.txt b/components/ssd1306/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/components/ssd1306/Kconfig.projbuild b/components/ssd1306/Kconfig.projbuild old mode 100644 new mode 100755 diff --git a/components/ssd1306/include/font8x8_basic.h b/components/ssd1306/include/font8x8_basic.h old mode 100644 new mode 100755 diff --git a/components/ssd1306/include/ssd1306.h b/components/ssd1306/include/ssd1306.h old mode 100644 new mode 100755 diff --git a/components/ssd1306/ssd1306.c b/components/ssd1306/ssd1306.c old mode 100644 new mode 100755 diff --git a/components/ssd1306/ssd1306_i2c_legacy.c b/components/ssd1306/ssd1306_i2c_legacy.c old mode 100644 new mode 100755 diff --git a/components/ssd1306/ssd1306_i2c_new.c b/components/ssd1306/ssd1306_i2c_new.c old mode 100644 new mode 100755 diff --git a/components/ssd1306/ssd1306_spi.c b/components/ssd1306/ssd1306_spi.c old mode 100644 new mode 100755 diff --git a/dependencies.lock b/dependencies.lock old mode 100644 new mode 100755 diff --git a/generate_pins_header.py b/generate_pins_header.py old mode 100644 new mode 100755 diff --git a/main/ADC.c b/main/ADC.c old mode 100644 new mode 100755 index 6377047..540a572 --- a/main/ADC.c +++ b/main/ADC.c @@ -4,7 +4,7 @@ #include "esp_adc/adc_cali_scheme.h" #include "esp_log.h" #include "parsed_pins.h" - +#include "esp_adc/adc_oneshot.h" static portMUX_TYPE mux = portMUX_INITIALIZER_UNLOCKED; static adc_cali_handle_t cali_handle = NULL; diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/main/GPIO.c b/main/GPIO.c old mode 100644 new mode 100755 diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild old mode 100644 new mode 100755 diff --git a/main/app_main.c b/main/app_main.c old mode 100644 new mode 100755 diff --git a/main/functions.c b/main/functions.c old mode 100644 new mode 100755 diff --git a/main/idf_component.yml b/main/idf_component.yml old mode 100644 new mode 100755 diff --git a/main/include/ADC.h b/main/include/ADC.h old mode 100644 new mode 100755 index c2e2dea..886399f --- a/main/include/ADC.h +++ b/main/include/ADC.h @@ -1,9 +1,6 @@ #ifndef GPIO_H #define GPIO_H - -#include "esp_adc/adc_oneshot.h" - - +#include void configure_ADC1(); uint32_t get_voltage_in(); uint32_t get_torque(); diff --git a/main/include/GPIO.h b/main/include/GPIO.h old mode 100644 new mode 100755 diff --git a/main/include/functions.h b/main/include/functions.h old mode 100644 new mode 100755 diff --git a/main/include/mcpwm.h b/main/include/mcpwm.h old mode 100644 new mode 100755 diff --git a/main/mcpwm.c b/main/mcpwm.c old mode 100644 new mode 100755 diff --git a/old_functions.c b/old_functions.c old mode 100644 new mode 100755 diff --git a/old_functions.h b/old_functions.h old mode 100644 new mode 100755 diff --git a/parsed_pins.h b/parsed_pins.h old mode 100644 new mode 100755 diff --git a/sdkconfig b/sdkconfig old mode 100644 new mode 100755 diff --git a/sdkconfig.old b/sdkconfig.old old mode 100644 new mode 100755