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

Исправлена ошибка переполнения переменной

Browse Source
This commit is contained in:
Михаил Батухтин 2023-06-08 17:15:36 +03:00
parent a766efb8a9
commit b8370ddc0a
8 changed files with 413 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
GccApplication3_6_2(1).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_6_2(1).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

140
GccApplication3_6_2(1).cproj Normal file
View File

@ -0,0 +1,140 @@
<?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="func.c">
<SubType>compile</SubType>
</Compile>
<Compile Include="func.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="spi_master.c">
<SubType>compile</SubType>
</Compile>
<Compile Include="spi_master.h">
<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>

86
GccApplication3_6_2.componentinfo.xml Normal file
View File

@ -0,0 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<Store xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="AtmelPackComponentManagement">
<ProjectComponents>
<ProjectComponent z:Id="i1" xmlns:z="http://schemas.microsoft.com/2003/10/Serialization/">
<CApiVersion></CApiVersion>
<CBundle></CBundle>
<CClass>Device</CClass>
<CGroup>Startup</CGroup>
<CSub></CSub>
<CVariant></CVariant>
<CVendor>Atmel</CVendor>
<CVersion>1.2.0</CVersion>
<DefaultRepoPath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs</DefaultRepoPath>
<DependentComponents xmlns:d4p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
<Description></Description>
<Files xmlns:d4p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
<d4p1:anyType i:type="FileInfo">
<AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include</AbsolutePath>
<Attribute></Attribute>
<Category>include</Category>
<Condition>C</Condition>
<FileContentHash i:nil="true" />
<FileVersion></FileVersion>
<Name>include</Name>
<SelectString></SelectString>
<SourcePath></SourcePath>
</d4p1:anyType>
<d4p1:anyType i:type="FileInfo">
<AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include\avr\iom328p.h</AbsolutePath>
<Attribute></Attribute>
<Category>header</Category>
<Condition>C</Condition>
<FileContentHash>UMk4QUzkkuShabuoYtNl/Q==</FileContentHash>
<FileVersion></FileVersion>
<Name>include/avr/iom328p.h</Name>
<SelectString></SelectString>
<SourcePath></SourcePath>
</d4p1:anyType>
<d4p1:anyType i:type="FileInfo">
<AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\templates\main.c</AbsolutePath>
<Attribute>template</Attribute>
<Category>source</Category>
<Condition>C Exe</Condition>
<FileContentHash>GD1k8YYhulqRs6FD1B2Hog==</FileContentHash>
<FileVersion></FileVersion>
<Name>templates/main.c</Name>
<SelectString>Main file (.c)</SelectString>
<SourcePath></SourcePath>
</d4p1:anyType>
<d4p1:anyType i:type="FileInfo">
<AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\templates\main.cpp</AbsolutePath>
<Attribute>template</Attribute>
<Category>source</Category>
<Condition>C Exe</Condition>
<FileContentHash>YXFphlh0CtZJU+ebktABgQ==</FileContentHash>
<FileVersion></FileVersion>
<Name>templates/main.cpp</Name>
<SelectString>Main file (.cpp)</SelectString>
<SourcePath></SourcePath>
</d4p1:anyType>
<d4p1:anyType i:type="FileInfo">
<AbsolutePath>C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p</AbsolutePath>
<Attribute></Attribute>
<Category>libraryPrefix</Category>
<Condition>GCC</Condition>
<FileContentHash i:nil="true" />
<FileVersion></FileVersion>
<Name>gcc/dev/atmega328p</Name>
<SelectString></SelectString>
<SourcePath></SourcePath>
</d4p1:anyType>
</Files>
<PackName>ATmega_DFP</PackName>
<PackPath>C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/Atmel.ATmega_DFP.pdsc</PackPath>
<PackVersion>1.2.209</PackVersion>
<PresentInProject>true</PresentInProject>
<ReferenceConditionId>ATmega328P</ReferenceConditionId>
<RteComponents xmlns:d4p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
<d4p1:string></d4p1:string>
</RteComponents>
<Status>Resolved</Status>
<VersionMode>Fixed</VersionMode>
<IsComponentInAtProject>true</IsComponentInAtProject>
</ProjectComponent>
</ProjectComponents>
</Store>

138
GccApplication3_6_2.cproj
View File

