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

Dataflash Logs : Fixed block erase on APM2 

Byte order for 512 vs 528 was reversed.
This commit is contained in:
Jason Short 2012-08-15 14:25:28 -07:00
parent 9c3c1c4f54
commit 44b715af9b
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/DataFlash/DataFlash_APM2.cpp
View File

@ -37,6 +37,9 @@ extern "C" {
#include <inttypes.h> #include <inttypes.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
} }
//#include <FastSerial.h>
//#include <AP_Common.h>
#if defined(ARDUINO) && ARDUINO >= 100 #if defined(ARDUINO) && ARDUINO >= 100
#include "Arduino.h" #include "Arduino.h"
#else #else
@ -44,7 +47,15 @@ extern "C" {
#endif #endif
#include "DataFlash_APM2.h" #include "DataFlash_APM2.h"
/*
#define ENABLE_FASTSERIAL_DEBUG
#ifdef ENABLE_FASTSERIAL_DEBUG
# define serialDebug(fmt, args...) if (FastSerial::getInitialized(0)) do {Serial.printf("%s:%d: " fmt "\n", __FUNCTION__, __LINE__ , ##args); delay(0); } while(0)
#else
# define serialDebug(fmt, args...)
#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
@ -155,6 +166,8 @@ void DataFlash_APM2::Init(void)
// what is this??? card not inserted perhaps? // what is this??? card not inserted perhaps?
df_NumPages = 0; df_NumPages = 0;
} }
//serialDebug("density_code %d pages %d, size %d\n", density_code, df_NumPages, df_PageSize);
} }
// This function is mainly to test the device // This function is mainly to test the device
@ -359,13 +372,14 @@ void DataFlash_APM2::BlockErase(uint16_t BlockAdr)
SPI_transfer(DF_BLOCK_ERASE); SPI_transfer(DF_BLOCK_ERASE);
if (df_PageSize==512) { if (df_PageSize==512) {
SPI_transfer((unsigned char)(BlockAdr >> 3));
SPI_transfer((unsigned char)(BlockAdr << 5));
} else {
SPI_transfer((unsigned char)(BlockAdr >> 4)); SPI_transfer((unsigned char)(BlockAdr >> 4));
SPI_transfer((unsigned char)(BlockAdr << 4)); SPI_transfer((unsigned char)(BlockAdr << 4));
} else {
SPI_transfer((unsigned char)(BlockAdr >> 3));
SPI_transfer((unsigned char)(BlockAdr << 5));
} }
SPI_transfer(0x00); SPI_transfer(0x00);
//serialDebug("BL Erase, %d\n", BlockAdr);
//initiate flash page erase //initiate flash page erase
CS_inactive(); CS_inactive();
@ -379,6 +393,8 @@ void DataFlash_APM2::BlockErase(uint16_t BlockAdr)
void DataFlash_APM2::ChipErase(void (*delay_cb)(unsigned long)) void DataFlash_APM2::ChipErase(void (*delay_cb)(unsigned long))
{ {
//serialDebug("Chip Erase\n");
// activate dataflash command decoder // activate dataflash command decoder
CS_active(); CS_active();