add calc impl

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

@@ -127,9 +127,6 @@ void handleCalc(struct calculator *calc, int input) {
 			case 14:
 			clearCalc(calc);
 			break;
-			case 13:
-			clearCalc(calc);
-			break;
 		}
 		break;
 	}

calculator.h

@@ -23,13 +23,13 @@ enum calculator_op {
 };
 struct calculator {
 	// 1 ÷èñëî
-	long num1;
+	int num1;
 	// 2 ÷èñëî
-	long num2;
+	int num2;
 	// 3 îïåðàöèÿ
 	enum calculator_op operation;
 	// 4 ðåçóëüòàò
-	long result;
+	int result;
 	// 5 ñîñòîÿíèå àòîìàòà
 	enum calculator_state state;
 };

func.c

@@ -1,72 +0,0 @@
-/*
-* delay.c
-*
-* Created: 03.06.2023 12:34:55
-*  Author: Admin
-*/
-#include "func.h"
-
-void delay() {
-	for(volatile long i = 0; i < 1000; i++){};
-}
-
-int count_digits(long number) {
-	int count = 0;
-
-	if (number == 0) {
-		return 1;
-	}
-
-	if (number < 0) {
-		number = -number;
-	}
-
-	while (number > 0) {
-		number /= 10;
-		count++;
-	}
-
-	return count;
-}
-
-void split_digits(long number, int* digits, int size) {
-	int digit;
-	int index = 0;
-
-	if (number == 0) {
-		digits[0] = 0;
-		return;
-	}
-
-	if (number < 0) {
-		number = -number;
-	}
-
-	while (number > 0 && index < size) {
-		digit = number % 10;
-		digits[index] = digit;
-		number /= 10;
-		index++;
-	}
-}
-
-static char map(int digit) {
-	if (digit >= 0 && digit <= 9)
-	return digit + 0x09;
-	else
-	return 0x01;
-}
-
-void map_digits(char* arr, int *digits, int size) {
-	int idx = 0;
-	for (int i = size - 1; i >= 0; i--) {
-		arr[idx] = map(digits[i]);
-		idx++;
-	}
-}
-
-void prepare_data(char *arr, int number, int size) {
-	int digits[size];
-	split_digits(number, digits, size);
-	map_digits(arr, digits, size);
-}

func.h

@@ -1,13 +0,0 @@
-/*
-* delay.h
-*
-* Created: 03.06.2023 12:35:06
-*  Author: Admin
-*/
-
-void delay();
-
-void split_digits(long number, int* digits, int size);
-int count_digits(long number);
-void map_digits(char* arr, int *digits, int size);
-void prepare_data(char *arr, int number, int size);

keyboard.c

@@ -9,7 +9,6 @@
 #include <stdio.h>
 #include "keyboard.h"
 #include "timer.h"
-#include "func.h"
 
 #define MASK_PIND 0b11110000
 
