Update Telelogger

3 files changed, 300 insertions, 1 deletions

diff --git a/telelogger/config.h b/telelogger/config.h
new file mode 100644
index 0000000..e55ee89
--- /dev/null
+++ b/telelogger/config.h
@@ -0,0 +1,45 @@
+#ifndef CONFIG_H_INCLUDED
+#define CONFIG_H_INCLUDED
+
+/**************************************
+* Data logging/streaming out
+**************************************/
+#define ENABLE_DATA_OUT 1
+#define ENABLE_DATA_LOG 0
+#define USE_SOFTSERIAL 1
+
+#define STREAM_BAUDRATE 9600
+#define DELAY_AFTER_SENDING 10
+
+//this defines the format of log file
+#define LOG_FORMAT FORMAT_TEXT
+#define STREAM_FORMAT FORMAT_TEXT
+
+/**************************************
+* Accelerometer & Gyro
+**************************************/
+//#define USE_MPU6050 1
+#define USE_MPU9150 1
+#define ACC_DATA_RATIO 160
+#define GYRO_DATA_RATIO 256
+#define COMPASS_DATA_RATIO 8
+
+/**************************************
+* Timeout/interval options
+**************************************/
+#define OBD_MIN_INTERVAL 100 /* ms */
+#define ACC_DATA_INTERVAL 200 /* ms */
+#define GPS_DATA_INTERVAL 200 /* ms */
+
+/**************************************
+* Choose SD pin here
+**************************************/
+#define SD_CS_PIN 10 // SD breakout
+
+/**************************************
+* Other options
+**************************************/
+//#define DEBUG 1
+#define DEBUG_BAUDRATE 9600
+
+#endif // CONFIG_H_INCLUDED
diff --git a/telelogger/datalogger.h b/telelogger/datalogger.h
new file mode 100644
index 0000000..fc2a329
--- /dev/null
+++ b/telelogger/datalogger.h
@@ -0,0 +1,252 @@
+#define FORMAT_BIN 0
+#define FORMAT_CSV 1
+#define FORMAT_TEXT 2
+
+typedef struct {
+    uint32_t time;
+    uint16_t pid;
+    uint8_t flags;
+    uint8_t checksum;
+    float value[3];
+} LOG_DATA_COMM;
+
+#define PID_GPS_LATITUDE 0xA
+#define PID_GPS_LONGITUDE 0xB
+#define PID_GPS_ALTITUDE 0xC
+#define PID_GPS_SPEED 0xD
+#define PID_GPS_HEADING 0xE
+#define PID_GPS_SAT_COUNT 0xF
+#define PID_GPS_TIME 0x10
+#define PID_GPS_DATE 0x11
+
+#define PID_ACC 0x20
+#define PID_GYRO 0x21
+#define PID_COMPASS 0x22
+#define PID_MEMS_TEMP 0x23
+#define PID_BATTERY_VOLTAGE 0x24
+
+#define PID_DATA_SIZE 0x80
+
+#define FILE_NAME_FORMAT "/DAT%05d.CSV"
+
+#if ENABLE_DATA_OUT
+
+#if USE_SOFTSERIAL
+SoftwareSerial SerialRF(A2, A3);
+#else
+#define SerialRF Serial
+#endif
+
+#endif
+
+#if ENABLE_DATA_LOG
+static File sdfile;
+#endif
+
+typedef struct {
+    uint16_t pid;
+    char name[3];
+} PID_NAME;
+
+const PID_NAME pidNames[] PROGMEM = {
+{PID_ACC, {'A','C','C'}},
+{PID_GYRO, {'G','Y','R'}},
+{PID_COMPASS, {'M','A','G'}},
+{PID_GPS_LATITUDE, {'L','A','T'}},
+{PID_GPS_LONGITUDE, {'L','O','N'}},
+{PID_GPS_ALTITUDE, {'A','L','T'}},
+{PID_GPS_SPEED, {'S','P','D'}},
+{PID_GPS_HEADING, {'C','R','S'}},
+{PID_GPS_SAT_COUNT, {'S','A','T'}},
+{PID_GPS_TIME, {'T','M','E'}},
+{PID_GPS_DATE, {'D','T','E'}},
+{PID_BATTERY_VOLTAGE, {'B','A','T'}},
+{PID_DATA_SIZE, {'D','A','T'}},
+};
+
+static const char* idstr = "FREEMATICS_V3\r";
+
+class CDataLogger {
+public:
+    void initSender()
+    {
+#if ENABLE_DATA_OUT
+        SerialRF.begin(STREAM_BAUDRATE);
+        SerialRF.print(idstr);
+#endif
+#if ENABLE_DATA_LOG
+    m_lastDataTime = 0;
+#endif
+    }
+    void recordData(const char* buf)
+    {
+#if ENABLE_DATA_LOG
+        dataSize += sdfile.print(dataTime - m_lastDataTime);
+        sdfile.write(',');
+        dataSize += sdfile.print(buf);
+        dataSize ++;
+        m_lastDataTime = dataTime;
+#endif
+    }
+    void logData(char c)
+    {
+#if ENABLE_DATA_LOG
+        if (c >= ' ') {
+            sdfile.write(c);
+            dataSize++;
+        }
+#else
+        SerialRF.write(c);
+#endif
+    }
+    void logData(uint16_t pid, int value)
+    {
+        char buf[16];
+#if STREAM_FORMAT == FORMAT_TEXT
+        sprintf(buf + translatePIDName(pid, buf), "%d\r", value);
+#else
+        sprintf(buf, "%X,%d\r", pid, value);
+#endif
+#if ENABLE_DATA_OUT
+#if STREAM_FORMAT == FORMAT_BIN
+        LOG_DATA_COMM ld = {dataTime, pid, 1, 0, value};
+        ld.checksum = getChecksum((char*)&ld, 12);
+        SerialRF.write((uint8_t*)&ld, 12);
+#else
+        SerialRF.print(buf);
+#endif
+        delay(DELAY_AFTER_SENDING);
+#endif
+        recordData(buf);
+    }
+    void logData(uint16_t pid, int32_t value)
+    {
+        char buf[20];
+#if STREAM_FORMAT == FORMAT_TEXT
+        sprintf(buf + translatePIDName(pid, buf), "%ld\r", value);
+#else
+        sprintf(buf, "%X,%ld\r", pid, value);
+#endif
+#if ENABLE_DATA_OUT
+#if STREAM_FORMAT == FORMAT_BIN
+        LOG_DATA_COMM ld = {dataTime, pid, 1, 0, value};
+        ld.checksum = getChecksum((char*)&ld, 12);
+        SerialRF.write((uint8_t*)&ld, 12);
+#else
+        SerialRF.print(buf);
+#endif
+        delay(DELAY_AFTER_SENDING);
+#endif
+        recordData(buf);
+    }
+    void logData(uint16_t pid, uint32_t value)
+    {
+        char buf[20];
+#if STREAM_FORMAT == FORMAT_TEXT
+        sprintf(buf + translatePIDName(pid, buf), "%lu\r", value);
+#else
+        sprintf(buf, "%X,%lu\r", pid, value);
+#endif
+#if ENABLE_DATA_OUT
+#if STREAM_FORMAT == FORMAT_BIN
+        LOG_DATA_COMM ld = {dataTime, pid, 1, 0, value};
+        ld.checksum = getChecksum((char*)&ld, 12);
+        SerialRF.write((uint8_t*)&ld, 12);
+#else
+        SerialRF.print(buf);
+#endif
+#endif
+        delay(DELAY_AFTER_SENDING);
+        recordData(buf);
+    }
+    void logData(uint16_t pid, int value1, int value2, int value3)
+    {
+        char buf[24];
+#if STREAM_FORMAT == FORMAT_TEXT
+        sprintf(buf + translatePIDName(pid, buf), "%d,%d,%d\r", value1, value2, value3);
+#else
+        sprintf(buf, "%X,%d,%d,%d\r", pid, value1, value2, value3);
+#endif
+#if ENABLE_DATA_OUT
+#if STREAM_FORMAT == FORMAT_BIN
+        LOG_DATA_COMM ld = {dataTime, pid, 3, 0, {value1, value2, value3}};
+        ld.checksum = getChecksum((char*)&ld, 20);
+        SerialRF.write((uint8_t*)&ld, 20);
+#else
+        SerialRF.print(buf);
+#endif
+        delay(DELAY_AFTER_SENDING);
+#endif
+        recordData(buf);
+    }
+#if ENABLE_DATA_LOG
+    uint16_t openFile(uint16_t logFlags = 0, uint32_t dateTime = 0)
+    {
+        uint16_t fileIndex;
+        char filename[24] = "/FRMATICS";
+
+        pinMode(SS, OUTPUT);
+        SD.begin(SD_CS_PIN);
+
+        if (SD.exists(filename)) {
+            for (fileIndex = 1; fileIndex; fileIndex++) {
+                sprintf(filename + 9, FILE_NAME_FORMAT, fileIndex);
+                if (!SD.exists(filename)) {
+                    break;
+                }
+            }
+            if (fileIndex == 0)
+                return 0;
+        } else {
+            SD.mkdir(filename);
+            fileIndex = 1;
+            sprintf(filename + 9, FILE_NAME_FORMAT, 1);
+        }
+
+        sdfile = SD.open(filename, FILE_WRITE);
+        if (!sdfile) {
+            return 0;
+        }
+
+        dataSize = sdfile.print(idstr);
+        m_lastDataTime = dateTime;
+        return fileIndex;
+    }
+    void closeFile()
+    {
+        sdfile.close();
+    }
+    void flushFile()
+    {
+        sdfile.flush();
+    }
+#endif
+    uint32_t dataTime;
+    uint32_t dataSize;
+private:
+    byte getChecksum(char* buffer, byte len)
+    {
+        uint8_t checksum = 0;
+        for (byte i = 0; i < len; i++) {
+          checksum ^= buffer[i];
+        }
+        return checksum;
+    }
+#if STREAM_FORMAT == FORMAT_TEXT
+    byte translatePIDName(uint16_t pid, char* text)
+    {
+        for (uint16_t n = 0; n < sizeof(pidNames) / sizeof(pidNames[0]); n++) {
+            uint16_t id = pgm_read_word(&pidNames[n].pid);
+            if (pid == id) {
+                memcpy_P(text, pidNames[n].name, 3);
+                text[3] = '=';
+                return 4;
+            }
+        }
+        return sprintf(text, "%X=", pid);
+    }
+#endif
+#if ENABLE_DATA_LOG
+    uint32_t m_lastDataTime;
+#endif
+};
diff --git a/telelogger/telelogger.ino b/telelogger/telelogger.ino
index 479d840..bd5a5ba 100644
--- a/telelogger/telelogger.ino
+++ b/telelogger/telelogger.ino
@@ -1,5 +1,5 @@
 /******************************************************************************
-* Vehicle Telematics Data Transmitter Sketch (SIM900/GPRS)
+* Vehicle Telematics Remote Data Logger Sketch (SIM900/GPRS)
 * Developed by Stanley Huang <stanleyhuangyc@gmail.com>
 * Distributed under GPL v2.0
 * 
@@ -15,7 +15,9 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include <OBD.h>
+#if ENABLE_DATA_LOG
 #include <SD.h>
+#endif
 #include <I2Cdev.h>
 #include <MPU9150.h>
 #include "config.h"