Revision 1:dafb963c3c14, committed 2012-11-29

Comitter:

TickTock

Date:

Thu Nov 29 12:18:37 2012 +0000

Parent:

0:1596b8644523

Child:

2:55b2357f0cf9

Commit message:

initial working version;

Changed in this revision

--- a/SDFileSystem.cpp	Mon Nov 19 04:44:11 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,441 +0,0 @@
-/* mbed Microcontroller Library - SDFileSystem
- * Copyright (c) 2008-2009, sford
- */
- 
-// VERY DRAFT CODE! Needs serious rework/refactoring 
- 
-/* Introduction
- * ------------
- * SD and MMC cards support a number of interfaces, but common to them all
- * is one based on SPI. This is the one I'm implmenting because it means
- * it is much more portable even though not so performant, and we already 
- * have the mbed SPI Interface!
- *
- * The main reference I'm using is Chapter 7, "SPI Mode" of: 
- *  http://www.sdcard.org/developers/tech/sdcard/pls/Simplified_Physical_Layer_Spec.pdf
- *
- * SPI Startup
- * -----------
- * The SD card powers up in SD mode. The SPI interface mode is selected by
- * asserting CS low and sending the reset command (CMD0). The card will 
- * respond with a (R1) response.
- *
- * CMD8 is optionally sent to determine the voltage range supported, and 
- * indirectly determine whether it is a version 1.x SD/non-SD card or 
- * version 2.x. I'll just ignore this for now.
- *
- * ACMD41 is repeatedly issued to initialise the card, until "in idle"
- * (bit 0) of the R1 response goes to '0', indicating it is initialised.
- *
- * You should also indicate whether the host supports High Capicity cards,
- * and check whether the card is high capacity - i'll also ignore this
- *
- * SPI Protocol
- * ------------
- * The SD SPI protocol is based on transactions made up of 8-bit words, with
- * the host starting every bus transaction by asserting the CS signal low. The
- * card always responds to commands, data blocks and errors.
- * 
- * The protocol supports a CRC, but by default it is off (except for the 
- * first reset CMD0, where the CRC can just be pre-calculated, and CMD8)
- * I'll leave the CRC off I think! 
- * 
- * Standard capacity cards have variable data block sizes, whereas High 
- * Capacity cards fix the size of data block to 512 bytes. I'll therefore
- * just always use the Standard Capacity cards with a block size of 512 bytes.
- * This is set with CMD16.
- *
- * You can read and write single blocks (CMD17, CMD25) or multiple blocks 
- * (CMD18, CMD25). For simplicity, I'll just use single block accesses. When
- * the card gets a read command, it responds with a response token, and then 
- * a data token or an error.
- * 
- * SPI Command Format
- * ------------------
- * Commands are 6-bytes long, containing the command, 32-bit argument, and CRC.
- *
- * +---------------+------------+------------+-----------+----------+--------------+
- * | 01 | cmd[5:0] | arg[31:24] | arg[23:16] | arg[15:8] | arg[7:0] | crc[6:0] | 1 |
- * +---------------+------------+------------+-----------+----------+--------------+
- *
- * As I'm not using CRC, I can fix that byte to what is needed for CMD0 (0x95)
- *
- * All Application Specific commands shall be preceded with APP_CMD (CMD55).
- *
- * SPI Response Format
- * -------------------
- * The main response format (R1) is a status byte (normally zero). Key flags:
- *  idle - 1 if the card is in an idle state/initialising 
- *  cmd  - 1 if an illegal command code was detected
- *
- *    +-------------------------------------------------+
- * R1 | 0 | arg | addr | seq | crc | cmd | erase | idle |
- *    +-------------------------------------------------+
- *
- * R1b is the same, except it is followed by a busy signal (zeros) until
- * the first non-zero byte when it is ready again.
- *
- * Data Response Token
- * -------------------
- * Every data block written to the card is acknowledged by a byte 
- * response token
- *
- * +----------------------+
- * | xxx | 0 | status | 1 |
- * +----------------------+
- *              010 - OK!
- *              101 - CRC Error
- *              110 - Write Error
- *
- * Single Block Read and Write
- * ---------------------------
- *
- * Block transfers have a byte header, followed by the data, followed
- * by a 16-bit CRC. In our case, the data will always be 512 bytes.
- *  
- * +------+---------+---------+- -  - -+---------+-----------+----------+
- * | 0xFE | data[0] | data[1] |        | data[n] | crc[15:8] | crc[7:0] | 
- * +------+---------+---------+- -  - -+---------+-----------+----------+
- */
- 
-#include "SDFileSystem.h"
-
-#define SD_COMMAND_TIMEOUT 5000
-
-SDFileSystem::SDFileSystem(PinName mosi, PinName miso, PinName sclk, PinName cs, const char* name) :
-  FATFileSystem(name), _spi(mosi, miso, sclk), _cs(cs) {
-      _cs = 1; 
-}
-
-#define R1_IDLE_STATE           (1 << 0)
-#define R1_ERASE_RESET          (1 << 1)
-#define R1_ILLEGAL_COMMAND      (1 << 2)
-#define R1_COM_CRC_ERROR        (1 << 3)
-#define R1_ERASE_SEQUENCE_ERROR (1 << 4)
-#define R1_ADDRESS_ERROR        (1 << 5)
-#define R1_PARAMETER_ERROR      (1 << 6)
-
-// Types
-//  - v1.x Standard Capacity
-//  - v2.x Standard Capacity
-//  - v2.x High Capacity
-//  - Not recognised as an SD Card
-
-#define SDCARD_FAIL 0
-#define SDCARD_V1   1
-#define SDCARD_V2   2
-#define SDCARD_V2HC 3
-
-int SDFileSystem::initialise_card() {
-    // Set to 100kHz for initialisation, and clock card with cs = 1
-    _spi.frequency(100000); 
-    _cs = 1;
-    for(int i=0; i<16; i++) {   
-        _spi.write(0xFF);
-    }
-
-    // send CMD0, should return with all zeros except IDLE STATE set (bit 0)
-    if(_cmd(0, 0) != R1_IDLE_STATE) { 
-        fprintf(stderr, "No disk, or could not put SD card in to SPI idle state\n");
-        return SDCARD_FAIL;
-    }
-
-    // send CMD8 to determine whther it is ver 2.x
-    int r = _cmd8();
-    if(r == R1_IDLE_STATE) {
-        return initialise_card_v2();
-    } else if(r == (R1_IDLE_STATE | R1_ILLEGAL_COMMAND)) {
-        return initialise_card_v1();
-    } else {
-        fprintf(stderr, "Not in idle state after sending CMD8 (not an SD card?)\n");
-        return SDCARD_FAIL;
-    }
-}
-
-int SDFileSystem::initialise_card_v1() {
-    for(int i=0; i<SD_COMMAND_TIMEOUT; i++) {
-        _cmd(55, 0); 
-        if(_cmd(41, 0) == 0) { 
-            return SDCARD_V1;
-        }
-    }
-
-    fprintf(stderr, "Timeout waiting for v1.x card\n");
-    return SDCARD_FAIL;
-}
-
-int SDFileSystem::initialise_card_v2() {
-    
-    for(int i=0; i<SD_COMMAND_TIMEOUT; i++) {
-        _cmd(55, 0); 
-        if(_cmd(41, 0) == 0) { 
-            _cmd58();
-            return SDCARD_V2;
-        }
-    }
-
-    fprintf(stderr, "Timeout waiting for v2.x card\n");
-    return SDCARD_FAIL;
-}
-
-int SDFileSystem::disk_initialize() {
-
-    int i = initialise_card();
-//    printf("init card = %d\n", i);
-//    printf("OK\n");
-
-    _sectors = _sd_sectors();
-
-    // Set block length to 512 (CMD16)
-    if(_cmd(16, 512) != 0) {
-        fprintf(stderr, "Set 512-byte block timed out\n");
-        return 1;
-    }
-        
-    _spi.frequency(1000000); // Set to 1MHz for data transfer
-    return 0;
-}
-
-int SDFileSystem::disk_write(const char *buffer, int block_number) {
-    // set write address for single block (CMD24)
-    if(_cmd(24, block_number * 512) != 0) {
-        return 1;
-    }
-
-    // send the data block
-    _write(buffer, 512);    
-    return 0;    
-}
-
-int SDFileSystem::disk_read(char *buffer, int block_number) {        
-    // set read address for single block (CMD17)
-    if(_cmd(17, block_number * 512) != 0) {
-        return 1;
-    }
-    
-    // receive the data
-    _read(buffer, 512);
-    return 0;
-}
-
-int SDFileSystem::disk_status() { return 0; }
-int SDFileSystem::disk_sync() { return 0; }
-int SDFileSystem::disk_sectors() { return _sectors; }
-
-// PRIVATE FUNCTIONS
-
-int SDFileSystem::_cmd(int cmd, int arg) {
-    _cs = 0; 
-
-    // send a command
-    _spi.write(0x40 | cmd);
-    _spi.write(arg >> 24);
-    _spi.write(arg >> 16);
-    _spi.write(arg >> 8);
-    _spi.write(arg >> 0);
-    _spi.write(0x95);
-
-    // wait for the repsonse (response[7] == 0)
-    for(int i=0; i<SD_COMMAND_TIMEOUT; i++) {
-        int response = _spi.write(0xFF);
-        if(!(response & 0x80)) {
-            _cs = 1;
-            _spi.write(0xFF);
-            return response;
-        }
-    }
-    _cs = 1;
-    _spi.write(0xFF);
-    return -1; // timeout
-}
-int SDFileSystem::_cmdx(int cmd, int arg) {
-    _cs = 0; 
-
-    // send a command
-    _spi.write(0x40 | cmd);
-    _spi.write(arg >> 24);
-    _spi.write(arg >> 16);
-    _spi.write(arg >> 8);
-    _spi.write(arg >> 0);
-    _spi.write(0x95);
-
-    // wait for the repsonse (response[7] == 0)
-    for(int i=0; i<SD_COMMAND_TIMEOUT; i++) {
-        int response = _spi.write(0xFF);
-        if(!(response & 0x80)) {
-            return response;
-        }
-    }
-    _cs = 1;
-    _spi.write(0xFF);
-    return -1; // timeout
-}
-
-
-int SDFileSystem::_cmd58() {
-    _cs = 0; 
-    int arg = 0;
-    
-    // send a command
-    _spi.write(0x40 | 58);
-    _spi.write(arg >> 24);
-    _spi.write(arg >> 16);
-    _spi.write(arg >> 8);
-    _spi.write(arg >> 0);
-    _spi.write(0x95);
-
-    // wait for the repsonse (response[7] == 0)
-    for(int i=0; i<SD_COMMAND_TIMEOUT; i++) {
-        int response = _spi.write(0xFF);
-        if(!(response & 0x80)) {
-            int ocr = _spi.write(0xFF) << 24;
-            ocr |= _spi.write(0xFF) << 16;
-            ocr |= _spi.write(0xFF) << 8;
-            ocr |= _spi.write(0xFF) << 0;
-//            printf("OCR = 0x%08X\n", ocr);
-            _cs = 1;
-            _spi.write(0xFF);
-            return response;
-        }
-    }
-    _cs = 1;
-    _spi.write(0xFF);
-    return -1; // timeout
-}
-
-int SDFileSystem::_cmd8() {
-    _cs = 0; 
-    
-    // send a command
-    _spi.write(0x40 | 8); // CMD8
-    _spi.write(0x00);     // reserved
-    _spi.write(0x00);     // reserved
-    _spi.write(0x01);     // 3.3v
-    _spi.write(0xAA);     // check pattern
-    _spi.write(0x87);     // crc
-
-    // wait for the repsonse (response[7] == 0)
-    for(int i=0; i<SD_COMMAND_TIMEOUT * 1000; i++) {
-        char response[5];
-        response[0] = _spi.write(0xFF);
-        if(!(response[0] & 0x80)) {
-                for(int j=1; j<5; j++) {
-                    response[i] = _spi.write(0xFF);
-                }
-                _cs = 1;
-                _spi.write(0xFF);
-                return response[0];
-        }
-    }
-    _cs = 1;
-    _spi.write(0xFF);
-    return -1; // timeout
-}
-
-int SDFileSystem::_read(char *buffer, int length) {
-    _cs = 0;
-
-    // read until start byte (0xFF)
-    while(_spi.write(0xFF) != 0xFE);
-
-    // read data
-    for(int i=0; i<length; i++) {
-        buffer[i] = _spi.write(0xFF);
-    }
-    _spi.write(0xFF); // checksum
-    _spi.write(0xFF);
-
-    _cs = 1;    
-    _spi.write(0xFF);
-    return 0;
-}
-
-int SDFileSystem::_write(const char *buffer, int length) {
-    _cs = 0;
-    
-    // indicate start of block
-    _spi.write(0xFE);
-    
-    // write the data
-    for(int i=0; i<length; i++) {
-        _spi.write(buffer[i]);
-    }
-    
-    // write the checksum
-    _spi.write(0xFF); 
-    _spi.write(0xFF);
-
-    // check the repsonse token
-    if((_spi.write(0xFF) & 0x1F) != 0x05) {
-        _cs = 1;
-        _spi.write(0xFF);        
-        return 1;
-    }
-
-    // wait for write to finish
-    while(_spi.write(0xFF) == 0);
-
-    _cs = 1; 
-    _spi.write(0xFF);
-    return 0;
-}
-
-static int ext_bits(char *data, int msb, int lsb) {
-    int bits = 0;
-    int size = 1 + msb - lsb; 
-    for(int i=0; i<size; i++) {
-        int position = lsb + i;
-        int byte = 15 - (position >> 3);
-        int bit = position & 0x7;
-        int value = (data[byte] >> bit) & 1;
-        bits |= value << i;
-    }
-    return bits;
-}
-
-int SDFileSystem::_sd_sectors() {
-
-    // CMD9, Response R2 (R1 byte + 16-byte block read)
-    if(_cmdx(9, 0) != 0) {
-        fprintf(stderr, "Didn't get a response from the disk\n");
-        return 0;
-    }
-    
-    char csd[16];    
-    if(_read(csd, 16) != 0) {
-        fprintf(stderr, "Couldn't read csd response from disk\n");
-        return 0;
-    }
-
-    // csd_structure : csd[127:126]
-    // c_size        : csd[73:62]
-    // c_size_mult   : csd[49:47]
-    // read_bl_len   : csd[83:80] - the *maximum* read block length
-
-    int csd_structure = ext_bits(csd, 127, 126);
-    int c_size = ext_bits(csd, 73, 62);
-    int c_size_mult = ext_bits(csd, 49, 47);
-    int read_bl_len = ext_bits(csd, 83, 80);
-
-//    printf("CSD_STRUCT = %d\n", csd_structure);
-    
-    if(csd_structure != 0) {
-        fprintf(stderr, "This disk tastes funny! I only know about type 0 CSD structures\n");
-        return 0;
-    }
-             
-    // memory capacity = BLOCKNR * BLOCK_LEN
-    // where
-    //  BLOCKNR = (C_SIZE+1) * MULT
-    //  MULT = 2^(C_SIZE_MULT+2) (C_SIZE_MULT < 8)
-    //  BLOCK_LEN = 2^READ_BL_LEN, (READ_BL_LEN < 12)         
-                            
-    int block_len = 1 << read_bl_len;
-    int mult = 1 << (c_size_mult + 2);
-    int blocknr = (c_size + 1) * mult;
-    int capacity = blocknr * block_len;
-        
-    int blocks = capacity / 512;
-        
-    return blocks;
-}

