diff --git a/.gitmodules b/.gitmodules index e871764..2398cc7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "cube/libmbus"] path = cube/libmbus url = https://github.com/wollud1969/libmbus.git +[submodule "cube/ioLibrary_Driver"] + path = cube/ioLibrary_Driver + url = https://github.com/wollud1969/ioLibrary_Driver.git diff --git a/cube/ioLibrary_Driver b/cube/ioLibrary_Driver new file mode 160000 index 0000000..0446055 --- /dev/null +++ b/cube/ioLibrary_Driver @@ -0,0 +1 @@ +Subproject commit 0446055537fe8147abe399110325587c6db3b727 diff --git a/tools/insertMyCode.sh b/tools/insertMyCode.sh index 81456dd..5650515 100755 --- a/tools/insertMyCode.sh +++ b/tools/insertMyCode.sh @@ -9,8 +9,6 @@ IT_C_BAK=${IT_C}-bak MAKEFILE=./Makefile MAKEFILE_BAK=${MAKEFILE}-bak - - PROCESSED="Processed by $0" checkFile () { @@ -52,6 +50,13 @@ cat $IT_C_BAK | \ sed -e 's,\(/\* USER CODE BEGIN Includes \*/\),\1\n#include "main2.h"\n,' | \ sed -e 's,\(/\* USER CODE BEGIN SysTick_IRQn 1 \*/\),\1\n SYSTICK_Callback();\n,' >> $IT_C +mkdir w5500 +pushd ioLibrary_Driver +for D in Ethernet Ethernet/W5500 Internet/DHCP Internet/DNS Internet/httpServer Internet/MQTT; do + cp $D/*.c $D/.h ../w5500 +done +popd + SRC_EXT='' for I in User/Src/*.c; do @@ -60,6 +65,9 @@ done for I in hottislib/*.c; do SRC_EXT+="$I " done +for I in w5500/*.c; do + SRC_EXT+="$I " +done cp $MAKEFILE $MAKEFILE_BAK echo "# $PROCESSED" > $MAKEFILE @@ -68,4 +76,5 @@ cat $MAKEFILE_BAK | \ sed -e 's,\(C_SOURCES = \\\),\1\n'"$SRC_EXT"' \\,' | \ sed -e 's,\(C_INCLUDES = \\\),\1\n-IUser/Inc \\,' | \ sed -e 's,\(C_INCLUDES = \\\),\1\n-Ilibmbus \\,' | \ + sed -e 's,\(C_INCLUDES = \\\),\1\n-Iw5500 \\,' | \ sed -e 's,\(C_INCLUDES = \\\),\1\n-Ihottislib \\,' >> $MAKEFILE