IDF Build Errors

pschatzmann · Dec 19, 2024 · 5608b37 · 5608b37
1 parent 6fa41d7
commit 5608b37
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ if (DEFINED ESP_PLATFORM)
     idf_component_register(
         # SRC_DIRS src
         INCLUDE_DIRS src 
-        REQUIRES bt esp_common freertos hal log nvs_flash driver
+        REQUIRES bt esp_common freertos hal log nvs_flash driver esp_adc
     )
 
     target_compile_options(${COMPONENT_LIB} INTERFACE -DESP32_CMAKE=1 -Wno-error -Wno-format -fpermissive)

diff --git a/component.mk b/component.mk
@@ -0,0 +1,4 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/src/AudioConfig.h b/src/AudioConfig.h
@@ -46,7 +46,7 @@ typedef WiFiClient WiFiClientSecure;
 // E.g when using the Espressif IDF. Use cmake for the necesseary defines
 #elif defined(ESP32_CMAKE)
 #  define ESP32
-#  include "AudioTools/AudioRuntime.h"
+#  include "AudioTools/CoreAudio/AudioRuntime.h"
 #  include "AudioTools/AudioLibs/Desktop/NoArduino.h"
 #else 
 #  include "AudioTools/AudioLibs/Desktop/NoArduino.h"

diff --git a/src/AudioTools/AudioLibs/Desktop/NoArduino.h b/src/AudioTools/AudioLibs/Desktop/NoArduino.h
@@ -203,12 +203,12 @@ inline long map(long x, long in_min, long in_max, long out_min, long out_max) {
 #if defined(ESP32) 
 #include "driver/gpio.h"
 /// e.g. for AudioActions
-int digitalRead(int pin) {
+static int digitalRead(int pin) {
 	printf("digitalRead:%d\n", pin);
 	return gpio_get_level((gpio_num_t)pin);
 }
 
-void pinMode(int pin, int mode) {
+static void pinMode(int pin, int mode) {
 	gpio_num_t gpio_pin=(gpio_num_t)pin;
 	printf("pinMode(%d,%d)\n", pin, mode);