Skip to content

Commit 133b243

Browse files
authored
Dont remove .cpp and refactor order (#37)
1 parent d785b53 commit 133b243

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

extras/library_generation/library_generation.sh

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pushd firmware/mcu_ws > /dev/null
5353
popd > /dev/null
5454

5555
######## Clean and source ########
56-
find /arduino_project/src/ ! -name micro_ros_arduino.h ! -name *.c ! -name *.c.in -delete
56+
find /arduino_project/src/ ! -name micro_ros_arduino.h ! -name *.c ! -name *.cpp ! -name *.c.in -delete
5757

5858
######## Build for OpenCR ########
5959
if [[ " ${PLATFORMS[@]} " =~ " opencr1 " ]]; then
@@ -69,59 +69,59 @@ if [[ " ${PLATFORMS[@]} " =~ " opencr1 " ]]; then
6969
cp -R firmware/build/libmicroros.a /arduino_project/src/cortex-m7/fpv5-sp-d16-softfp/libmicroros.a
7070
fi
7171

72-
######## Build for Teensy 3.2 ########
73-
if [[ " ${PLATFORMS[@]} " =~ " teensy3 " ]]; then
72+
######## Build for SAMD (e.g. Arduino Zero) ########
73+
if [[ " ${PLATFORMS[@]} " =~ " cortex_m0 " ]]; then
7474
rm -rf firmware/build
7575

7676
export TOOLCHAIN_PREFIX=/uros_ws/gcc-arm-none-eabi-5_4-2016q3/bin/arm-none-eabi-
77-
ros2 run micro_ros_setup build_firmware.sh /arduino_project/extras/library_generation/teensy32_toolchain.cmake /arduino_project/extras/library_generation/colcon_lowmem.meta
77+
ros2 run micro_ros_setup build_firmware.sh /arduino_project/extras/library_generation/cortex_m0_toolchain.cmake /arduino_project/extras/library_generation/colcon_verylowmem.meta
7878

7979
find firmware/build/include/ -name "*.c" -delete
8080
cp -R firmware/build/include/* /arduino_project/src/
8181

82-
mkdir -p /arduino_project/src/mk20dx256
83-
cp -R firmware/build/libmicroros.a /arduino_project/src/mk20dx256/libmicroros.a
82+
mkdir -p /arduino_project/src/cortex-m0plus
83+
cp -R firmware/build/libmicroros.a /arduino_project/src/cortex-m0plus/libmicroros.a
8484
fi
85-
######## Build for Teensy 4 ########
86-
if [[ " ${PLATFORMS[@]} " =~ " teensy4 " ]]; then
85+
86+
######## Build for SAM (e.g. Arduino Due) ########
87+
if [[ " ${PLATFORMS[@]} " =~ " cortex_m3 " ]]; then
8788
rm -rf firmware/build
8889

89-
export TOOLCHAIN_PREFIX=/uros_ws/gcc-arm-none-eabi-5_4-2016q3/bin/arm-none-eabi-
90-
ros2 run micro_ros_setup build_firmware.sh /arduino_project/extras/library_generation/teensy4_toolchain.cmake /arduino_project/extras/library_generation/colcon.meta
90+
export TOOLCHAIN_PREFIX=/uros_ws/gcc-arm-none-eabi-4_8-2014q1/bin/arm-none-eabi-
91+
ros2 run micro_ros_setup build_firmware.sh /arduino_project/extras/library_generation/cortex_m3_toolchain.cmake /arduino_project/extras/library_generation/colcon_lowmem.meta
9192

9293
find firmware/build/include/ -name "*.c" -delete
9394
cp -R firmware/build/include/* /arduino_project/src/
9495

95-
mkdir -p /arduino_project/src/imxrt1062/fpv5-d16-hard
96-
cp -R firmware/build/libmicroros.a /arduino_project/src/imxrt1062/fpv5-d16-hard/libmicroros.a
96+
mkdir -p /arduino_project/src/cortex-m3
97+
cp -R firmware/build/libmicroros.a /arduino_project/src/cortex-m3/libmicroros.a
9798
fi
9899

99-
######## Build for SAMD (e.g. Arduino Zero) ########
100-
if [[ " ${PLATFORMS[@]} " =~ " cortex_m0 " ]]; then
100+
######## Build for Teensy 3.2 ########
101+
if [[ " ${PLATFORMS[@]} " =~ " teensy3 " ]]; then
101102
rm -rf firmware/build
102103

103104
export TOOLCHAIN_PREFIX=/uros_ws/gcc-arm-none-eabi-5_4-2016q3/bin/arm-none-eabi-
104-
ros2 run micro_ros_setup build_firmware.sh /arduino_project/extras/library_generation/cortex_m0_toolchain.cmake /arduino_project/extras/library_generation/colcon_verylowmem.meta
105+
ros2 run micro_ros_setup build_firmware.sh /arduino_project/extras/library_generation/teensy32_toolchain.cmake /arduino_project/extras/library_generation/colcon_lowmem.meta
105106

106107
find firmware/build/include/ -name "*.c" -delete
107108
cp -R firmware/build/include/* /arduino_project/src/
108109

109-
mkdir -p /arduino_project/src/cortex-m0plus
110-
cp -R firmware/build/libmicroros.a /arduino_project/src/cortex-m0plus/libmicroros.a
110+
mkdir -p /arduino_project/src/mk20dx256
111+
cp -R firmware/build/libmicroros.a /arduino_project/src/mk20dx256/libmicroros.a
111112
fi
112-
113-
######## Build for SAM (e.g. Arduino Due) ########
114-
if [[ " ${PLATFORMS[@]} " =~ " cortex_m3 " ]]; then
113+
######## Build for Teensy 4 ########
114+
if [[ " ${PLATFORMS[@]} " =~ " teensy4 " ]]; then
115115
rm -rf firmware/build
116116

117-
export TOOLCHAIN_PREFIX=/uros_ws/gcc-arm-none-eabi-4_8-2014q1/bin/arm-none-eabi-
118-
ros2 run micro_ros_setup build_firmware.sh /arduino_project/extras/library_generation/cortex_m3_toolchain.cmake /arduino_project/extras/library_generation/colcon_lowmem.meta
117+
export TOOLCHAIN_PREFIX=/uros_ws/gcc-arm-none-eabi-5_4-2016q3/bin/arm-none-eabi-
118+
ros2 run micro_ros_setup build_firmware.sh /arduino_project/extras/library_generation/teensy4_toolchain.cmake /arduino_project/extras/library_generation/colcon.meta
119119

120120
find firmware/build/include/ -name "*.c" -delete
121121
cp -R firmware/build/include/* /arduino_project/src/
122122

123-
mkdir -p /arduino_project/src/cortex-m3
124-
cp -R firmware/build/libmicroros.a /arduino_project/src/cortex-m3/libmicroros.a
123+
mkdir -p /arduino_project/src/imxrt1062/fpv5-d16-hard
124+
cp -R firmware/build/libmicroros.a /arduino_project/src/imxrt1062/fpv5-d16-hard/libmicroros.a
125125
fi
126126

127127
######## Generate extra files ########

0 commit comments

Comments
 (0)