add calc impl

.gitignore

@@ -4,3 +4,4 @@ cmake-buid-debug
 
 # Executables
 *.exe
+Debug

GccApplication3.atsln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Atmel Studio Solution File, Format Version 11.00
+Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "GccApplication3", "GccApplication3.cproj", "{94BBCABE-3E5B-448F-A40B-2B08DEF16444}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|AVR = Debug|AVR
+		Release|AVR = Release|AVR
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{94BBCABE-3E5B-448F-A40B-2B08DEF16444}.Debug|AVR.ActiveCfg = Debug|AVR
+		{94BBCABE-3E5B-448F-A40B-2B08DEF16444}.Debug|AVR.Build.0 = Debug|AVR
+		{94BBCABE-3E5B-448F-A40B-2B08DEF16444}.Release|AVR.ActiveCfg = Release|AVR
+		{94BBCABE-3E5B-448F-A40B-2B08DEF16444}.Release|AVR.Build.0 = Release|AVR
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

GccApplication3.cproj

@@ -99,6 +99,9 @@
     <Compile Include="calculator.c">
       <SubType>compile</SubType>
     </Compile>
+    <Compile Include="calculator.h">
+      <SubType>compile</SubType>
+    </Compile>
     <Compile Include="keyboard.c">
       <SubType>compile</SubType>
     </Compile>

calculator.c

@@ -1,187 +1,141 @@
-#include <stdio.h>
+#include "calculator.h"
-#include <stdlib.h>
 
