# HG changeset patch
# User kripperger@CL-SEC241-09.cedarville.edu
# Date 2012-11-07 19:27:57
# Node ID af3d1c88dc4ae169b991af3b8980cd2332846a2a
# Parent  764445936ccabbd1804cf17ecebeeabc50aab980

Adding i2c and io libs

diff --git a/slave/slave/config.h b/slave/slave/config.h
--- a/slave/slave/config.h
+++ b/slave/slave/config.h
@@ -1,5 +1,5 @@
 /*
- * IncFile1.h
+ * config.h
  *
  * Created: 10/25/2012 10:00:09 PM
  *  Author: mkanning
@@ -11,6 +11,6 @@
 
  #define F_CPU 11059200
  #define USART_BAUDRATE 19200
- #define MODULE_ID '2'
+ #define MODULE_ID '2'			//TEMP
 
  #endif /* CONFIG_H_ */
\ No newline at end of file
diff --git a/slave/slave/lib/i2c.c b/slave/slave/lib/i2c.c
new file mode 100644
--- /dev/null
+++ b/slave/slave/lib/i2c.c
@@ -0,0 +1,6 @@
+/*
+ * i2c.c
+ *
+ * Created: 11/7/2012 7:18:23 PM
+ *  Author: kripperger
+ */ 
diff --git a/slave/slave/lib/i2c.h b/slave/slave/lib/i2c.h
new file mode 100644
--- /dev/null
+++ b/slave/slave/lib/i2c.h
@@ -0,0 +1,16 @@
+/*
+ * i2c.h
+ *
+ * Created: 11/7/2012 7:18:33 PM
+ *  Author: kripperger
+ */ 
+
+
+#ifndef I2C_H_
+#define I2C_H_
+
+
+
+
+
+#endif /* I2C_H_ */
\ No newline at end of file
diff --git a/slave/slave/lib/io.c b/slave/slave/lib/io.c
new file mode 100644
--- /dev/null
+++ b/slave/slave/lib/io.c
@@ -0,0 +1,6 @@
+/*
+ * io.c
+ *
+ * Created: 11/7/2012 7:17:52 PM
+ *  Author: kripperger
+ */ 
diff --git a/slave/slave/lib/io.h b/slave/slave/lib/io.h
new file mode 100644
--- /dev/null
+++ b/slave/slave/lib/io.h
@@ -0,0 +1,16 @@
+/*
+ * io.h
+ *
+ * Created: 11/7/2012 7:18:08 PM
+ *  Author: kripperger
+ */ 
+
+
+#ifndef IO_H_
+#define IO_H_
+
+
+
+
+
+#endif /* IO_H_ */
\ No newline at end of file
diff --git a/slave/slave/lib/led.c b/slave/slave/lib/led.c
--- a/slave/slave/lib/led.c
+++ b/slave/slave/lib/led.c
@@ -1,5 +1,5 @@
 /*
- * CFile1.c
+ * led.c
  *
  * Created: 10/25/2012 10:03:22 PM
  *  Author: mkanning
diff --git a/slave/slave/lib/led.h b/slave/slave/lib/led.h
--- a/slave/slave/lib/led.h
+++ b/slave/slave/lib/led.h
@@ -1,5 +1,5 @@
 /*
- * IncFile1.h
+ * led.h
  *
  * Created: 10/25/2012 10:01:29 PM
  *  Author: mkanning
@@ -11,8 +11,8 @@
 
  #define POWER 1
  #define ERROR 2
- #define STAT 2
- #define OK 2
+ #define STAT 3
+ #define OK 4
 
  void led_Configure();
  void led_On(uint8_t led);
diff --git a/slave/slave/lib/serial.c b/slave/slave/lib/serial.c
deleted file mode 100644
--- a/slave/slave/lib/serial.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * CFile1.c
- *
- * Created: 10/25/2012 10:02:38 PM
- *  Author: mkanning
- */
-
- #include <avr/io.h>
-
- void serial_SendChar( char byte )
- {
-	 while (!(UCSR0A & (1<<UDRE0)));
-	 UDR0 = byte;
- }
-
- void serial_SendCommand( char moduleID, char sensorID, uint8_t dataLength, char* data )
- {
-	 char checkSum = 0x00; //initialize checksum
-	 
-	 serial_SendChar('['); //bracket indicates start of command
-	 serial_SendChar(moduleID);
-	 checkSum+=moduleID;
-	 
-	 serial_SendChar(sensorID);
-	 checkSum+=sensorID;
-	 
-	 //send each character of data individually
-	 for (int i=0; i<dataLength; i++)
-	 {
-		 serial_SendChar(data[i]);
-		 checkSum += data[i];
-	 }
-	 
-	 serial_SendChar(checkSum);
-	 serial_SendChar(']'); //bracket indicates end of command
- }
-
- void serial_SendResponseData(){
-	 
- }
-
- void serial_Configure() {
-	 // Set registers!
-	 
-	 // from mnl
-	 // uart
-	 //UBRRH = (BAUD_PRESCALE >> 8); // 0
-	 //UBRRL = BAUD_PRESCALE; // 8
-	 //UCSRA = 0;
-	 //UCSRB = 0x18;
-	 //UCSRC = 0x06;
-	 //OCR0B = 0xff;
-	 //OCR0A = 0xff;
-	 //OCR1AL = 0xff;
-	 //OCR1BL = 0xff;
- }
diff --git a/slave/slave/lib/serial.h b/slave/slave/lib/serial.h
deleted file mode 100644
--- a/slave/slave/lib/serial.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * IncFile1.h
- *
- * Created: 10/25/2012 10:01:43 PM
- *  Author: mkanning
- */
-
-
- #ifndef SERIAL_H_
- #define SERIAL_H_
-
- #define BAUD_PRESCALE (((F_CPU / (USART_BAUDRATE * 16UL))) -1 )
-
- void serial_SendChar( char byte );
- void serial_SendCommand( char moduleID, char sensorID, uint8_t dataLength, char* data );
- void serial_SendResponseData();
- void serial_Configure();
-
- #endif /* SERIAL_H_ */
\ No newline at end of file
diff --git a/slave/slave/lib/serparser.c b/slave/slave/lib/serparser.c
deleted file mode 100644
--- a/slave/slave/lib/serparser.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * serparser.c
- *
- * Created: 10/25/2012 10:04:09 PM
- *  Author: mkanning
-*/
-
-
-// ************* Macros ***************
-#define SERIAL_RX_HASBYTES UCSR0A & _BV(RXC)
-#define MAX_CMD_LEN 16
-#define BROADCAST_ADDR 0 //public address
-#include <avr/io.h>
-#include "../config.h"
-
-//#define DEBUG
-
-// ************* Command Definitions ***************
-
-// Serial Commands
-enum cmd // CMD ID#
-{
-	BOARDTEMP = 0, // 0
-	PRESSURE,      // 1
-};
-
-// Incoming command buffer
-uint8_t buffer[MAX_CMD_LEN+2];
-
-// Current buffer location
-uint8_t bufferPosition = 0;
-
-//ID of the sensor of most recent transmission
-char sensorID;
-
-//checksum to be calculated and then compared to the received checksum
-char checksumCalc;
-
-/* return char from UART (h/w buffer) */
-uint8_t uart_getchar(void)
-{
-	// Wait for chars
-	/*	while (!(UCSRA & (1<<RXC)))
-	{
-		idle();
-	}
-	return UDR;
-	*/
-	return 0;
-}
-
-/* Process incoming serial data */
-int uart_Parser(void)
-{
-	char byte;
-	
-	if(SERIAL_RX_HASBYTES) // Only process data if buffer has a byte
-	{
-		
-		// Pull byte off of the buffer
-		byte = uart_getchar();
-		buffer[bufferPosition] = byte;
-		
-		// byte checking/validation
-		if(bufferPosition == 0)
-		{
-			if(byte == '[') // If this is a start byte, we're OK. Keep reading.
-			{
-				bufferPosition++;
-			}
-			else // Not a start byte that we're expecting. Reset to initial state.
-			{
-				bufferPosition = 0;
-			}
-		}
-		else if(bufferPosition == 1)
-		{
-			if(byte == MODULE_ID) //this transmission is intended for this module; continue parsing
-			{
-				bufferPosition++;
-				checksumCalc += byte;
-			}
-			else //this transmission is intended for another module; stop parsing and reset
-			{
-				bufferPosition = 0;
-			}
-		}
-		else if(bufferPosition == 2)
-		{
-			sensorID = byte; //store the type of data receiving
-			bufferPosition++;
-			checksumCalc += byte;
-		}
-		else if(bufferPosition == 3)
-		{
-			if (byte == checksumCalc) //the computed and recieved checksums match; data is valid
-			{
-				bufferPosition++;
-				checksumCalc += byte;
-			} 
-			else //the computed and recieved checksums do not match; data is invalid
-			{
-				bufferPosition = 0;
-			}
-		}
-		//this else if and the final else have the same results - combine ??
-		else if (bufferPosition == 4) //this should be end of transmission
-		{
-			if (byte == ']') //this is the end of the transmission
-			{
-				bufferPosition = 0;
-			}
-			else // unexpected character; reset
-			{
-				bufferPosition = 0;
-			}
-		
-		}
-		else //command is too long and bad data has been recieved; reset
-		{
-			bufferPosition = 0;
-		}
-	
-	
-	}
-	else
-	{
-		return 0; // serial data not available
-	}
-}
\ No newline at end of file
diff --git a/slave/slave/lib/serparser.h b/slave/slave/lib/serparser.h
deleted file mode 100644
--- a/slave/slave/lib/serparser.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * serparser.h
- *
- * Created: 10/25/2012 10:04:23 PM
- *  Author: mkanning
- */
-
-
- #ifndef SERPARSER_H_
- #define SERPARSER_H_
-
-
- // Prototypes
- uint8_t convertchar(uint8_t);
- uint8_t uart_getchar(void);
- void got_char(uint8_t);
- int uart_machine(void);
- void uart_putchar(uint8_t);
- void exec_cmd(void);
- void idle(void);
- void uart_init(void);
-
-
-
- #endif /* SERPARSER_H_ */
\ No newline at end of file
diff --git a/slave/slave/slave.cproj b/slave/slave/slave.cproj
--- a/slave/slave/slave.cproj
+++ b/slave/slave/slave.cproj
@@ -25,49 +25,61 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <ToolchainSettings>
       <AvrGcc>
