- added compile all warning & report on maintainer script

- added Millis using timer2
- fixed timer test
- add report style, error control in proj manager

Author: dannyp11

Makefile

@@ -13,8 +13,8 @@ check:
 # comipile all projects
 compile:        
 	$(TOP)/project_manager.sh -m test/
-	$(TOP)/project_manager.sh -m c-project/
-	$(TOP)/project_manager.sh -m cpp-project/
+	$(TOP)/project_manager.sh -f -m c-project/ 
+	$(TOP)/project_manager.sh -f -m cpp-project/ 
 
 # clean all projects for maintaining purpose
 clean:

c-project/without-os/i2c-console/Makefile

@@ -4,7 +4,7 @@ DEBUG = no
 FLOAT_SUPPORT = no # support printf, sscanf floats
 UTILS_SUPPORT = YES # extra utils such as soft serial, i2c, serial debug
 PROJECT_NAME = i2c-console
-OPTIMIZE = no
+OPTIMIZE = yes
 TOP = ../../../
 
 # required

c-project/without-os/i2c-console/main.c

@@ -9,6 +9,7 @@
 #include "PgmStorage.h"
 #include "Timer.h"
 #include "I2C.h"
+#include "Millis.h"
 
 #include <stdio.h>
 #include <util/delay.h>
@@ -31,8 +32,6 @@ const char PROGMEM help72[] = "HISTORY \t\t - show past entered messages";
 const char PROGMEM help73[] = "SCAN \t\t\t - scan all I2C devices on the bus";
 const char PROGMEM help8[] = "========================================================================";
 
-static volatile unsigned long mMillis;
-
 void processMessage(const char * buffer);
 
 void showHelp()
@@ -199,11 +198,6 @@ void runScan()
 	}
 }
 