--- a/SDFileSystem.h	Mon Nov 19 04:44:11 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/* mbed Microcontroller Library - SDFileSystem
- * Copyright (c) 2008-2009, sford
- */
- 
-// VERY DRAFT CODE!!! 
-
-#ifndef SDFILESYSTEM_H
-#define SDFILESYSTEM_H
-
-#include "mbed.h"
-#include "FATFileSystem.h"
-
-/* Class: SDFileSystem
- *  Access the filesystem on an SD Card using SPI
- *
- * Example:
- * > SDFileSystem sd(p5, p6, p7, p12, "sd");
- * > 
- * > int main() {
- * >     FILE *fp = fopen("/sd/myfile.txt", "w");
- * >     fprintf(fp, "Hello World!\n");
- * >     fclose(fp);
- * > }
- */
-class SDFileSystem : public FATFileSystem {
-public:
-
-    /* Constructor: SDFileSystem
-     *  Create the File System for accessing an SD Card using SPI
-     *
-     * Variables:
-     *  mosi - SPI mosi pin connected to SD Card
-     *  miso - SPI miso pin conencted to SD Card
-     *  sclk - SPI sclk pin connected to SD Card
-     *  cs   - DigitalOut pin used as SD Card chip select
-   *  name - The name used to access the filesystem
-     */
-    SDFileSystem(PinName mosi, PinName miso, PinName sclk, PinName cs, const char* name);
-    virtual int disk_initialize();
-    virtual int disk_write(const char *buffer, int block_number);
-    virtual int disk_read(char *buffer, int block_number);    
-    virtual int disk_status();
-    virtual int disk_sync();
-    virtual int disk_sectors();
-
-protected:
-
-    int _cmd(int cmd, int arg);
-    int _cmdx(int cmd, int arg);
-    int _cmd8();
-    int _cmd58();
-    int initialise_card();
-    int initialise_card_v1();
-    int initialise_card_v2();
-    
-    
-    int _read(char *buffer, int length);
-    int _write(const char *buffer, int length);
-    int _sd_sectors();
-    int _sectors;
-    
-    SPI _spi;
-    DigitalOut _cs;     
-};
-
-#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SDHCFileSystem.lib	Thu Nov 29 12:18:37 2012 +0000
@@ -0,0 +1,1 @@
+SDHCFileSystem#89846a293813

