Skip to content

Commit e079029

Browse files
authored
Merge branch 'main' into wrapper
2 parents edcfcd2 + 6fafeb9 commit e079029

File tree

8 files changed

+21
-12
lines changed

8 files changed

+21
-12
lines changed

.github/workflows/c-cpp-cmake.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v4
16+
with:
17+
submodules: 'true'
1618
- name: build.sh
1719
run: ./build.sh

.github/workflows/unit-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
steps:
2626
- name: Checkout repository
2727
uses: actions/checkout@v2
28+
with:
29+
submodules: 'true'
2830

2931
- name: Relax some warings
3032
# run: echo 'add_compile_options(-Wno-unused-function)' >> ArduinoCore-API/test/CMakeLists.txt
@@ -51,4 +53,4 @@ jobs:
5153
# with:
5254
# token: ${{ secrets.CODECOV_TOKEN }}
5355
# files: ${{ env.COVERAGE_DATA_PATH }}
54-
# fail_ci_if_error: true
56+
# fail_ci_if_error: true

ArduinoCore-Linux/cores/arduino/EthernetUDP.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
* bjoern@cs.stanford.edu 12/30/2008
3535
*/
3636

37-
#include <api/IPAddress.h>
38-
#include <api/Udp.h>
37+
#include "api/IPAddress.h"
38+
#include "api/Udp.h"
3939
#include <RingBufferExt.h>
4040
#include "SignalHandler.h"
4141
#include "ArduinoLogger.h"

ArduinoCore-Linux/cores/arduino/FileStream.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
#include <fstream>
44
#include <iostream>
5-
6-
#include "Stream.h"
5+
#include "api/Stream.h"
76

87
namespace arduino {
98

ArduinoCore-Linux/cores/arduino/Serial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#if USE_SERIALLIB
44

5-
#include "HardwareSerial.h"
65
#include "serialib.h"
6+
#include "api/HardwareSerial.h"
77

88
namespace arduino {
99

ArduinoCore-Linux/cores/arduino/StdioDevice.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
#include <iostream>
44
#include <streambuf>
5-
6-
#include "Printable.h"
7-
#include "Stream.h"
5+
#include "api/Stream.h"
6+
#include "api/Printable.h"
87

98
namespace arduino {
109

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ target_include_directories (arduino_emulator PUBLIC
4545

4646
# Install header files
4747
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ArduinoCore-API/api/" # source directory
48-
DESTINATION "include/arduino" # target directory
48+
DESTINATION "include/arduino/api" # target directory
4949
FILES_MATCHING # install only matched files
5050
PATTERN "*.h" # select header files
5151
)

README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
## Using this Project as a library
77

88
If you have an Arduino Sketch that you want to run e.g in Linux, OS/X or Windows you can include this library with cmake.
9-
Here is an [example cmake file](https://github.com/pschatzmann/arduino-audio-tools/blob/main/examples/examples-desktop/generator/CMakeLists.txt) for a [Arduino Audio Sketch](https://github.com/pschatzmann/arduino-audio-tools/tree/main/examples/examples-desktop/generator)).
9+
Here is an [example cmake file](https://github.com/pschatzmann/arduino-audio-tools/blob/main/examples/examples-desktop/generator/CMakeLists.txt) for an [Arduino Audio Sketch](https://github.com/pschatzmann/arduino-audio-tools/tree/main/examples/examples-desktop/generator)).
1010

1111
## GPIO/SPI/I2C
1212

@@ -66,5 +66,12 @@ Adjust the cmake parameters dependent on your requirements.
6666

6767
## Documentation
6868

69-
The generated [Class documentation](https://pschatzmann.github.io/Arduino-Emulator/html/annotated.html).
69+
- [Class documentation](https://pschatzmann.github.io/Arduino-Emulator/html/annotated.html).
70+
- You can find further information in the [Wiki](https://github.com/pschatzmann/Arduino-Emulator/wiki)
7071

72+
## Usage notes
73+
74+
### Case-insensitive file systems (Windows, OSX, WSL)
75+
76+
To avoid conflicts between system `string.h` and Arduino’s string library `String.h`, just do not put `(include)/api` to include path. Put `(include)` and `(include)/api/deprecated` instead.
77+
This usual way to resolve this conflict in all Arduino cores.

0 commit comments

Comments
 (0)