From 748a45462a60c3748eeec63461a573ed432aeb46 Mon Sep 17 00:00:00 2001 From: Serge Ageyev Date: Thu, 2 Oct 2025 20:10:59 +0300 Subject: [PATCH 1/4] Final adjustments on api/ path --- ArduinoCore-Linux/cores/arduino/EthernetUDP.h | 4 ++-- ArduinoCore-Linux/cores/arduino/FileStream.h | 2 +- ArduinoCore-Linux/cores/arduino/Serial.h | 2 +- ArduinoCore-Linux/cores/arduino/StdioDevice.h | 4 ++-- ArduinoCore-Linux/cores/rasperry_pi/HardwareI2C_RPI.h | 2 +- ArduinoCore-Linux/cores/rasperry_pi/HardwareSPI_RPI.h | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ArduinoCore-Linux/cores/arduino/EthernetUDP.h b/ArduinoCore-Linux/cores/arduino/EthernetUDP.h index 9edc2f0..17b87d8 100644 --- a/ArduinoCore-Linux/cores/arduino/EthernetUDP.h +++ b/ArduinoCore-Linux/cores/arduino/EthernetUDP.h @@ -34,8 +34,8 @@ * bjoern@cs.stanford.edu 12/30/2008 */ -#include -#include +#include "api/IPAddress.h" +#include "api/Udp.h" #include #include "SignalHandler.h" #include "ArduinoLogger.h" diff --git a/ArduinoCore-Linux/cores/arduino/FileStream.h b/ArduinoCore-Linux/cores/arduino/FileStream.h index c2dbd2a..c9c29fe 100644 --- a/ArduinoCore-Linux/cores/arduino/FileStream.h +++ b/ArduinoCore-Linux/cores/arduino/FileStream.h @@ -2,7 +2,7 @@ #include #include -#include "Stream.h" +#include "api/Stream.h" namespace arduino { diff --git a/ArduinoCore-Linux/cores/arduino/Serial.h b/ArduinoCore-Linux/cores/arduino/Serial.h index 35be4d7..6b1946f 100644 --- a/ArduinoCore-Linux/cores/arduino/Serial.h +++ b/ArduinoCore-Linux/cores/arduino/Serial.h @@ -3,7 +3,7 @@ #if USE_SERIALLIB #include "serialib.h" -#include "HardwareSerial.h" +#include "api/HardwareSerial.h" namespace arduino { diff --git a/ArduinoCore-Linux/cores/arduino/StdioDevice.h b/ArduinoCore-Linux/cores/arduino/StdioDevice.h index d70b571..db9aa73 100644 --- a/ArduinoCore-Linux/cores/arduino/StdioDevice.h +++ b/ArduinoCore-Linux/cores/arduino/StdioDevice.h @@ -2,8 +2,8 @@ #include #include -#include "Stream.h" -#include "Printable.h" +#include "api/Stream.h" +#include "api/Printable.h" namespace arduino { diff --git a/ArduinoCore-Linux/cores/rasperry_pi/HardwareI2C_RPI.h b/ArduinoCore-Linux/cores/rasperry_pi/HardwareI2C_RPI.h index 9120f38..093b966 100644 --- a/ArduinoCore-Linux/cores/rasperry_pi/HardwareI2C_RPI.h +++ b/ArduinoCore-Linux/cores/rasperry_pi/HardwareI2C_RPI.h @@ -5,7 +5,7 @@ #include // for open(), close(), etc. #include #include "Hardware.h" -#include "HardwareI2C.h" +#include "api/HardwareI2C.h" #include "ArduinoLogger.h" namespace arduino { diff --git a/ArduinoCore-Linux/cores/rasperry_pi/HardwareSPI_RPI.h b/ArduinoCore-Linux/cores/rasperry_pi/HardwareSPI_RPI.h index 044c97a..27aa5fa 100644 --- a/ArduinoCore-Linux/cores/rasperry_pi/HardwareSPI_RPI.h +++ b/ArduinoCore-Linux/cores/rasperry_pi/HardwareSPI_RPI.h @@ -2,9 +2,9 @@ #ifdef USE_RPI #include -#include "Common.h" -#include "HardwareSPI.h" -#include "Stream.h" +#include "api/Common.h" +#include "api/HardwareSPI.h" +#include "api/Stream.h" namespace arduino { From 0e9624e7da99d8dd25e522d9c3d09fa893b75014 Mon Sep 17 00:00:00 2001 From: Serge Ageyev Date: Thu, 2 Oct 2025 20:11:35 +0300 Subject: [PATCH 2/4] Arduino core api moved to include/arduino/api --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe69c7d..235accd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ target_include_directories (arduino_emulator PUBLIC # Install header files install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ArduinoCore-API/api/" # source directory - DESTINATION "include/arduino" # target directory + DESTINATION "include/arduino/api" # target directory FILES_MATCHING # install only matched files PATTERN "*.h" # select header files ) From 81e5518aba2f1a05eed24feffa5c45ae44dbc760 Mon Sep 17 00:00:00 2001 From: Serge Ageyev Date: Thu, 2 Oct 2025 20:12:03 +0300 Subject: [PATCH 3/4] Submodules checkout on action --- .github/workflows/c-cpp-cmake.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/c-cpp-cmake.yml b/.github/workflows/c-cpp-cmake.yml index 66a5cda..0546e0e 100644 --- a/.github/workflows/c-cpp-cmake.yml +++ b/.github/workflows/c-cpp-cmake.yml @@ -13,5 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 + with: + submodules: 'true' - name: build.sh run: ./build.sh \ No newline at end of file From 47a84dff57c7255c2d63446df183910c736b06f6 Mon Sep 17 00:00:00 2001 From: Serge Ageyev Date: Thu, 2 Oct 2025 20:15:39 +0300 Subject: [PATCH 4/4] Update unit-tests.yml Added submodules to unit tests --- .github/workflows/unit-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index b7c9311..8897b9a 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -25,6 +25,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 + with: + submodules: 'true' - name: Relax some warings # run: echo 'add_compile_options(-Wno-unused-function)' >> ArduinoCore-API/test/CMakeLists.txt @@ -51,4 +53,4 @@ jobs: # with: # token: ${{ secrets.CODECOV_TOKEN }} # files: ${{ env.COVERAGE_DATA_PATH }} - # fail_ci_if_error: true \ No newline at end of file + # fail_ci_if_error: true