-  <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
-  <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
-  <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
-  <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
-  <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
-  <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
-  <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
-  <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
-  <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
-  <avrgcc.linker.libraries.Libraries>
-    <ListValues>
-      <Value>m</Value>
-    </ListValues>
-  </avrgcc.linker.libraries.Libraries>
-</AvrGcc>
+        <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
+        <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
+        <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
+        <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
+        <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
+        <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
+        <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
+        <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
+        <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
+        <avrgcc.linker.libraries.Libraries>
+          <ListValues>
+            <Value>m</Value>
+          </ListValues>
+        </avrgcc.linker.libraries.Libraries>
+      </AvrGcc>
     </ToolchainSettings>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <ToolchainSettings>
       <AvrGcc>
-  <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
-  <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
-  <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
-  <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
-  <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
-  <avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
-  <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
-  <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
-  <avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
-  <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
-  <avrgcc.linker.libraries.Libraries>
-    <ListValues>
-      <Value>m</Value>
-    </ListValues>
-  </avrgcc.linker.libraries.Libraries>
-  <avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
-</AvrGcc>
+        <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
+        <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
+        <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
+        <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
+        <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
+        <avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
+        <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
+        <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
+        <avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
+        <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
+        <avrgcc.linker.libraries.Libraries>
+          <ListValues>
+            <Value>m</Value>
+          </ListValues>
+        </avrgcc.linker.libraries.Libraries>
+        <avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
+      </AvrGcc>
     </ToolchainSettings>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="config.h">
       <SubType>compile</SubType>
     </Compile>
+    <Compile Include="lib\i2c.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="lib\i2c.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="lib\io.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="lib\io.h">
+      <SubType>compile</SubType>
+    </Compile>
     <Compile Include="lib\led.c">
       <SubType>compile</SubType>
     </Compile>