wn/mbusgateway3variant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include w5500 stuff

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2020-11-07 22:00:58 +01:00
parent ab8a97b1d2
commit 17304140fa
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -4,3 +4,6 @@
[submodule "cube/libmbus"] [submodule "cube/libmbus"]
path = cube/libmbus path = cube/libmbus
url = https://github.com/wollud1969/libmbus.git url = https://github.com/wollud1969/libmbus.git
[submodule "cube/ioLibrary_Driver"]
path = cube/ioLibrary_Driver
url = https://github.com/wollud1969/ioLibrary_Driver.git

1
cube/ioLibrary_Driver Submodule

@ -0,0 +1 @@
Subproject commit 0446055537fe8147abe399110325587c6db3b727

13
tools/insertMyCode.sh
View File

@ -9,8 +9,6 @@ IT_C_BAK=${IT_C}-bak
MAKEFILE=./Makefile MAKEFILE=./Makefile
MAKEFILE_BAK=${MAKEFILE}-bak MAKEFILE_BAK=${MAKEFILE}-bak
PROCESSED="Processed by $0" PROCESSED="Processed by $0"
checkFile () { 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 Includes \*/\),\1\n#include "main2.h"\n,' | \
sed -e 's,\(/\* USER CODE BEGIN SysTick_IRQn 1 \*/\),\1\n SYSTICK_Callback();\n,' >> $IT_C 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='' SRC_EXT=''
for I in User/Src/*.c; do for I in User/Src/*.c; do
@ -60,6 +65,9 @@ done
for I in hottislib/*.c; do for I in hottislib/*.c; do
SRC_EXT+="$I " SRC_EXT+="$I "
done done
for I in w5500/*.c; do
SRC_EXT+="$I "
done
cp $MAKEFILE $MAKEFILE_BAK cp $MAKEFILE $MAKEFILE_BAK
echo "# $PROCESSED" > $MAKEFILE echo "# $PROCESSED" > $MAKEFILE
@ -68,4 +76,5 @@ cat $MAKEFILE_BAK | \
sed -e 's,\(C_SOURCES = \\\),\1\n'"$SRC_EXT"' \\,' | \ 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-IUser/Inc \\,' | \
sed -e 's,\(C_INCLUDES = \\\),\1\n-Ilibmbus \\,' | \ 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 sed -e 's,\(C_INCLUDES = \\\),\1\n-Ihottislib \\,' >> $MAKEFILE