--- a/log.h	Mon Nov 19 04:44:11 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#define LOGFILE "/sd/canary.log"
-extern bool LogCreated;
-void Log (char *message);
-void LogErr (char *message);
\ No newline at end of file

--- a/main.cpp	Mon Nov 19 04:44:11 2012 +0000
+++ b/main.cpp	Thu Nov 29 12:18:37 2012 +0000
@@ -1,28 +1,54 @@
 #include "mbed.h"
 #include "CAN.h"
 #include "TextLCD.h"
-#include "SDFileSystem.h"
+#include "SDHCFileSystem.h"
 #include "DebounceIn.h"
-#include "log.h"
 #include "beep.h"
 
+#define upLine "\033[1A"
+#define LOGFILE "/sd/canary.log"
+
+//CANcan.cpp
+
+//LEAF OBD
+//1:
+//2:
+//3:    AVCAN-L     White/Blue
+//4:
+//5:    VSS         Brown,White/Brown
+//6:    CARCAN-H    Green
+//7:
+//8:    12V-SW      Orange,White/Orange
+//9:
+//10:
+//11:   AVCAN-H     Blue
+//12:   EVCAN-L     White/Grey
+//13:   EVCAN-H     Grey
+//14:   CARCAN-L    White/Green
+//15:
+//16:   12V-AON     Red/Blue,Blue/Red
+
 //VP230
