Merged changes from submodule branch

This commit is contained in:
BlackMark 2016-10-29 16:47:56 +02:00
parent 103e8698bf
commit 79741c300b
2 changed files with 9 additions and 5 deletions

View File

@ -182,7 +182,9 @@ InOutPin::InOutPin( InOut::Pin enmPin )
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
InOutPin::~InOutPin() InOutPin::~InOutPin()
{} {
setDirection( InOut::Dir::D_IN, false );
}
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
void InOutPin::setPin( InOut::Pin enmPin ) void InOutPin::setPin( InOut::Pin enmPin )
@ -210,7 +212,9 @@ InOutPort::InOutPort( InOut::Pin enmPin )
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
InOutPort::~InOutPort() InOutPort::~InOutPort()
{} {
setDirection( InOut::Dir::D_IN, false );
}
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
void InOutPort::setPort( InOut::Pin enmPortPin ) void InOutPort::setPort( InOut::Pin enmPortPin )

View File

@ -1,7 +1,7 @@
/* /*
* Copyright (c) by BlackMark 2015-2016 * Copyright (c) by BlackMark 2015-2016
* Date 25/02/2016 * Date 19/06/2016
* Version 2.4 * Version 2.6
*/ */
#ifndef INOUT_H #ifndef INOUT_H
@ -12,7 +12,7 @@
#define AVR_DIP40 defined (__AVR_ATmega32A__) || defined (__AVR_ATmega644P__) || defined (__AVR_ATmega1284P__) #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_DIP28 defined (__AVR_ATmega8__) || defined (__AVR_ATmega168A__) || defined (__AVR_ATmega328P__)
#define AVR_DIP8 defined (__AVR_ATtiny13A__) #define AVR_DIP8 defined (__AVR_ATtiny13A__) || defined (__AVR_ATtiny85__)
#if AVR_DIP40 #if AVR_DIP40
#define PORT_PINA &PINA #define PORT_PINA &PINA