move files to src folder

hathach · May 10, 2022 · d2c6c45 · d2c6c45
1 parent 6b82ae1
commit d2c6c45
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 14 deletions.
diff --git a/example/capture_hid_report/CMakeLists.txt b/example/capture_hid_report/CMakeLists.txt
@@ -3,19 +3,21 @@ add_executable(${target_name})
 
 pico_enable_stdio_usb(${target_name} 1) 
 
-pico_generate_pio_header(${target_name} ${CMAKE_CURRENT_LIST_DIR}/../../usb_tx.pio)
-pico_generate_pio_header(${target_name} ${CMAKE_CURRENT_LIST_DIR}/../../usb_rx.pio)
+set(PICO_PIO_USB_SRC "${CMAKE_CURRENT_LIST_DIR}/../../src")
+
+pico_generate_pio_header(${target_name} ${PICO_PIO_USB_SRC}/usb_tx.pio)
+pico_generate_pio_header(${target_name} ${PICO_PIO_USB_SRC}/usb_rx.pio)
 
 target_sources(${target_name} PRIVATE
  capture_hid_report.c
- ../../pio_usb.c
- ../../pio_usb_device.c
- ../../pio_usb_host.c
- ../../usb_crc.c
+ ${PICO_PIO_USB_SRC}/pio_usb.c
+ ${PICO_PIO_USB_SRC}/pio_usb_device.c
+ ${PICO_PIO_USB_SRC}/pio_usb_host.c
+ ${PICO_PIO_USB_SRC}/usb_crc.c
  )
 target_link_options(${target_name} PRIVATE -Xlinker --print-memory-usage)
 target_compile_options(${target_name} PRIVATE -Wall -Wextra)
-target_include_directories(${target_name} PRIVATE ../../)
+target_include_directories(${target_name} PRIVATE ${PICO_PIO_USB_SRC})
 
 target_link_libraries(${target_name} PRIVATE pico_stdlib pico_multicore hardware_pio hardware_dma)
 pico_add_extra_outputs(${target_name})

diff --git a/example/usb_device/CMakeLists.txt b/example/usb_device/CMakeLists.txt
@@ -3,19 +3,21 @@ add_executable(${target_name})
 
 pico_enable_stdio_usb(${target_name} 1) 
 
-pico_generate_pio_header(${target_name} ${CMAKE_CURRENT_LIST_DIR}/../../usb_tx.pio)
-pico_generate_pio_header(${target_name} ${CMAKE_CURRENT_LIST_DIR}/../../usb_rx.pio)
+set(PICO_PIO_USB_SRC "${CMAKE_CURRENT_LIST_DIR}/../../src")
+
+pico_generate_pio_header(${target_name} ${PICO_PIO_USB_SRC}/usb_tx.pio)
+pico_generate_pio_header(${target_name} ${PICO_PIO_USB_SRC}/usb_rx.pio)
 
 target_sources(${target_name} PRIVATE
   usb_device.c
-  ../../pio_usb.c
- ../../pio_usb_device.c
- ../../pio_usb_host.c
-  ../../usb_crc.c
+  ${PICO_PIO_USB_SRC}/pio_usb.c
+  ${PICO_PIO_USB_SRC}/pio_usb_device.c
+  ${PICO_PIO_USB_SRC}/pio_usb_host.c
+  ${PICO_PIO_USB_SRC}/usb_crc.c
 )
 target_link_options(${target_name} PRIVATE -Xlinker --print-memory-usage)
 target_compile_options(${target_name} PRIVATE -Wall -Wextra)
-target_include_directories(${target_name} PRIVATE ../../)
+target_include_directories(${target_name} PRIVATE ${PICO_PIO_USB_SRC})
 
 target_link_libraries(${target_name} PRIVATE pico_stdlib pico_multicore hardware_pio hardware_dma)
 pico_add_extra_outputs(${target_name})

diff --git a/pio_usb.c → src/pio_usb.c b/pio_usb.c → src/pio_usb.c
diff --git a/pio_usb.h → src/pio_usb.h b/pio_usb.h → src/pio_usb.h
diff --git a/pio_usb_configuration.h → src/pio_usb_configuration.h b/pio_usb_configuration.h → src/pio_usb_configuration.h
diff --git a/pio_usb_device.c → src/pio_usb_device.c b/pio_usb_device.c → src/pio_usb_device.c
diff --git a/pio_usb_host.c → src/pio_usb_host.c b/pio_usb_host.c → src/pio_usb_host.c
diff --git a/pio_usb_ll.h → src/pio_usb_ll.h b/pio_usb_ll.h → src/pio_usb_ll.h
diff --git a/usb_crc.c → src/usb_crc.c b/usb_crc.c → src/usb_crc.c
diff --git a/usb_crc.h → src/usb_crc.h b/usb_crc.h → src/usb_crc.h
diff --git a/usb_definitions.h → src/usb_definitions.h b/usb_definitions.h → src/usb_definitions.h
diff --git a/usb_rx.pio → src/usb_rx.pio b/usb_rx.pio → src/usb_rx.pio
diff --git a/usb_tx.pio → src/usb_tx.pio b/usb_tx.pio → src/usb_tx.pio