@@ -19,7 +18,7 @@ void get_physical_keys(struct key *keys) {
 	uint8_t row;
 	for (int i = 0; i < KEYS_AMOUNT / 4; i++) {
 		PORTC &= ~(1 << i);
-		delay();
+		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;

main.c

@@ -5,7 +5,7 @@
 #include "timer.h"
 #include "keyboard.h"
 #include "uart.h"
-#include "spi_master.h"
+#include "calculator.h"
 
 void setup_registers() {
 	MCUCR &= ~(1 << 4); // PUD
@@ -21,7 +21,6 @@ void setup_registers() {
 
 void setup() {
 	USART_Init(MYUBRR);
-	SPI_MasterInit();
 	setup_timer();
 	setup_registers();
 }
@@ -47,16 +46,10 @@ int main(void) {
 			get_event(&keys[i], &up, &down);
 			if (down)
 			{
-				//printf("button %d\r\n", keys[i].button);
+				printf("%d", keys[i].button);
 				handleCalc(&calc, keys[i].button);
-				output_on_display(&calc);
-				//printf("-----\r\n");
-				//printf("%ld\r\n", calc.num1);
-				//printf("%ld\r\n", calc.num2);
-				//printf("%ld\r\n", calc.result);
-				//printf("%d\r\n", calc.operation);
-				//printf("%d\r\n", calc.state);
-				
+				printf("num1: %d | num2: %d | result: %d | operation: %d | state: %d", 
+				 calc.num1, calc.num2, calc.result, calc.operation, calc.state);
 			}
 		}
 	}

spi_master.c

@@ -1,285 +0,0 @@
-#include <avr/interrupt.h>
-#include <avr/io.h>
-#include <string.h>
-#include <util/delay.h>
-#include "spi_master.h"
-#include "func.h"
-
-#define MAX_DIGITS 11
-#define F_CPU 16000000UL
-#define DELAY_MS 3000
-
-void output_on_display(struct calculator *calc)
-{
-	char buffer[8];
-	switch (calc->state)
-	{
-		case NUMBER_FIRST:
-		{
-			size_t b_size = display_all_clear(0, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			b_size = display_set_page(0x01, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			int size = count_digits(calc->num1);
-			char mapped_digits[size];
-			prepare_data(mapped_digits, calc->num1, size);
-			b_size = display_add_simbol(mapped_digits, size, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			break;
-		}
-		case NUMBER_SECOND:
-		{
-			size_t b_size = display_all_clear(0, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			b_size = display_set_page(0x01, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			int size = count_digits(calc->num1);
-			char mapped_digits[size];
-			prepare_data(mapped_digits, calc->num1, size);
-			b_size = display_add_simbol(mapped_digits, size, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			char symbol[] = {0x01};
-			// îïåðàöèÿ
-			switch (calc->operation)
-			{
-				case NO_OP:
-				break;
-				case ADD:
-				symbol[0] = 0x04;
-				break;
-				case SUB:
-				symbol[0] = 0x06;
-				break;
-				case DIV:
-				symbol[0] = 0x08;
-				break;
-				case MUL:
-				symbol[0] = 0x03;
-				break;
-			}
-			
-			b_size = display_add_simbol(symbol, 1, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			b_size = display_set_page(0x02, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			size = count_digits(calc->num2);
-			char mapped_digits1[size];
-			prepare_data(mapped_digits1, calc->num2, size);
-			b_size = display_add_simbol(mapped_digits1, size, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			break;
-		}
-		case RESULT:
-		{
-			size_t b_size = display_all_clear(0, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			b_size = display_set_page(0x01, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			int size = count_digits(calc->num1);
-			char mapped_digits[size];
-			prepare_data(mapped_digits, calc->num1, size);
-			b_size = display_add_simbol(mapped_digits, size, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			char symbol[] = {0x01};
-			// îïåðàöèÿ
-			switch (calc->operation)
-			{
-				case NO_OP:
-				break;
-				case ADD:
-				symbol[0] = 0x04;
-				break;
-				case SUB:
-				symbol[0] = 0x06;
-				break;
-				case DIV:
-				symbol[0] = 0x08;
-				break;
-				case MUL:
-				symbol[0] = 0x03;
-				break;
-			}
-			
-			b_size = display_add_simbol(symbol, 1, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			b_size = display_set_page(0x02, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			size = count_digits(calc->num2);
-			char mapped_digits1[size];
-			prepare_data(mapped_digits1, calc->num2, size);
-			b_size = display_add_simbol(mapped_digits1, size, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-
-			// ëèíèÿ
-			
-			
-			// ðåçóëüòàò
-			b_size = display_set_page(0x03, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			symbol[0] = 0x15;
-			b_size = display_add_simbol(symbol, 1, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			size = count_digits(calc->result);
-			char mapped_digits2[size];
-			prepare_data(mapped_digits2, calc->result, size);
-			b_size = display_add_simbol(mapped_digits2, size, buffer);
-			SPI_MasterTransmit(buffer, b_size);
-			
-			break;
-		}
-		default:
-		display_all_clear(0, buffer);
-	}
-}
-
-void SPI_MasterInit(void)
-{
-	/* Íàñòðîéêà MOSI è SCK êàê âûõîä,
-	âñå îñòàëüíûå ñèãíàëû êàê âõîä: */
-	SPI_DDRX = (1 << SPI_MOSI) | (1 << SPI_SCK) | (1 << SPI_SS) | (0 << SPI_MISO);
-
-	/* Ðàçðåøèòü ðàáîòó SPI, ðåæèì Master,
-	óñòàíîâèòü ñêîðîñòü òàêòîâ fck/16: */
-	SPCR = (1 << SPE) | (1 << MSTR) | (0 << CPOL) | (0 << CPHA) | (1 << SPR1);
-
-	SPI_PORTX |= (1 << SPI_SS);
-}
-
-void SPI_MasterTransmit(char *buffer, size_t length)
-{
-	SPI_PORTX &= ~(1 << SPI_SS);
-	for (int i = 0; i < length; i++)
-	{
-		SPDR = buffer[i];
-		while (!(SPSR & (1 << SPIF)))
-		{
-			// îæèäàíèå çàâåðøåíèÿ ïåðåäà÷è
-		}
-	}
-	SPI_PORTX |= (1 << SPI_SS);
-	_delay_ms(DELAY_MS);
-}
-
-char crc8(char *data, int len) {
-	char crc = 0x00;
-	while (len--) {
-		crc ^= *data++;
-		for (int i = 0; i < 8; i++) {
-			if (crc & 0x80) {
-				crc = (crc << 1) ^ 0x07;
-				} else {
-				crc <<= 1;
-			}
-		}
-	}
-	return crc;
-}
-
-//î÷èùåíèå ýêðàía
-size_t display_all_clear(char color, char *buffer)
-{
-	buffer[0] = 0x01;
-	buffer[1] = color;
-	buffer[2] = crc8(buffer, 2);
-	return 3;
-}
-
-//âûáîð òî÷êè
-size_t display_set_page(char point, char *buffer)
-{
-	buffer[0] = 0x02;
-	buffer[1] = point;
-	buffer[2] = crc8(buffer, 2);
-	return 3;
-}
-
-//äîáàâëåíèå íîâîãî ñèìâîëà è åãî ïàðàìåòðîâ
-size_t display_add_simbol(char *str, size_t str_len, char *buffer)
-{
-	size_t idx = 0;
-	buffer[idx] = 0x03;
-	idx++;
-	for (int i = 0; i < str_len; i++)
-	{
-		buffer[idx] = str[i];
-		idx++;
-	}
-	buffer[idx] = crc8(buffer, idx);
-	idx++;
-	return idx;
-}
-
-//óäàëåíèå ñèìâîëà è åãî ïàðàìåòðîâ
-size_t display_del_simbol(char number, char *buffer)
-{
-	buffer[0] = 0x04;
-	buffer[1] = number;
-	buffer[2] = crc8(buffer, 2);
-	return 3;
-}
-
-//çàêðàøèâàíèå ïèêñåëÿ
-size_t display_draw_pixel(char x, char y, char color, uint8_t *buffer)
-{
-	buffer[0] = 0x05;
-	buffer[1] = x;
-	buffer[2] = y;
-	buffer[3] = color;
-	buffer[4] = crc8(buffer, 4);
-	return 5;
-}
-
-//ðèñóåò ëèíèþ
-size_t display_draw_line(char x1, char y1, char x2, char y2, char color, char *buffer)
-{
-	buffer[0] = 0x06;
-	buffer[1] = x1;
-	buffer[2] = y1;
-	buffer[3] = x2;
-	buffer[4] = y2;
-	buffer[5] = color;
-	buffer[6] = crc8(buffer, 6);
-	return 7;
-}
-
-//ðèñóåò êðóã
-size_t display_draw_circle(char x, char y, char r, char color, uint8_t *buffer)
-{
-	buffer[0] = 0x07;
-	buffer[1] = x;
-	buffer[2] = y;
-	buffer[3] = r;
-	buffer[4] = color;
-	buffer[5] = crc8(buffer, 5);
-	return 6;
-}
-
-//ðèñóåò ïðÿìîóãîëüíèê
-size_t display_draw_rectangle(char x, char y, char height, char width, char color, uint8_t *buffer)
-{
-	buffer[0] = 0x08;
-	buffer[1] = x;
-	buffer[2] = y;
-	buffer[3] = height;
-	buffer[4] = width;
-	buffer[5] = color;
-	buffer[6] = crc8(buffer, 6);
-	return 7;
-}
-
-

spi_master.h

@@ -1,20 +0,0 @@
-#define SPI_PORTX PORTB
-#define SPI_DDRX DDRB
-#define SPI_MISO 4
-#define SPI_MOSI 3
-#define SPI_SCK 5
-#define SPI_SS 2
-
-#include "calculator.h"
-
-void output_on_display(struct calculator *calc);
-void SPI_MasterInit(void);
-void SPI_MasterTransmit(char *buffer, size_t length);
-void transmit_first_num(struct calculator *calc, char *buffer);
-void transmit_second_num(struct calculator *calc, char *buffer);
-void transmit_result(struct calculator *calc, char *buffer, char *symblo);
-size_t display_all_clear(char color, char *buffer);
-size_t display_add_simbol(char *str, size_t str_len, char *buffer);
-size_t display_draw_line(char x1, char y1, char x2, char y2, char color, char *buffer);
-size_t display_del_simbol(char number, char *buffer);
-size_t display_set_page(char point, char *buffer);