Merge pull request #3 from TimerOverflow/20190723

20190723

Author: TimerOverflow

DataSampling.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include "DataSampling.h"
 /*********************************************************************************/
-#if(DATA_SAMPLING_REVISION_DATE != 20180403)
+#if(DATA_SAMPLING_REVISION_DATE != 20190723)
 #error wrong include file. (DataSampling.h)
 #endif
 /*********************************************************************************/
@@ -26,9 +26,9 @@
 	3) 설명
 		- 인수로 전달받은 데이터로 버퍼를 채움.
 */
-static void FillBuffer(tag_DataSampling *Smp, int Data)
+static void FillBuffer(tag_DataSampling *Smp, tS16 Data)
 {
-	int i;
+	tS16 i;
 
 	Smp->Sum = Smp->Index = 0;
 	for(i = 0; i < Smp->Level; i++)
@@ -51,14 +51,14 @@ static void FillBuffer(tag_DataSampling *Smp, int Data)
 		- 'tag_DataSampling' 인스턴스의 필수 초기화 실행.
 		- DataSampling 모듈을 사용하기 위해 선행적 실행 필요.
 */
-char DataSamplingInitGeneral(tag_DataSampling *Smp, int BufSize)
+tU8 DataSamplingInitGeneral(tag_DataSampling *Smp, tS16 BufSize)
 {
 	if(Smp->Bit.InitGeneral == true)
 	{
 		return true;
 	}
 
-	Smp->Buf = (int *) malloc(sizeof(int) * BufSize);
+	Smp->Buf = (tS16 *) malloc(sizeof(tS16) * BufSize);
 
 	if(Smp->Buf != null)
 	{
@@ -81,7 +81,7 @@ char DataSamplingInitGeneral(tag_DataSampling *Smp, int BufSize)
 	3) 설명
 		- 샘플링 수준(Level) 변경.
 */
-void DataSamplingChangeLevel(tag_DataSampling *Smp, int Level)
+void DataSamplingChangeLevel(tag_DataSampling *Smp, tS16 Level)
 {
 	if((Smp->Bit.InitGeneral == false) || (Smp->Bit.InitFillBuffer == false))
 	{
@@ -106,9 +106,9 @@ void DataSamplingChangeLevel(tag_DataSampling *Smp, int Level)
 	3) 설명
 		- ring buffer 형식으로 데이터를 입력 받아 평균을 내어 샘플링.
 */
-int DataSamplingGetData(tag_DataSampling *Smp, int Data)
+tS16 DataSamplingGetData(tag_DataSampling *Smp, tS16 Data)
 {
-	int Result;
+	tS16 Result;
 
 	if(Smp->Bit.InitGeneral == false)
 	{

DataSampling.h

@@ -7,10 +7,15 @@
 #ifndef __DATA_SAMPLING_H__
 #define	__DATA_SAMPLING_H__
 /*********************************************************************************/
-#define DATA_SAMPLING_REVISION_DATE		20180403
+#include "SysTypedef.h"
+/*********************************************************************************/
+#define DATA_SAMPLING_REVISION_DATE		20190723
 /*********************************************************************************/
 /** REVISION HISTORY **/
 /*
+	2019. 07. 23.					- SysTypedef.h 적용.
+	Jeong Hyun Gu
+
 	2018. 04. 03.					- DataSamplingResetData() 함수 추가.
 	Jeong Hyun Gu
 
@@ -35,21 +40,21 @@ typedef struct
 {
 	struct
 	{
-		char InitGeneral			:				1;				//필수초기화
-		char InitFillBuffer		:				1;				//버퍼초기화
+		tU8 InitGeneral					:				1;				//필수초기화
+		tU8 InitFillBuffer			:				1;				//버퍼초기화
 	}Bit;
 
-	int *Buf;
-	int Index, BufSize, Level;
-	long Sum;
+	tS16 *Buf;
+	tS16 Index, BufSize, Level;
+	tS32 Sum;
 }tag_DataSampling;
 
 /*********************************************************************************/
 /**Function**/
 
-char DataSamplingInitGeneral(tag_DataSampling *Smp, int BufSize);
-void DataSamplingChangeLevel(tag_DataSampling *Smp, int Level);
-int DataSamplingGetData(tag_DataSampling *Smp, int Data);
+tU8 DataSamplingInitGeneral(tag_DataSampling *Smp, tS16 BufSize);
+void DataSamplingChangeLevel(tag_DataSampling *Smp, tS16 Level);
+tS16 DataSamplingGetData(tag_DataSampling *Smp, tS16 Data);
 void DataSamplingResetData(tag_DataSampling *Smp);
 
 /*********************************************************************************/

SysTypedef.h

@@ -0,0 +1,31 @@
+/*********************************************************************************/
+/*
+ * Author : Jeong Hyun Gu
+ * File name : SysTypedef.h
+*/
+/*********************************************************************************/
+#ifndef __SYS_TYPEDEF_H__
+#define __SYS_TYPEDEF_H__
+/*********************************************************************************/
+/**Define**/
+
+typedef unsigned char						tU8;
+typedef signed char							tS8;
+
+typedef unsigned int					tU16;
+typedef signed int						tS16;
+
+typedef unsigned long						tU32;
+typedef signed long							tS32;
+
+/*********************************************************************************/
+/**Enum**/
+
+/*********************************************************************************/
+/**Struct**/
+
+/*********************************************************************************/
+/**Function**/
+
+/*********************************************************************************/
+#endif //__SYS_TYPEDEF_H__