From cdcba456cbc76c989a0a87f347ec2bac13ee0a5d Mon Sep 17 00:00:00 2001
From: Tristan Krause <tristan.krause@stud.htwk-leipzig.de>
Date: Wed, 3 Apr 2019 14:58:50 +0200
Subject: [PATCH] main revised

---
 firmware/B15F.elf     | Bin 16580 -> 16716 bytes
 firmware/main.cpp     |  79 ++----------------------------------------
 firmware/requests.cpp |  72 ++++++++++++++++++++++++++++++++++++++
 firmware/requests.h   |   6 ++++
 4 files changed, 80 insertions(+), 77 deletions(-)

diff --git a/firmware/B15F.elf b/firmware/B15F.elf
index b96caae04affc14dfa5f1dfc2655d33c6b7136cd..e8fd455475958ed0ffea3857d452dd931a1face6 100755
GIT binary patch
delta 4151
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
IJs&CjFC8@PWB>pF

delta 4356
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
E0RAh2<p2Nx

diff --git a/firmware/main.cpp b/firmware/main.cpp
index 01701f7..6d9c5be 100644
--- a/firmware/main.cpp
+++ b/firmware/main.cpp
@@ -6,8 +6,7 @@
 #include "selftest.h"
 #include "requests.h"
 
-
-void initAll()
+int main()
 {
 	// deactivate WDT ENTIRELY!
 	MCUSR &= ~_BV(WDRF);
@@ -28,84 +27,10 @@ void initAll()
 	
 	usart.init();
 	usart.initRX();
-}
-
-void handleRequest()
-{
-	const uint8_t req = usart.readByte();
 	
-	wdt_reset();
 	
-	switch(req)
-	{
-		case RQ_DISC:
-			break;
-
-		case RQ_TEST:
-			rqTestConnection();
-			break;
-		
-		case RQ_INFO:
-			rqBoardInfo();
-			break;
-		
-		case RQ_INT:
-			rqTestIntConv();
-			break;
-
-		case RQ_ST:
-			rqSelfTest();
-			break;
-			
-		case RQ_BA0:
-			rqDigitalWrite0();
-			break;
-
-		case RQ_BA1:
-			rqDigitalWrite1();
-			break;
-
-		case RQ_BE0:
-			rqDigitalRead0();
-			break;
-
-		case RQ_BE1:
-			rqDigitalRead1();
-			break;
-			
-		case RQ_DSW:
-			rqReadDipSwitch();
-			break;
-
-		case RQ_AA0:
-			rqAnalogWrite0();
-			break;
-
-		case RQ_AA1:
-			rqAnalogWrite1();
-			break;
-
-		case RQ_ADC:
-			rqAnalogRead();
-			break;
-			
-		case RQ_ADC_DAC_STROKE:
-			rqAdcDacStroke();
-			break;
-
-		default:
-			break;
-	}
 	
-	usart.initRX();
-	
-	wdt_disable();
-}
-
-int main()
-{
-	initAll();
-
+	// Hauptschleife, Verarbeitung der Requests
 	while(1)
 	{
 		if(nextRequest)
diff --git a/firmware/requests.cpp b/firmware/requests.cpp
index 93c2e4f..8d068ff 100644
--- a/firmware/requests.cpp
+++ b/firmware/requests.cpp
@@ -1,5 +1,77 @@
 #include "requests.h"
 
+void handleRequest()
+{
+	const uint8_t req = usart.readByte();
+	
+	wdt_reset();
+	
+	switch(req)
+	{
+		case RQ_DISC:
+			break;
+
+		case RQ_TEST:
+			rqTestConnection();
+			break;
+		
+		case RQ_INFO:
+			rqBoardInfo();
+			break;
+		
+		case RQ_INT:
+			rqTestIntConv();
+			break;
+
+		case RQ_ST:
+			rqSelfTest();
+			break;
+			
+		case RQ_BA0:
+			rqDigitalWrite0();
+			break;
+
+		case RQ_BA1:
+			rqDigitalWrite1();
+			break;
+
+		case RQ_BE0:
+			rqDigitalRead0();
+			break;
+
+		case RQ_BE1:
+			rqDigitalRead1();
+			break;
+			
+		case RQ_DSW:
+			rqReadDipSwitch();
+			break;
+
+		case RQ_AA0:
+			rqAnalogWrite0();
+			break;
+
+		case RQ_AA1:
+			rqAnalogWrite1();
+			break;
+
+		case RQ_ADC:
+			rqAnalogRead();
+			break;
+			
+		case RQ_ADC_DAC_STROKE:
+			rqAdcDacStroke();
+			break;
+
+		default:
+			break;
+	}
+	
+	usart.initRX();
+	
+	wdt_disable();
+}
+
 void rqTestConnection()
 {
 	usart.initTX();
diff --git a/firmware/requests.h b/firmware/requests.h
index a59f95e..3910388 100644
--- a/firmware/requests.h
+++ b/firmware/requests.h
@@ -38,6 +38,12 @@ uint8_t const rq_len[] = {
 	/* RQ_ADC_DAC_STROKE */ 9
 };
 
+/**
+ * Hauptfunktion für die Verarbeitung einer neuen empfangen Request
+ */
+void handleRequest(void);
+
+// spezifische Funktion für jede Request
 void rqTestConnection(void);
 void rqBoardInfo(void);
 void rqTestIntConv(void);