-//1:D   8:RS
-//2:GND 7:CANH
-//3:VCC 6:CANL
-//4:R   5:Vref
+//1:D   
+//2:GND 
+//3:VCC 
+//4:R   
+//5:Vref
+//6:CANL
+//7:CANH
+//8:RS
 
 //LPC1768
 //1:    VSS
-//2:        NC:VIN
+//2:        NC:VIN  (4.5-9V supply)
 //3:        NC:VB
 //4:        NC:nR
 //5:    SPI:MOSI   -->  6:SDRAM:DI
 //6:    SPI:MISO   -->  2:SDRAM:DO
 //7:    SPI:SCLK   -->  4:SDRAM:SCLK
 //8:    CS         -->  7:SDRAM:CS
-//9:    CAN1:TX    -->  1:CAN1:D
-//10:   CAN1:RX    -->  4:CAN1:R
+//9:    CAN1:RX    -->  4:CAN1:R
+//10:   CAN1:TX    -->  1:CAN1:D
 //11:   RS         -->  4:LCD:RS
 //12:   E          -->  6:LCD:E
 //13:   D4         -->  11:LCD:D4
@@ -30,19 +56,19 @@
 //15:   D6         -->  13:LCD:D6
 //16:   D7         -->  14:LCD:D7
 //17:   CD         -->  1:SDRAM:CD