@ -2,7 +2,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectVersion>6.2</ProjectVersion> <ProjectVersion>7.0</ProjectVersion>
<ToolchainName>com.Atmel.AVRGCC8.C</ToolchainName> <ToolchainName>com.Atmel.AVRGCC8.C</ToolchainName>
<ProjectGuid>{94bbcabe-3e5b-448f-a40b-2b08def16444}</ProjectGuid> <ProjectGuid>{94bbcabe-3e5b-448f-a40b-2b08def16444}</ProjectGuid>
<avrdevice>ATmega328P</avrdevice> <avrdevice>ATmega328P</avrdevice>
@ -27,72 +27,96 @@
<BootSegment>2</BootSegment> <BootSegment>2</BootSegment>
<eraseonlaunchrule>1</eraseonlaunchrule> <eraseonlaunchrule>1</eraseonlaunchrule>
<AsfFrameworkConfig> <AsfFrameworkConfig>
<framework-data xmlns=""> <framework-data>
<options /> <options />
<configurations /> <configurations />
<files /> <files />
<documentation help="" /> <documentation help="" />
<offline-documentation help="" /> <offline-documentation help="" />
<dependencies> <dependencies>
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.21.0" /> <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.34.1" />
</dependencies> </dependencies>
</framework-data> </framework-data>
</AsfFrameworkConfig> </AsfFrameworkConfig>
<ResetRule>0</ResetRule>
<EraseKey />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<ToolchainSettings> <ToolchainSettings>
<AvrGcc> <AvrGcc>
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex> <avrgcc.common.Device>-mmcu=atmega328p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p"</avrgcc.common.Device>
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss> <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep> <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec> <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures> <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned> <avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned> <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
<avrgcc.compiler.symbols.DefSymbols> <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
<ListValues> <avrgcc.compiler.symbols.DefSymbols>
<Value>NDEBUG</Value> <ListValues>
</ListValues> <Value>NDEBUG</Value>
</avrgcc.compiler.symbols.DefSymbols> </ListValues>
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level> </avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers> <avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum> <ListValues>
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings> <Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.209\include</Value>
<avrgcc.linker.libraries.Libraries> </ListValues>
<ListValues> </avrgcc.compiler.directories.IncludePaths>
<Value>libm</Value> <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
</ListValues> <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
</avrgcc.linker.libraries.Libraries> <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
</AvrGcc> <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
<avrgcc.linker.libraries.Libraries>
<ListValues>
<Value>libm</Value>
</ListValues>
</avrgcc.linker.libraries.Libraries>
<avrgcc.assembler.general.IncludePaths>
<ListValues>
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.209\include</Value>
</ListValues>
</avrgcc.assembler.general.IncludePaths>
</AvrGcc>
</ToolchainSettings> </ToolchainSettings>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<ToolchainSettings> <ToolchainSettings>
<AvrGcc> <AvrGcc>
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex> <avrgcc.common.Device>-mmcu=atmega328p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p"</avrgcc.common.Device>
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss> <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep> <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec> <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures> <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned> <avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned> <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
<avrgcc.compiler.symbols.DefSymbols> <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
<ListValues> <avrgcc.compiler.symbols.DefSymbols>
<Value>DEBUG</Value> <ListValues>
</ListValues> <Value>DEBUG</Value>
</avrgcc.compiler.symbols.DefSymbols> </ListValues>
<avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level> </avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers> <avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum> <ListValues>
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel> <Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.209\include</Value>
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings> </ListValues>
<avrgcc.linker.libraries.Libraries> </avrgcc.compiler.directories.IncludePaths>
<ListValues> <avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
<Value>libm</Value> <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
</ListValues> <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
</avrgcc.linker.libraries.Libraries> <avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel> <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
</AvrGcc> <avrgcc.linker.libraries.Libraries>
<ListValues>
<Value>libm</Value>
</ListValues>
</avrgcc.linker.libraries.Libraries>
<avrgcc.assembler.general.IncludePaths>
<ListValues>
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.2.209\include</Value>
</ListValues>
</avrgcc.assembler.general.IncludePaths>
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
</AvrGcc>
</ToolchainSettings> </ToolchainSettings>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

38
func.c
View File

@ -50,16 +50,40 @@ void split_digits(long number, long* digits, int size) {
} }
} }
static char map(int digit) { static char map(char c) {
if (digit >= 0 && digit <= 9) //if (c >= 0 && c <= 9)
return digit + 0x09; //return c - 0x27;
else //else
return 0x01; //return 0x01;
switch (c) {
case 0x30:
return 0x09;
case 0x31:
return 0x0a;
case 0x32:
return 0x0b;
case 0x33:
return 0x0c;
case 0x34:
return 0x0d;
case 0x35:
return 0x0e;
case 0x36:
return 0x0f;
case 0x37:
return 0x10;
case 0x38:
return 0x11;
case 0x39:
return 0x12;
case 0x2d:
return 0x06;
}
} }
void map_digits(char* arr, long *digits, int size) { void map_digits(char* arr, char *digits, int size) {
int idx = 0; int idx = 0;
for (int i = size - 1; i >= 0; i--) { for (int i = 0; i < size; i++) {
arr[idx] = map(digits[i]); arr[idx] = map(digits[i]);
idx++; idx++;
} }

2
func.h
View File

@ -9,5 +9,5 @@ void delay();
void split_digits(long number, long* digits, int size); void split_digits(long number, long* digits, int size);
int count_digits(long number); int count_digits(long number);
void map_digits(char* arr, long *digits, int size); void map_digits(char* arr, char *digits, int size);
void prepare_data(char *arr, long number, int size); void prepare_data(char *arr, long number, int size);

53
spi_master.c
View File

@ -6,13 +6,13 @@
#include "func.h" #include "func.h"
#include <stdlib.h> #include <stdlib.h>
#define MAX_DIGITS 11 #define MAX_DIGITS 12
#define F_CPU 16000000UL #define F_CPU 16000000UL
#define DELAY_MS 2000 #define DELAY_MS 2000
void output_on_display(struct calculator *calc) void output_on_display(struct calculator *calc)
{ {
char buffer[8]; char buffer[32];
switch (calc->state) switch (calc->state)
{ {
case NUMBER_FIRST: case NUMBER_FIRST:
@ -23,13 +23,7 @@ void output_on_display(struct calculator *calc)
b_size = display_set_page(0x01, buffer); b_size = display_set_page(0x01, buffer);
SPI_MasterTransmit(buffer, b_size); SPI_MasterTransmit(buffer, b_size);
//int size = count_digits(calc->num1); transmit_num(calc->num1, buffer);
char mapped_digits[12];
//prepare_data(mapped_digits, calc->num1, size);
ltoa(calc->num1 , mapped_digits, 10);
b_size = display_add_simbol(mapped_digits, 12, buffer);
SPI_MasterTransmit(buffer, b_size);
break; break;
} }
case NUMBER_SECOND: case NUMBER_SECOND:
@ -40,11 +34,7 @@ void output_on_display(struct calculator *calc)
b_size = display_set_page(0x01, buffer); b_size = display_set_page(0x01, buffer);
SPI_MasterTransmit(buffer, b_size); SPI_MasterTransmit(buffer, b_size);
int size = count_digits(calc->num1); transmit_num(calc->num1, buffer);
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}; char symbol[] = {0x01};
// Îïåðàöèÿ // Îïåðàöèÿ
@ -72,11 +62,7 @@ void output_on_display(struct calculator *calc)
b_size = display_set_page(0x02, buffer); b_size = display_set_page(0x02, buffer);
SPI_MasterTransmit(buffer, b_size); SPI_MasterTransmit(buffer, b_size);
size = count_digits(calc->num2); transmit_num(calc->num2, buffer);
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; break;
} }
case RESULT: case RESULT:
@ -87,14 +73,10 @@ void output_on_display(struct calculator *calc)
b_size = display_set_page(0x01, buffer); b_size = display_set_page(0x01, buffer);
SPI_MasterTransmit(buffer, b_size); SPI_MasterTransmit(buffer, b_size);
int size = count_digits(calc->num1); transmit_num(calc->num1, buffer);
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}; char symbol[] = {0x01};
// îïåðàöèÿ // Îïåðàöèÿ
switch (calc->operation) switch (calc->operation)
{ {
case NO_OP: case NO_OP:
@ -119,11 +101,7 @@ void output_on_display(struct calculator *calc)
b_size = display_set_page(0x02, buffer); b_size = display_set_page(0x02, buffer);
SPI_MasterTransmit(buffer, b_size); SPI_MasterTransmit(buffer, b_size);
size = count_digits(calc->num2); transmit_num(calc->num2, buffer);
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); b_size = display_set_page(0x03, buffer);
@ -133,11 +111,7 @@ void output_on_display(struct calculator *calc)
b_size = display_add_simbol(symbol, 1, buffer); b_size = display_add_simbol(symbol, 1, buffer);
SPI_MasterTransmit(buffer, b_size); SPI_MasterTransmit(buffer, b_size);
size = count_digits(calc->result); transmit_num(calc->result, buffer);
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; break;
} }
@ -146,6 +120,15 @@ void output_on_display(struct calculator *calc)
} }
} }
void transmit_num(long number, char *buffer) {
char number_buffer[MAX_DIGITS];
char mapped_digits[MAX_DIGITS];
ltoa(number, number_buffer, 10);
map_digits(mapped_digits, number_buffer, strlen(number_buffer));
size_t b_size = display_add_simbol(mapped_digits, strlen(number_buffer), buffer);
SPI_MasterTransmit(buffer, b_size);
}
void SPI_MasterInit(void) void SPI_MasterInit(void)
{ {
/* Íàñòðîéêà MOSI è SCK êàê âûõîä, /* Íàñòðîéêà MOSI è SCK êàê âûõîä,

4
spi_master.h
View File

@ -10,9 +10,7 @@
void output_on_display(struct calculator *calc); void output_on_display(struct calculator *calc);
void SPI_MasterInit(void); void SPI_MasterInit(void);
void SPI_MasterTransmit(char *buffer, size_t length); void SPI_MasterTransmit(char *buffer, size_t length);
void transmit_first_num(struct calculator *calc, char *buffer); void transmit_num(long number, 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_all_clear(char color, char *buffer);
size_t display_add_simbol(char *str, size_t str_len, 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_draw_line(char x1, char y1, char x2, char y2, char color, char *buffer);