Compare commits

...

6 Commits

9 changed files with 589 additions and 221 deletions

1
.gitignore vendored
View File

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

View File

@ -1,187 +1,144 @@
#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, case NUMBER_FIRST:
RESULT switch (input) {
}; case 0:
enum calculator_op { calc->num1 = (calc->num1 * 10) + 7;
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;
break; break;
case 1: case 1:
calc.num1 = (calc.num1 * 10) + 8; 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;
}
printf("num1: %d | num2: %d | result: %d | operation: %d | state: %d", calc.num1, calc.num2, calc.result, calc.operation, calc.state);
break; break;
case 2:
case NUMBER_SECOND: calc->num1 = (calc->num1 * 10) + 9;
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:
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;
}
printf("num1: %d | num2: %d | result: %d | operation: %d | state: %d", calc.num1, calc.num2, calc.result, calc.operation, calc.state);
break; break;
case RESULT: case 3:
switch (input) { calc->operation = DIV;
case 14: calc->state = NUMBER_SECOND;
calc.state = NUMBER_FIRST; break;
calc.operation = NO_OP; case 4:
calc.num1 = 0; calc->num1 = (calc->num1 * 10) + 4;
calc.num2 = 0; break;
calc.result = 0; case 5:
printf("num1: %d | num2: %d | result: %d | operation: %d | state: %d", calc.num1, calc.num2, calc.result, calc.operation, calc.state); calc->num1 = (calc->num1 * 10) + 5;
break; 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;
} }
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;
case 13:
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;
}

41
calculator.h Normal file
View File

@ -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 ÷èñëî
long num1;
// 2 ÷èñëî
long num2;
// 3 îïåðàöèÿ
enum calculator_op operation;
// 4 ðåçóëüòàò
long result;
// 5 ñîñòîÿíèå àòîìàòà
enum calculator_state state;
};
void clearCalc(struct calculator *calc);
void handleCalc(struct calculator *calc, int input);
#endif /* CALCULATOR_H_ */

72
func.c Normal file
View File

@ -0,0 +1,72 @@
/*
* 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);
}

13
func.h Normal file
View File

@ -0,0 +1,13 @@
/*
* 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);

View File

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

54
main.c
View File

@ -5,6 +5,7 @@
#include "timer.h" #include "timer.h"
#include "keyboard.h" #include "keyboard.h"
#include "uart.h" #include "uart.h"
#include "spi_master.h"
void setup_registers() { void setup_registers() {
MCUCR &= ~(1 << 4); // PUD MCUCR &= ~(1 << 4); // PUD
@ -20,6 +21,7 @@ void setup_registers() {
void setup() { void setup() {
USART_Init(MYUBRR); USART_Init(MYUBRR);
SPI_MasterInit();
setup_timer(); setup_timer();
setup_registers(); setup_registers();
} }
@ -33,6 +35,8 @@ int main(void) {
setup(); setup();
puts("Hello\r\n"); puts("Hello\r\n");
struct key keys[KEYS_AMOUNT]; struct key keys[KEYS_AMOUNT];
struct calculator calc;
clearCalc(&calc);
fill_buttons_names(keys); fill_buttons_names(keys);
while(1) { while(1) {
get_physical_keys(keys); get_physical_keys(keys);
@ -43,44 +47,18 @@ int main(void) {
get_event(&keys[i], &up, &down); get_event(&keys[i], &up, &down);
if (down) if (down)
{ {
printf("%d", keys[i].button); //printf("button %d\r\n", 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);
} }
} }
//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;
} }
} }
@ -99,8 +77,8 @@ int printf( const char * format, ... )
va_start (args, format); va_start (args, format);
size_t s = vsprintf (buffer,format, args); size_t s = vsprintf (buffer,format, args);
for(size_t i = 0; i < s; i++){ for(size_t i = 0; i < s; i++){
while (!(UCSR0A & (1<<UDREn))); while (!(UCSR0A & (1<<UDREn)));
UDR0 = buffer[i]; UDR0 = buffer[i];
} }
va_end (args); va_end (args);
return s; return s;

285
spi_master.c Normal file
View File

@ -0,0 +1,285 @@
#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;
}

20
spi_master.h Normal file
View File

@ -0,0 +1,20 @@
#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);