-//18:       NC:Ain
+//18:   MON12V     -->  4K to 12V, 1K to VSS  (To be implemented)
 //19:   PB2
 //20:   PB1
 //21:   Spkr+
-//22:       NC:pwm
+//22:   Spkr-           (optional complimentary output for more volume)
 //23:       NC:pwm
-//24:       NC:pwm
-//25:       NC:pwm
-//26:       NC:pwm
+//24:   LEDBLU     -->  18:LCD:BLU (only used for tri-color displays)
+//25:   LEDGRN     -->  17:LCD:GRN (only used for tri-color displays)
+//26:   LEDRED     -->  16:LCD:RED
 //27:   CAN1:Sleep -->  8:CAN1:RS
 //28:   CAN2:Sleep -->  8:CAN2:RS
-//29:   CAN2:RX    -->  4:CAN2:R
-//30:   CAN2:TX    -->  1:CAN2:D
+//29:   CAN2:TX    -->  1:CAN2:D
+//30:   CAN2:RX    -->  4:CAN2:R
 //31:       NC:USB_D+
 //32:       NC:USB_D-
 //33:       NC:Eth_TD+
@@ -51,22 +77,29 @@
 //36:       NC:Eth_RD-
 //37:       NC:IF+
 //38:       NC:IF-
-//39:       NC:5Vout
+//39:       NC:5Vout (only available when connected as USB device)
 //40:   VCC3.3
 
