arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-27 18:02:17 +03:00
Code Activity

Merge branch 'master' into esp8266

Browse Source 
* master: (148 commits)
  Update revision log
  Cherry picked fix from 87865ac19d
  Updated revision log
  Added dependencies for AStylej.dll
  Updated translations
  Update revision log
  Temporary fix for pulseIn() regression.
  Added README.adoc for the library manager project
  Fixed some libraries metadata.
  Temporary disabled DefaultTargetTest under certain conditions
  Updated translation from transifex
  Updated some translation strings
  Fixed test
  sam: Fixed initialization of UART/USART mode register
  update revision log
  Fixed NPE when import menu are empty
  Fixed NPE when currently selected platform is no more installed.
  Optimized FileUtils.recursiveDelete(File) function
  Fixed a bunch of simple warnings in java code
  Removed unused classes Commander.java and Webserver.java
  ...
This commit is contained in:
Ivan Grokhotkov
2015-01-26 02:35:02 +03:00
parent 2acf29fa1f
commit 383c19fd34
5 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/SD/src/utility/Sd2Card.cpp
View File

@ -157,16 +157,24 @@ uint32_t Sd2Card::cardSize(void) {
}
}
//------------------------------------------------------------------------------
static uint8_t chip_select_asserted = 0;
void Sd2Card::chipSelectHigh(void) {
digitalWrite(chipSelectPin_, HIGH);
#ifdef USE_SPI_LIB
SPI.endTransaction();
if (chip_select_asserted) {
chip_select_asserted = 0;
SPI.endTransaction();
}
#endif
}
//------------------------------------------------------------------------------
void Sd2Card::chipSelectLow(void) {
#ifdef USE_SPI_LIB
SPI.beginTransaction(settings);
if (!chip_select_asserted) {
chip_select_asserted = 1;
SPI.beginTransaction(settings);
}
#endif
digitalWrite(chipSelectPin_, LOW);
}