updated formatting, baud

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1642 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
jasonshort 2011-02-14 00:43:11 +00:00
parent 17804fbc29
commit 6512531bf9

View File

@ -1,99 +1,98 @@
/* /*
Example of DataFlash library. Example of DataFlash library.
Code by Jordi Muñoz and Jose Julio. DIYDrones.com Code by Jordi MuÒoz and Jose Julio. DIYDrones.com
*/ */
#include <DataFlash.h> #include <DataFlash.h>
#define HEAD_BYTE1 0xA3 #define HEAD_BYTE1 0xA3
#define HEAD_BYTE2 0x95 #define HEAD_BYTE2 0x95
void setup() void setup()
{ {
Serial.begin(57600); Serial.begin(38400);
DataFlash.Init(); // DataFlash initialization DataFlash.Init(); // DataFlash initialization
Serial.println("Dataflash Log Test 1.0"); Serial.println("Dataflash Log Test 1.0");
// Test // Test
delay(20); delay(20);
DataFlash.ReadManufacturerID(); DataFlash.ReadManufacturerID();
delay(10); delay(10);
Serial.print("Manufacturer:"); Serial.print("Manufacturer:");
Serial.print(int(DataFlash.df_manufacturer)); Serial.print(int(DataFlash.df_manufacturer));
Serial.print(","); Serial.print(",");
Serial.print(int(DataFlash.df_device_0)); Serial.print(int(DataFlash.df_device_0));
Serial.print(","); Serial.print(",");
Serial.print(int(DataFlash.df_device_1)); Serial.print(int(DataFlash.df_device_1));
Serial.println(); Serial.println();
// We start to write some info (sequentialy) starting from page 1 // We start to write some info (sequentialy) starting from page 1
// This is similar to what we will do... // This is similar to what we will do...
DataFlash.StartWrite(1); DataFlash.StartWrite(1);
Serial.println("Writing to flash... wait..."); Serial.println("Writing to flash... wait...");
for (int i=0;i<1000;i++) // Write 1000 packets... for (int i = 0; i < 1000; i++){ // Write 1000 packets...
{ // We write packets of binary data... (without worry about nothing more)
// We write packets of binary data... (without worry about nothing more) DataFlash.WriteByte(HEAD_BYTE1);
DataFlash.WriteByte(HEAD_BYTE1); DataFlash.WriteByte(HEAD_BYTE2);
DataFlash.WriteByte(HEAD_BYTE2); DataFlash.WriteInt(2000 + i);
DataFlash.WriteInt(2000+i); DataFlash.WriteInt(2001 + i);
DataFlash.WriteInt(2001+i); DataFlash.WriteInt(2002 + i);
DataFlash.WriteInt(2002+i); DataFlash.WriteInt(2003 + i);
DataFlash.WriteInt(2003+i); DataFlash.WriteLong((long)i * 5000);
DataFlash.WriteLong((long)i*5000); DataFlash.WriteLong((long)i * 16268);
DataFlash.WriteLong((long)i*16268); DataFlash.WriteByte(0xA2); // 2 bytes of checksum (example)
DataFlash.WriteByte(0xA2); // 2 bytes of checksum (example) DataFlash.WriteByte(0x4E);
DataFlash.WriteByte(0x4E); delay(10);
delay(10); }
} delay(100);
delay(100); }
}
void loop()
void loop() {
{ int i, tmp_int;
int i; byte tmp_byte1, tmp_byte2;
byte tmp_byte1; long tmp_long;
byte tmp_byte2;
int tmp_int; Serial.println("Start reading page 1...");
long tmp_long;
DataFlash.StartRead(1); // We start reading from page 1
Serial.println("Start reading page 1...");
DataFlash.StartRead(1); // We start reading from page 1 for (i = 0; i < 200; i++){ // Read 200 packets...
for (i=0;i<200;i++) // Read 200 packets...
{ tmp_byte1 = DataFlash.ReadByte();
tmp_byte1=DataFlash.ReadByte(); tmp_byte2 = DataFlash.ReadByte();
tmp_byte2=DataFlash.ReadByte();
Serial.print("PACKET:"); Serial.print("PACKET:");
if ((tmp_byte1==HEAD_BYTE1)&&(tmp_byte1==HEAD_BYTE1))
{ if ((tmp_byte1 == HEAD_BYTE1) && (tmp_byte1 == HEAD_BYTE1)){
// Read 4 ints... // Read 4 ints...
tmp_int=DataFlash.ReadInt(); tmp_int = DataFlash.ReadInt();
Serial.print(tmp_int); Serial.print(tmp_int);
Serial.print(","); Serial.print(",");
tmp_int=DataFlash.ReadInt(); tmp_int = DataFlash.ReadInt();
Serial.print(tmp_int); Serial.print(tmp_int);
Serial.print(","); Serial.print(",");
tmp_int=DataFlash.ReadInt(); tmp_int = DataFlash.ReadInt();
Serial.print(tmp_int); Serial.print(tmp_int);
Serial.print(","); Serial.print(",");
tmp_int=DataFlash.ReadInt(); tmp_int = DataFlash.ReadInt();
Serial.print(tmp_int); Serial.print(tmp_int);
Serial.print(","); Serial.print(",");
// Read 2 longs... // Read 2 longs...
tmp_long=DataFlash.ReadLong(); tmp_long = DataFlash.ReadLong();
Serial.print(tmp_long); Serial.print(tmp_long);
Serial.print(","); Serial.print(",");
tmp_long=DataFlash.ReadLong(); tmp_long = DataFlash.ReadLong();
Serial.print(tmp_long); Serial.print(tmp_long);
Serial.print(";"); Serial.print(";");
// Read the checksum... // Read the checksum...
tmp_byte1=DataFlash.ReadByte(); tmp_byte1 = DataFlash.ReadByte();
tmp_byte2=DataFlash.ReadByte(); tmp_byte2 = DataFlash.ReadByte();
} }
Serial.println(); Serial.println();
} }
delay(10000);
delay(10000);
} }