Exported library to submodule branch and adapted example
This commit is contained in:
parent
79741c300b
commit
b438aac91d
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
[submodule "inout/inout"]
|
||||
path = inout/inout
|
||||
url = git@blackmark.me:inout.git
|
||||
1
inout/inout
Submodule
1
inout/inout
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 093c0a6a025a5d39b9f236a03a290a374e3570e7
|
||||
225
inout/inout.cpp
225
inout/inout.cpp
@ -1,225 +0,0 @@
|
||||
#include "inout.h"
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
volatile uint8_t* InOut::getPort( Pin enmPin, Type enmType )
|
||||
{
|
||||
volatile uint8_t *vpui8Port = nullptr;
|
||||
|
||||
if( enmPin == Pin::P_NONE )
|
||||
{
|
||||
return vpui8Port;
|
||||
}
|
||||
|
||||
uint8_t ui8Port = ( static_cast<uint16_t>( enmPin ) >> 4 ) & 0x0F;
|
||||
|
||||
switch( ui8Port )
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
if( enmType == Type::T_PIN )
|
||||
{
|
||||
vpui8Port = PORT_PINA;
|
||||
}
|
||||
else if( enmType == Type::T_DDR )
|
||||
{
|
||||
vpui8Port = PORT_DDRA;
|
||||
}
|
||||
else if( enmType == Type::T_PORT )
|
||||
{
|
||||
vpui8Port = PORT_PORTA;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case 1:
|
||||
{
|
||||
if( enmType == Type::T_PIN )
|
||||
{
|
||||
vpui8Port = PORT_PINB;
|
||||
}
|
||||
else if( enmType == Type::T_DDR )
|
||||
{
|
||||
vpui8Port = PORT_DDRB;
|
||||
}
|
||||
else if( enmType == Type::T_PORT )
|
||||
{
|
||||
vpui8Port = PORT_PORTB;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case 2:
|
||||
{
|
||||
if( enmType == Type::T_PIN )
|
||||
{
|
||||
vpui8Port = PORT_PINC;
|
||||
}
|
||||
else if( enmType == Type::T_DDR )
|
||||
{
|
||||
vpui8Port = PORT_DDRC;
|
||||
}
|
||||
else if( enmType == Type::T_PORT )
|
||||
{
|
||||
vpui8Port = PORT_PORTC;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case 3:
|
||||
{
|
||||
if( enmType == Type::T_PIN )
|
||||
{
|
||||
vpui8Port = PORT_PIND;
|
||||
}
|
||||
else if( enmType == Type::T_DDR )
|
||||
{
|
||||
vpui8Port = PORT_DDRD;
|
||||
}
|
||||
else if( enmType == Type::T_PORT )
|
||||
{
|
||||
vpui8Port = PORT_PORTD;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return vpui8Port;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
uint8_t InOut::getPin( Pin enmPin )
|
||||
{
|
||||
return static_cast<uint16_t>( enmPin ) & 0x0F;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void InOut::setPinDirection( Pin enmPin, Dir enmDir, bool bPullup )
|
||||
{
|
||||
if( enmPin == Pin::P_NONE )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
volatile uint8_t *vpui8PortDir = getPort( enmPin, Type::T_DDR );
|
||||
volatile uint8_t *vpui8PortOut = getPort( enmPin, Type::T_PORT );
|
||||
uint8_t ui8Pin = getPin( enmPin );
|
||||
|
||||
setPinDirection( vpui8PortDir, ui8Pin, enmDir );
|
||||
|
||||
if( enmDir == Dir::D_IN )
|
||||
{
|
||||
writePin( vpui8PortOut, ui8Pin, bPullup );
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
bool InOut::readPin( Pin enmPin )
|
||||
{
|
||||
if( enmPin == Pin::P_NONE )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
volatile uint8_t *vpui8Port = getPort( enmPin, Type::T_PIN );
|
||||
uint8_t ui8Pin = getPin( enmPin );
|
||||
|
||||
return readPin( vpui8Port, ui8Pin );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void InOut::writePin( Pin enmPin, bool bValue )
|
||||
{
|
||||
if( enmPin == Pin::P_NONE )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
volatile uint8_t *vpui8Port = getPort( enmPin, Type::T_PORT );
|
||||
uint8_t ui8Pin = getPin( enmPin );
|
||||
|
||||
writePin( vpui8Port, ui8Pin, bValue );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
uint8_t InOut::readPort( Pin enmPortPin )
|
||||
{
|
||||
if( enmPortPin == Pin::P_NONE )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
volatile uint8_t *vpui8Port = getPort( enmPortPin, Type::T_PIN );
|
||||
|
||||
return readPort( vpui8Port );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void InOut::writePort( Pin enmPortPin, uint8_t ui8Value )
|
||||
{
|
||||
if( enmPortPin == Pin::P_NONE )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
volatile uint8_t *vpui8Port = getPort( enmPortPin, Type::T_PORT );
|
||||
|
||||
writePort( vpui8Port, ui8Value );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
InOutPin::InOutPin()
|
||||
{
|
||||
setPin( InOut::Pin::P_NONE );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
InOutPin::InOutPin( InOut::Pin enmPin )
|
||||
{
|
||||
setPin( enmPin );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
InOutPin::~InOutPin()
|
||||
{
|
||||
setDirection( InOut::Dir::D_IN, false );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void InOutPin::setPin( InOut::Pin enmPin )
|
||||
{
|
||||
m_vpui8Input = InOut::getPort( enmPin, InOut::Type::T_PIN );
|
||||
m_vpui8Dir = InOut::getPort( enmPin, InOut::Type::T_DDR );
|
||||
m_vpui8Output = InOut::getPort( enmPin, InOut::Type::T_PORT );
|
||||
|
||||
m_ui8Pin = InOut::getPin( enmPin );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
InOutPort::InOutPort()
|
||||
{
|
||||
setPort( InOut::Pin::P_NONE );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
InOutPort::InOutPort( InOut::Pin enmPin )
|
||||
{
|
||||
setPort( enmPin );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
InOutPort::~InOutPort()
|
||||
{
|
||||
setDirection( InOut::Dir::D_IN, false );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void InOutPort::setPort( InOut::Pin enmPortPin )
|
||||
{
|
||||
m_vpui8Input = InOut::getPort( enmPortPin, InOut::Type::T_PIN );
|
||||
m_vpui8Dir = InOut::getPort( enmPortPin, InOut::Type::T_DDR );
|
||||
m_vpui8Output = InOut::getPort( enmPortPin, InOut::Type::T_PORT );
|
||||
}
|
||||
@ -27,16 +27,16 @@
|
||||
<BootSegment>2</BootSegment>
|
||||
<eraseonlaunchrule>0</eraseonlaunchrule>
|
||||
<AsfFrameworkConfig>
|
||||
<framework-data xmlns="">
|
||||
<options />
|
||||
<configurations />
|
||||
<files />
|
||||
<documentation help="" />
|
||||
<offline-documentation help="" />
|
||||
<dependencies>
|
||||
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.29.0" />
|
||||
</dependencies>
|
||||
</framework-data>
|
||||
<framework-data>
|
||||
<options />
|
||||
<configurations />
|
||||
<files />
|
||||
<documentation help="" />
|
||||
<offline-documentation help="" />
|
||||
<dependencies>
|
||||
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.30.1" />
|
||||
</dependencies>
|
||||
</framework-data>
|
||||
</AsfFrameworkConfig>
|
||||
<avrtool>com.atmel.avrdbg.tool.stk500</avrtool>
|
||||
<avrtoolserialnumber />
|
||||
@ -55,129 +55,91 @@
|
||||
</com_atmel_avrdbg_tool_stk500>
|
||||
<avrtoolinterface>ISP</avrtoolinterface>
|
||||
<avrtoolinterfaceclock>1843200</avrtoolinterfaceclock>
|
||||
<ResetRule>0</ResetRule>
|
||||
<EraseKey />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<ToolchainSettings>
|
||||
<AvrGccCpp>
|
||||
<avrgcc.common.Device>-mmcu=atmega328p -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega328p"</avrgcc.common.Device>
|
||||
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
|
||||
<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.directories.IncludePaths>
|
||||
<ListValues>
|
||||
<Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include</Value>
|
||||
</ListValues>
|
||||
</avrgcc.compiler.directories.IncludePaths>
|
||||
<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>
|
||||
<avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
|
||||
<avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>
|
||||
<avrgcccpp.compiler.symbols.DefSymbols>
|
||||
<ListValues>
|
||||
<Value>NDEBUG</Value>
|
||||
</ListValues>
|
||||
</avrgcccpp.compiler.symbols.DefSymbols>
|
||||
<avrgcccpp.compiler.directories.IncludePaths>
|
||||
<ListValues>
|
||||
<Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include</Value>
|
||||
</ListValues>
|
||||
</avrgcccpp.compiler.directories.IncludePaths>
|
||||
<avrgcccpp.compiler.optimization.level>Optimize for size (-Os)</avrgcccpp.compiler.optimization.level>
|
||||
<avrgcccpp.compiler.optimization.PackStructureMembers>True</avrgcccpp.compiler.optimization.PackStructureMembers>
|
||||
<avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>
|
||||
<avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
|
||||
<avrgcccpp.compiler.warnings.Pedantic>True</avrgcccpp.compiler.warnings.Pedantic>
|
||||
<avrgcccpp.compiler.miscellaneous.OtherFlags>-Wextra -std=c++11</avrgcccpp.compiler.miscellaneous.OtherFlags>
|
||||
<avrgcccpp.linker.libraries.Libraries>
|
||||
<ListValues>
|
||||
<Value>libm</Value>
|
||||
</ListValues>
|
||||
</avrgcccpp.linker.libraries.Libraries>
|
||||
</AvrGccCpp>
|
||||
<avrgcc.common.Device>-mmcu=atmega328p -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega328p"</avrgcc.common.Device>
|
||||
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
|
||||
<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.directories.IncludePaths><ListValues><Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include</Value></ListValues></avrgcc.compiler.directories.IncludePaths>
|
||||
<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>
|
||||
<avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
|
||||
<avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>
|
||||
<avrgcccpp.compiler.directories.IncludePaths><ListValues><Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include</Value></ListValues></avrgcccpp.compiler.directories.IncludePaths>
|
||||
<avrgcccpp.compiler.optimization.PackStructureMembers>True</avrgcccpp.compiler.optimization.PackStructureMembers>
|
||||
<avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>
|
||||
<avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
|
||||
<avrgcccpp.compiler.warnings.Pedantic>True</avrgcccpp.compiler.warnings.Pedantic>
|
||||
<avrgcccpp.compiler.miscellaneous.OtherFlags>-Wextra -std=c++14</avrgcccpp.compiler.miscellaneous.OtherFlags>
|
||||
<avrgcccpp.linker.libraries.Libraries><ListValues><Value>libm</Value></ListValues></avrgcccpp.linker.libraries.Libraries>
|
||||
<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>
|
||||
<avrgcccpp.compiler.symbols.DefSymbols><ListValues><Value>NDEBUG</Value></ListValues></avrgcccpp.compiler.symbols.DefSymbols>
|
||||
<avrgcccpp.compiler.optimization.level>Optimize for size (-Os)</avrgcccpp.compiler.optimization.level>
|
||||
</AvrGccCpp>
|
||||
</ToolchainSettings>
|
||||
<PreBuildEvent>echo "C:\avrdude-6.2\avrdude.exe" -v -p$(avrdevice) %%* -Uflash:w:"$(OutputDirectory)\$(Name).hex":i > "$(MSBuildProjectDirectory)\avrdude.bat"</PreBuildEvent>
|
||||
<PreBuildEvent>echo "C:\bin\avrdude-6.3" -v -p$(avrdevice) %%* -Uflash:w:"$(OutputDirectory)\$(Name).hex":i > "$(MSBuildProjectDirectory)\avrdude.bat"</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
<ToolchainSettings>
|
||||
<AvrGccCpp>
|
||||
<avrgcc.common.Device>-mmcu=atmega328p -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega328p"</avrgcc.common.Device>
|
||||
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
|
||||
<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.directories.IncludePaths>
|
||||
<ListValues>
|
||||
<Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include</Value>
|
||||
</ListValues>
|
||||
</avrgcc.compiler.directories.IncludePaths>
|
||||
<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>
|
||||
<avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
|
||||
<avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>
|
||||
<avrgcccpp.compiler.symbols.DefSymbols>
|
||||
<ListValues>
|
||||
<Value>DEBUG</Value>
|
||||
</ListValues>
|
||||
</avrgcccpp.compiler.symbols.DefSymbols>
|
||||
<avrgcccpp.compiler.directories.IncludePaths>
|
||||
<ListValues>
|
||||
<Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include</Value>
|
||||
</ListValues>
|
||||
</avrgcccpp.compiler.directories.IncludePaths>
|
||||
<avrgcccpp.compiler.optimization.level>Optimize (-O1)</avrgcccpp.compiler.optimization.level>
|
||||
<avrgcccpp.compiler.optimization.PackStructureMembers>True</avrgcccpp.compiler.optimization.PackStructureMembers>
|
||||
<avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>
|
||||
<avrgcccpp.compiler.optimization.DebugLevel>Default (-g2)</avrgcccpp.compiler.optimization.DebugLevel>
|
||||
<avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
|
||||
<avrgcccpp.compiler.warnings.Pedantic>True</avrgcccpp.compiler.warnings.Pedantic>
|
||||
<avrgcccpp.compiler.miscellaneous.OtherFlags>-Wextra -std=c++11</avrgcccpp.compiler.miscellaneous.OtherFlags>
|
||||
<avrgcccpp.linker.libraries.Libraries>
|
||||
<ListValues>
|
||||
<Value>libm</Value>
|
||||
</ListValues>
|
||||
</avrgcccpp.linker.libraries.Libraries>
|
||||
<avrgcccpp.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcccpp.assembler.debugging.DebugLevel>
|
||||
</AvrGccCpp>
|
||||
<avrgcc.common.Device>-mmcu=atmega328p -B "%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\gcc\dev\atmega328p"</avrgcc.common.Device>
|
||||
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
|
||||
<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.directories.IncludePaths><ListValues><Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include</Value></ListValues></avrgcc.compiler.directories.IncludePaths>
|
||||
<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>
|
||||
<avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultCharTypeUnsigned>
|
||||
<avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcccpp.compiler.general.ChangeDefaultBitFieldUnsigned>
|
||||
<avrgcccpp.compiler.directories.IncludePaths><ListValues><Value>%24(PackRepoDir)\Atmel\ATmega_DFP\1.0.91\include</Value></ListValues></avrgcccpp.compiler.directories.IncludePaths>
|
||||
<avrgcccpp.compiler.optimization.PackStructureMembers>True</avrgcccpp.compiler.optimization.PackStructureMembers>
|
||||
<avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcccpp.compiler.optimization.AllocateBytesNeededForEnum>
|
||||
<avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
|
||||
<avrgcccpp.compiler.warnings.Pedantic>True</avrgcccpp.compiler.warnings.Pedantic>
|
||||
<avrgcccpp.compiler.miscellaneous.OtherFlags>-Wextra -std=c++14</avrgcccpp.compiler.miscellaneous.OtherFlags>
|
||||
<avrgcccpp.linker.libraries.Libraries><ListValues><Value>libm</Value></ListValues></avrgcccpp.linker.libraries.Libraries>
|
||||
<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.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
|
||||
<avrgcccpp.compiler.symbols.DefSymbols><ListValues><Value>DEBUG</Value></ListValues></avrgcccpp.compiler.symbols.DefSymbols>
|
||||
<avrgcccpp.compiler.optimization.level>Optimize (-O1)</avrgcccpp.compiler.optimization.level>
|
||||
<avrgcccpp.compiler.optimization.DebugLevel>Default (-g2)</avrgcccpp.compiler.optimization.DebugLevel>
|
||||
<avrgcccpp.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcccpp.assembler.debugging.DebugLevel>
|
||||
</AvrGccCpp>
|
||||
</ToolchainSettings>
|
||||
<PreBuildEvent>echo "C:\avrdude-6.2\avrdude.exe" -v -p$(avrdevice) %%* -Uflash:w:"$(OutputDirectory)\$(Name).hex":i > "$(MSBuildProjectDirectory)\avrdude.bat"</PreBuildEvent>
|
||||
<PreBuildEvent>echo "C:\bin\avrdude-6.3" -v -p$(avrdevice) %%* -Uflash:w:"$(OutputDirectory)\$(Name).hex":i > "$(MSBuildProjectDirectory)\avrdude.bat"</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="clock.h">
|
||||
<SubType>compile</SubType>
|
||||
</Compile>
|
||||
<Compile Include="inout.cpp">
|
||||
<SubType>compile</SubType>
|
||||
</Compile>
|
||||
<Compile Include="inout.h">
|
||||
<Compile Include="inout\inout.h">
|
||||
<SubType>compile</SubType>
|
||||
</Compile>
|
||||
<Compile Include="main.cpp">
|
||||
<SubType>compile</SubType>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="inout" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
|
||||
</Project>
|
||||
298
inout/inout.h
298
inout/inout.h
@ -1,298 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) by BlackMark 2015-2016
|
||||
* Date 19/06/2016
|
||||
* Version 2.6
|
||||
*/
|
||||
|
||||
#ifndef INOUT_H
|
||||
#define INOUT_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <avr/io.h>
|
||||
|
||||
#define AVR_DIP40 defined (__AVR_ATmega32A__) || defined (__AVR_ATmega644P__) || defined (__AVR_ATmega1284P__)
|
||||
#define AVR_DIP28 defined (__AVR_ATmega8__) || defined (__AVR_ATmega168A__) || defined (__AVR_ATmega328P__)
|
||||
#define AVR_DIP8 defined (__AVR_ATtiny13A__) || defined (__AVR_ATtiny85__)
|
||||
|
||||
#if AVR_DIP40
|
||||
#define PORT_PINA &PINA
|
||||
#define PORT_DDRA &DDRA
|
||||
#define PORT_PORTA &PORTA
|
||||
#else
|
||||
#define PORT_PINA nullptr
|
||||
#define PORT_DDRA nullptr
|
||||
#define PORT_PORTA nullptr
|
||||
#endif
|
||||
|
||||
#if AVR_DIP40 || AVR_DIP28 || AVR_DIP8
|
||||
#define PORT_PINB &PINB
|
||||
#define PORT_DDRB &DDRB
|
||||
#define PORT_PORTB &PORTB
|
||||
#else
|
||||
#define PORT_PINB nullptr
|
||||
#define PORT_DDRB nullptr
|
||||
#define PORT_PORTB nullptr
|
||||
#endif
|
||||
|
||||
#if AVR_DIP40 || AVR_DIP28
|
||||
#define PORT_PINC &PINC
|
||||
#define PORT_DDRC &DDRC
|
||||
#define PORT_PORTC &PORTC
|
||||
#else
|
||||
#define PORT_PINC nullptr
|
||||
#define PORT_DDRC nullptr
|
||||
#define PORT_PORTC nullptr
|
||||
#endif
|
||||
|
||||
#if AVR_DIP40 || AVR_DIP28
|
||||
#define PORT_PIND &PIND
|
||||
#define PORT_DDRD &DDRD
|
||||
#define PORT_PORTD &PORTD
|
||||
#else
|
||||
#define PORT_PIND nullptr
|
||||
#define PORT_DDRD nullptr
|
||||
#define PORT_PORTD nullptr
|
||||
#endif
|
||||
|
||||
class InOut
|
||||
{
|
||||
public:
|
||||
enum class Pin
|
||||
{
|
||||
P_NONE = -1,
|
||||
#if AVR_DIP40
|
||||
P_A0 = 0x00,
|
||||
P_A1 = 0x01,
|
||||
P_A2 = 0x02,
|
||||
P_A3 = 0x03,
|
||||
P_A4 = 0x04,
|
||||
P_A5 = 0x05,
|
||||
P_A6 = 0x06,
|
||||
P_A7 = 0x07,
|
||||
#endif
|
||||
#if AVR_DIP40 || AVR_DIP28 || AVR_DIP8
|
||||
P_B0 = 0x10,
|
||||
P_B1 = 0x11,
|
||||
P_B2 = 0x12,
|
||||
P_B3 = 0x13,
|
||||
P_B4 = 0x14,
|
||||
P_B5 = 0x15,
|
||||
#endif
|
||||
#if AVR_DIP40 || AVR_DIP28
|
||||
P_B6 = 0x16,
|
||||
P_B7 = 0x17,
|
||||
P_C0 = 0x20,
|
||||
P_C1 = 0x21,
|
||||
P_C2 = 0x22,
|
||||
P_C3 = 0x23,
|
||||
P_C4 = 0x24,
|
||||
P_C5 = 0x25,
|
||||
P_C6 = 0x26,
|
||||
#endif
|
||||
#if AVR_DIP40
|
||||
P_C7 = 0x27,
|
||||
#endif
|
||||
#if AVR_DIP40 || AVR_DIP28
|
||||
P_D0 = 0x30,
|
||||
P_D1 = 0x31,
|
||||
P_D2 = 0x32,
|
||||
P_D3 = 0x33,
|
||||
P_D4 = 0x34,
|
||||
P_D5 = 0x35,
|
||||
P_D6 = 0x36,
|
||||
P_D7 = 0x37,
|
||||
#endif
|
||||
};
|
||||
|
||||
enum class Dir
|
||||
{
|
||||
D_IN = 0,
|
||||
D_OUT = 1
|
||||
};
|
||||
|
||||
enum class Type
|
||||
{
|
||||
T_PIN = 0,
|
||||
T_DDR = 1,
|
||||
T_PORT = 2
|
||||
};
|
||||
|
||||
static volatile uint8_t* getPort( Pin enmPin, Type enmType );
|
||||
static uint8_t getPin( Pin enmPin );
|
||||
|
||||
static void setPinDirection( Pin enmPin, Dir enmDir, bool bPullup );
|
||||
static bool readPin( Pin enmPin );
|
||||
static void writePin( Pin enmPin, bool bValue );
|
||||
|
||||
static uint8_t readPort( Pin enmPortPin );
|
||||
static void writePort( Pin enmPortPin, uint8_t ui8Value );
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
static inline void setPinDirection( volatile uint8_t *vpui8Port, uint8_t ui8Pin, Dir enmDir )
|
||||
{
|
||||
if( enmDir == Dir::D_OUT )
|
||||
{
|
||||
*vpui8Port |= ( 1 << ui8Pin );
|
||||
}
|
||||
else
|
||||
{
|
||||
*vpui8Port &= ~( 1 << ui8Pin );
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
static inline bool readPin( volatile uint8_t *vpui8Port, uint8_t ui8Pin )
|
||||
{
|
||||
if( ( ( *vpui8Port ) >> ui8Pin ) & 1 )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
static inline void writePin( volatile uint8_t *vpui8Port, uint8_t ui8Pin, bool bValue )
|
||||
{
|
||||
if( bValue )
|
||||
{
|
||||
*vpui8Port |= ( 1 << ui8Pin );
|
||||
}
|
||||
else
|
||||
{
|
||||
*vpui8Port &= ~( 1 << ui8Pin );
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
static inline void setPortDirection( volatile uint8_t *vpui8Port, Dir enmDir )
|
||||
{
|
||||
*vpui8Port = ( ( enmDir == InOut::Dir::D_OUT ) ? ( 0xFF ) : ( 0x00 ) );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
static inline uint8_t readPort( volatile uint8_t *vpui8Port )
|
||||
{
|
||||
return *vpui8Port;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
static inline void writePort( volatile uint8_t *vpui8Port, uint8_t ui8Value )
|
||||
{
|
||||
*vpui8Port = ui8Value;
|
||||
}
|
||||
};
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
class InOutPin
|
||||
{
|
||||
private:
|
||||
volatile uint8_t *m_vpui8Input;
|
||||
volatile uint8_t *m_vpui8Dir;
|
||||
volatile uint8_t *m_vpui8Output;
|
||||
|
||||
uint8_t m_ui8Pin;
|
||||
|
||||
public:
|
||||
InOutPin();
|
||||
InOutPin( InOut::Pin enmPin );
|
||||
~InOutPin();
|
||||
|
||||
void setPin( InOut::Pin enmPin );
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
inline void setDirection( InOut::Dir enmDir, bool bPullup )
|
||||
{
|
||||
if( !m_vpui8Dir || !m_vpui8Output )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
InOut::setPinDirection( m_vpui8Dir, m_ui8Pin, enmDir );
|
||||
|
||||
if( enmDir == InOut::Dir::D_IN )
|
||||
{
|
||||
InOut::writePin( m_vpui8Output, m_ui8Pin, bPullup );
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
inline bool read()
|
||||
{
|
||||
if( !m_vpui8Input )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return InOut::readPin( m_vpui8Input, m_ui8Pin );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
inline void write( bool bValue )
|
||||
{
|
||||
if( !m_vpui8Output )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
InOut::writePin( m_vpui8Output, m_ui8Pin, bValue );
|
||||
}
|
||||
};
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
class InOutPort
|
||||
{
|
||||
private:
|
||||
volatile uint8_t *m_vpui8Input;
|
||||
volatile uint8_t *m_vpui8Dir;
|
||||
volatile uint8_t *m_vpui8Output;
|
||||
|
||||
public:
|
||||
InOutPort();
|
||||
InOutPort( InOut::Pin enmPortPin );
|
||||
~InOutPort();
|
||||
|
||||
void setPort( InOut::Pin enmPortPin );
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
inline void setDirection( InOut::Dir enmDir, bool bPullup )
|
||||
{
|
||||
if( !m_vpui8Dir || !m_vpui8Output )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
InOut::setPortDirection( m_vpui8Dir, enmDir );
|
||||
|
||||
if( enmDir == InOut::Dir::D_IN )
|
||||
{
|
||||
InOut::writePort( m_vpui8Output, ( ( bPullup ) ? ( 0xFF ) : ( 0x00 ) ) );
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
inline uint8_t read()
|
||||
{
|
||||
if( !m_vpui8Input )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return InOut::readPort( m_vpui8Input );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
inline void write( uint8_t ui8Value )
|
||||
{
|
||||
if( !m_vpui8Output )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
InOut::writePort( m_vpui8Output, ui8Value );
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -1,18 +1,16 @@
|
||||
/*
|
||||
* Copyright (c) by BlackMark 2015-2016
|
||||
* Date 25/02/2016
|
||||
* Version 1.3
|
||||
* Copyright (c) by BlackMark 2015-2018
|
||||
* Date 26/04/2018
|
||||
* Version 1.4
|
||||
*/
|
||||
|
||||
#include "clock.h"
|
||||
#include "inout.h"
|
||||
#include "inout/inout.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
InOutPin cLED( InOut::Pin::P_D7 );
|
||||
|
||||
cLED.setDirection( InOut::Dir::D_OUT, false );
|
||||
|
||||
InOutPin cLED( InOut::Pin::B5 );
|
||||
cLED.setDirection( InOut::Dir::OUT );
|
||||
cLED.write( false );
|
||||
|
||||
while( true )
|
||||
|
||||
Loading…
Reference in New Issue
Block a user