Merge branch 'devel'

Author: dannyp11

.gitmodules

@@ -8,3 +8,6 @@
 	path = submodules/googletest
 	url = https://github.com/google/googletest
     ignore = dirty
+[submodule "submodules/cxxtest"]
+	path = submodules/cxxtest
+	url = https://github.com/CxxTest/cxxtest

.travis.yml

@@ -0,0 +1,37 @@
+# Set up notification options
+notifications: 
+  email:
+    recipients:
+      - [email protected]
+
+    # change is when the repo status goes from pass to fail or vice versa
+    on_success: change
+    on_failure: always
+
+# specify language
+language: cpp
+
+# non-root build
+sudo: true
+
+# specify language options
+
+os:
+- linux
+
+# configure which branches to run
+branches:
+  # whitelist
+  only:
+    - master
+    - devel
+
+compiler: 
+- clang++
+
+script: 
+- make check
+
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install -y gcc-avr binutils-avr avr-libc arduino

README.md

@@ -1,4 +1,6 @@
 # arduino-skeleton
+[![Build Status](https://travis-ci.org/dannyp11/arduino-skeleton.svg?branch=master)](https://travis-ci.org/dannyp11/arduino-skeleton)
+
 This is the first embarkment of my learning experience & side projects. Let's see how far I could go :)
 Skeleton framework for Arduino with/without RTOS, uses avr gcc/ g++
 Currently works with Unix system, compatible with Arduino framework (setup/loop) using sudar's repo

ReleaseNote.txt

@@ -38,6 +38,9 @@ RelNote -*- mode : org -*-
    - State "DONE"       from "CANCELED"   [2017-07-30 Sun 13:45]
 ** DONE avoid recompiling gtest library every time running make check
    - State "DONE"       from "CANCELED"   [2017-07-30 Sun 13:46]
+** DONE integrate Travis CI in project
+   - State "DONE"       from "FEEDBACK"   [2017-07-30 Sun 16:39]
+   - State "FEEDBACK"   from "INPROGRESS" [2017-07-30 Sun 16:39]
 ** TODO motion sensor test code
 ** TODO hand clap sound detector
 * WAIT v2.2.0 - more integrated module in i2c-console

common/makefiles/unittest.mk

@@ -5,6 +5,11 @@ MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 MKFILE_DIRNAME := $(notdir $(patsubst %/,%,$(dir $(MKFILE_PATH))))
 TOP :=$(shell dirname $(MKFILE_PATH))/../../
 
+# cxxtest dir & pkg config
+CXXTEST_DIR ?=$(TOP)/submodules/cxxtest
+INCLUDES += $(CXXTEST_DIR)
+CXXTEST_GEN ?=$(CXXTEST_DIR)/bin/cxxtestgen
+
 # test objects definition
 TEST_OBJECTS	= $(patsubst %.cpp, %.ocxx, $(TEST_SOURCES))
 TEST_OBJECTS	+= $(patsubst %.c, %.ocxx, $(TEST_SOURCES))
@@ -22,7 +27,7 @@ IFLAGS	 = $(foreach d, $(INCLUDES), -I$d)
 # main rules to run
 ##########################################################################################
 TEST_GEN: 
-	$(foreach f, $(TEST_HEADERS), cxxtestgen --error-printer -o $(f).cpp $(f) ; )
+	$(foreach f, $(TEST_HEADERS), $(CXXTEST_GEN) --error-printer -o $(f).cpp $(f) ; )
 	$(MAKE) test_compile
 
 ifneq ($(filter $(BRIEF), $(TRUE)),) # check if compile message should be output, BRIEF means no

common/skeleton.mk

@@ -16,6 +16,8 @@ PROGRAMMER = -c arduino -P $(TTY) -b 115200
 # Directory path ####################################################################
 OS_DIR     = $(TOP)/submodules/ChibiOS/
 ARDUINO_MAKEFILE_DIR = $(TOP)/submodules/Arduino-Makefile
+CXXTEST_DIR = $(TOP)/submodules/cxxtest
+GTEST_DIR = $(TOP)/submodules/googletest
 UTILS_DIR  = $(TOP)/common/utils/
 MKFILES_DIR = $(TOP)/common/makefiles/
 
@@ -100,6 +102,9 @@ TEST_CFLAGS  += -DDEBUG=1 -g -O0
 endif
 
 ## help menu #########################################################################
+GCC_COLOR=\033[1;34m
+SRC_COLOR=\033[1;35m
+NO_COLOR=\033[0;0m
 define helpMenu
 --------------------------------------------------------------------------------------
 Configurable Variable names (* means required)
@@ -112,31 +117,35 @@ Device          DEVICE          uController chip                $(DEVICE)
 Project         CPP_PROJECT     is C++ project?                 $(CPP_PROJECT)  
                 WITH_OS         uses ChibiOS?                   $(WITH_OS)
                 UTILS_SUPPORT   utils such as i2c, debug, etc.  $(UTILS_SUPPORT)
-                UTILS_DIR	path to utils source code	$(UTILS_DIR)
+                UTILS_DIR       path to utils source code       $(UTILS_DIR)
                 FLOAT_SUPPORT   support float printf/scanf      $(FLOAT_SUPPORT)
                 IDE_SUPPORT     support ide lib (setup, loop)?  $(IDE_SUPPORT)
                 DEBUG           add -DDEBUG=1 to cflags         $(DEBUG)       
-                OPTIMIZE	enable optimization?		$(OPTIMIZE) 
+                OPTIMIZE        enable optimization?            $(OPTIMIZE) 
                 PROJECT_NAME    name of project                 $(PROJECT_NAME)
 
-Compiler        CFLAGS          add to cflag of avr gcc         $(CFLAGS)
-                CPPFLAGS	add to c++ flags of avr g++	$(CPPFLAGS)
-                *INCLUDES       list of directories to include  $(INCLUDES)
-                *SOURCES        all .c and .cpp files           $(SOURCES)
+Compiler        CFLAGS          add to cflag of avr gcc         $(GCC_COLOR)$(CFLAGS)$(NO_COLOR)
+                CPPFLAGS        add to c++ flags of avr g++     $(GCC_COLOR)$(CPPFLAGS)$(NO_COLOR)
+                *INCLUDES       list of directories to include  $(SRC_COLOR)$(INCLUDES)$(NO_COLOR)
+                
+                *SOURCES        all .c and .cpp files           $(SRC_COLOR)$(SOURCES)$(NO_COLOR)
 
 SW Unittest     UNITTEST_SUPPORT cxx test  support              $(UNITTEST_SUPPORT) 
                 GTEST_SUPPORT   Google test support             $(GTEST_SUPPORT)
-                TEST_SOURCES    files to be tested              $(TEST_SOURCES)
+                TEST_SOURCES    files to be tested              $(SRC_COLOR)$(TEST_SOURCES)$(NO_COLOR)
                                 (required if UNITTEST_SUPPORT is enabled)
-                TEST_HEADERS    list of .h files for cxxtest    $(TEST_HEADERS)
+                TEST_HEADERS    list of .h files for cxxtest    $(SRC_COLOR)$(TEST_HEADERS)$(NO_COLOR)
                                 usually inside proj/test/
                 TEST_DEBUG      add -DDEBUG flag to unittest?   $(TEST_DEBUG)
                 TEST_CC         g++ of unit test                $(TEST_CC)
-                TEST_CFLAGS     cflags of unit test             $(TEST_CFLAGS)
+                TEST_CFLAGS     cflags of unit test             $(GCC_COLOR)$(TEST_CFLAGS)$(NO_COLOR)
 --------------------------------------------------------------------------------------
 endef
 export helpMenu
+export GCC_COLOR
+export NO_COLOR
+export SRC_COLOR
 help:
 	@$(TOP)/project_manager.sh -t 'Skeleton help menu:'
-	@echo  "$$helpMenu"
+	@echo -e "$$helpMenu"
 

project_manager.sh

@@ -40,13 +40,18 @@ print_warning()
 # run all make check in directory recursively
 function checkFolder()
 {
+    local retVal=0
 	find "$1" -name Makefile | while read line; do		
-                local TEST_DIR=$(dirname $line)/test/
-                if [ -d "$TEST_DIR" ] ; then
-                	print_title "Checking in $(dirname ${line})" ;	
-                        make -C $(dirname $line) check BRIEF=1 -j4
-                fi		
-	done		
+        local TEST_DIR=$(dirname $line)/test/
+        if [ -d "$TEST_DIR" ] ; then
+        	print_title "Checking in $(dirname ${line})"
+            make -C $(dirname $line) check BRIEF=1 -j4
+            
+            ((retVal = retVal + $?))
+        fi		
+	done
+	
+	return $retVal		
 }
 
 # run make clean in dir recursively
@@ -60,24 +65,29 @@ function cleanFolder()
 # run make all in dir recursively
 function makeFolder()
 {
+    local retVal=0
+
 	find "$1" -name Makefile | while read line; do	
-	        print_title "Compile in $(dirname ${line})..." ;
-	        
-	        if (($FULL_REPORT == 0)) ; then
-                  make -C $(dirname $line) all -j4 > /dev/null
-	        else
-	          make -C $(dirname $line) all -j4
-	        fi	
+        print_title "Compile in $(dirname ${line})..." ;
+        
+        if (($FULL_REPORT == 0)) ; then
+              make -C $(dirname $line) all -j4 > /dev/null
+        else
+          make -C $(dirname $line) all -j4
+        fi	
 
-		local MK_RESULT=$?
+	    local MK_RESULT=$?
+	    ((retVal=retVal + MK_RESULT))
 
-		if (($MK_RESULT!=0)) ; then
-			print_warning "Error code $MK_RESULT on compiling $(dirname $line)"
-			if (($FORCE_CONTINUE == 0)) ; then
-				exit $MK_RESULT
-			fi
-		fi
-	done		
+	    if (($MK_RESULT!=0)) ; then
+		    print_warning "Error code $MK_RESULT on compiling $(dirname $line)"
+		    if (($FORCE_CONTINUE == 0)) ; then
+			    exit $MK_RESULT
+		    fi
+	    fi
+	done
+	
+	return $retVal		
 }
 
 function checkDependency()