From 79741c300bfd4b2694bcea07dc549befc5dccc2f Mon Sep 17 00:00:00 2001 From: BlackMark Date: Sat, 29 Oct 2016 16:47:56 +0200 Subject: [PATCH] Merged changes from submodule branch --- inout/inout.cpp | 8 ++++++-- inout/inout.h | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/inout/inout.cpp b/inout/inout.cpp index 428e012..74cfa89 100644 --- a/inout/inout.cpp +++ b/inout/inout.cpp @@ -182,7 +182,9 @@ InOutPin::InOutPin( InOut::Pin enmPin ) ////////////////////////////////////////////////////////////////////////// InOutPin::~InOutPin() -{} +{ + setDirection( InOut::Dir::D_IN, false ); +} ////////////////////////////////////////////////////////////////////////// void InOutPin::setPin( InOut::Pin enmPin ) @@ -210,7 +212,9 @@ InOutPort::InOutPort( InOut::Pin enmPin ) ////////////////////////////////////////////////////////////////////////// InOutPort::~InOutPort() -{} +{ + setDirection( InOut::Dir::D_IN, false ); +} ////////////////////////////////////////////////////////////////////////// void InOutPort::setPort( InOut::Pin enmPortPin ) diff --git a/inout/inout.h b/inout/inout.h index d6811b1..f91801f 100644 --- a/inout/inout.h +++ b/inout/inout.h @@ -1,7 +1,7 @@ /* * Copyright (c) by BlackMark 2015-2016 -* Date 25/02/2016 -* Version 2.4 +* Date 19/06/2016 +* Version 2.6 */ #ifndef INOUT_H @@ -12,7 +12,7 @@ #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__) +#define AVR_DIP8 defined (__AVR_ATtiny13A__) || defined (__AVR_ATtiny85__) #if AVR_DIP40 #define PORT_PINA &PINA