Skip to content

Commit b73ed8e

Browse files
committed
fix(api): case insensitive issue
Having the api/ folder in the include path cause issue between string.h and String.h. See arduino/ArduinoCore-API#37 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent b4bae0d commit b73ed8e

10 files changed

Lines changed: 11 additions & 12 deletions

File tree

cmake/set_base_arduino_config.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ target_include_directories(base_config INTERFACE
5656
"${BUILD_CORE_PATH}"
5757
"${BUILD_CORE_PATH}/avr"
5858
"${BUILD_CORE_PATH}/stm32"
59-
"${BUILD_CORE_PATH}/api"
59+
"${BUILD_CORE_PATH}/api/deprecated"
6060
"${BUILD_LIB_PATH}/SrcWrapper/inc"
6161
"${BUILD_LIB_PATH}/SrcWrapper/inc/LL"
6262
"${BUILD_LIB_PATH}/USBDevice/inc"

cores/arduino/Arduino.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@
3333
#include "SrcWrapper.h"
3434
#endif
3535

36-
#include "ArduinoAPI.h"
36+
#include "api/ArduinoAPI.h"
3737
#include "wiring.h"
38-
#include "deprecated-avr-comp/avr/dtostrf.h"
3938

4039
/* sketch */
4140

cores/arduino/Serial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include <inttypes.h>
2828

29-
#include "Common.h"
29+
#include "api/Common.h"
3030
#include "HardwareSerial.h"
3131
#include "Stream.h"
3232
#include "uart.h"

cores/arduino/pins_arduino.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define _PINS_ARDUINO_H_
2020
#include <stdbool.h>
2121
#include <stdlib.h> /* Required for static_assert */
22-
#include "Common.h"
22+
#include "api/Common.h"
2323
#include "variant.h"
2424
#include "PinNames.h"
2525

cores/arduino/wiring.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include <math.h>
2727
#include <sys/time.h> // for struct timeval
2828

29-
#include "Common.h"
30-
#include "deprecated-avr-comp/avr/dtostrf.h"
29+
#include "api/Common.h"
30+
#include "api/deprecated-avr-comp/avr/dtostrf.h"
3131
#include "clock.h"
3232
#include "dwt.h"
3333
#include "interrupt.h"

libraries/SPI/src/SPI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define _SPI_H_INCLUDED
1414

1515
#include "Arduino.h"
16-
#include "HardwareSPI.h"
16+
#include "api/HardwareSPI.h"
1717
#include <stdio.h>
1818
extern "C" {
1919
#include "utility/spi_com.h"

libraries/Servo/src/Servo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#ifndef Servo_h
4949
#define Servo_h
5050

51-
#include <Common.h>
51+
#include "api/Common.h"
5252
#include <inttypes.h>
5353

5454
/*

libraries/SrcWrapper/inc/HardwareTimer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define HARDWARETIMER_H_
2929

3030
/* Includes ------------------------------------------------------------------*/
31-
#include "Common.h"
31+
#include "api/Common.h"
3232
#include "timer.h"
3333
#include "stm32yyxx_ll_tim.h"
3434

libraries/Wire/src/Wire.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <functional>
2626

2727
#include "Arduino.h"
28-
#include "HardwareI2C.h"
28+
#include "api/HardwareI2C.h"
2929
extern "C" {
3030
#include "utility/twi.h"
3131
}

platform.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ USBDevice_include_dir={builtin_library_dir}/USBDevice/inc
3939

4040
# STM compile variables
4141
# ----------------------
42-
compiler.stm.extra_include="-I{build.source.path}" "-I{build.core.path}/avr" "-I{core_stm32_dir}" "-I{api_dir}" "-I{SrcWrapper_include_dir}" "-I{SrcWrapper_include_dir}/LL" "-I{hal_dir}/Inc" "-I{hal_dir}/Src" "-I{build.system.path}/{build.series}" "-I{USBDevice_include_dir}" "-I{usbd_core_dir}/Inc" "-I{usbd_core_dir}/Src" "-I{VirtIO_include_dir}" {build.virtio_extra_include}
42+
compiler.stm.extra_include="-I{build.source.path}" "-I{build.core.path}/avr" "-I{core_stm32_dir}" "-I{api_dir}/deprecated" "-I{SrcWrapper_include_dir}" "-I{SrcWrapper_include_dir}/LL" "-I{hal_dir}/Inc" "-I{hal_dir}/Src" "-I{build.system.path}/{build.series}" "-I{USBDevice_include_dir}" "-I{usbd_core_dir}/Inc" "-I{usbd_core_dir}/Src" "-I{VirtIO_include_dir}" {build.virtio_extra_include}
4343
compiler.arm.cmsis.c.flags="-I{cmsis_dir}/Core/Include/" "-I{cmsis_dev_dir}/Include/" "-I{cmsis_dev_dir}/Source/Templates/gcc/" "-I{cmsis_dsp}/Include" "-I{cmsis_dsp}/PrivateInclude"
4444

4545
compiler.warning_flags=-w

0 commit comments

Comments
 (0)