Deleted 'sketch_apr13a.ino' from branch calc-console-impl

ArduionIDE

.gitignore

@@ -1,4 +1,6 @@
 .idea
+
 cmake-buid-debug
+
 # Executables
 *.exe

README.md

@@ -8,8 +8,9 @@
 * Хромова Полина
 
 ## Части задачи
-- GPIO + GPIO в контексте Atmega328. Pull up, Pull down (Михаил Батухтин/Уткин Никита)
+- GPIO + GPIO в контексте Atmega328. Pull up, Pull down (Кристина Бочкина/Полина Хромова)
-- Физическая реализация клавиатуры (Кристина Бочкина/Полина Хромова)
+- Реализация клавиатуры (Кристина Бочкина/Полина Хромова)
-- SPI интерфейс + SPI у Atmega328 (Кристина Бочкина)
+- SPI интерфейс + SPI у Atmega328 (Никита Уткин)
-- Программная реализация клавиатуры (Полина Хромова)
 - Архитектура ПО (Михаил Батухтин)
+
+

c_programm

@@ -1,204 +0,0 @@
-#include <stdio.h>
-#include <stdlib.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 результат
-    double result;
-    // 5 состояние атомата
-    enum calculator_state state;
-};
-
-// double calculate(char op, double num1, double num2) {
-//     double result = 0;
-//     switch (op) {
-//         case '+':
-//             result = num1 + num2;
-//             break;
-//         case '-':
-//             result = num1 - num2;
-//             break;
-//         case '*':
-//             result = num1 * num2;
-//             break;
-//         case '/':
-//             result = num1 / num2;
-//             break;
-//     }
-//     return result;
-// }
-
-int main()
-{
-    struct calculator calc;
-    calc.state = NUMBER_FIRST;
-    calc.operation = NO_OP;
-    calc.num1 = 0;
-    calc.num2 = 0;
-    calc.result = 0;
-
-    char input;
-    while (1)
-    {
-        scanf("%d", &input);
-        switch (calc.state)
-        {
-        case NUMBER_FIRST:
-            switch (input)
-            {
-            case 0:
-                calc.num1 = (calc.num1 * 10) + 7;
-                printf("%d",calc.num1);
-                break;
-            case 1:
-                calc.num1 = (calc.num1 * 10) + 8;
-                break;
-            case 2:
-                calc.num1 = (calc.num1 * 10) + 9;
-                break;
-            case 3:
-                calc.operation = DIV;
-                calc.state = NUMBER_SECOND;
-                break;
-            case 4:
-                calc.num1 = (calc.num1 * 10) + 4;
-                break;
-            case 5:
-                calc.num1 = (calc.num1 * 10) + 5;
-                break;
-            case 6:
-                calc.num1 = (calc.num1 * 10) + 6;
-                break;
-            case 7:
-                calc.operation = MUL;
-                calc.state = NUMBER_SECOND;
-                break;
-            case 8:
-                calc.num1 = (calc.num1 * 10) + 1;
-                break;
-            case 9:
-                calc.num1 = (calc.num1 * 10) + 2;
-            case 10:
-                calc.num1 = (calc.num1 * 10) + 3;
-                break;
-            case 11:
-                calc.operation = SUB;
-                calc.state = NUMBER_SECOND;
-                break;
-            case 12:
-                calc.num1 = 0;
-                break;
-            case 13:
-                calc.state = NUMBER_FIRST;
-                calc.operation = NO_OP;
-                calc.num1 = 0;
-                calc.num2 = 0;
-                calc.result = 0;
-                break;
-            case 14:
-                break;
-            case 15:
-                calc.operation = ADD;
-                calc.state = NUMBER_SECOND;
-                break;
-            
-            }
-
-        case NUMBER_SECOND:
-            switch (input)
-            {
-            case 0:
-                calc.num2 = (calc.num2 * 10) + 7;
-                break;
-            case 1:
-                calc.num2 = (calc.num2 * 10) + 8;
-                break;
-            case 2:
-                calc.num2 = (calc.num2 * 10) + 9;
-                break;
-            case 3:
-
-                break;
-            case 4:
-                calc.num2 = (calc.num2 * 10) + 4;
-                break;
-            case 5:
-                calc.num2 = (calc.num2 * 10) + 5;
-                break;
-            case 6:
-                calc.num2 = (calc.num2 * 10) + 6;
-                break;
-            case 7:
-
-                break;
-            case 8:
-                calc.num2 = (calc.num2 * 10) + 1;
-                break;
-            case 9:
-                calc.num2 = (calc.num2 * 10) + 2;
-            case 10:
-                calc.num2 = (calc.num2 * 10) + 3;
-                break;
-            case 11:
-
-                break;
-            case 12:
-                calc.num2 = 0;
-                break;
-            case 13:
-                calc.state = NUMBER_FIRST;
-                calc.operation = NO_OP;
-                calc.num1 = 0;
-                calc.num2 = 0;
-                calc.result = 0;
-                break;
-            case 14:
-                calc.state = RESULT;
-                break;
-            case 15:
-
-                break;
-            }
-
-        case RESULT:
-            switch (calc.operation)
-            {
-            case ADD:
-                calc.result = calc.num1 + calc.num2;
-                break;
-            case SUB:
-                calc.result = calc.num1 - calc.num2;
-                break;
-            case MUL:
-                calc.result = calc.num1 * calc.num2;
-                break;
-            case DIV:
-                calc.result = calc.num1 / calc.num2;
-                break;
-                return calc.result;
-            }
-        }
-    }
-    return 0;
-}

calculator.c

