add calc impl

ArduionIDE

.gitignore

@@ -1,4 +1,7 @@
 .idea
+
 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

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectVersion>6.2</ProjectVersion>
+    <ToolchainName>com.Atmel.AVRGCC8.C</ToolchainName>
+    <ProjectGuid>{94bbcabe-3e5b-448f-a40b-2b08def16444}</ProjectGuid>
+    <avrdevice>ATmega328P</avrdevice>
+    <avrdeviceseries>none</avrdeviceseries>
+    <OutputType>Executable</OutputType>
+    <Language>C</Language>
+    <OutputFileName>$(MSBuildProjectName)</OutputFileName>
+    <OutputFileExtension>.elf</OutputFileExtension>
+    <OutputDirectory>$(MSBuildProjectDirectory)\$(Configuration)</OutputDirectory>
+    <AssemblyName>GccApplication3</AssemblyName>
+    <Name>GccApplication3</Name>
+    <RootNamespace>GccApplication3</RootNamespace>
+    <ToolchainFlavour>Native</ToolchainFlavour>
+    <KeepTimersRunning>true</KeepTimersRunning>
+    <OverrideVtor>false</OverrideVtor>
+    <CacheFlash>true</CacheFlash>
+    <ProgFlashFromRam>true</ProgFlashFromRam>
+    <RamSnippetAddress />
+    <UncachedRange />
+    <preserveEEPROM>true</preserveEEPROM>
+    <OverrideVtorValue />
+    <BootSegment>2</BootSegment>
+    <eraseonlaunchrule>1</eraseonlaunchrule>
+    <AsfFrameworkConfig>
+      <framework-data xmlns="">
+        <options />
+        <configurations />
+        <files />
+        <documentation help="" />
+        <offline-documentation help="" />
+        <dependencies>
+          <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.21.0" />
+        </dependencies>
+      </framework-data>
+    </AsfFrameworkConfig>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <ToolchainSettings>
+      <AvrGcc>
+        <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
+        <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
+        <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
+        <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
+        <avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
+        <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
+        <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
+        <avrgcc.compiler.symbols.DefSymbols>
+          <ListValues>
+            <Value>NDEBUG</Value>
+          </ListValues>
+        </avrgcc.compiler.symbols.DefSymbols>
+        <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
+        <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
+        <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
+        <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
+        <avrgcc.linker.libraries.Libraries>
+          <ListValues>
+            <Value>libm</Value>
+          </ListValues>
+        </avrgcc.linker.libraries.Libraries>
+      </AvrGcc>
+    </ToolchainSettings>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <ToolchainSettings>
+      <AvrGcc>
+        <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
+        <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
+        <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
+        <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
+        <avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
+        <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
+        <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
+        <avrgcc.compiler.symbols.DefSymbols>
+          <ListValues>
+            <Value>DEBUG</Value>
+          </ListValues>
+        </avrgcc.compiler.symbols.DefSymbols>
+        <avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
+        <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
+        <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
+        <avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
+        <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
+        <avrgcc.linker.libraries.Libraries>
+          <ListValues>
+            <Value>libm</Value>
+          </ListValues>
+        </avrgcc.linker.libraries.Libraries>
+        <avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
+      </AvrGcc>
+    </ToolchainSettings>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="calculator.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="calculator.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="keyboard.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="keyboard.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="main.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="timer.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="timer.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="uart.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="uart.h">
+      <SubType>compile</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
+</Project>

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,4 +1,3 @@
-#include <stdio.h>
 #include "calculator.h"
 
 void handleCalc(struct calculator *calc, int input) {
@@ -58,7 +57,6 @@ void handleCalc(struct calculator *calc, int input) {
 			break;
 		}
 		break;
-
 		case NUMBER_SECOND:
 		switch (input) {
 			case 0:
@@ -118,7 +116,6 @@ void handleCalc(struct calculator *calc, int input) {
 				calc->result = calc->num1 / calc->num2;
 				calc->state = RESULT;
 				break;
-
 			}
 			break;
 			case 15:
@@ -134,6 +131,7 @@ void handleCalc(struct calculator *calc, int input) {
 		break;
 	}
 }
+
 void clearCalc(struct calculator *calc) {
 	calc->state = NUMBER_FIRST;
 	calc->operation = NO_OP;

calculator.h

@@ -1,5 +1,13 @@
-#ifndef TESTCALC_MAIN_H
+/*
-#define TESTCALC_MAIN_H
+ * calculator.h
+ *
+ * Created: 29.05.2023 12:01:39
+ *  Author: mrnek
+ */ 
+
+
+#ifndef CALCULATOR_H_
+#define CALCULATOR_H_
 
 enum calculator_state {
 	NUMBER_FIRST,
@@ -14,19 +22,20 @@ enum calculator_op {
 	MUL
 };
 struct calculator {
-    // 1 число
+	// 1 ÷èñëî
 	int num1;
-    // 2 число
+	// 2 ÷èñëî
 	int num2;
-    // 3 операция
+	// 3 îïåðàöèÿ
 	enum calculator_op operation;
-    // 4 результат
+	// 4 ðåçóëüòàò
 	int result;
-    // 5 состояние атомата
+	// 5 ñîñòîÿíèå àòîìàòà
 	enum calculator_state state;
 };
 
 void clearCalc(struct calculator *calc);
+
 void handleCalc(struct calculator *calc, int input);
 
-#endif //TESTCALC_MAIN_H
+#endif /* CALCULATOR_H_ */

keyboard.c

@@ -0,0 +1,68 @@
+/*
+* core.c
+*
+* Created: 13.04.2023 14:28:40
+*  Author: mrnek
+*/
+#include <avr/io.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include "keyboard.h"
+#include "timer.h"
+
+#define MASK_PIND 0b11110000
+
+static void set_key_event(struct key *button);
+
+void get_physical_keys(struct key *keys) {
+	uint8_t row;
+	for (int i = 0; i < KEYS_AMOUNT / 4; i++) {
+		PORTC &= ~(1 << i);
+		for(volatile long i = 0; i < 1000; i++){};
+		row = PIND & MASK_PIND;
+		if (row & (1 << 4)) keys[i * 4].physical = false; else keys[i * 4].physical = true;
+		if (row & (1 << 5)) keys[i * 4 + 1].physical = false; else keys[i * 4 + 1].physical = true;
+		if (row & (1 << 6)) keys[i * 4 + 2].physical = false; else keys[i * 4 + 2].physical = true;
+		if (row & (1 << 7)) keys[i * 4 + 3].physical = false; else keys[i * 4 + 3].physical = true;
+		PORTC |= (1 << i);
+	}
+}
+
+void get_logical_keys(struct key *undc_keys) {
+	unsigned long timestamp = get_millis();
+	for(int i = 0; i < KEYS_AMOUNT; i++) {
+		if (undc_keys[i].physical != undc_keys[i].logical) {
+			if (timestamp - undc_keys[i].time >= DEBOUNCE_MS_THRESHOLD) {
+				undc_keys[i].logical = undc_keys[i].physical;
+				set_key_event(&undc_keys[i]);
+			}
+			} else { 
+				undc_keys[i].time = timestamp;
+				
+			}
+		}
+}
+
+void fill_buttons_names(struct key *buttons) {
+	for (int i = 0; i < KEYS_AMOUNT; i++) {
+		buttons[i].button = i;
+	}
+}
+
+/************************************************************************/
+/*                                                                      */
+/************************************************************************/
+static void set_key_event(struct key *button) {
+	if (button->logical == true) {
+		button->on_down = true;
+	} else {
+		button->on_up = true;	
+	}
+}
+
+void get_event(struct key *button, bool *up, bool *down) {
+	*up = button->on_up;
+	*down = button->on_down;
+	button->on_up = false;
+	button->on_down = false;
+}

keyboard.h

@@ -0,0 +1,27 @@
+#include <stdbool.h>
+/*
+ * core.h
+ *
+ * Created: 13.04.2023 14:23:22
+ *  Author: mrnek
+ */ 
+#define KEYS_AMOUNT 16
+#define DEBOUNCE_MS_THRESHOLD 20
+
+struct key {
+	char button;
+	unsigned long time;
+	bool physical;
+	bool logical;
+	bool on_down;
+	bool on_up;
+};
+
+
+void get_physical_keys(struct key *keys);
+
+void get_logical_keys(struct key *undc_keys);
+
+void fill_buttons_names(struct key *buttons);
+
+void get_event(struct key *button, bool *up, bool *down);

main.c

@@ -1,13 +1,78 @@
+#include <avr/interrupt.h>
+#include <avr/io.h>
+#include <stdbool.h>
 #include <stdio.h>
+#include "timer.h"
+#include "keyboard.h"
+#include "uart.h"
 #include "calculator.h"
 
-int main() {
+void setup_registers() {
+	MCUCR &= ~(1 << 4); // PUD
+	MCUCR &= ~(1 << 5); 
+	MCUCR &= ~(1 << 6); 
+	MCUCR &= ~(1 << 7);
+	DDRD &= 0x0F;
+	PORTD |= 0xF0;
+
+	DDRC = 0b111111;
+	PORTC = 0b001111;
+}
+
+void setup() {
+	USART_Init(MYUBRR);
+	setup_timer();
+	setup_registers();
+}
+
+int up_amoumt = 0;
+int down_amount = 0;
+int diff = 0;
+int diff_prev = 0;
+
+int main(void) {
+	setup();
+	puts("Hello\r\n");
+	struct key keys[KEYS_AMOUNT];
 	struct calculator calc;
 	clearCalc(&calc);
-    int input;
+	fill_buttons_names(keys);
 	while(1) {
-        scanf("%d", &input);
+		get_physical_keys(keys);
-        handleCalc(&calc, input);
+		get_logical_keys(keys);
-        printf("num1: %d | num2: %d | result: %d | operation: %d | state: %d", calc.num1, calc.num2, calc.result, calc.operation, calc.state);
+		
+		for (int i = 0; i < KEYS_AMOUNT; i++) {
+			bool up, down;
+			get_event(&keys[i], &up, &down);
+			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);
 			}
 		}
+	}
+}
+
+int puts(const char * __str){
+	int len = strlen(__str);
+	for(size_t i = 0; i < len; i++){
+		while (!(UCSR0A & (1<<UDREn)));
+		UDR0 = __str[i];
+	}
+}
+
+int printf( const char * format, ... )
+{
+	char buffer[16];
+	va_list args;
+	va_start (args, format);
+	size_t s = vsprintf (buffer,format, args);
+	for(size_t i = 0; i < s; i++){
+			while (!(UCSR0A & (1<<UDREn)));
+			UDR0 = buffer[i];
+	}
+	va_end (args);
+	return s;
+}

timer.c

@@ -0,0 +1,26 @@
+#include <avr/interrupt.h>
+#include "timer.h"
+/*
+ * timer.c
+ *
+ * Created: 13.04.2023 14:13:50
+ *  Author: mrnek
+ */ 
+
+static unsigned long millis = 0;
+
+void setup_timer() {
+	TCCR1B |= (1 << WGM12); // настраиваем режим CTC (Clear Timer on Compare Match)
+	OCR1A = 250; // задаем значение, при котором будет срабатывать прерывание (в данном случае 15999, так как Atmega328p работает на частоте 16 МГц и нужно получить прерывание раз в 1 мс)
+	TIMSK1 |= (1 << OCIE1A); // включаем прерывание по совпадению со значением регистра OCR1A
+	sei(); // разрешаем глобальные прерывания
+	TCCR1B |= (1 << CS11) | (1 << CS10); // запускаем таймер с предделителем 64 (16000000/64=250000)
+}
+
+unsigned long get_millis() {
+	return millis;	
+}
+
+ISR(TIMER1_COMPA_vect) {
+	++millis;
+}

timer.h

@@ -0,0 +1,10 @@
+/*
+ * timer.h
+ *
+ * Created: 13.04.2023 14:12:16
+ *  Author: mrnek
+ */ 
+
+void setup_timer();
+
+unsigned long get_millis();

uart.c

@@ -0,0 +1,28 @@
+/*
+ * uart.c
+ *
+ * Created: 13.04.2023 15:32:02
+ *  Author: mrnek
+ */ 
+#include <avr/io.h>
+#include "uart.h"
+
+void USART_Init(unsigned int ubrr) {
+	/*Set baud rate */
+	UBRR0H = (unsigned char)(ubrr>>8);
+	UBRR0L = (unsigned char)ubrr;
+	UBRR0H = 0;
+	UBRR0L = 8;
+	/* Set frame format: 8data, 2stop bit */
+	UCSR0C = (1<<USBS0)|(3<<UCSZ00);
+	/* Enable receiver and transmitter */
+	UCSR0B = (1<<RXEN0)|(1<<TXEN0);
+}
+
+void USART_Transmit(unsigned char data) {
+	/* Wait for empty transmit buffer */
+	while (!(UCSR0A & (1<<UDREn)))
+	;
+	/* Put data into buffer, sends the data */
+	UDR0 = data;
+}

uart.h

@@ -0,0 +1,14 @@
+/*
+ * uart.h
+ *
+ * Created: 13.04.2023 15:32:20
+ *  Author: mrnek
+ */ 
+#define FOSC 1843200 // Clock Speed
+#define BAUD 9600
+#define UDREn (5)
+#define MYUBRR FOSC/16/BAUD-1
+
+void USART_Transmit(unsigned char data);
+
+void USART_Init(unsigned int ubrr);