-enum calculator_state {
+void handleCalc(struct calculator *calc, int input) {
-		NUMBER_FIRST,
+	switch (calc->state) {
-	NUMBER_SECOND,
-	RESULT
-};
-enum calculator_op {
-	NO_OP,
-	ADD,
-	SUB,
-	DIV,
-	MUL
-};
-struct calculator {
-	// 1 ÷èñëî
-	int num1;
-	// 2 ÷èñëî
-	int num2;
-	// 3 îïåðàöèÿ
-	enum calculator_op operation;
-	// 4 ðåçóëüòàò
-	int result;
-	// 5 ñîñòîÿíèå àòîìàòà
-	enum calculator_state state;
-};
-
-
-
-int main() {
-	struct calculator calc;
-	calc.state = NUMBER_FIRST;
-	calc.operation = NO_OP;
-	calc.num1 = 0;
-	calc.num2 = 0;
-	calc.result = 0;
-	int input;
-	while (1) {
-		scanf("%d", &input);
-		switch (calc.state) {
 		case NUMBER_FIRST:
 		switch (input) {
 			case 0:
-				calc.num1 = (calc.num1 * 10) + 7;
+				calc->num1 = (calc->num1 * 10) + 7;
 				break;
 			case 1:
-				calc.num1 = (calc.num1 * 10) + 8;
+			calc->num1 = (calc->num1 * 10) + 8;
 			break;
 			case 2:
-				calc.num1 = (calc.num1 * 10) + 9;
+			calc->num1 = (calc->num1 * 10) + 9;
 			break;
 			case 3:
-				calc.operation = DIV;
+			calc->operation = DIV;
-				calc.state = NUMBER_SECOND;
+			calc->state = NUMBER_SECOND;
 			break;
 			case 4:
-				calc.num1 = (calc.num1 * 10) + 4;
+			calc->num1 = (calc->num1 * 10) + 4;
 			break;
 			case 5:
-				calc.num1 = (calc.num1 * 10) + 5;
+			calc->num1 = (calc->num1 * 10) + 5;
 			break;
 			case 6:
-				calc.num1 = (calc.num1 * 10) + 6;
+			calc->num1 = (calc->num1 * 10) + 6;
 			break;
 			case 7:
-				calc.operation = MUL;
+			calc->operation = MUL;
-				calc.state = NUMBER_SECOND;
+			calc->state = NUMBER_SECOND;
 			break;
 			case 8:
-				calc.num1 = (calc.num1 * 10) + 1;
+			calc->num1 = (calc->num1 * 10) + 1;
 			break;
 			case 9:
-				calc.num1 = (calc.num1 * 10) + 2;
+			calc->num1 = (calc->num1 * 10) + 2;
+			break;
 			case 10:
-				calc.num1 = (calc.num1 * 10) + 3;
+			calc->num1 = (calc->num1 * 10) + 3;
 			break;
 			case 11:
-				calc.operation = SUB;
+			calc->operation = SUB;
-				calc.state = NUMBER_SECOND;
+			calc->state = NUMBER_SECOND;
 			break;
 			case 12:
-				calc.num1 = 0;
+			calc->num1 = (calc->num1 * 10);
 			break;
 			case 13:
-				calc.state = NUMBER_FIRST;
+			clearCalc(calc);
-				calc.operation = NO_OP;
-				calc.num1 = 0;
-				calc.num2 = 0;
-				calc.result = 0;
 			break;
 			case 14:
 			break;
 			case 15:
-				calc.operation = ADD;
+			calc->operation = ADD;
-				calc.state = NUMBER_SECOND;
+			calc->state = NUMBER_SECOND;
 			break;
 		}
-			printf("num1: %d | num2: %d | result: %d | operation: %d | state: %d", calc.num1, calc.num2, calc.result, calc.operation, calc.state);
 		break;
-
 		case NUMBER_SECOND:
 		switch (input) {
 			case 0:
-				calc.num2 = (calc.num2 * 10) + 7;
+			calc->num2 = (calc->num2 * 10) + 7;
 			break;
 			case 1:
-				calc.num2 = (calc.num2 * 10) + 8;
+			calc->num2 = (calc->num2 * 10) + 8;
 			break;
 			case 2:
-				calc.num2 = (calc.num2 * 10) + 9;
+			calc->num2 = (calc->num2 * 10) + 9;
 			break;
 			case 3:
 			break;
 			case 4:
-				calc.num2 = (calc.num2 * 10) + 4;
+			calc->num2 = (calc->num2 * 10) + 4;
 			break;
 			case 5:
-				calc.num2 = (calc.num2 * 10) + 5;
+			calc->num2 = (calc->num2 * 10) + 5;
 			break;
 			case 6:
-				calc.num2 = (calc.num2 * 10) + 6;
+			calc->num2 = (calc->num2 * 10) + 6;
 			break;
 			case 7:
 			break;
 			case 8:
-				calc.num2 = (calc.num2 * 10) + 1;
+			calc->num2 = (calc->num2 * 10) + 1;
 			break;
 			case 9:
-				calc.num2 = (calc.num2 * 10) + 2;
+			calc->num2 = (calc->num2 * 10) + 2;
+			break;
 			case 10:
-				calc.num2 = (calc.num2 * 10) + 3;
+			calc->num2 = (calc->num2 * 10) + 3;
 			break;
 			case 11:
 			break;
 			case 12:
-				calc.num2 = 0;
+			calc->num2 = (calc->num2 * 10);
 			break;
 			case 13:
-				calc.state = NUMBER_FIRST;
+			clearCalc(calc);
-				calc.operation = NO_OP;
-				calc.num1 = 0;
-				calc.num2 = 0;
-				calc.result = 0;
 			break;
 			case 14:
-				switch (calc.operation) {
+			switch (calc->operation) {
 				case ADD:
-					calc.result = calc.num1 + calc.num2;
+				calc->result = calc->num1 + calc->num2;
-					calc.state = RESULT;
+				calc->state = RESULT;
 				break;
 				case SUB:
-					calc.result = calc.num1 - calc.num2;
+				calc->result = calc->num1 - calc->num2;
-					calc.state = RESULT;
+				calc->state = RESULT;
 				break;
 				case MUL:
-					calc.result = calc.num1 * calc.num2;
+				calc->result = calc->num1 * calc->num2;
-					calc.state = RESULT;
+				calc->state = RESULT;
 				break;
 				case DIV:
-					calc.result = calc.num1 / calc.num2;
+				calc->result = calc->num1 / calc->num2;
-					calc.state = RESULT;
+				calc->state = RESULT;
 				break;
-
 			}
 			break;
 			case 15:
 			break;
 		}
-			printf("num1: %d | num2: %d | result: %d | operation: %d | state: %d", calc.num1, calc.num2, calc.result, calc.operation, calc.state);
 		break;
 		case RESULT:
 		switch (input) {
 			case 14:
-				calc.state = NUMBER_FIRST;
+			clearCalc(calc);
-				calc.operation = NO_OP;
-				calc.num1 = 0;
-				calc.num2 = 0;
-				calc.result = 0;
-				printf("num1: %d | num2: %d | result: %d | operation: %d | state: %d", calc.num1, calc.num2, calc.result, calc.operation, calc.state);
 			break;
 		}
 		break;
+	}
+}
 
-		}
+void clearCalc(struct calculator *calc) {
-	}
+	calc->state = NUMBER_FIRST;
+	calc->operation = NO_OP;
+	calc->num1 = 0;
+	calc->num2 = 0;
+	calc->result = 0;
 }

calculator.h

@@ -0,0 +1,41 @@
+/*
+ * calculator.h
+ *
+ * Created: 29.05.2023 12:01:39
+ *  Author: mrnek
+ */ 
+
+
+#ifndef CALCULATOR_H_
+#define CALCULATOR_H_
+
+enum calculator_state {
+	NUMBER_FIRST,
+	NUMBER_SECOND,
+	RESULT
+};
+enum calculator_op {
+	NO_OP,
+	ADD,
+	SUB,
+	DIV,
+	MUL
+};
+struct calculator {
+	// 1 ÷èñëî
+	int num1;
+	// 2 ÷èñëî
+	int num2;
+	// 3 îïåðàöèÿ
+	enum calculator_op operation;
+	// 4 ðåçóëüòàò
+	int result;
+	// 5 ñîñòîÿíèå àòîìàòà
+	enum calculator_state state;
+};
+
+void clearCalc(struct calculator *calc);
+
+void handleCalc(struct calculator *calc, int input);
+
+#endif /* CALCULATOR_H_ */

main.c

@@ -5,6 +5,7 @@
 #include "timer.h"
 #include "keyboard.h"
 #include "uart.h"
+#include "calculator.h"
 
 void setup_registers() {
 	MCUCR &= ~(1 << 4); // PUD
@@ -33,6 +34,8 @@ int main(void) {
 	setup();
 	puts("Hello\r\n");
 	struct key keys[KEYS_AMOUNT];
+	struct calculator calc;
+	clearCalc(&calc);
 	fill_buttons_names(keys);
 	while(1) {
 		get_physical_keys(keys);
@@ -44,43 +47,11 @@ int main(void) {
 			if (down)
 			{
 				printf("%d", keys[i].button);
+				handleCalc(&calc, keys[i].button);
+				printf("num1: %d | num2: %d | result: %d | operation: %d | state: %d", 
+				 calc.num1, calc.num2, calc.result, calc.operation, calc.state);
 			}
 		}
-		
-		//down_amount = 0;
-		//up_amoumt = 0;
-		//
-		//for (int i = 0; i < KEYS_AMOUNT; i++) {
-			//if (keys[i].logical == false) {
-				//down_amount++;
-			//} else {
-				//up_amoumt++;
-			//}
-			////bool up;
-			////bool down;
-			////get_event(&keys[i], &up, &down);
-			////if (down) {
-				////down_amount++;
-			////}
-			////else {
-				////up_amoumt++;
-			////}
-		//}
-		//diff = up_amoumt;
-		////if (diff != diff_prev) {
-			//for (int i = 0; i < KEYS_AMOUNT; i++) {
-				//bool up, down;
-				//get_event(&keys[i], &up, &down);
-				////if (keys[i].logical == true) {
-					////printf("%d", keys[i].button);
-				////}
-				//if (down) {
-					////printf("%s\r\n", i);
-					//printf("%d", keys[i].button);
-				//}
-			//}
-		////}
-		//diff_prev = diff;
 	}
 }