Skip to content

Commit a3e468a

Browse files
fpistmfpistm
authored
Merge pull request #2404 from fpistm/refactor_code
refactor: move several sources as built-in library
2 parents 6c0c006 + 66b29ba commit a3e468a

File tree

152 files changed

+337
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+337
-89
lines changed

‎CI/update/stm32cube.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,8 @@ def checkConfig():
123123
stm32_def = (
124124
repo_local_path
125125
/ repo_core_name
126-
/ "cores"
127-
/ "arduino"
128-
/ "stm32"
126+
/ "libraries"
127+
/ "SrcWrapper"
129128
/ stm32_def
130129
)
131130
except IOError:

‎CI/update/stm32wrapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def checkConfig(arg_core, arg_cmsis):
9797

9898
HALoutSrc_path = SrcWrapper_path / "src" / "HAL"
9999
LLoutSrc_path = SrcWrapper_path / "src" / "LL"
100-
LLoutInc_path = core_path / "cores" / "arduino" / "stm32" / "LL"
100+
LLoutInc_path = SrcWrapper_path / "inc" / "LL"
101101

102102
if arg_cmsis is not None:
103103
CMSIS_path = Path(arg_cmsis).resolve()

‎License.md

Lines changed: 22 additions & 4 deletions

‎cmake/set_base_arduino_config.cmake

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,10 @@ target_include_directories(base_config INTERFACE
5555
"${BUILD_CORE_PATH}"
5656
"${BUILD_CORE_PATH}/avr"
5757
"${BUILD_CORE_PATH}/stm32"
58-
"${BUILD_CORE_PATH}/stm32/LL"
59-
"${BUILD_CORE_PATH}/stm32/usb"
60-
"${BUILD_CORE_PATH}/stm32/OpenAMP"
61-
"${BUILD_CORE_PATH}/stm32/usb/hid"
62-
"${BUILD_CORE_PATH}/stm32/usb/cdc"
58+
"${BUILD_LIB_PATH}/SrcWrapper/inc"
59+
"${BUILD_LIB_PATH}/SrcWrapper/inc/LL"
60+
"${BUILD_LIB_PATH}/USBDevice/inc"
61+
"${BUILD_LIB_PATH}/VirtIO/inc"
6362
"${BUILD_SYSTEM_PATH}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc"
6463
"${BUILD_SYSTEM_PATH}/Middlewares/ST/STM32_USB_Device_Library/Core/Src"
6564
"${CMSIS5_PATH}/CMSIS/DSP/Include"

‎cmake/templates/easy_cmake.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ build_sketch(TARGET "{{tgtname or "@binary_name_here@"}}"
9191
# SD
9292
# Wire
9393
# SPI
94+
# USBDevice
95+
# VirtIO
9496
)
9597

9698
# STEP 4: optional features

‎cores/arduino/CMakeLists.txt

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -31,46 +31,9 @@ add_library(core_bin STATIC EXCLUDE_FROM_ALL
3131
pins_arduino.c
3232
Print.cpp
3333
RingBuffer.cpp
34-
stm32/OpenAMP/libmetal/device.c
35-
stm32/OpenAMP/libmetal/generic/condition.c
36-
stm32/OpenAMP/libmetal/generic/cortexm/sys.c
37-
stm32/OpenAMP/libmetal/generic/generic_device.c
38-
stm32/OpenAMP/libmetal/generic/generic_init.c
39-
stm32/OpenAMP/libmetal/generic/generic_io.c
40-
stm32/OpenAMP/libmetal/generic/generic_shmem.c
41-
stm32/OpenAMP/libmetal/generic/time.c
42-
stm32/OpenAMP/libmetal/init.c
43-
stm32/OpenAMP/libmetal/io.c
44-
stm32/OpenAMP/libmetal/log.c
45-
stm32/OpenAMP/libmetal/shmem.c
46-
stm32/OpenAMP/mbox_ipcc.c
47-
stm32/OpenAMP/open-amp/remoteproc/remoteproc_virtio.c
48-
stm32/OpenAMP/open-amp/rpmsg/rpmsg.c
49-
stm32/OpenAMP/open-amp/rpmsg/rpmsg_virtio.c
50-
stm32/OpenAMP/openamp.c
51-
stm32/OpenAMP/rsc_table.c
52-
stm32/OpenAMP/virt_uart.c
53-
stm32/OpenAMP/virtio/virtio.c
54-
stm32/OpenAMP/virtio/virtqueue.c
55-
stm32/OpenAMP/virtio_buffer.c
56-
stm32/OpenAMP/virtio_log.c
5734
stm32/startup_stm32yyxx.S
58-
stm32/usb/cdc/cdc_queue.c
59-
stm32/usb/cdc/usbd_cdc.c
60-
stm32/usb/cdc/usbd_cdc_if.c
61-
stm32/usb/hid/usbd_hid_composite.c
62-
stm32/usb/hid/usbd_hid_composite_if.c
63-
stm32/usb/usb_device_core.c
64-
stm32/usb/usb_device_ctlreq.c
65-
stm32/usb/usb_device_ioreq.c
66-
stm32/usb/usbd_conf.c
67-
stm32/usb/usbd_desc.c
68-
stm32/usb/usbd_ep_conf.c
69-
stm32/usb/usbd_if.c
7035
Stream.cpp
7136
Tone.cpp
72-
USBSerial.cpp
73-
VirtIOSerial.cpp
7437
WInterrupts.cpp
7538
wiring_analog.c
7639
wiring_digital.c

‎cores/arduino/WSerial.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33

44
#include "variant.h"
55
#include "HardwareSerial.h"
6-
#include "USBSerial.h"
7-
#include "VirtIOSerial.h"
6+
#if defined (USBCON) && defined(USBD_USE_CDC)
7+
#include "USBSerial.h"
8+
#endif /* USBCON && USBD_USE_CDC */
9+
#if defined(VIRTIOCON)
10+
#include "VirtIOSerial.h"
11+
#endif /* VIRTIOCON */
812

913
#if defined (USBCON) && defined(USBD_USE_CDC)
1014
#ifndef DISABLE_GENERIC_SERIALUSB

‎libraries/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ add_subdirectory(SPI)
1010
add_subdirectory(Servo)
1111
add_subdirectory(SoftwareSerial)
1212
add_subdirectory(SrcWrapper)
13+
add_subdirectory(USBDevice)
14+
add_subdirectory(VirtIO)
1315
add_subdirectory(Wire)

‎cores/arduino/HardwareTimer.h renamed to ‎libraries/SrcWrapper/inc/HardwareTimer.h

File renamed without changes.

‎cores/arduino/stm32/LL/stm32yyxx_ll.h renamed to ‎libraries/SrcWrapper/inc/LL/stm32yyxx_ll.h

File renamed without changes.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy