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

add calc impl

Browse Source
This commit is contained in:
mrnek 2023-05-29 12:57:48 +03:00
parent bc896de6b2
commit c5fb133688
7 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

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

20
GccApplication3.atsln Normal file
View File

@ -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

BIN
GccApplication3.atsuo Normal file
View File

Binary file not shown.

3
GccApplication3.cproj
View File

@ -99,6 +99,9 @@
<Compile Include="calculator.c"> <Compile Include="calculator.c">
<SubType>compile</SubType> <SubType>compile</SubType>
</Compile> </Compile>
<Compile Include="calculator.h">
<SubType>compile</SubType>
</Compile>
<Compile Include="keyboard.c"> <Compile Include="keyboard.c">
<SubType>compile</SubType> <SubType>compile</SubType>
</Compile> </Compile>

9
calculator.c
View File

@ -1,12 +1,12 @@
#include <stdio.h>
#include "calculator.h" #include "calculator.h"
void handleCalc(struct calculator *calc, int input) { void handleCalc(struct calculator *calc, int input) {
switch (calc->state) { switch (calc->state) {
case NUMBER_FIRST: case NUMBER_FIRST:
switch (input) { switch (input) {
case 0: case 0:
calc->num1 = (calc->num1 * 10) + 7; 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; break;
@ -131,7 +131,8 @@ void handleCalc(struct calculator *calc, int input) {
break; break;
} }
} }
void clearCalc(struct calculator* calc) {
void clearCalc(struct calculator *calc) {
calc->state = NUMBER_FIRST; calc->state = NUMBER_FIRST;
calc->operation = NO_OP; calc->operation = NO_OP;
calc->num1 = 0; calc->num1 = 0;

3
calculator.h
View File

@ -33,8 +33,9 @@ struct calculator {
// 5 ñîñòîÿíèå àòîìàòà // 5 ñîñòîÿíèå àòîìàòà
enum calculator_state state; enum calculator_state state;
}; };
void clearCalc(struct calculator *calc); void clearCalc(struct calculator *calc);
void handleCalc(struct calculator *calc, int input) void handleCalc(struct calculator *calc, int input);
#endif /* CALCULATOR_H_ */ #endif /* CALCULATOR_H_ */

41
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 "calculator.h"
void setup_registers() { void setup_registers() {
MCUCR &= ~(1 << 4); // PUD MCUCR &= ~(1 << 4); // PUD
@ -33,6 +34,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);
@ -44,43 +47,11 @@ int main(void) {
if (down) if (down)
{ {
printf("%d", keys[i].button); 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);
} }
} }
//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;
} }
} }