Merge pull request #5 from TimerOverflow/20200724

20200724

Author: TimerOverflow

DataSampling.c

@@ -7,13 +7,41 @@
 #include <stdlib.h>
 #include "DataSampling.h"
 /*********************************************************************************/
-#if(DATA_SAMPLING_REVISION_DATE != 20200416)
+#if(DATA_SAMPLING_REVISION_DATE != 20200724)
 #error wrong include file. (DataSampling.h)
 #endif
+/*********************************************************************************/
+
 /*********************************************************************************/
 /** Global variable **/
 
+static tS8 *pS8;
+static tS16 *pS16;
+static tS32 *pS32;
+static tS32 Ret;
 
+/*********************************************************************************/
+inline static void InToBuf(tag_DataSampling *Smp, tU8 Idx, tS32 Data)
+{
+	switch(Smp->DataSize)
+	{
+		case	sizeof(tS8)	:	pS8 = (tS8 *) Smp->Buf; pS8[Idx] = Data; break;
+		case	sizeof(tS16)	:	pS16 = (tS16 *) Smp->Buf; pS16[Idx] = Data; break;
+		case	sizeof(tS32)	:	pS32 = (tS32 *) Smp->Buf; pS32[Idx] = Data; break;
+	}
+}
+/*********************************************************************************/
+inline static tS32 OutFromBuf(tag_DataSampling *Smp, tU8 Idx)
+{
+	switch(Smp->DataSize)
+	{
+		case	sizeof(tS8)	: pS8 = (tS8 *) Smp->Buf; Ret = pS8[Idx]; break;
+		case	sizeof(tS16)	: pS16 = (tS16 *) Smp->Buf; Ret = pS16[Idx]; break;
+		case	sizeof(tS32)	: pS32 = (tS32 *) Smp->Buf; Ret = pS32[Idx]; break;
+	}
+	
+	return Ret;
+}
 /*********************************************************************************/
 /*
 	1) 인수
@@ -26,14 +54,14 @@
 	3) 설명
 		- 인수로 전달받은 데이터로 버퍼를 채움.
 */
-static void FillBuffer(tag_DataSampling *Smp, tS16 Data)
+static void FillBuffer(tag_DataSampling *Smp, tS32 Data)
 {
 	tS16 i;
 
 	Smp->Sum = Smp->Index = 0;
 	for(i = 0; i < Smp->Level; i++)
 	{
-		Smp->Buf[i] = Data;
+		InToBuf(Smp, i, Data);
 		Smp->Sum += Data;
 	}
 }
@@ -51,14 +79,21 @@ static void FillBuffer(tag_DataSampling *Smp, tS16 Data)
 		- 'tag_DataSampling' 인스턴스의 필수 초기화 실행.
 		- DataSampling 모듈을 사용하기 위해 선행적 실행 필요.
 */
-tU8 DataSamplingInitGeneral(tag_DataSampling *Smp, tS16 BufSize)
+tU8 DataSamplingInitGeneral(tag_DataSampling *Smp, tS16 BufSize, tS8 DataSize)
 {
 	if(Smp->Bit.InitGeneral == true)
 	{
 		return true;
 	}
+	
+	if((DataSize != sizeof(tS8)) && (DataSize != sizeof(tS16)) && (DataSize != sizeof(tS32)))
+	{
+		return false;
+	}
 
-	Smp->Buf = (tS16 *) malloc(sizeof(tS16) * BufSize);
+	Smp->DataSize = DataSize;
+	
+	Smp->Buf = malloc(Smp->DataSize * BufSize);
 
 	if(Smp->Buf != null)
 	{
@@ -91,7 +126,7 @@ void DataSamplingChangeLevel(tag_DataSampling *Smp, tS16 Level)
 	if((Smp->Level != Level) && (1 <= Level) && (Level <= Smp->Level))
 	{
 		Smp->Level = Level;
-		FillBuffer(Smp, Smp->Buf[0]);
+		FillBuffer(Smp, OutFromBuf(Smp, 0));
 	}
 }
 /*********************************************************************************/
@@ -106,9 +141,9 @@ void DataSamplingChangeLevel(tag_DataSampling *Smp, tS16 Level)
 	3) 설명
 		- ring buffer 형식으로 데이터를 입력 받아 평균을 내어 샘플링.
 */
-tS16 DataSamplingGetData(tag_DataSampling *Smp, tS16 Data)
+tS32 DataSamplingGetData(tag_DataSampling *Smp, tS32 Data)
 {
-	tS16 Result;
+	tS32 Result;
 
 	if(Smp->Bit.InitGeneral == false)
 	{
@@ -121,9 +156,9 @@ tS16 DataSamplingGetData(tag_DataSampling *Smp, tS16 Data)
 		FillBuffer(Smp, Data);
 	}
 
-	Smp->Sum -= Smp->Buf[Smp->Index];
-	Smp->Buf[Smp->Index] = Data;
-	Smp->Sum += Smp->Buf[Smp->Index];
+	Smp->Sum -= OutFromBuf(Smp, Smp->Index);
+	InToBuf(Smp, Smp->Index, Data);
+	Smp->Sum += OutFromBuf(Smp, Smp->Index);
 	Result = Smp->Sum / Smp->Level;
 
 	if(++(Smp->Index) >= Smp->Level) Smp->Index = 0;

DataSampling.h

@@ -9,10 +9,13 @@
 /*********************************************************************************/
 #include "SysTypedef.h"
 /*********************************************************************************/
-#define DATA_SAMPLING_REVISION_DATE		20200416
+#define DATA_SAMPLING_REVISION_DATE		20200724
 /*********************************************************************************/
 /** REVISION HISTORY **/
 /*
+	2020. 07. 24.					- 이제 샘플링 데이터의 자료형을 tS8, tS16, tS32 중 선택할 수 있음.
+	Jeong Hyun Gu
+
 	2020. 04. 16.					- DataSamplingResetData()에서 FillBuffer()호출 부분 삭제.
 	Jeong Hyun Gu
 
@@ -47,17 +50,18 @@ typedef struct
 		tU8 InitFillBuffer			:				1;				//버퍼초기화
 	}Bit;
 
-	tS16 *Buf;
+	void *Buf;
 	tS16 Index, BufSize, Level;
 	tS32 Sum;
+	tS8 DataSize;
 }tag_DataSampling;
 
 /*********************************************************************************/
 /**Function**/
 
-tU8 DataSamplingInitGeneral(tag_DataSampling *Smp, tS16 BufSize);
+tU8 DataSamplingInitGeneral(tag_DataSampling *Smp, tS16 BufSize, tS8 DataSzie);
 void DataSamplingChangeLevel(tag_DataSampling *Smp, tS16 Level);
-tS16 DataSamplingGetData(tag_DataSampling *Smp, tS16 Data);
+tS32 DataSamplingGetData(tag_DataSampling *Smp, tS32 Data);
 void DataSamplingResetData(tag_DataSampling *Smp);
 
 /*********************************************************************************/