mhu/shellmatta
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: mhu:6c76dfc7aed2594579f09d0b797d6a51cffff343
Branches Tags
mhu:develop
mhu:continue
...
compare: mhu:ebf65d744838a5c7bbf6ddfff6cb4428f012fd97
Branches Tags
mhu:develop
mhu:continue

3 Commits
6c76dfc7ae ... ebf65d7448

Author SHA1 Message Date
sebastian
ebf65d7448 Merge branch 'Fix_redundant_assignment' of shimatta/shellmatta into develop 2020-04-20 21:08:02 +02:00
S.Hentges
0fa2e5d1f8 Fix bug in shellmatta.c 2020-04-20 21:02:46 +02:00
prozessorkern
3f54a989f3 fixed cppcheck call for older versions of cppcheck - removed misra checking (is broken anyway if there is no misra text file present 2020-04-19 14:45:42 +02:00
2 changed files with 7 additions and 6 deletions
Show Stats Expand all files Collapse all files

11
makefile
View File

@ -53,7 +53,7 @@ TESTFLAGS := $(INCLUDES:%=-I%) -g -Wall -Werror -Wextra -fprofile-arcs -ftest-
TESTLFLAGS := -fprofile-arcs -Wl,--allow-multiple-definition TESTLFLAGS := -fprofile-arcs -Wl,--allow-multiple-definition
DEPEND = -MT $@ -MF "$(@:%.o=%.d)" -MG -MM DEPEND = -MT $@ -MF "$(@:%.o=%.d)" -MG -MM
COBJ := $(patsubst %.c,$(OBJ_DIR)%.o,$(SOURCES)) COBJ := $(patsubst %.c,$(OBJ_DIR)%.o,$(SOURCES))
EXAMPLE_SOURCES := example/main.c EXAMPLE_SOURCES := example/main.c
@ -72,17 +72,18 @@ export
help: help:
@echo Shellmatta help @echo Shellmatta help
@echo ------------------------- @echo -----------------------------------------------
@echo test - run all tests @echo test - run all tests
@echo cppcheck - run static code analysis (cppcheck)
@echo example - build example @echo example - build example
@echo ------------------------- @echo -----------------------------------------------
test: unittest integrationtest test: unittest integrationtest
cppcheck: cppcheck:
- @mkdir -p output/cppcheck/html - @mkdir -p output/cppcheck/html
cppcheck --addon=/usr/bin/misra.py --enable=all --template=gcc --cppcheck-build-dir=output/cppcheck $(SOURCES) cppcheck --enable=all --template=gcc --cppcheck-build-dir=output/cppcheck $(SOURCES)
cppcheck --addon=/usr/bin/misra.py --enable=all --template=gcc --cppcheck-build-dir=output/cppcheck $(SOURCES) --xml 2>output/cppcheck/cppcheck.xml cppcheck --enable=all --template=gcc --cppcheck-build-dir=output/cppcheck $(SOURCES) --xml 2>output/cppcheck/cppcheck.xml
cppcheck-htmlreport --file=output/cppcheck/cppcheck.xml --title="Shellmatta" --report-dir=output/cppcheck/html cppcheck-htmlreport --file=output/cppcheck/cppcheck.xml --title="Shellmatta" --report-dir=output/cppcheck/html
unittest: $(UNITTEST_TARGET) unittest: $(UNITTEST_TARGET)

2
src/shellmatta.c
View File

@ -416,7 +416,7 @@ shellmatta_retCode_t shellmatta_processData(shellmatta_handle_t handle,
/** -# check if continuous mode is canceled or interrupted by busy mode */ /** -# check if continuous mode is canceled or interrupted by busy mode */
if(SHELLMATTA_BUSY == cmdRet) if(SHELLMATTA_BUSY == cmdRet)
{ {
inst->busyCmd = inst->busyCmd; inst->busyCmd = inst->continuousCmd;
inst->continuousCmd = NULL; inst->continuousCmd = NULL;
} }
else if(('\x03' == data[inst->byteCounter])) else if(('\x03' == data[inst->byteCounter]))