Merge branch 'master' of https://github.com/thetianshuhuang/serial-to…

…ken-ring
thetianshuhuang · May 3, 2018 · 0ebbd0f · 0ebbd0f
2 parents 5648178 + 8041558
commit 0ebbd0f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/C/TM4C123/tm4c_client.c b/C/TM4C123/tm4c_client.c
@@ -7,7 +7,7 @@
 
 #include "tm4c_client.h"
 #include "UART.h"
-#incldue "../c_client.h"
+#include "c_client.h"
 #include <stdint.h>
 
 
@@ -16,7 +16,7 @@
 // Parameter: address - network address to use
 void initTokenRing(uint8_t address) {
     UART_Init();
-    ipConfig(address, &UART_OutChar, &UART_InChar);
+    ipConfig(address, &UART_InChar, &UART_OutChar);
     return;
 }
 
@@ -26,7 +26,7 @@ void initTokenRing(uint8_t address) {
 char* updateTokenRing() {
     char* returnBuffer;
     while(RxFifo_Size()) {
-        returnBuffer = updateNetwork(UART_InChar());
+        returnBuffer = updateNetwork();
         if(returnBuffer[0] != 0) {
             return(returnBuffer);
         }

diff --git a/C/c_client.c b/C/c_client.c
@@ -66,8 +66,8 @@ uint8_t sendByte(uint8_t input) {
 // Returns: none
 void ipConfig(
 	uint8_t deviceAddress,
-	uint8_t(*recieveFunction)(),
-	void(*sendFunction)(uint8_t)) {
+	char(*recieveFunction)(void),
+	void(*sendFunction)(char)) {
 
 	configuration.deviceAddress = deviceAddress;
 	configuration.recieveFunction = recieveFunction;

diff --git a/C/c_client.h b/C/c_client.h
@@ -13,9 +13,9 @@
 
 // Struct for storing IP info
 struct ipInfo {
-	uint8_t deviceAddress;
-	uint8_t(*recieveFunction)();
-	void(*sendFunction)(uint8_t);
+	char deviceAddress;
+	char(*recieveFunction)();
+	void(*sendFunction)(char);
 };
 
 
@@ -26,7 +26,7 @@ struct ipInfo {
 //		char*(*recieveFunction)() recieve function; user defined
 //		void(*sendFunction)(char*)	send function; user defined
 // Returns: none
-void ipConfig(uint8_t deviceAddress, uint8_t(*recieveFunction)(), void(*sendFunction)(uint8_t));
+void ipConfig(uint8_t deviceAddress, char(*recieveFunction)(), void(*sendFunction)(char));
 
 
 // ----------sendMessage------------

diff --git a/PCBs/Main_Board/MainBoard.dri b/PCBs/Main_Board/MainBoard.dri
@@ -1,8 +1,8 @@
-Generated by EAGLE CAM Processor 8.3.1
+Generated by EAGLE CAM Processor 9.0.0
 
-Drill Station Info File: C:/Users/Tianshu Huang/Desktop/319K/serial-token-ring/PCBs/Main_Board/MainBoard.dri
+Drill Station Info File: C:/Users/bbelo/OneDrive/Documents/Spring 2018/serial-token-ring/PCBs/Main_Board/MainBoard.dri
 
- Date              : 4/20/2018 6:56 PM
+ Date              : 4/20/2018 3:35 PM
  Drills            : generated
  Device            : Excellon drill station, coordinate format 2.4 inch
 
@@ -40,4 +40,4 @@ Total number of drills: 138
 
 Plotfiles:
 
- C:/Users/Tianshu Huang/Desktop/319K/serial-token-ring/PCBs/Main_Board/MainBoard.txt
+ C:/Users/bbelo/OneDrive/Documents/Spring 2018/serial-token-ring/PCBs/Main_Board/MainBoard.txt
diff --git a/PCBs/Main_Board/MainBoard.gpi b/PCBs/Main_Board/MainBoard.gpi
@@ -1,9 +1,9 @@
-Generated by EAGLE CAM Processor 8.3.1
+Generated by EAGLE CAM Processor 9.0.0
 
-Photoplotter Info File: C:/Users/Tianshu Huang/Desktop/319K/serial-token-ring/PCBs/Main_Board/MainBoard.gpi
+Photoplotter Info File: C:/Users/bbelo/OneDrive/Documents/Spring 2018/serial-token-ring/PCBs/Main_Board/MainBoard.gpi
 
- Date              : 4/20/2018 6:56 PM
- Plotfile          : C:/Users/Tianshu Huang/Desktop/319K/serial-token-ring/PCBs/Main_Board/MainBoard.gko
+ Date              : 4/20/2018 3:35 PM
+ Plotfile          : C:/Users/bbelo/OneDrive/Documents/Spring 2018/serial-token-ring/PCBs/Main_Board/MainBoard.gko
  Apertures         : generated: 
  Device            : Gerber RS-274-X photoplotter, coordinate format 2.4 inch