ICS-Microprocessor-2020/terminal
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
Михаил Батухтин 2023-06-03 19:12:52 +03:00
parent 5fe0a6d3e4
commit 17f212cf43
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
main.c
View File

@ -5,12 +5,12 @@
#include "timer.h" #include "timer.h"
#include "keyboard.h" #include "keyboard.h"
#include "uart.h" #include "uart.h"
#include "calculator.h" #include "spi_master.h"
void setup_registers() { void setup_registers() {
MCUCR &= ~(1 << 4); // PUD MCUCR &= ~(1 << 4); // PUD
MCUCR &= ~(1 << 5); MCUCR &= ~(1 << 5);
MCUCR &= ~(1 << 6); MCUCR &= ~(1 << 6);
MCUCR &= ~(1 << 7); MCUCR &= ~(1 << 7);
DDRD &= 0x0F; DDRD &= 0x0F;
PORTD |= 0xF0; PORTD |= 0xF0;
@ -21,21 +21,23 @@ void setup_registers() {
void setup() { void setup() {
USART_Init(MYUBRR); USART_Init(MYUBRR);
SPI_MasterInit();
setup_timer(); setup_timer();
setup_registers(); setup_registers();
} }
int up_amoumt = 0;
int down_amount = 0;
int diff = 0;
int diff_prev = 0;
int main(void) { int main(void) {
puts("Program started\r\n");
setup(); setup();
puts("Hello\r\n");
struct calculator calc;
struct key keys[KEYS_AMOUNT]; struct key keys[KEYS_AMOUNT];
struct calculator calc;
fill_buttons_names(keys);
clearCalc(&calc); clearCalc(&calc);
fill_buttons_names(keys);
while(1) { while(1) {
get_physical_keys(keys); get_physical_keys(keys);
get_logical_keys(keys); get_logical_keys(keys);
@ -43,15 +45,18 @@ int main(void) {
for (int i = 0; i < KEYS_AMOUNT; i++) { for (int i = 0; i < KEYS_AMOUNT; i++) {
bool up, down; bool up, down;
get_event(&keys[i], &up, &down); get_event(&keys[i], &up, &down);
if (down) { if (down)
{
//printf("button %d\r\n", keys[i].button);
handleCalc(&calc, keys[i].button); handleCalc(&calc, keys[i].button);
printf("-------\r\n"); output_on_display(&calc);
printf("%d\r\n", keys[i].button); //printf("-----\r\n");
printf("%li\r\n", calc.num1); //printf("%ld\r\n", calc.num1);
printf("%li\r\n", calc.num2); //printf("%ld\r\n", calc.num2);
printf("%li\r\n", calc.result); //printf("%ld\r\n", calc.result);
printf("%d\r\n", calc.operation); //printf("%d\r\n", calc.operation);
printf("%d\r\n", calc.state); //printf("%d\r\n", calc.state);
} }
} }
} }
@ -72,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;