Merge pull request #8 from TimerOverflow/20190905

20190905

Author: TimerOverflow

SysEeprom.c

@@ -4,9 +4,10 @@
  * File name : SysEeprom.c
 */
 /*********************************************************************************/
+#include <string.h>
 #include "SysEeprom.h"
 /*********************************************************************************/
-#if(SYS_EEPROM_REVISION_DATE != 20190723)
+#if(SYS_EEPROM_REVISION_DATE != 20190905)
 #error wrong include file. (SysEeprom.h)
 #endif
 /*********************************************************************************/
@@ -21,6 +22,8 @@ static inline tU8 CheckAllOfInit(tag_EepControl *Eep)
 tU8 InitEepCommonConfig(tag_EepCommonConfig *EepConfig, tU16 LastAddr, tU8 (*EepromWrite)(tU16 Addr, tU8 Data), tU8 (*EepromRead)(tU16 Addr, tU8 *pData))
 {
 	tU16 *pLastAddr = (tU16 *) &EepConfig->LastAddr;
+	static tag_EepControl EepSignature = { .Bit.InitGeneral = false };
+	volatile static tU8 StrSignature[3];
 
 	/*
 		1) 인수
@@ -40,7 +43,25 @@ tU8 InitEepCommonConfig(tag_EepCommonConfig *EepConfig, tU16 LastAddr, tU8 (*Eep
 	EepConfig->EepromWrite = EepromWrite;
 	EepConfig->EepromRead = EepromRead;
 	EepConfig->Bit.Init = true;
-
+	
+	memset((void *) StrSignature, 0, sizeof(StrSignature));
+	
+	InitEepControl(&EepSignature, (const tU8 *) StrSignature, sizeof(StrSignature), EepConfig);
+	DoEepReadControl(&EepSignature);
+	if((StrSignature[0] != 'J') || (StrSignature[1] != 'H') || (StrSignature[2] != 'G'))
+	{
+		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;
+			}
+		}
+	}
+	
 	return EepConfig->Bit.Init;
 }
 /*********************************************************************************/

SysEeprom.h

@@ -9,10 +9,15 @@
 /*********************************************************************************/
 #include "SysTypedef.h"
 /*********************************************************************************/
-#define SYS_EEPROM_REVISION_DATE		20190723
+#define SYS_EEPROM_REVISION_DATE		20190905
 /*********************************************************************************/
 /** REVISION HISTORY **/
 /*
+	2019. 09. 05.					- 프로그램 최초 실행 감지 루틴을 모듈 내 InitEepCommonConfig() 함수에 추가.
+	Jeong Hyun Gu						이제 어플리케이션에서 시그니쳐 확인하여 초기화를 실행 여부를 판단할 필요없이
+													tag_EepCommonConfig::Bit.FirstExecute 비트가 '1'이면 최초 실행으로 판단.
+												- 이전 버전에서 업데이트 시 AVR-EESAVE 불가.
+
 	2019. 07. 23.					- Eeprom_Write(), Eeprom_Read() 삭제하고 HAL 적용.
 	Jeong Hyun Gu					- 접두어 AVR -> SYS로 변경.
 												- GetDataFromEeprom() 삭제.
@@ -57,6 +62,7 @@ typedef struct
 	struct
 	{
 		tU8 Init						:		1;
+		tU8 FirstExecute		:		1;
 	}Bit;
 
 	const tU16 LastAddr;					// eeprom마지막 주소(크기)

example/Debug/Exe/SysEeprom(AT64).d90

@@ -1,4 +1,4 @@
 This is an internal working file generated by the Source Browser.
-14:21 00s
+14:42 43s
 F:\Github\SysEeprom\example\Debug\Obj\SysEeprom.pbi
 F:\Github\SysEeprom\example\Debug\Obj\main.pbi

example/Debug/Obj/SysEeprom.pbd

@@ -1,74 +1,78 @@
 :020000020000FC
-:100000000C94EA0118951895189518951895189557
+:100000000C9401021895189518951895189518953F
 :100010001895189518951895189518951895189578
 :100020001895189518951895189518951895189568
 :100030001895189518951895189518951895189558
 :100040001895189518951895189518951895189548
 :100050001895189518951895189518951895189538
 :100060001895189518951895189518951895189528
 :100070001895189518951895189518951895189518
-:100080001895189518951895189518953100000130
-:100090000000F801008101700895F8012183328386
-:1000A000458356836783708700810160008301E088
-:1000B00008950E94FC01D80109019D012B5F3F4F6B
-:1000C0000D5F1F4F1D01E9E02E0EE0E03E1EFB011B
-:1000D000808180FD02C000E038C0FD016183728331
-:1000E000E02DE12931F1E42FE52B19F1FB018381AA
-:1000F0009481840F951F0A9641805280841595053E
-:10010000C0F4F10140835183F90100821182FB01A7
-:1001100023813481F80120833183465F5F4FFB01E7
-:1001200003811481040F151F038314830C91016054
-:100130000C938D01AEDF1C911D7F202F20FB00E072
-:1001400001F9102B1C930C910170E6E00C94030252
-:100150000E94FC012197D801FD01858196814424EC
-:1001600055240C9101FF1BC09E0103811481040DD5
-:10017000151D41815281FA0147815085FA01099587
-:100180000881FC01E40DF51D008301E0400E00E054
-:10019000501EFD01018512854016510628F3219657
-:1001A000E6E00C9403020E94FE012197D801CD01E4
-:1001B000079600E008830C910670063009F041C0F4
-:1001C0009E01FD0103811481FC0140815181040FD6
-:1001D000151FFD0141815281FA0147815085FA01C5
-:1001E0000995FD0105811681FC0120813181020FF5
-:1001F000131FF80120810881021789F0FD01038196
-:100200001481FC0140815181040F151FFD01A18162
-:10021000B2811596ED91FC91099501E013C0FC01A6
-:10022000008111810F5F1F4F0083118300811181B5
-:10023000FD01218532850217130710F20C910B7F07
-:100240000C9300E02196E4E00C940502F801208173
-:1002500021FF06C020812460208320E0278320879F
-:100260000895A89501C00000E199FDCF1FBB0EBB0A
-:100270002DBB0FB7F894E29AE19A0FBF01E0089501
-:10028000A89501C00000E199FDCF1FBB0EBBE09A0D
-:100290000DB3F901008301E00895BA93AA93229760
-:1002A000A0E0B1E060E471E041E351E020E038E03B
-:1002B00002E111E00E944D0062E171E047E050E090
-:1002C0009D010BE111E00E94590062E171E04AE0FA
-:1002D00050E027E031E006E211E00E9459009E0163
-:1002E00006EF17E0CDDF9E012F5F3F4F07EF17E0CE
-:1002F000C7DF08810F3421F409810B3409F447C0AA
-:100300009E0106EF17E0BCDF9E012F5F3F4F07EF16
-:1003100017E0B6DF08810F3419F409810B34B9F105
-:100320000AE00093000108EE13E0FD01018312834F
-:1003300003EC15EF28E430E403831483258336832C
-:100340000BE111E00E9426010BE111E00E94D300B5
-:100350000130D1F300E007C010E0E0E0F1E0E00F91
-:10036000F11F078303950A30B8F306E211E00E94FB
-:10037000260106E211E00E94D3000130D1F32FE400
-:1003800006EF17E06EDF2BE407EF17E06ADF0BE103
-:1003900011E00E94A80006E211E00E94A80000916E
-:1003A0001101002359F000E0009311010BE111E06D
-:1003B0000E94260106E211E00E9426010BE111E0F5
-:1003C0000E94D30006E211E00E94D300E8CF0000B3
-:1003D0008895FECF00E70DBF01E00EBFC1E7D3E077
-:1003E0000E940E02002311F00E941E020E944D0185
-:1003F0000E94E7010C94E7015A924A92BA93AA9399
-:100400009A938A9308955D804C80BB81AA819981DB
-:100410008881F0E0EC0FFD1FEF01089501E00895E1
-:1004200020E006D0E9F70895259102D0E9F7089574
-:100430002D9301501040202F212B08958CE890E03F
-:10044000FC0105911491FC013296A591B491FC0137
-:10045000349625913491422F432B19F0F901E4DFB2
-:1004600001C0DEDF069610E08239910748F3089557
+:100080001895189518951895189518953F00000122
+:100090000000F8010081017008950E941502D80146
+:1000A000FD012183328345835683678370870C91DA
+:1000B00001600C9380E091E043E050E020E030E00C
+:1000C0008C010E942702BD0143E050E09C0103E047
+:1000D00011E038D003E011E084D0009100010A342F
+:1000E00041F400910101083421F400910201073428
+:1000F00021F103E011E075D0009100010A3441F4D0
+:1001000000910101083421F4009102010734A9F0A3
+:100110000AE40093000108E40093010107E400935E
+:10012000020103E011E0DBD003C00C9102600C93EC
+:1001300003E011E081D00130C1F30C910170E4E0E3
+:100140000C941C020E941302D80109019D012B5F2F
+:100150003F4F0D5F1F4F1D01E9E02E0EE0E03E1EF8
+:10016000FB01808180FD02C000E038C0FD01618399
+:100170007283E02DE12931F1E42FE52B19F1FB0128
+:1001800083819481840F951F0A9641805280841543
+:100190009505C0F4F10140835183F9010082118279
+:1001A000FB0123813481F80120833183465F5F4F57
+:1001B000FB0103811481040F151F038314830C9129
+:1001C00001600C938D0165DF1C911D7F202F20FBAA
+:1001D00000E001F9102B1C930C910170E6E00C94E7
+:1001E0001A020E9413022197D801FD018581968190
+:1001F000442455240C9101FF1BC09E0103811481EE
+:10020000040D151D41815281FA0147815085FA0183
+:1002100009950881FC01E40DF51D008301E0400E05
+:1002200000E0501EFD01018512854016510628F39D
+:100230002196E6E00C941A020E9415022197D8013B
+:10024000CD01079600E008830C910670063009F096
+:1002500041C09E01FD0103811481FC014081518157
+:10026000040F151FFD0141815281FA01478150851C
+:10027000FA010995FD0105811681FC01208131817A
+:10028000020F131FF80120810881021789F0FD0178
+:1002900003811481FC0140815181040F151FFD0170
+:1002A000A181B2811596ED91FC91099501E013C0F1
+:1002B000FC01008111810F5F1F4F008311830081BA
+:1002C0001181FD01218532850217130710F20C916F
+:1002D0000B7F0C9300E02196E4E00C941C02F801E3
+:1002E000208121FF06C020812460208320E0278315
+:1002F00020870895A89501C00000E199FDCF1FBB9C
+:100300000EBB2DBB0FB7F894E29AE19A0FBF01E044
+:100310000895A89501C00000E199FDCF1FBB0EBB59
+:10032000E09A0DB3F901008301E00895BA93AA930E
+:10033000AEE0B1E069E871E04AE751E020E038E082
+:100340000FE111E00E944D006FE171E047E050E0E5
+:100350009D0109E211E00E94A2006FE171E04AE014
+:1003600050E025E131E004E311E00E94A200FD012C
+:10037000018901FF23C00AE000930E0108EE13E09B
+:100380000183128303EC15EF28E430E40383148324
+:100390002583368309E211E00E946F0100E007C067
+:1003A00010E0EEE0F1E0E00FF11F078303950A3063
+:1003B000B8F304E311E00E946F0108C009E211E004
+:1003C0000E94F10004E311E00E94F1000091280175
+:1003D000002359F000E00093280109E211E00E9497
+:1003E0006F0104E311E00E946F0109E211E00E9435
+:1003F0001C0104E311E00E941C01E8CF0000889575
+:10040000FECF0EE70DBF01E00EBFCFE7D3E00E94A5
+:100410002502002311F00E943E020E9496010E94D4
+:10042000FE010C94FE015A924A92BA93AA939A93AF
+:100430008A9308955D804C80BB81AA8199818881CF
+:10044000F0E0EC0FFD1FEF01089501E00895F801C1
+:1004500001C02193BA0141505040672BD1F7089554
+:1004600020E006D0E9F70895259102D0E9F7089534
+:100470002D9301501040202F212B08958CE890E0FF
+:10048000FC0105911491FC013296A591B491FC01F7
+:10049000349625913491422F432B19F0F901E4DF72
+:1004A00001C0DEDF069610E08239910748F3089517
 :0400000300000000F9
 :00000001FF

example/Debug/Obj/SysEeprom.r90

@@ -0,0 +1,4 @@
+This is an internal working file generated by the Source Browser.
+14:42 39s
+F:\Github\SysEeprom\example\Release\Obj\SysEeprom.pbi
+F:\Github\SysEeprom\example\Release\Obj\main.pbi