+extern bool LogCreated;
+void Log (char *message);
+void LogErr (char *message);
+
+time_t seconds ;
 Beep buzzer(p21);
-DigitalIn  CD( p17 ); 
-DigitalIn  PB1( p20 ); 
-SDFileSystem sd(p5, p6, p7, p8, "sd"); // SDFileSystem::SDFileSystem(PinName mosi, PinName miso, PinName sclk, PinName cs, const char* name)
+DigitalIn  CD(p17); 
+DebounceIn  dbPB1( p20 );
+;DigitalIn  PB1(p20); 
+SDFileSystem sd(p5, p6, p7, p8, "sd" ); // SDFileSystem::SDFileSystem(PinName mosi, PinName miso, PinName sclk, PinName cs, const char* name)
 TextLCD lcd(p11, p12, p13, p14, p15, p16); // rs, e, d0-d3 (RW to GND)
 Ticker ticker;
+Timer timer;
 DigitalOut led1(LED1);
 DigitalOut led2(LED2);
 DigitalOut led3(LED3);
 DigitalOut led4(LED4);
-CAN can1(p9, p10);      // CAN1 uses pins 9 and 10 (tx, rx)
-CAN can2(p30, p29);     // CAN2 uses pins 30 and 29 (tx, rx)
-bool LogCreated = false;
+CAN can1(p9, p10);      // CAN1 uses pins 9 and 10 (rx, tx) and pin 27 (rs)
+CAN can2(p30, p29);     // CAN2 uses pins 30 and 29 (rx, tx) and pin 28 (rs)
+bool logCreated = false;
 char logMsg[64];
 
 char counter = 0;
@@ -74,84 +107,165 @@
 //DigitalOut can2_SleepMode(p28);     // Use pin 28 to control the sleep mode of can2
 Serial pc(USBTX, USBRX); // tx, rx   default settings (9600 8N1)
 