-static void incMillis()
-{
-	++mMillis;
-}
-
 void parseNRunMessage(const char * message)
 {
 	I2CConsoleMessage cmd;
@@ -273,8 +267,8 @@ void loopCommand(const char * message)
 				SerialDebugPrint("looping %d seconds for '%s'", loop_time,
 						message + strlen("loop ") + strlen(token) + 1);
 
-				uint8_t initSec = mMillis / 1000;
-				while ((uint8_t) (mMillis / 1000) - initSec
+				uint8_t initSec = Millis() / 1000;
+				while ((uint8_t) (Millis() / 1000) - initSec
 						<= (uint8_t) loop_time)
 				{
 					parseNRunMessage(
@@ -326,10 +320,6 @@ int main()
 	I2CConsoleStackInit();
 #endif
 
-	Timer1Init(1);
-	mMillis = 0;
-	Timer1SetCallback(incMillis);
-
 	while (1)
 	{
 		char buffer[I2CMESSAGE_MAXLEN];

common/makefiles/without-os.mk

@@ -75,18 +75,22 @@ all:
 .c.o:
 	@mkdir -p $(OBJ_DIR)
 	$(COMPILE) -c $< -o $(OBJ_DIR)/$(notdir $@)
+	@echo ""
 
 .cpp.o:
 	@mkdir -p $(OBJ_DIR)
 	$(COMPILE_CPP) -c $< -o $(OBJ_DIR)/$(notdir $@)
+	@echo ""
 
 %.c.libo: %.c
 	@mkdir -p $(OBJ_DIR)
 	$(UTILS_COMPILE) -c $< -o $(OBJ_DIR)/$(notdir $@)
+	@echo ""
 
 %.cpp.libo: %.cpp
 	@mkdir -p $(OBJ_DIR)
 	$(UTILS_COMPILE_CPP) -c $< -o $(OBJ_DIR)/$(notdir $@)
+	@echo ""
 
 flash:	all
 	$(AVRDUDE) -U flash:w:$(HEX_NAME):i
@@ -104,12 +108,12 @@ load: all
 clean: 
 	rm -f $(HEX_NAME) $(BINARY_NAME) $(LIBUTILS)
 	rm -rf $(OBJ_DIR)
+	rm -f $(UTILS_DIR)/*.d
 
 # file targets:
 ifeq ($(wildcard $(LIBUTILS)),) # check if libutils.a exists
 $(LIBUTILS): $(UTILS_OBJECTS)
-	echo $(wildcard $(LIBUTILS))
-	$(foreach obj, $(UTILS_OBJ_TMP), $(LINK_LIBUTILS) $(obj) ; )
+	$(foreach obj, $(UTILS_OBJ_TMP), $(LINK_LIBUTILS) $(obj) ;)
 else
 $(LIBUTILS):
 

common/utils/I2C.c

@@ -11,9 +11,7 @@
 #include <compat/twi.h>
 
 #include "SerialDebug.h"
-#include "Timer.h"
-
-static volatile long _sec;
+#include "Millis.h"
 
 /*
  i2c_io - write and read bytes to a slave I2C device
@@ -241,11 +239,6 @@ uint8_t i2c_io(uint8_t device_addr, const uint8_t *ap, uint16_t an,
 	return (status);
 }
 
-static void incSec()
-{
-	++_sec;
-}
-
 /*
  i2c_init - Initialize the I2C port
  */
@@ -254,10 +247,7 @@ void i2c_init(uint8_t bdiv)
 	TWSR = 0;                           // Set prescalar for 1
 	TWBR = bdiv;                        // Set bit rate register
 
-	// init timer 2
-	_sec = 0;
-//	Timer1Init(1000);
-//	Timer1SetCallback(incSec);
+	MillisInit();
 }
 
 static volatile uint8_t _i2cIsRunning;
@@ -314,13 +304,35 @@ uint8_t I2CSendnRecvData(uint8_t address, const uint8_t * txdata,
  */
 uint8_t I2CCheckAlive(uint8_t address)
 {
+	if (_i2cIsRunning)
+		return 1;
+	_i2cIsRunning = 1;
+
 	uint8_t status;
 	uint8_t retVal = 0;
+	unsigned long long initMillis = 0;
+	uint8_t isValid = 0;
 
 	// send I2C start
 	TRACE()
 	TWCR = (1 << TWINT) | (1 << TWEN) | (1 << TWSTA); // Send start condition
-	while (!(TWCR & (1 << TWINT))) ;     // Wait for TWINT to be set
+
+	initMillis = Millis();
+	isValid = 0;
+	while ( Millis() - initMillis < 100)
+	{
+		if ((TWCR & (1 << TWINT))) // Wait for TWINT to be set in 100ms
+		{
+			isValid = 1;
+			break;
+		}
+	}
+	if (!isValid)
+	{
+		retVal = 4;
+		goto _I2CCheckAlive_sendstop;
+	}
+
 	TRACE()
 	status = TWSR & 0xf8;
 	if (status != 0x08)                 // Check that START was sent OK
@@ -334,7 +346,22 @@ uint8_t I2CCheckAlive(uint8_t address)
 	{
 		TWDR = (address << 1) & 0xfe;          // Load device address and R/W = 0;
 		TWCR = (1 << TWINT) | (1 << TWEN);  // Start transmission
-		while (!(TWCR & (1 << TWINT)));     // Wait for TWINT to be set
+
+		initMillis = Millis();
+		isValid = 0;
+		while ( Millis() - initMillis < 100)
+		{
+			if ((TWCR & (1 << TWINT))) // Wait for TWINT to be set in 100ms
+			{
+				isValid = 1;
+				break;
+			}
+		}
+		if(!isValid)
+		{
+			retVal = 4;
+			goto _I2CCheckAlive_sendstop;
+		}
 
 		TRACE()
 		status = TWSR & 0xf8;
@@ -346,14 +373,16 @@ uint8_t I2CCheckAlive(uint8_t address)
 			}
 			else
 			{
-				retVal = 4;
+				retVal = 5;
 			}
 		}
 	}
 
+_I2CCheckAlive_sendstop:
 	// send stop
 	TWCR = (1 << TWINT) | (1 << TWEN) | (1 << TWSTO); // Send STOP condition
 	_delay_ms(1);
 
+	_i2cIsRunning = 0;
 	return retVal;
 }

common/utils/I2C.h

@@ -34,6 +34,8 @@ uint8_t I2CSendnRecvData(uint8_t address, const uint8_t * txdata, uint8_t txdata
  * 			1 on NAK recv
  * 			2 on START not ok
  * 			3 on address not sent ok
+ * 			4 on timeout
+ * 			5 on unknown error
  */
 uint8_t I2CCheckAlive(uint8_t address);
 

common/utils/Millis.c

@@ -0,0 +1,67 @@
+/*
+ * Millis.c
+ *
+ *  Created on: Jun 8, 2017
+ *      Author: dat
+ */
+
+#include "Millis.h"
+#include "Timer.h"
+
+static Timer2Callback _mCallback_DB[MILLIS_MAX_CALLBACKS];
+static uint8_t _nCallback;
+
+static volatile unsigned long long _mmillis;
+static void incMillis()
+{
+	++_mmillis;
+
+	if (_nCallback)
+	{
+		uint8_t i;
+		for (i = 0; i < _nCallback; ++i)
+		{
+			_mCallback_DB[i]();
+		}
+	}
+}
+
+
+void MillisInit()
+{
+	static char isInit = 0;
+	if (isInit)
+	{
+		return;
+	}
+	isInit = 1;
+
+	_mmillis = 0;
+	_nCallback = 0;
+
+	Timer2Init(1000);
+	Timer2SetCallback(incMillis);
+}
+
+unsigned long long Millis()
+{
+	MillisInit();
+	return _mmillis;
+}
+
+uint8_t MillisRegisterCallback(Timer2Callback callback)
+{
+	uint8_t retVal = 0;
+	MillisInit();
+
+	if ( _nCallback == MILLIS_MAX_CALLBACKS)
+	{
+		return 1;
+	}
+	else
+	{
+		_mCallback_DB[_nCallback++] = callback;
+	}
+
+	return retVal;
+}

common/utils/Millis.h

@@ -0,0 +1,35 @@
+/*
+ * Millis.h
+ *
+ *  Created on: Jun 8, 2017
+ *      Author: dat
+ */
+
+#ifndef MILLIS_H_
+#define MILLIS_H_
+
+#include "Timer.h"
+
+#define MILLIS_MAX_CALLBACKS	3
+
+/**
+ * Init millisecond, this will use timer2, don't use timer2 if use this Millis
+ *
+ */
+void MillisInit();
+
+/**
+ * main getter of millis
+ */
+unsigned long long Millis();
+
+/**
+ * Register callback function for every millisecond
+ * Supports up to MILLIS_MAX_CALLBACKS functions
+ *
+ * @param callback
+ * @return 0 on success , 1 on overload
+ */
+uint8_t MillisRegisterCallback(Timer2Callback callback);
+
+#endif /* MILLIS_H_ */

common/utils/SoftSerial.c

@@ -193,7 +193,7 @@ void SoftSerialInit()
 	TOGGLE_PIN(SS_DDR_PORT_RX, SS_RX_PIN, 0); // input on rx
 
 	// config interrupt
-	Timer2init(1000000ul / SS_BAUD - 2);
+	Timer2Init(1000000ul / SS_BAUD - 2);
 	Timer2SetCallback(fetchChar);
 
 	// config getcdata

common/utils/Timer.c

@@ -8,7 +8,7 @@
 #include "Timer.h"
 #include <avr/interrupt.h>
 
-static Timer1Callback mT1Callback, mT1Callback2;
+static Timer1Callback mT1Callback1, mT1Callback2;
 static Timer2Callback mT2Callback;
 
 void Timer1Init(uint16_t ms)
@@ -18,7 +18,7 @@ void Timer1Init(uint16_t ms)
 		return;
 	isInited = 1;
 
-	mT1Callback = 0;
+	mT1Callback1 = 0;
 	mT1Callback2 = 0;
 
 	cli();
@@ -33,9 +33,9 @@ void Timer1Init(uint16_t ms)
 
 void Timer1SetCallback(Timer1Callback callback)
 {
-	if (!mT1Callback)
+	if (!mT1Callback1)
 	{
-		mT1Callback = callback;
+		mT1Callback1 = callback;
 	}
 	else
 	{
@@ -50,9 +50,9 @@ void Timer2SetCallback(Timer2Callback callback)
 
 ISR(TIMER1_COMPA_vect)
 {
-	if (mT1Callback)
+	if (mT1Callback1)
 	{
-		mT1Callback();
+		mT1Callback1();
 	}
 
 	if (mT1Callback2)
@@ -69,7 +69,7 @@ ISR(TIMER2_COMPA_vect)
 	}
 }
 
-void Timer2init(uint16_t n)
+void Timer2Init(uint16_t n)
 {
 	static uint8_t isInited = 0;
 	if (isInited)