Merge pull request #12 from TimerOverflow/20200417

20200417

Author: TimerOverflow

SysEeprom.c

@@ -7,7 +7,7 @@
 #include <string.h>
 #include "SysEeprom.h"
 /*********************************************************************************/
-#if(SYS_EEPROM_REVISION_DATE != 20200115)
+#if(SYS_EEPROM_REVISION_DATE != 20200417)
 #error wrong include file. (SysEeprom.h)
 #endif
 /*********************************************************************************/
@@ -74,12 +74,7 @@ tU8 InitEepCommonConfig(tag_EepCommonConfig *EepConfig, tU16 LastAddr, tU8 (*Hal
 		DoEepReadControl(&EepSignature);
 		if((StrSignature[0] != 'J') || (StrSignature[1] != 'H') || (StrSignature[2] != 'G'))
 		{
-			StrSignature[0] = 'J'; StrSignature[1] = 'H'; StrSignature[2] = 'G';
-			SetEepWriteEnable(&EepSignature);
-			while(DoEepWriteControl(&EepSignature) == true)
-			{
-				EepConfig->Bit.FirstExecute = true;
-			}
+			EepConfig->Bit.FirstExecute = true;
 		}
 	}
 
@@ -166,6 +161,7 @@ void DoEepReadControl(tag_EepControl *Eep)
 tU8 DoEepWriteControl(tag_EepControl *Eep)
 {
 	tU16 *pIndex = (tU16 *) &Eep->Index;
+	tag_EepCommonConfig *Config = (tag_EepCommonConfig *) Eep->Config;
 	tag_EepBitField *pBit;
 	tU8 Data = 0;
 
@@ -184,30 +180,41 @@ tU8 DoEepWriteControl(tag_EepControl *Eep)
 			- 값이 유효하여 쓰기를 진행하거나 해당영역의 마지막에 도달할 경우에만 while loop를 탈출한다.
 	*/
 
-	if((Eep->Bit.InitComplete == false) || (Eep->Config->Bit.ReadFail == true) || (Eep->Config->Bit.WriteFail == true) || (Eep->Bit.Write == false))
+	if((Eep->Bit.InitComplete == false) || (Config->Bit.ReadFail == true) || (Config->Bit.WriteFail == true))
 	{
 		return false;
 		/* error or disabled */
 	}
-
-	while(true)
+	
+	if(Eep->Bit.Write == true)
 	{
-		EepRead((tag_EepCommonConfig *) Eep->Config, Eep->EepBase + (*pIndex), &Data);
-		if(Data != Eep->DataBase[*pIndex])
+		Config->SignatureWriteDelay = 5;
+		while(true)
 		{
-			EepWrite((tag_EepCommonConfig *) Eep->Config, Eep->EepBase + (*pIndex), Eep->DataBase[*pIndex]);
-			return true;
-			/* check valid data */
-		}
-
-		if(++(*pIndex) >= Eep->Length)
-		{
-			pBit = (tag_EepBitField *) &Eep->Bit;
-			pBit->Write = false;
-			return false;
-			/* end of sector */
+			EepRead(Config, Eep->EepBase + (*pIndex), &Data);
+			if(Data != Eep->DataBase[*pIndex])
+			{
+				EepWrite(Config, Eep->EepBase + (*pIndex), Eep->DataBase[*pIndex]);
+				return true;
+				/* check valid data */
+			}
+	
+			if(++(*pIndex) >= Eep->Length)
+			{
+				pBit = (tag_EepBitField *) &Eep->Bit;
+				pBit->Write = false;
+				return false;
+				/* end of sector */
+			}
 		}
 	}
+	else if(Config->Bit.FirstExecute)
+	{
+		if(Config->SignatureWriteDelay == 0){ EepWrite(Config, 0, 'J'); EepWrite(Config, 1, 'H'); EepWrite(Config, 2, 'G'); Config->Bit.FirstExecute = false; }
+		else{ Config->SignatureWriteDelay--; }
+	}
+	
+	return false;
 }
 /*********************************************************************************/
 void SetEepWriteEnable(tag_EepControl *Eep)

SysEeprom.h

@@ -9,10 +9,13 @@
 /*********************************************************************************/
 #include "SysTypedef.h"
 /*********************************************************************************/
-#define SYS_EEPROM_REVISION_DATE		20200115
+#define SYS_EEPROM_REVISION_DATE		20200417
 /*********************************************************************************/
 /** REVISION HISTORY **/
 /*
+	2020. 04. 17.					- tag_EepCommonConfig의 시그니처는 연결된 모든 tag_EepControl 인스턴스들이
+	Jeong Hyun Gu						write동작을 끝냈을 때 write하도록 변경.
+
 	2020. 01. 15.					- 실제 Eeprom과의 정상 동작 여부 확인 기능 추가.
 	Jeong Hyun Gu					- CheckEepromError() 함수 추가. 'tag_EepCommonConfig'에서 관리 하는 실제
 													Eeprom의 정상 동작 여부 확인.
@@ -80,6 +83,7 @@ typedef struct
 
 	const tU16 LastAddr;					// eeprom마지막 주소(크기)
 	tU16 AllocEepAddr;
+	tU8 SignatureWriteDelay;
 
 	tU8 (*HalEepromWrite)(tU16 Addr, tU8 Data);
 	tU8 (*HalEepromRead)(tU16 Addr, tU8 *pData);