From 063932b9ebad74d711049bf8f2b3727956a17c93 Mon Sep 17 00:00:00 2001 From: Stanley Huang Date: Tue, 19 May 2015 21:23:17 +1000 Subject: Update Tester --- tester/config.h | 2 ++ tester/datalogger.h | 16 ++++++++-------- tester/tester.ino | 2 -- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tester') diff --git a/tester/config.h b/tester/config.h index cb70095..ed6714a 100644 --- a/tester/config.h +++ b/tester/config.h @@ -33,6 +33,8 @@ LCD_ILI9341 lcd; /* 2.4" ILI9341 based SPI TFT LCD */ // enable(1)/disable(0) data streaming #define ENABLE_DATA_OUT 1 +#define DELAY_AFTER_SENDING 10 + // uses software(1)/hardware(0) serial for data streaming #define USE_SOFTSERIAL 0 diff --git a/tester/datalogger.h b/tester/datalogger.h index 241d3cf..d8c9449 100644 --- a/tester/datalogger.h +++ b/tester/datalogger.h @@ -97,9 +97,9 @@ public: { char buf[16]; #if STREAM_FORMAT == FORMAT_TEXT - sprintf(buf + translatePIDName(pid, buf), "%d\r", value); + sprintf(buf + translatePIDName(pid, buf), "%d\n", value); #else - sprintf(buf, "%X,%d\r", pid, value); + sprintf(buf, "%X,%d\n", pid, value); #endif #if ENABLE_DATA_OUT #if STREAM_FORMAT == FORMAT_BIN @@ -119,9 +119,9 @@ public: { char buf[20]; #if STREAM_FORMAT == FORMAT_TEXT - sprintf(buf + translatePIDName(pid, buf), "%ld\r", value); + sprintf(buf + translatePIDName(pid, buf), "%ld\n", value); #else - sprintf(buf, "%X,%ld\r", pid, value); + sprintf(buf, "%X,%ld\n", pid, value); #endif #if ENABLE_DATA_OUT #if STREAM_FORMAT == FORMAT_BIN @@ -141,9 +141,9 @@ public: { char buf[20]; #if STREAM_FORMAT == FORMAT_TEXT - sprintf(buf + translatePIDName(pid, buf), "%lu\r", value); + sprintf(buf + translatePIDName(pid, buf), "%lu\n", value); #else - sprintf(buf, "%X,%lu\r", pid, value); + sprintf(buf, "%X,%lu\n", pid, value); #endif #if ENABLE_DATA_OUT #if STREAM_FORMAT == FORMAT_BIN @@ -163,9 +163,9 @@ public: { char buf[24]; #if STREAM_FORMAT == FORMAT_TEXT - sprintf(buf + translatePIDName(pid, buf), "%d,%d,%d\r", value1, value2, value3); + sprintf(buf + translatePIDName(pid, buf), "%d,%d,%d\n", value1, value2, value3); #else - sprintf(buf, "%X,%d,%d,%d\r", pid, value1, value2, value3); + sprintf(buf, "%X,%d,%d,%d\n", pid, value1, value2, value3); #endif #if ENABLE_DATA_OUT #if STREAM_FORMAT == FORMAT_BIN diff --git a/tester/tester.ino b/tester/tester.ino index d452615..412b6ea 100644 --- a/tester/tester.ino +++ b/tester/tester.ino @@ -441,8 +441,6 @@ public: lcd.setCursor(164, 7); lcd.print("INTAKE MAP"); - lcd.setCursor(260, 7); - lcd.print("ELAPSED"); lcd.setCursor(260, 9); lcd.print("BATTERY"); -- cgit v1.2.3