Skip to content
Browse files

Fixed failed merge.

  • Loading branch information...
1 parent 3b0cab3 commit cb4989a723698ee5c9b67914980deeb2c0e2eee5 @BlockoS committed Sep 19, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 DataFlashInlines.h
View
6 DataFlashInlines.h
@@ -55,8 +55,7 @@ inline void DataFlash::enable()
**/
inline void DataFlash::disable()
{
- if (m_writeProtectPin >= 0)
- digitalWrite(m_chipSelectPin, HIGH);
+ digitalWrite(m_chipSelectPin, HIGH);
}
/**
@@ -73,7 +72,8 @@ inline void DataFlash::writeProtect()
**/
inline void DataFlash::readWrite()
{
- digitalWrite(m_writeProtectPin, HIGH);
+ if (m_writeProtectPin >= 0)
+ digitalWrite(m_writeProtectPin, HIGH);
}
/** Get chip Select (CS) pin **/

0 comments on commit cb4989a

Please sign in to comment.
Something went wrong with that request. Please try again.