Skip to content

Commit 205688d

Browse files
facchinmfacchinm
authored
Merge pull request #47 from facchinm/gh_fix
gh: try to fix zephyr project action
2 parents fab11e2 + ff19b4f commit 205688d

File tree

19 files changed

+79
-46
lines changed

19 files changed

+79
-46
lines changed

‎.github/workflows/build.yml

+14-17
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,30 @@ jobs:
1212
- name: Checkout
1313
uses: actions/checkout@v4
1414
with:
15-
path: Arduino-Zephyr-API
15+
path: ArduinoCore-zephyr
1616

1717
- name: Initialize
18-
working-directory: Arduino-Zephyr-API
18+
working-directory: ArduinoCore-zephyr
1919
run: |
20-
west init -m https://github.com/zephyrproject-rtos/gsoc-2022-arduino-core.git
20+
mkdir build && cd build
21+
west init -m https://github.com/arduino/ArduinoCore-zephyr.git
2122
west update
22-
git clone https://github.com/arduino/ArduinoCore-API.git ArduinoCore-API
23-
cp -r ArduinoCore-API/api modules/lib/Arduino-Zephyr-API/cores/arduino/.
23+
rm -rf modules/lib/ArduinoCore-zephyr/*
24+
cp -r ../* modules/lib/ArduinoCore-zephyr || true
25+
rm modules/lib/ArduinoCore-zephyr/cores/arduino/api
26+
cp -r modules/lib/ArduinoCore-API/api modules/lib/ArduinoCore-zephyr/cores/arduino/api
2427
2528
- name: Build fade
26-
working-directory: Arduino-Zephyr-API
29+
working-directory: ArduinoCore-zephyr/build
2730
run: |
28-
west build -p -b arduino_nano_33_ble_sense samples/fade
31+
west build -p -b arduino_nano_33_ble//sense ../samples/fade
2932
3033
- name: Build i2cdemo
31-
working-directory: Arduino-Zephyr-API
34+
working-directory: ArduinoCore-zephyr/build
3235
run: |
33-
west build -p -b arduino_nano_33_ble_sense samples/i2cdemo
36+
west build -p -b ek_ra8d1 ../samples/i2cdemo
3437
3538
- name: Build adc
36-
working-directory: Arduino-Zephyr-API
39+
working-directory: ArduinoCore-zephyr/build
3740
run: |
38-
west build -p -b beagleconnect_freedom samples/analog_input
39-
40-
- name: Archive firmware
41-
uses: actions/upload-artifact@v3
42-
with:
43-
name: firmware
44-
path: Arduino-Zephyr-API/build/zephyr/zephyr.*
41+
west build -p -b arduino_nano_33_ble//sense ../samples/analog_input

‎CMakeLists.txt

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
4+
35
if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${BOARD})
46
set(variant_dir variants/${BOARD})
5-
elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS})
6-
set(variant_dir variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS})
7+
elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${NORMALIZED_BOARD_TARGET})
8+
set(variant_dir variants/${NORMALIZED_BOARD_TARGET})
79
else()
8-
message(INFO "Variant dir not found: variants/${BOARD}, variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS}")
10+
if (CONFIG_ARDUINO_API)
11+
message(FATAL_ERROR "Variant dir not found: variants/${BOARD}, variants/${NORMALIZED_BOARD_TARGET}")
12+
endif()
913
endif()
1014

1115
if (CONFIG_ARDUINO_API)

‎cores/arduino/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ if(NOT DEFINED ARDUINO_BUILD_PATH)
66

77
zephyr_sources(zephyrSerial.cpp)
88
zephyr_sources(zephyrCommon.cpp)
9+
zephyr_sources(USB.cpp)
10+
zephyr_sources(itoa.cpp)
911

1012
if(DEFINED CONFIG_ARDUINO_ENTRY)
1113
zephyr_sources(main.cpp)

‎cores/arduino/SerialUSB.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ class SerialUSB_ : public ZephyrSerial {
3131
};
3232
} // namespace arduino
3333

34-
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)
34+
#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
3535
extern arduino::SerialUSB_ Serial;
3636
#endif

‎cores/arduino/USB.cpp

+1-11
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,13 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
// Make PluggableUSB link happy
8-
#include "api/PluggableUSB.h"
9-
10-
static uint8_t _epBuffer[1];
11-
void* epBuffer(unsigned int n) {
12-
return &_epBuffer[n];
13-
};
14-
15-
arduino::PluggableUSB_::PluggableUSB_() {}
16-
177
#include <zephyr/devicetree.h>
188
#include <zephyr/drivers/uart.h>
199
#include <zephyr/drivers/uart/cdc_acm.h>
2010
#include <zephyr/usb/usb_device.h>
2111
#include <SerialUSB.h>
2212

23-
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)
13+
#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
2414
const struct device *const usb_dev = DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), cdc_acm, 0));
2515

2616
void usb_status_cb(enum usb_dc_status_code cb_status, const uint8_t *param) {

‎cores/arduino/main.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@
1010
#endif
1111

1212
int main(void) {
13-
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) || DT_NODE_HAS_PROP(DT_PATH(zephyr_user), serials)
13+
#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
1414
Serial.begin(115200);
1515
#endif
1616
setup();
1717

1818
for (;;) {
1919
loop();
20+
#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM) || DT_NODE_HAS_PROP(DT_PATH(zephyr_user), serials)
2021
if (arduino::serialEventRun) arduino::serialEventRun();
22+
#endif
2123
}
2224

2325
return 0;

‎cores/arduino/zephyrSerial.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,16 @@ void arduino::ZephyrSerial::flush() {
198198
}
199199
}
200200

201+
#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm))
202+
#define FIRST_UART_INDEX 1
203+
#else
204+
#define FIRST_UART_INDEX 0
205+
#endif
201206

202207
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), serials)
203-
#if !DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)
208+
#if !(DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
204209
// If CDC USB, use that object as Serial (and SerialUSB)
205-
arduino::ZephyrSerial Serial(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), serials, 0)));
210+
arduino::ZephyrSerial Serial(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), serials, FIRST_UART_INDEX)));
206211
#endif
207212
#if (DT_PROP_LEN(DT_PATH(zephyr_user), serials) > 1)
208213
#define ARDUINO_SERIAL_DEFINED_0 1

‎cores/arduino/zephyrSerial.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class ZephyrSerial : public HardwareSerial
8181
} // namespace arduino
8282

8383
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), serials)
84-
#if !DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)
84+
#if !(DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
8585
// If CDC USB, use that object as Serial (and SerialUSB)
8686
extern arduino::ZephyrSerial Serial;
8787
#endif

‎extra/bootstrap.sh

+3
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ west init -l .
1212
west update
1313
pip install -r ../zephyr/scripts/requirements-base.txt
1414
# download slim toolchain from https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.8
15+
16+
# add here the required blobs based on supported platforms
17+
west blobs fetch hal_nxp

‎samples/analog_input/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(analog_input)

‎samples/attach_interrupt/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(attach_interrupt)

‎samples/blinky_arduino/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(blinky)

‎samples/button_press_led/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(blinky)

‎samples/fade/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(fade)

‎samples/hello_arduino/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(hello_world)

‎samples/i2cdemo/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(blinky)

‎samples/serial_event/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(serial_event)

‎samples/spi_controller/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(spi_controller)

‎samples/threads_arduino/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
cmake_minimum_required(VERSION 3.20.0)
44

55
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6-
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
6+
set(NORMALIZED_BOARD_TARGET "${BOARD}${BOARD_QUALIFIERS}")
7+
string(REPLACE "/" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
8+
string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
9+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/ArduinoCore-zephyr/loader/boards/${NORMALIZED_BOARD_TARGET}.overlay)
710

811
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
912
project(threads)

0 commit comments

Comments
 (0)