Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dataflash fix for missing card error

This commit is contained in:
Jason Short 2012-08-16 15:37:28 -07:00
parent 0e7794336e
commit ff32718d9b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/DataFlash/DataFlash_APM2.cpp
View File

@ -55,7 +55,8 @@ extern "C" {
#else #else
# define serialDebug(fmt, args...) # define serialDebug(fmt, args...)
#endif #endif
*/ //*/
// DataFlash is connected to Serial Port 3 (we will use SPI mode) // DataFlash is connected to Serial Port 3 (we will use SPI mode)
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define DF_DATAOUT 14 // MOSI #define DF_DATAOUT 14 // MOSI
@ -122,6 +123,9 @@ DataFlash_APM2::DataFlash_APM2()
// Public Methods ////////////////////////////////////////////////////////////// // Public Methods //////////////////////////////////////////////////////////////
void DataFlash_APM2::Init(void) void DataFlash_APM2::Init(void)
{ {
// init to zero
df_NumPages = 0;
pinMode(DF_DATAOUT, OUTPUT); pinMode(DF_DATAOUT, OUTPUT);
pinMode(DF_DATAIN, INPUT); pinMode(DF_DATAIN, INPUT);
pinMode(DF_SLAVESELECT,OUTPUT); pinMode(DF_SLAVESELECT,OUTPUT);
@ -162,9 +166,6 @@ void DataFlash_APM2::Init(void)
} else if (density_code == 0x6) { } else if (density_code == 0x6) {
// 16 Mbit // 16 Mbit
df_NumPages = 4095; df_NumPages = 4095;
} else {
// what is this??? card not inserted perhaps?
df_NumPages = 0;
} }
//serialDebug("density_code %d pages %d, size %d\n", density_code, df_NumPages, df_PageSize); //serialDebug("density_code %d pages %d, size %d\n", density_code, df_NumPages, df_PageSize);
@ -191,7 +192,9 @@ void DataFlash_APM2::ReadManufacturerID()
// This function return 1 if Card is inserted on SD slot // This function return 1 if Card is inserted on SD slot
bool DataFlash_APM2::CardInserted() bool DataFlash_APM2::CardInserted()
{ {
return (df_NumPages >= 4095 && digitalRead(DF_CARDDETECT) == 0); //serialDebug("df_NumPages %d, detect:%d\n", df_NumPages, tmp);
//return (df_NumPages >= 4095 && digitalRead(DF_CARDDETECT) == 0);
return (df_NumPages >= 4095);
} }
// Read the status register // Read the status register