- added release note

- done v2.0.0
- added Millis, soft serial
- I2C uses millis timer
- master mkfile has show log

Author: dannyp11

Makefile

@@ -1,8 +1,7 @@
 # This makefile doesn't build anything, just for maintaining the skeleton 
-
 TOP = ./
-.PHONY: clean
 
+.PHONY: compile
 # run all unit tests in all folders
 check:
 	$(TOP)/project_manager.sh -k test/
@@ -26,6 +25,10 @@ clean:
 readme info:
 	@view README.md
 
+# show release note
+log:
+	@view ReleaseNote.txt
+
 # show help
 help:
-	$(TOP)/project_manager.sh -h
+	$(TOP)/project_manager.sh -h	

ReleaseNote.txt

@@ -4,14 +4,21 @@
 ** GPS NMEA data parser with LCD: track walked distance & position compared to initial one
 ** Simple calculator via serial port, supports +-*/() and non negative numbers
 
-* TODO v2.0.0 - matured C support & new mk files structure
-** INPROGRESS Software Serial C support upto baud 9600 for RX, 115200 for TX
+* DONE v2.0.0 - matured C support & new mk files structure
+  - State "DONE"       from "INPROGRESS" [2017-06-10 Sat 01:00]
+** DONE Software Serial C support upto 115200 for TX (RX isn't stable so it's dropped)
+   - State "DONE"       from "INPROGRESS" [2017-06-10 Sat 00:59]
 ** DONE Support Arduino IDE framework (Arduino Makefile)
 ** DONE skeleton.mk is one-stop .mk for all projects, include it at the end of project's makefile
 ** DONE create libutils.a
+** INPROGRESS v2.0.1 - migrate SerialDebugPrint api to non-macro, restructure i2c-console parser
+*** TODO change SerialDebugPrint* api & test src
+*** WAIT move i2c-console parser to module & callback management
+*** WAIT GPS breakout board to output to softserial
 
 * WAIT v2.1.0 - Google test support & C sensor library support
 ** add common/makefiles/gtest.mk
+*** add simple gtest project
 ** motion sensor test code
 ** hand clap sound detector
 ** full range adc & pin change interrupt C support

common/utils/AVRString.h

@@ -11,7 +11,7 @@
 #define UTILS_AVRSTRING_H_
 
 #ifdef DEBUG
-#define STRING_MAXLEN	80 // max string length for all strings
+#define STRING_MAXLEN	128 // max string length for all strings
 #else
 #define STRING_MAXLEN	128 // max string length for all strings
 #endif

common/utils/I2C.c

@@ -247,7 +247,7 @@ void i2c_init(uint8_t bdiv)
 	TWSR = 0;                           // Set prescalar for 1
 	TWBR = bdiv;                        // Set bit rate register
 
-	MillisInit();
+	MillisInit(2);
 }
 
 static volatile uint8_t _i2cIsRunning;
