Skip to content

Commit b18bdae

Browse files
committed
IDF linker errors
1 parent 4a1409b commit b18bdae

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

src/AudioTools/AudioLibs/Desktop/NoArduino.h

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -197,16 +197,16 @@ inline long map(long x, long in_min, long in_max, long out_min, long out_max) {
197197
#include "freertos/FreeRTOSConfig.h"
198198

199199
/// e.g. for AudioActions
200-
extern "C" int digitalRead(int pin) {
200+
inline int digitalRead(int pin) {
201201
printf("digitalRead:%d\n", pin);
202202
return gpio_get_level((gpio_num_t)pin);
203203
}
204204

205-
extern "C" void digitalWrite(int pin, int value) {
205+
inline void digitalWrite(int pin, int value) {
206206
gpio_set_level((gpio_num_t)pin, value);
207207
}
208208

209-
extern "C" void pinMode(int pin, int mode) {
209+
inline void pinMode(int pin, int mode) {
210210
gpio_num_t gpio_pin = (gpio_num_t)pin;
211211
printf("pinMode(%d,%d)\n", pin, mode);
212212

@@ -228,14 +228,12 @@ extern "C" void pinMode(int pin, int mode) {
228228
}
229229
}
230230

231-
// delay and millis is needed by this framework
232-
#define DESKTOP_MILLIS_DEFINED
233-
234-
extern "C" void delay(uint32_t ms){ vTaskDelay(ms / portTICK_PERIOD_MS);}
235-
extern "C" uint32_t millis() {return (xTaskGetTickCount() * portTICK_PERIOD_MS);}
236-
extern "C" void delayMicroseconds(uint32_t ms) {esp_rom_delay_us(ms);}
237-
extern "C" uint64_t micros() { return xTaskGetTickCount() * portTICK_PERIOD_MS * 1000;}
238-
231+
inline void delay(uint32_t ms){ vTaskDelay(ms / portTICK_PERIOD_MS);}
232+
inline uint32_t millis() {return (xTaskGetTickCount() * portTICK_PERIOD_MS);}
233+
inline void delayMicroseconds(uint32_t ms) {esp_rom_delay_us(ms);}
234+
inline uint64_t micros() { return xTaskGetTickCount() * portTICK_PERIOD_MS * 1000;}
239235

236+
// delay and millis has been defined
237+
#define DESKTOP_MILLIS_DEFINED
240238

241239
#endif

0 commit comments

Comments
 (0)