clean function

daviinacio · daviinacio · commit d4028f0fdf05 · 2019-03-31T21:56:11.000-03:00
diff --git a/.vscode/ipch/d5f06e6836b90039/BUFFER.ipch b/.vscode/ipch/d5f06e6836b90039/BUFFER.ipch
diff --git a/Buffer.cpp b/Buffer.cpp
@@ -4,9 +4,8 @@
 Buffer::Buffer(int length, int init){
 	this->values = new int[length];
 	this->length = length;
-	this->average = init;
 	this->init = init;
-	this->fill(init);
+	this->clean();
 }
 
 
@@ -31,7 +30,7 @@ int Buffer::getAt(int position){
 }
 
 bool Buffer::empty(){
-	return this->average == this->init;	
+	return this->calcAverage() == this->init;	
 }
 
 int Buffer::size(){
@@ -48,19 +47,18 @@ void Buffer::fill(int value){
 }
 
 void Buffer::insert(int value){
-	if(!this->empty()){
-		// Move array values
-		for(int i = this->length -1; i > 0; i--)
-			this->values[i] = this->values[i - 1];
-		
-		// Insert new value
-		this->values[0] = value;
-		
-		// Update the average variable
-		this->calcAverage();
-	} 
-	// Insert the first value on array
-	else {
-		this->fill(value);
-	}
+	// Move array values
+	for(int i = this->length -1; i > 0; i--)
+		this->values[i] = this->values[i - 1];
+	
+	// Insert new value
+	this->values[0] = value;
+	
+	// Update the average variable
+	this->calcAverage();
+}
+
+void Buffer::clean(){
+	// Clean the Buffer and enable to fill on first insert
+	this->fill(this->init);
 }
diff --git a/Buffer.h b/Buffer.h
@@ -16,6 +16,7 @@ class Buffer {
 		// Setters
 		void fill(int);
 		void insert(int);
+		void clean();
 		
 	private:
         int init;
diff --git a/keywords.txt b/keywords.txt
@@ -12,15 +12,14 @@ Buffer	KEYWORD1
 # Methods and Functions (KEYWORD2)
 #######################################
 
-setup	KEYWORD2
-getTemperature	KEYWORD2
-getHumidity	KEYWORD2
-getStatus	KEYWORD2
-getStatusString	KEYWORD2
-getModel	KEYWORD2
-getMinimumSamplingPeriod	KEYWORD2
-toFahrenheit  KEYWORD2
-toCelsius  KEYWORD2
+calcAverage	KEYWORD2
+getAverage	KEYWORD2
+getAt	KEYWORD2
+empty	KEYWORD2
+size	KEYWORD2
+fill	KEYWORD2
+insert	KEYWORD2
+clean	KEYWORD2
 
 #######################################
 # Instances (KEYWORD2)
@@ -29,14 +28,4 @@ toCelsius  KEYWORD2
 
 #######################################
 # Constants (LITERAL1)
-#######################################
-
-AUTO_DETECT	LITERAL1
-DHT11	LITERAL1
-DHT22	LITERAL1
-AM2302	LITERAL1
-RHT03	LITERAL1
-
-ERROR_NONE	LITERAL1
-ERROR_TIMEOUT	LITERAL1
-ERROR_CHECKSUM	LITERAL1
+#######################################