-void Log (char *message)
+unsigned short getTimeStamp() {// from Gary's code
+
+    int msec = timer.read_ms(); // not synchronized with RTC
+    //unsigned long secs = time(NULL); // seconds past 12:00:00 AM 1 Jan 1900
+    unsigned long secs = msec / 1000;
+    int isecs = secs % 60; // modulo 60 for 0-59 seconds from RTC
+    return ((isecs << 10) + (msec%1000)); // return the two byte time stamp
+}
+
+void readLog ()
 {
     FILE *file;
+    unsigned char c;
+    int i=0;
+    pc.printf("printing file\n");
+    file = fopen(LOGFILE, "r");
+    if (file == NULL) {
+        pc.printf("no file found\n");
+        }
+    while (!feof(file))
+        {
+        c=fgetc(file);
+        pc.printf("%02x ",c);
+        if (++i>11)
+            {
+            pc.printf("\n");
+            i=0;
+            }
+        }
+    pc.printf("\n");
+    pc.printf("\n");
+    fclose(file);
+ }
+ 
+void logCan (CANMessage canRXmsg)
+{
+    FILE *file;
+    unsigned short ts;
+    
+    ts=getTimeStamp();
 
-    if (!LogCreated) {
+    if (!logCreated) {
         file = fopen(LOGFILE, "w");
-        LogCreated = true;
+        logCreated = true;
     }
     else
         file = fopen(LOGFILE, "a");
 
     if (file == NULL) {
-        if (LogCreated)
-            LogCreated = false;
+        if (logCreated)
+            logCreated = false;
+        return;
+    }
+    else
+    {
+        fprintf(file,"%c%c%c%c%c%c%c%c%c%c%c%c",ts>>8,ts&0xff,canRXmsg.id&0xff,(canRXmsg.id>>8)+(canRXmsg.len<<4),canRXmsg.data[0],canRXmsg.data[1],canRXmsg.data[2],canRXmsg.data[3],canRXmsg.data[4],canRXmsg.data[5],canRXmsg.data[6],canRXmsg.data[7]);
+        fclose(file);
+    }
+}
+
+void Log (char *message)
+{
+    FILE *file;
+
+    if (!logCreated) {
+        file = fopen(LOGFILE, "w");
+        logCreated = true;
+    }
+    else
+        file = fopen(LOGFILE, "a");
+
+    if (file == NULL) {
+        if (logCreated)
+            logCreated = false;
         return;
     }
     else
     {
         fputs(message, file);
-        //fprintf(file, message);
         fclose(file);
     }
+}
 
-    if (file)
-        fclose(file);
+void send1() {
+    static char counter = 0; // use for fake data
+
+    can1.write(CANMessage(0x350, &counter, 1));
+    counter++;
+    // test sending 3 quickly
+    //can1.write(CANMessage(0x351, &counter, 1));
+    //can1.write(CANMessage(0x352, &counter, 1));
+
 }
 
 
-void send() {
-    if(can1.write(CANMessage(0x350, &counter, 1))) {
-        counter++;
-        pc.printf("Message %d sent\n", counter);
-        lcd.printf("sent: %d  \n", counter);
-        if(LogCreated) {
-            if((PB1==0)||(CD==0)){
-                LogCreated=false;
-                pc.printf("Stopping log\n", counter);
-            }else{
-                sprintf(logMsg, "sent: %d \n", counter);
-                Log(logMsg);
-                pc.printf("Message logged\n");
-                buzzer.beep(800,0.025);              }
-        }
-    } 
-    led1 = !led1;
-}
- 
 void recieve1() {
     static CANMessage msg1;
+    unsigned short msgTime;
+    
+    msgTime=getTimeStamp();
     can1.read(msg1);
-    pc.printf("Can1 Message received: %d\n", msg1.data[0]);
+    pc.printf("%sCan1 Message received: %d %x\n", upLine, msg1.data[0], msgTime);
     lcd.printf("Can1 rxd: %d\n", msg1.data[0]);
+    if(logCreated) {
+        if((PB1==0)||(CD==0)){
+            logCreated=false;
+            pc.printf("Stopping log\n", counter);
+            readLog();
+        }else{
+            logCan(msg1);
+        }
+    }
     led2 = !led2;
 }
 void recieve2() {
     static CANMessage msg2;
+    unsigned short msgTime;
+    int milisec;
+    
+    msgTime=getTimeStamp();
+    milisec=timer.read_ms();
+
     can2.read(msg2);
-    pc.printf("Can2 Message received: %d\n", msg2.data[0]);
-    lcd.printf("Can2 rxd: %d\n", msg2.data[0]);
+    pc.printf("%sCan2 Message received: %d %04x %d       \n", upLine, msg2.data[0],msgTime,milisec);
+    ;lcd.printf("Can2 rxd: %d\n", msg2.data[0]);
+    if(logCreated) {
+        if((PB1==0)||(CD==0)){
+            logCreated=false;
+            pc.printf("Stopping log\n\n", counter);
+            readLog();
+        }else{
+            logCan(msg2);
+        }
+    }
     led3 = !led3;
 }
 
 int main() {
     pc.baud(115200);        // change serial interface to pc to 115200, 8N1
-    can1.frequency(100000);
-    can2.frequency(100000);
-    //can1_SleepMode = 0;         // Turn off Sleep Mode
-    //can2_SleepMode = 0;         // Turn off Sleep Mode
+    can1.frequency(1000000);
+    can2.frequency(1000000);
+    //can1_SleepMode = 0;         // Enable TX
+    //can2_SleepMode = 0;         // Enable TX
+    //can1_SleepMode = 1;         // Turn on Monitor_only Mode
+    //can2_SleepMode = 1;         // Turn on Monitor_only Mode
     CD.mode(PullUp) ; //SDRAM Chip Detect
-    PB1.mode(PullUp) ; //Pushbutton 1
-    ticker.attach(&send, 1);
+    dbPB1.mode(PullUp) ; //Pushbutton 1
+    ticker.attach(&send1, 1.1);
     can1.attach(&recieve1);
     can2.attach(&recieve2);
+    
+    timer.start() ;
+
+
     if(CD == 1) {
-        pc.printf("Starting Can Log\n");
-        Log("Starting Can Log\n");
+        pc.printf("Starting Can Log\n\n\n\n");
+        Log("");
         } 
     else {
-        pc.printf("No SDRAM Inserted.\n");
+        pc.printf("No SDRAM Inserted.\n\n\n\n");
     }
 }
\ No newline at end of file