From 1061b04a4102410b871275c4514e086ac9ddcb52 Mon Sep 17 00:00:00 2001
From: Todd Branchflower <todd.branchflower@gmail.com>
Date: Mon, 21 Oct 2013 15:16:38 -0600
Subject: [PATCH] fixed naming convention, improved formatting

---
 main.c                           | 16 +++++++++-------
 L22_imp.c => moving_average.c    | 12 ++++++++++--
 L22_header.h => moving_average.h |  2 --
 3 files changed, 19 insertions(+), 11 deletions(-)
 rename L22_imp.c => moving_average.c (96%)
 rename L22_header.h => moving_average.h (99%)

diff --git a/main.c b/main.c
index beaffb3..545b3c9 100644
--- a/main.c
+++ b/main.c
@@ -4,11 +4,12 @@
   * Description: Computes the "moving average"
   * for a stream of data points it is receiving.
 *******************************************/
+
 #include <msp430.h> 
-#include "L22_header.h"
-#define N_AVG_SAMPLES 4
-#define SIZE 10 //Amount of numbers in number array
+#include "moving_average.h"
 
+#define N_AVG_SAMPLES 4
+#define SIZE 10                 //Amount of numbers in number array
 
 int main(void) {
     WDTCTL = WDTPW | WDTHOLD;	// Stop watchdog timer
@@ -18,8 +19,10 @@ int main(void) {
     int range;
     int numbers[] = {174, 162, 149, 85, 130, 149, 153, 164, 169, 173};
     int sampleArray[N_AVG_SAMPLES];  //Array that numbers are moved into and out of
-    Max = -256; // Lowest number possible for 1 byte, easily overwritten
-    Min = 255; // Highest number possible for 1 byte, easily overwritten
+
+    Max = -256;                 // Lowest number possible for 1 byte, easily overwritten
+    Min = 255;                  // Highest number possible for 1 byte, easily overwritten
+
     int i = 0;
     int x = 0;
     int avg;
@@ -34,7 +37,7 @@ int main(void) {
     }
 
     //Determine size of array
-   // int SizeOfArray = sizeof(numbers)/sizeof(int); //Number of bytes in numbers divided by number of bytes in int
+    // int SizeOfArray = sizeof(numbers)/sizeof(int); //Number of bytes in numbers divided by number of bytes in int
     int SizeOfArray = SIZE; //Can get by with only
 
     //Finds the average
@@ -51,6 +54,5 @@ int main(void) {
 
 	while(1){} //Trap CPU
 
-
 	return 0;
 }
diff --git a/L22_imp.c b/moving_average.c
similarity index 96%
rename from L22_imp.c
rename to moving_average.c
index ca76b66..44bd2e9 100644
--- a/L22_imp.c
+++ b/moving_average.c
@@ -5,7 +5,7 @@
  * Description: Implementation for moving average computation
  */
 
-#include "L22_Header.h"
+#include "moving_average.h"
 
 /*
  *Sums up all the numbers in the input array and
@@ -15,9 +15,11 @@
 int CalcAverage(int array[], int amountSamples){
 	int sum = 0;
 	int i;
+
 	for(i = 0; i < amountSamples; i++){
 		sum += array[i];
 	}
+
 	int avg = sum / amountSamples;
 
 	return avg;
@@ -29,9 +31,11 @@ int CalcAverage(int array[], int amountSamples){
  */
 void shiftarray(int number, int array[], int amountSamples){
 	int i;
+
 	for(i=0; i < amountSamples-1; i++){
 		array[i] = array[i+1]; // Move array to the right one place
 	}
+
 	array[amountSamples-1] = number; //Move the next number into the array
 }
 
@@ -44,12 +48,14 @@ void shiftarray(int number, int array[], int amountSamples){
  */
 int maximum(int* Numbers, int maximum, int size){
 	int i;
+
 	for(i = 0; i < size; i++){
 		if(*Numbers > maximum){
 			maximum = *Numbers;
 		}
-	Numbers++;
+        Numbers++;
 	}
+
 	return maximum;
 }
 
@@ -62,12 +68,14 @@ int maximum(int* Numbers, int maximum, int size){
  */
 int minimum(int* Numbers, int minimum, int size){
 	int i;
+
 	for(i = 0; i < size; i++){
 		if(*Numbers < minimum){
 			minimum = *Numbers;
 		}
 		Numbers++;
 	}
+
 	return minimum;
 }
 
diff --git a/L22_header.h b/moving_average.h
similarity index 99%
rename from L22_header.h
rename to moving_average.h
index db333ac..f113f95 100644
--- a/L22_header.h
+++ b/moving_average.h
@@ -5,8 +5,6 @@
  * Description: Header file for moving average computation
  */
 
-
-
 int CalcAverage(int array[], int numberOfSamples);
 
 void shiftarray(int sample, int array[], int numberOfSamples);