@@ -1,143 +0,0 @@
-#include <stdio.h>
-#include "calculator.h"
-
-void handleCalc(struct calculator *calc, int input) {
-    switch (calc->state) {
-        case NUMBER_FIRST:
-            switch (input) {
-                case 0:
-                    calc->num1 = (calc->num1 * 10) + 7;
-                    break;
-                case 1:
-                    calc->num1 = (calc->num1 * 10) + 8;
-                    break;
-                case 2:
-                    calc->num1 = (calc->num1 * 10) + 9;
-                    break;
-                case 3:
-                    calc->operation = DIV;
-                    calc->state = NUMBER_SECOND;
-                    break;
-                case 4:
-                    calc->num1 = (calc->num1 * 10) + 4;
-                    break;
-                case 5:
-                    calc->num1 = (calc->num1 * 10) + 5;
-                    break;
-                case 6:
-                    calc->num1 = (calc->num1 * 10) + 6;
-                    break;
-                case 7:
-                    calc->operation = MUL;
-                    calc->state = NUMBER_SECOND;
-                    break;
-                case 8:
-                    calc->num1 = (calc->num1 * 10) + 1;
-                    break;
-                case 9:
-                    calc->num1 = (calc->num1 * 10) + 2;
-                    break;
-                case 10:
-                    calc->num1 = (calc->num1 * 10) + 3;
-                    break;
-                case 11:
-                    calc->operation = SUB;
-                    calc->state = NUMBER_SECOND;
-                    break;
-                case 12:
-                    calc->num1 = (calc->num1 * 10);
-                    break;
-                case 13:
-                    clearCalc(calc);
-                    break;
-                case 14:
-                    break;
-                case 15:
-                    calc->operation = ADD;
-                    calc->state = NUMBER_SECOND;
-                    break;
-            }
-            break;
-
-        case NUMBER_SECOND:
-            switch (input) {
-                case 0:
-                    calc->num2 = (calc->num2 * 10) + 7;
-                    break;
-                case 1:
-                    calc->num2 = (calc->num2 * 10) + 8;
-                    break;
-                case 2:
-                    calc->num2 = (calc->num2 * 10) + 9;
-                    break;
-                case 3:
-                    break;
-                case 4:
-                    calc->num2 = (calc->num2 * 10) + 4;
-                    break;
-                case 5:
-                    calc->num2 = (calc->num2 * 10) + 5;
-                    break;
-                case 6:
-                    calc->num2 = (calc->num2 * 10) + 6;
-                    break;
-                case 7:
-                    break;
-                case 8:
-                    calc->num2 = (calc->num2 * 10) + 1;
-                    break;
-                case 9:
-                    calc->num2 = (calc->num2 * 10) + 2;
-                    break;
-                case 10:
-                    calc->num2 = (calc->num2 * 10) + 3;
-                    break;
-                case 11:
-                    break;
-                case 12:
-                    calc->num2 = (calc->num2 * 10);
-                    break;
-                case 13:
-                    clearCalc(calc);
-                    break;
-                case 14:
-                    switch (calc->operation) {
-                        case ADD:
-                            calc->result = calc->num1 + calc->num2;
-                            calc->state = RESULT;
-                            break;
-                        case SUB:
-                            calc->result = calc->num1 - calc->num2;
-                            calc->state = RESULT;
-                            break;
-                        case MUL:
-                            calc->result = calc->num1 * calc->num2;
-                            calc->state = RESULT;
-                            break;
-                        case DIV:
-                            calc->result = calc->num1 / calc->num2;
-                            calc->state = RESULT;
-                            break;
-
-                    }
-                    break;
-                case 15:
-                    break;
-            }
-            break;
-        case RESULT:
-            switch (input) {
-                case 14:
-                    clearCalc(calc);
-                    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

@@ -1,32 +0,0 @@
-#ifndef TESTCALC_MAIN_H
-#define TESTCALC_MAIN_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 //TESTCALC_MAIN_H

main.c

@@ -1,13 +1,64 @@
 #include <stdio.h>
-#include "calculator.h"
+#include <stdlib.h>
-
+double calculate(char op, double num1, double num2) {
-int main() {
+    double result = 0;
-    struct calculator calc;
+    switch (op) {
-    clearCalc(&calc);
+        case '+':
-    int input;
+            result = num1 + num2;
-    while (1) {
+            break;
-        scanf("%d", &input);
+        case '-':
-        handleCalc(&calc, input);
+            result = num1 - num2;
-        printf("num1: %d | num2: %d | result: %d | operation: %d | state: %d", calc.num1, calc.num2, calc.result, calc.operation, calc.state);
+            break;
+        case '*':
+            result = num1 * num2;
+            break;
+        case '/':
+            result = num1 / num2;
+            break;
     }
+    return result;
+}
+int main() {
+    double number = 0;
+    double tmpNumber = 0;
+    char input;
+    char operator;
+    while (1) {
+        scanf(" %c", &input);
+        switch (input) {
+            case '+':
+                operator = '+';
+                tmpNumber = number;
+                number = 0;
+                break;
+            case '-':
+                operator = '-';
+                tmpNumber = number;
+                number = 0;
+                break;
+            case '*':
+                operator = '*';
+                tmpNumber = number;
+                number = 0;
+                break;
+            case '/':
+                operator = '/';
+                tmpNumber = number;
+                number = 0;
+                break;
+            case '=':
+                printf("%lf\n", calculate(operator, tmpNumber, number));
+                tmpNumber = 0;
+                number = 0;
+                break;
+            case 'q':
+                goto exit;
+                // operator doesn't match any case constant
+            default:
+                number = (number * 10) + atof(&input);
+                printf("%.1lf\n", number);
+        }
+    }
+    exit:
+    return 0;
 }