Merge branch 'master' of ssh://home.hottis.de:2922/wolutator/mbusgateway3variant

This commit is contained in:
Wolfgang Hottgenroth 2020-11-26 09:43:07 +01:00
commit cbc3ca6f20
No known key found for this signature in database
GPG Key ID: 656C88C7C1734267
2 changed files with 6 additions and 3 deletions

View File

@ -289,7 +289,7 @@ void mbusCommISR() {
}
if ((isrflags & USART_SR_NE) != RESET) {
mbusCommStats.uartNoiseErrCnt += 1;
// do not consider noise as an error
// do not consider noise as an error for the moment
// errorFound = true;
}
mbusCommStats.uartOctetCnt += 1;

View File

@ -47,8 +47,11 @@ cat $MAIN_C_BAK | \
cp $IT_C $IT_C_BAK
echo "// $PROCESSED" > $IT_C
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
sed -e 's,\(/\* USER CODE BEGIN Includes \*/\),\1\n#include "main2.h"\n,' \
-e 's,\(/\* USER CODE BEGIN SysTick_IRQn 1 \*/\),\1\n SYSTICK_Callback();\n,' \
-e 's,\(HAL_UART_IRQHandler(&huart5);\),// \1,' \
-e 's,\(/\* USER CODE BEGIN UART5_IRQn 1 \*/\),\1\n mbusCommISR();\n,' \
>> $IT_C
# mkdir w5500
# pushd ioLibrary_Driver