seniordesign-firmware Changeset - cadd69fc3fad

Changeset - cadd69fc3fad

Parent rev.

Child rev.

[Not reviewed]

default

2 6 2

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2012-11-07 19:55:15
kripperger@CL-SEC241-09.cedarville.edu

File Rename

8 files changed with 37 insertions and 29 deletions:

master/master/master.c

slave/slave/config.h

slave/slave/lib/inputOutput.c

slave/slave/lib/inputOutput.h

slave/slave/lib/led.c

slave/slave/lib/led.h

slave/slave/slave.c

slave/slave/slave.cproj

0 comments (0 inline, 0 general)

master/master/master.c

➞

Show inline comments

@@ @@ -22,6 +22,7 @@ @@
 void micro_setup() {
 	// Generic microcontroller config options
+}
 int main(void)

slave/slave/config.h

➞

Show inline comments

@@ @@ -11,6 +11,6 @@ @@
  #define F_CPU 11059200
  #define USART_BAUDRATE 19200
- #define MODULE_ID '2'			//TEMP
  #endif /* CONFIG_H_ */
@@ \ No newline at end of file @@

slave/slave/lib/inputOutput.c

➞

Show inline comments

@@ file renamed from slave/slave/lib/io.c to slave/slave/lib/inputOutput.c @@
@@ @@ -4,3 +4,15 @@ @@
  * Created: 11/7/2012 7:17:52 PM
  *  Author: kripperger
  */
  #include <avr/io.h>
  uint8_t io_getModuleId() {
 	//get ID from rotary dip and return it.
 	uint8_t id;
 	id = 0; //DEBUG
 	return id;
+ }
@@ \ No newline at end of file @@

slave/slave/lib/inputOutput.h

➞

Show inline comments

@@ file renamed from slave/slave/lib/io.h to slave/slave/lib/inputOutput.h @@
@@ @@ -6,11 +6,11 @@ @@
  */
 #ifndef IO_H_
 #define IO_H_
  #ifndef IO_H_
  #define IO_H_
  uint8_t io_getModuleId();	//get ID from rotary dip and return it.
 #endif /* IO_H_ */
@@ \ No newline at end of file @@
  #endif /* IO_H_ */
@@ \ No newline at end of file @@

slave/slave/lib/led.c

➞

Show inline comments

@@ @@ -7,18 +7,18 @@ @@
  #include <avr/io.h>
- void led_Configure() {
+ void led_configure() {
 	 // Configure ports/pins for LEDs
+ }
- void led_On(uint8_t led) {
+ void led_on(uint8_t led) {
 	 // Turn the specified LED on
+ }
- void led_Off(uint8_t led) {
+ void led_off(uint8_t led) {
 	 // Turn the specified LED off
+ }
- void led_Toggle(uint8_t led) {
+ void led_toggle(uint8_t led) {
 	 // Toggle the specified LED
+ }
@@ \ No newline at end of file @@

slave/slave/lib/led.h

➞

Show inline comments

@@ @@ -14,10 +14,10 @@ @@
  #define STAT 3
  #define OK 4
  void led_Configure();
  void led_On(uint8_t led);
  void led_Off(uint8_t led);
  void led_Toggle(uint8_t led);
  void led_configure();
  void led_on(uint8_t led);
  void led_off(uint8_t led);
  void led_toggle(uint8_t led);
  #endif /* LED_H_ */

slave/slave/slave.c

➞

Show inline comments

@@ @@ -16,22 +16,29 @@ @@
 #include <avr/io.h>
 #include <util/delay.h>
 #include "lib/serial.h"
+//#include "lib/serial.h"
 #include "lib/led.h"
 void micro_setup() {
 	// Generic microcontroller config options
+}
 int main(void)
+{
 	// Initialize
 	micro_setup();
 	led_setup();
 	serial_setup(); // Config serial ports
 	led_configure();
 	//serial_setup(); // Config serial ports
 	uint8_t moduleID = io_getModuleId(); //Slave Module ID from rotary dip switch
     while(1)
+    {
         //serial_SendCommand('0','A',0,0);
+    }
 	return 0;
+}
@@ \ No newline at end of file @@

slave/slave/slave.cproj

➞

Show inline comments

@@ @@ -83,21 +83,9 @@ @@
     <Compile Include="lib\led.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\serial.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\serial.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\led.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\serparser.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\serparser.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="slave.c">
       <SubType>compile</SubType>
     </Compile>

0 comments (0 inline, 0 general)