@@ -300,8 +300,14 @@ uint8_t I2CSendnRecvData(uint8_t address, const uint8_t * txdata,
  * 			1 on NAK recv
  * 			2 on START not ok
  * 			3 on address not sent ok
- * 			4 on unknown
+ * 			4 on timeout, check your wiring
+ * 			5 on unknown error
  */
+#ifdef DEBUG
+#define _I2C_TIMEOUT_INTERVAL	1000
+#else
+#define _I2C_TIMEOUT_INTERVAL	100
+#endif
 uint8_t I2CCheckAlive(uint8_t address)
 {
 	if (_i2cIsRunning)
@@ -310,7 +316,7 @@ uint8_t I2CCheckAlive(uint8_t address)
 
 	uint8_t status;
 	uint8_t retVal = 0;
-	unsigned long long initMillis = 0;
+	unsigned long initMillis = 0;
 	uint8_t isValid = 0;
 
 	// send I2C start
@@ -319,14 +325,15 @@ uint8_t I2CCheckAlive(uint8_t address)
 
 	initMillis = Millis();
 	isValid = 0;
-	while ( Millis() - initMillis < 100)
+	while ( Millis() - initMillis < _I2C_TIMEOUT_INTERVAL)
 	{
 		if ((TWCR & (1 << TWINT))) // Wait for TWINT to be set in 100ms
 		{
 			isValid = 1;
 			break;
 		}
 	}
+	TRACE()
 	if (!isValid)
 	{
 		retVal = 4;
@@ -349,7 +356,7 @@ uint8_t I2CCheckAlive(uint8_t address)
 
 		initMillis = Millis();
 		isValid = 0;
-		while ( Millis() - initMillis < 100)
+		while ( Millis() - initMillis < _I2C_TIMEOUT_INTERVAL)
 		{
 			if ((TWCR & (1 << TWINT))) // Wait for TWINT to be set in 100ms
 			{

common/utils/I2C.h

@@ -11,17 +11,33 @@
 #include <inttypes.h>
 
 /**
+ * call this before calling any below apis
  *
  */
 void I2CInit(void);
 
 /**
+ * Send only data on i2c
  *
+ * @param address - 7bit address
+ * @param data
+ * @param datalen
+ * @param isSlowTX - slow sending between bytes
+ * @return 0 on success
  */
 uint8_t I2CSendData(uint8_t address, const uint8_t * data, uint8_t datalen, uint8_t isSlowTX);
 
 /**
+ *	Send and then recv data on i2c
+ *
  *
+ * @param address - 7bit address
+ * @param txdata
+ * @param txdatalen
+ * @param rxdata
+ * @param rxdatalen
+ * @param isSlowTX - slow sending between bytes
+ * @return 0 on success
  */
 uint8_t I2CSendnRecvData(uint8_t address, const uint8_t * txdata, uint8_t txdatalen,
 		uint8_t * rxdata, uint8_t rxdatalen, uint8_t isSlowTX);
@@ -34,7 +50,7 @@ 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
+ * 			4 on timeout, check your wiring
  * 			5 on unknown error
  */
 uint8_t I2CCheckAlive(uint8_t address);

common/utils/Millis.c

@@ -7,11 +7,13 @@
 
 #include "Millis.h"
 #include "Timer.h"
+#include "SerialDebug.h"
 
 static Timer2Callback _mCallback_DB[MILLIS_MAX_CALLBACKS];
 static uint8_t _nCallback;
+static int _millisInit;
 
-static volatile unsigned long long _mmillis;
+static volatile unsigned long _mmillis;
 static void incMillis()
 {
 	++_mmillis;
@@ -26,33 +28,51 @@ static void incMillis()
 	}
 }
 
-
-void MillisInit()
+char MillisInit(char timerNumber)
 {
 	static char isInit = 0;
 	if (isInit)
 	{
-		return;
+		return _millisInit;
 	}
 	isInit = 1;
 
 	_mmillis = 0;
 	_nCallback = 0;
+	_millisInit = 0;
 
-	Timer2Init(1000);
-	Timer2SetCallback(incMillis);
+	if (timerNumber == 1)
+	{
+		Timer1Init(1);
+		Timer1SetCallback(incMillis);
+	}
+	else if (timerNumber == 2)
+	{
+		Timer2Init(1000);
+		Timer2SetCallback(incMillis);
+	}
+	else
+	{
+		_millisInit = 1;
+	}
+
+	return _millisInit;
 }
 
-unsigned long long Millis()
+unsigned long Millis()
 {
-	MillisInit();
+	if (MillisInit(2))
+	{
+		return 1;
+	}
+
 	return _mmillis;
 }
 
 uint8_t MillisRegisterCallback(Timer2Callback callback)
 {
 	uint8_t retVal = 0;
-	MillisInit();
+	MillisInit(2);
 
 	if ( _nCallback == MILLIS_MAX_CALLBACKS)
 	{

common/utils/Millis.h

@@ -13,15 +13,17 @@
 #define MILLIS_MAX_CALLBACKS	3
 
 /**
- * Init millisecond, this will use timer2, don't use timer2 if use this Millis
+ * Init millisecond, this will use timer
+ * If other apis called before this API, it will default to timer 2
  *
+ * @param timerNumber - timer 1 or 2
  */
-void MillisInit();
+char MillisInit(char timerNumber);
 
 /**
- * main getter of millis
+ * main getter of millis, will always return 1 if error on init
  */
-unsigned long long Millis();
+unsigned long Millis();
 
 /**
  * Register callback function for every millisecond