From 74e3a860d65199ad9fe1edadc27960acef2adff6 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Thu, 1 Dec 2016 09:04:37 +0100
Subject: [PATCH 01/23] Remove the dependency to Serial. The sub class can
 assign this pointer when needed.

---
 NMEA2000.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/NMEA2000.cpp b/NMEA2000.cpp
index ec56c0e2..0300c62a 100644
--- a/NMEA2000.cpp
+++ b/NMEA2000.cpp
@@ -113,7 +113,8 @@ void ClearSetCharBuf(const char *str, int MaxLen, char *buf) {
 }
 
  //*****************************************************************************
-tNMEA2000::tNMEA2000() {
+tNMEA2000::tNMEA2000() 
+  : ForwardStream(0) {
 
   SingleFrameMessages[0]=DefSingleFrameMessages;
   FastPacketMessages[0]=DefFastPacketMessages;
@@ -127,8 +128,7 @@ tNMEA2000::tNMEA2000() {
 
   MsgHandler=0;
   ISORqstHandler=0;
-
-  ForwardStream=&Serial;
+  
   DeviceInformation[0].N2kSource=0;
   DeviceReady=false;
   AddressClaimStarted=0;

From 7af7236caf68f1170a8bce115bde4edfd730eb58 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Thu, 1 Dec 2016 12:04:13 +0100
Subject: [PATCH 02/23] Add missing headers.

---
 N2kMessages.cpp | 1 +
 N2kMessages.h   | 1 +
 N2kMsg.cpp      | 1 +
 N2kMsg.h        | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/N2kMessages.cpp b/N2kMessages.cpp
index 4c5f4428..3fa5ccc2 100644
--- a/N2kMessages.cpp
+++ b/N2kMessages.cpp
@@ -22,6 +22,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "N2kMessages.h"
+#include <string.h>
 
 //*****************************************************************************
 // System time
diff --git a/N2kMessages.h b/N2kMessages.h
index 8a77e6b3..9c1a3f01 100644
--- a/N2kMessages.h
+++ b/N2kMessages.h
@@ -37,6 +37,7 @@ NMEA2000.h
 #define _N2kMessages_H_
 
 #include "N2kMsg.h"
+#include <stdint.h>
 
 inline double RadToDeg(double v) { return v*180.0/3.1415926535897932384626433832795; }
 inline double DegToRad(double v) { return v/180.0*3.1415926535897932384626433832795; }
diff --git a/N2kMsg.cpp b/N2kMsg.cpp
index df129841..e00509fb 100644
--- a/N2kMsg.cpp
+++ b/N2kMsg.cpp
@@ -22,6 +22,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "N2kMsg.h"
+#include <math.h>
 //#include <MemoryFree.h>  // For testing used memory
 
 #define Escape 0x10
diff --git a/N2kMsg.h b/N2kMsg.h
index 4127d60b..749f808b 100644
--- a/N2kMsg.h
+++ b/N2kMsg.h
@@ -26,7 +26,9 @@ Definition for NMEA2000 message class used in my NMEA2000 libraries.
 
 #ifndef _tN2kMsg_H_
 #define _tN2kMsg_H_
+
 #include <Arduino.h>
+#include <stdint.h>
 
 const double   N2kDoubleNA=-1e9;
 const uint8_t  N2kUInt8NA=0xff;

From 2afabed738d60144c3da0d40030b0c414ab96211 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Thu, 1 Dec 2016 19:11:23 +0100
Subject: [PATCH 03/23] Replace Arduino binary definitions with BIT(n) macro
 which uses bit shifts.

---
 N2kMessages.cpp | 58 ++++++++++++++++++++++++-------------------------
 N2kMessages.h   | 20 ++++++++---------
 N2kMsg.h        |  1 +
 NMEA2000.h      | 11 +++++-----
 4 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/N2kMessages.cpp b/N2kMessages.cpp
index 3fa5ccc2..69d40cdd 100644
--- a/N2kMessages.cpp
+++ b/N2kMessages.cpp
@@ -220,35 +220,35 @@ void SetN2kPGN127489(tN2kMsg &N2kMsg, unsigned char EngineInstance, double Engin
   N2kMsg.Add2ByteUDouble(EngineFuelPress, 1000);
   N2kMsg.AddByte(0xff);  // reserved
 
-  int engineStatus1P1 = B00000000;
-  int engineStatus1P2 = B00000000;
-  int engineStatus2 = B00000000;
-  if (flagCheckEngine) engineStatus1P1 |= B00000001;
-  if (flagOverTemp) engineStatus1P1 |= B00000010;
-  if (flagLowOilPress) engineStatus1P1 |= B00000100;
-  if (flagLowOilLevel) engineStatus1P1 |= B00001000;
-  if (flagLowFuelPress) engineStatus1P1 |= B00010000;
-  if (flagLowSystemVoltage) engineStatus1P1 |= B00100000;
-  if (flagLowCoolantLevel) engineStatus1P1 |= B01000000;
-  if (flagWaterFlow) engineStatus1P1 |= B10000000;
-
-  if (flagWaterInFuel) engineStatus1P2 |= B00000001;
-  if (flagChargeIndicator) engineStatus1P2 |= B00000010;
-  if (flagPreheatIndicator) engineStatus1P2 |= B00000100;
-  if (flagHighBoostPress) engineStatus1P2 |= B00001000;
-  if (flagRevLimitExceeded) engineStatus1P2 |= B00010000;
-  if (flagEgrSystem) engineStatus1P2 |= B00100000;
-  if (flagTPS) engineStatus1P2 |= B01000000;
-  if (flagEmergencyStopMode) engineStatus1P2 |= B10000000;
-
-  if (flagWarning1) engineStatus2 |= B00000001;
-  if (flagWarning2) engineStatus2 |= B00000010;
-  if (flagPowerReduction) engineStatus2 |= B00000100;
-  if (flagMaintenanceNeeded) engineStatus2 |= B00001000;
-  if (flagEngineCommError) engineStatus2 |= B00010000;
-  if (flagSubThrottle) engineStatus2 |= B00100000;
-  if (flagNeutralStartProtect) engineStatus2 |= B01000000;
-  if (flagEngineShuttingDown) engineStatus2 |= B10000000;
+  int engineStatus1P1 = 0;
+  int engineStatus1P2 = 0;
+  int engineStatus2 = 0;
+  if (flagCheckEngine) engineStatus1P1      |= BIT(0);
+  if (flagOverTemp) engineStatus1P1         |= BIT(1);
+  if (flagLowOilPress) engineStatus1P1      |= BIT(2);
+  if (flagLowOilLevel) engineStatus1P1      |= BIT(3);
+  if (flagLowFuelPress) engineStatus1P1     |= BIT(4);
+  if (flagLowSystemVoltage) engineStatus1P1 |= BIT(5);
+  if (flagLowCoolantLevel) engineStatus1P1  |= BIT(6);
+  if (flagWaterFlow) engineStatus1P1        |= BIT(7);
+
+  if (flagWaterInFuel) engineStatus1P2       |= BIT(0);
+  if (flagChargeIndicator) engineStatus1P2   |= BIT(1);
+  if (flagPreheatIndicator) engineStatus1P2  |= BIT(2);
+  if (flagHighBoostPress) engineStatus1P2    |= BIT(3);
+  if (flagRevLimitExceeded) engineStatus1P2  |= BIT(4);
+  if (flagEgrSystem) engineStatus1P2         |= BIT(5);
+  if (flagTPS) engineStatus1P2               |= BIT(6);
+  if (flagEmergencyStopMode) engineStatus1P2 |= BIT(7);
+
+  if (flagWarning1) engineStatus2            |= BIT(0);
+  if (flagWarning2) engineStatus2            |= BIT(1);
+  if (flagPowerReduction) engineStatus2      |= BIT(2);
+  if (flagMaintenanceNeeded) engineStatus2   |= BIT(3);
+  if (flagEngineCommError) engineStatus2     |= BIT(4);
+  if (flagSubThrottle) engineStatus2         |= BIT(5);
+  if (flagNeutralStartProtect) engineStatus2 |= BIT(6);
+  if (flagEngineShuttingDown) engineStatus2  |= BIT(7);
   N2kMsg.Add2ByteInt(engineStatus1P2<<8 | engineStatus1P1); // Discrete Status 1
   N2kMsg.Add2ByteInt(engineStatus2);  // Discrete Status 1
 
diff --git a/N2kMessages.h b/N2kMessages.h
index 9c1a3f01..68a3958b 100644
--- a/N2kMessages.h
+++ b/N2kMessages.h
@@ -503,11 +503,11 @@ inline void SetN2kTransmissionParameters(tN2kMsg &N2kMsg, unsigned char EngineIn
                      bool flagSailDrive=false) {
   unsigned char DiscreteStatus1=0;
   
-  if (flagCheck) DiscreteStatus1 |= B00000001;
-  if (flagOverTemp) DiscreteStatus1 |= B00000010;
-  if (flagLowOilPressure) DiscreteStatus1 |= B00000100;
-  if (flagLowOilLevel) DiscreteStatus1 |= B00001000;
-  if (flagSailDrive) DiscreteStatus1 |= B00010000;
+  if (flagCheck) DiscreteStatus1          |= BIT(0);
+  if (flagOverTemp) DiscreteStatus1       |= BIT(1);
+  if (flagLowOilPressure) DiscreteStatus1 |= BIT(2);
+  if (flagLowOilLevel) DiscreteStatus1    |= BIT(3);
+  if (flagSailDrive) DiscreteStatus1      |= BIT(4);
   SetN2kPGN127493(N2kMsg, EngineInstance, TransmissionGear, OilPressure, OilTemperature,DiscreteStatus1);
 }
 
@@ -525,11 +525,11 @@ inline bool ParseN2kTransmissionParameters(const tN2kMsg &N2kMsg, unsigned char
   unsigned char DiscreteStatus1;
   bool ret=ParseN2kPGN127493(N2kMsg, EngineInstance, TransmissionGear, OilPressure, OilTemperature, DiscreteStatus1);
   if (ret) {
-    flagCheck          = ((DiscreteStatus1&B00000001)!=0);
-    flagOverTemp       = ((DiscreteStatus1&B00000010)!=0);
-    flagLowOilPressure = ((DiscreteStatus1&B00000100)!=0);
-    flagLowOilLevel    = ((DiscreteStatus1&B00001000)!=0);
-    flagSailDrive      = ((DiscreteStatus1&B00010000)!=0);
+    flagCheck          = ((DiscreteStatus1 & BIT(0))!=0);
+    flagOverTemp       = ((DiscreteStatus1 & BIT(1))!=0);
+    flagLowOilPressure = ((DiscreteStatus1 & BIT(2))!=0);
+    flagLowOilLevel    = ((DiscreteStatus1 & BIT(3))!=0);
+    flagSailDrive      = ((DiscreteStatus1 & BIT(4))!=0);
   }
   return ret;
 }
diff --git a/N2kMsg.h b/N2kMsg.h
index 749f808b..210c8c21 100644
--- a/N2kMsg.h
+++ b/N2kMsg.h
@@ -37,6 +37,7 @@ const uint16_t N2kUInt16NA=0xffff;
 const int16_t  N2kInt16NA=0x7fff;
 const uint32_t N2kUInt32NA=0xffffffff;
 const int32_t  N2kInt32NA=0x7fffffff;
+#define BIT(n) (1 << n)
 
 inline bool N2kIsNA(double v) { return v==N2kDoubleNA; }
 inline bool N2kIsNA(uint8_t v) { return v==N2kUInt8NA; }
diff --git a/NMEA2000.h b/NMEA2000.h
index 306a9bf3..1445b9bf 100644
--- a/NMEA2000.h
+++ b/NMEA2000.h
@@ -161,12 +161,11 @@ class tNMEA2000
 
 protected:
   // Forward mode bit settings.
-  static const int FwdModeBit_EnableForward     = B00000001; // If set, forward is enabled 
-  static const int FwdModeBit_SystemMessages    = B00000010; // System messages will be forwarded
-  static const int FwdModeBit_OnlyKnownMessages = B00000100; // Only known messages will be forwarded. System messages will be forwarded according its own bit.
-  static const int FwdModeBit_OwnMessages       = B00001000; // Forward also all messages, what this device will send
-
-  static const int HandleModeBit_OnlyKnownMessages       = B00010000; // Only known messages will be handled.
+  static const int FwdModeBit_EnableForward        = BIT(0); // If set, forward is enabled
+  static const int FwdModeBit_SystemMessages       = BIT(1); // System messages will be forwarded
+  static const int FwdModeBit_OnlyKnownMessages    = BIT(2); // Only known messages will be forwarded. System messages will be forwarded according its own bit.
+  static const int FwdModeBit_OwnMessages          = BIT(3); // Forward also all messages, what this device will send
+  static const int HandleModeBit_OnlyKnownMessages = BIT(4); // Only known messages will be handled.
                
 protected:
     tDebugMode dbMode; // Default dm_None

From 6c191b4228cdf32eeaf66898f8d2b4bcfb1e0b7c Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Thu, 1 Dec 2016 19:22:51 +0100
Subject: [PATCH 04/23] Replace byte with uint8_t.

---
 ActisenseReader.cpp |   2 +-
 N2kMsg.cpp          | 119 +++++++++++++++++++++++---------------------
 2 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/ActisenseReader.cpp b/ActisenseReader.cpp
index 4b3d14bd..ec7a6654 100644
--- a/ActisenseReader.cpp
+++ b/ActisenseReader.cpp
@@ -64,7 +64,7 @@ bool tActisenseReader::CheckMessage(tN2kMsg &N2kMsg) {
      return false; // Length does not match. Add type, length and crc
    }
    
-   byte CheckSum = (byte)((byteSum == 0) ? 0 : (256 - byteSum));
+   uint8_t CheckSum = (uint8_t)((byteSum == 0) ? 0 : (256 - byteSum));
    if ( CheckSum!=MsgBuf[MsgWritePos-1] ) {
      return false; // Checksum does not match
    }
diff --git a/N2kMsg.cpp b/N2kMsg.cpp
index e00509fb..cbdaecf8 100644
--- a/N2kMsg.cpp
+++ b/N2kMsg.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
 N2kMsg.cpp
 
 Copyright (c) 2015-2016 Timo Lappalainen, Kave Oy, www.kave.fi
@@ -23,6 +23,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "N2kMsg.h"
 #include <math.h>
+#include <stdlib.h>
 //#include <MemoryFree.h>  // For testing used memory
 
 #define Escape 0x10
@@ -173,28 +174,28 @@ unsigned char tN2kMsg::GetByte(int &Index) const {
   if (Index<DataLen) {
     return Data[Index++];
   } else return 0xff;
-}  
-  
+}
+
 //*****************************************************************************
 int16_t tN2kMsg::Get2ByteInt(int &Index, int16_t def) const {
   if (Index+2<=DataLen) {
     return GetBuf2ByteInt(Index,Data);
   } else return def;
-}  
-  
+}
+
 //*****************************************************************************
 uint16_t tN2kMsg::Get2ByteUInt(int &Index, uint16_t def) const {
   if (Index+2<=DataLen) {
     return GetBuf2ByteUInt(Index,Data);
   } else return def;
-}  
-  
+}
+
 //*****************************************************************************
 uint32_t tN2kMsg::Get4ByteUInt(int &Index, uint32_t def) const {
   if (Index+4<=DataLen) {
     return GetBuf4ByteUInt(Index,Data);
   } else return def;
-}  
+}
 
 //*****************************************************************************
 double tN2kMsg::Get1ByteDouble(double precision, int &Index, double def) const {
@@ -298,9 +299,9 @@ void SetBuf8ByteDouble(double v, double precision, int &index, unsigned char *bu
   long long *vll=(long long *)(&buf[index]);
     (*vll)=v*1e6;
     (*vll)*=fpll;
-    
+
     index+=8;
-*/    
+*/
 
     buf[index]=vll&255; index++;
     vll>>=8;
@@ -324,7 +325,7 @@ void SetBuf8ByteDouble(double v, double precision, int &index, unsigned char *bu
 void SetBuf4ByteDouble(double v, double precision, int &index, unsigned char *buf) {
   int32_t *vi=(int32_t *)(&buf[index]);
   index+=4;
-  
+
   (*vi)=(int32_t)round(v/precision);
 }
 
@@ -332,7 +333,7 @@ void SetBuf4ByteDouble(double v, double precision, int &index, unsigned char *bu
 void SetBuf4ByteUDouble(double v, double precision, int &index, unsigned char *buf) {
   uint32_t *vi=(uint32_t *)(&buf[index]);
   index+=4;
-  
+
   (*vi)=(uint32_t)round(v/precision);
 }
 
@@ -347,7 +348,7 @@ void SetBuf3ByteDouble(double v, double precision, int &index, unsigned char *bu
 int16_t GetBuf2ByteInt(int &index, const unsigned char *buf) {
   int16_t *vi=(int16_t *)(&buf[index]);
   index+=2;
-  
+
   return *vi;
 }
 
@@ -355,7 +356,7 @@ int16_t GetBuf2ByteInt(int &index, const unsigned char *buf) {
 uint16_t GetBuf2ByteUInt(int &index, const unsigned char *buf) {
   uint16_t *vi=(uint16_t *)(&buf[index]);
   index+=2;
-  
+
   return *vi;
 }
 
@@ -363,7 +364,7 @@ uint16_t GetBuf2ByteUInt(int &index, const unsigned char *buf) {
 uint32_t GetBuf4ByteUInt(int &index, const unsigned char *buf) {
   uint32_t *vi=(uint32_t *)(&buf[index]);
   index+=4;
-  
+
   return *vi;
 }
 
@@ -371,9 +372,9 @@ uint32_t GetBuf4ByteUInt(int &index, const unsigned char *buf) {
 double GetBuf1ByteDouble(double precision, int &index, const unsigned char *buf, double def) {
   int8_t *vi=(int8_t *)(&buf[index]);
   index+=1;
-  
+
   if (*vi==0x7f) return def;
-  
+
   return ((double)(*vi))*precision;
 }
 
@@ -381,9 +382,9 @@ double GetBuf1ByteDouble(double precision, int &index, const unsigned char *buf,
 double GetBuf1ByteUDouble(double precision, int &index, const unsigned char *buf, double def) {
   uint8_t *vi=(uint8_t *)(&buf[index]);
   index+=1;
-  
+
   if (*vi==0xff) return def;
-  
+
   return ((double)(*vi))*precision;
 }
 
@@ -391,9 +392,9 @@ double GetBuf1ByteUDouble(double precision, int &index, const unsigned char *buf
 double GetBuf2ByteDouble(double precision, int &index, const unsigned char *buf, double def) {
   int16_t *vi=(int16_t *)(&buf[index]);
   index+=2;
-  
+
   if (*vi==0x7fff) return def;
-  
+
   return ((double)(*vi))*precision;
 }
 
@@ -401,9 +402,9 @@ double GetBuf2ByteDouble(double precision, int &index, const unsigned char *buf,
 double GetBuf2ByteUDouble(double precision, int &index, const unsigned char *buf, double def) {
   uint16_t *vi=(uint16_t *)(&buf[index]);
   index+=2;
-  
+
   if (*vi==0xffff) return def;
-  
+
   return ((double)(*vi))*precision;
 }
 
@@ -416,23 +417,23 @@ double GetBuf8ByteDouble(double precision, int &index, const unsigned char *buf,
   index+=4;
   long *vlhi=(long *)(&buf[index]);
   index+=4;
-  
+
   if ( (*vlhi==0x7fff) && (*vllo==0xffff) ) return def;
   double v=*vlhi * 4294967296.0;
-  
+
   if (v>=0) { v += *vllo; } else { v -= *vllo; }
-  
+
   // Below did not work even with Due
   //long long vll=*vlhi;
   //vll<<=32;
   //vll|=*vllo;
- 
-  
-  //Serial.print(*vlhi,HEX); Serial.print(","); Serial.println(*vllo,HEX); 
+
+
+  //Serial.print(*vlhi,HEX); Serial.print(","); Serial.println(*vllo,HEX);
 
 
 //  if (((unsigned long long)(vll))==0xffffffffffffffff) return def;
-  
+
   return v*precision;
 }
 
@@ -445,7 +446,7 @@ double GetBuf3ByteDouble(double precision, int &index, const unsigned char *buf,
   // We use only 3 bytes, so set highest byte to 0
   vll&=0x00ffffff;
   if (vll==0x007fffff) return def;
-  
+
   return ((double)(vll))*precision;
 }
 
@@ -455,7 +456,7 @@ double GetBuf4ByteDouble(double precision, int &index, const unsigned char *buf,
   index+=4;
 
   if (*vl==0x7fffffff) return def;
-  
+
   return ((double)(*vl))*precision;
 }
 
@@ -465,7 +466,7 @@ double GetBuf4ByteUDouble(double precision, int &index, const unsigned char *buf
   index+=4;
 
   if (*vl==0xffffffff) return def;
-  
+
   return ((double)(*vl))*precision;
 }
 
@@ -473,7 +474,7 @@ double GetBuf4ByteUDouble(double precision, int &index, const unsigned char *buf
 void SetBuf2ByteDouble(double v, double precision, int &index, unsigned char *buf) {
   int16_t *vi=(int16_t *)(&buf[index]);
   index+=2;
-  
+
   (*vi)=(int16_t)round(v/precision);
 }
 
@@ -481,7 +482,7 @@ void SetBuf2ByteDouble(double v, double precision, int &index, unsigned char *bu
 void SetBuf2ByteUDouble(double v, double precision, int &index, unsigned char *buf) {
   uint16_t *vi=(uint16_t *)(&buf[index]);
   index+=2;
-  
+
   (*vi)=(uint16_t)round(v/precision);
 }
 
@@ -489,7 +490,7 @@ void SetBuf2ByteUDouble(double v, double precision, int &index, unsigned char *b
 void SetBuf1ByteDouble(double v, double precision, int &index, unsigned char *buf) {
   int8_t *vi=(int8_t *)(&buf[index]);
   index+=1;
-  
+
   (*vi)=(int8_t)round(v/precision);
 }
 
@@ -497,7 +498,7 @@ void SetBuf1ByteDouble(double v, double precision, int &index, unsigned char *bu
 void SetBuf1ByteUDouble(double v, double precision, int &index, unsigned char *buf) {
   uint8_t *vi=(uint8_t *)(&buf[index]);
   index+=1;
-  
+
   (*vi)=(uint8_t)round(v/precision);
 }
 
@@ -524,7 +525,7 @@ void SetBuf3ByteInt(int32_t v, int &index, unsigned char *buf) {
 void SetBuf4ByteUInt(uint32_t v, int &index, unsigned char *buf) {
   uint32_t *vl=(uint32_t *)(&buf[index]);
   index+=4;
-  
+
   (*vl)=v;
 }
 
@@ -552,34 +553,36 @@ void SetBufStr(const char *str, int len, int &index, unsigned char *buf) {
 }
 
 //*****************************************************************************
-void PrintBuf(Stream *port, unsigned char len, const unsigned char *pData, bool AddLF) {
+void PrintBuf(N2kStream *port, unsigned char len, const unsigned char *pData, bool AddLF) {
     if (port==0) return;
 
+    char out[3];
     for(int i = 0; i<len; i++) {
       if (i>0) { port->print(","); };
-      port->print(pData[i],HEX);
+      // Print bytes as hex.
+      port->print(itoa(pData[i], out, 16));
     }
-    
+
     if (AddLF) port->println("");
 }
 
 //*****************************************************************************
-void tN2kMsg::Print(Stream *port, bool NoData) const {
+void tN2kMsg::Print(N2kStream *port, bool NoData) const {
   if (port==0 || !IsValid()) return;
-  port->print(F("Pri:")); port->print(Priority);
-  port->print(F(" PGN:")); port->print(PGN);
-  port->print(F(" Source:")); port->print(Source);
-  port->print(F(" Dest:")); port->print(Destination);
-  port->print(F(" Len:")); port->print(DataLen);
+  port->print(CSTR("Pri:")); port->print(Priority);
+  port->print(CSTR(" PGN:")); port->print(PGN);
+  port->print(CSTR(" Source:")); port->print(Source);
+  port->print(CSTR(" Dest:")); port->print(Destination);
+  port->print(CSTR(" Len:")); port->print(DataLen);
   if (!NoData) {
-    port->print(F(" Data:"));
+    port->print(CSTR(" Data:"));
     PrintBuf(port,DataLen,Data);
   }
-  port->print(F("\r\n"));
+  port->println("");
 }
 
 //*****************************************************************************
-void AddByteEscapedToBuf(unsigned char byteToAdd, byte &idx, unsigned char *buf, int &byteSum)
+void AddByteEscapedToBuf(unsigned char byteToAdd, uint8_t &idx, unsigned char *buf, int &byteSum)
 {
   buf[idx++]=byteToAdd;
   byteSum+=byteToAdd;
@@ -592,17 +595,17 @@ void AddByteEscapedToBuf(unsigned char byteToAdd, byte &idx, unsigned char *buf,
 //*****************************************************************************
 // Actisense Format:
 // <10><02><93><length (1)><priority (1)><PGN (3)><destination (1)><source (1)><time (4)><len (1)><data (len)><CRC (1)><10><03>
-void tN2kMsg::SendInActisenseFormat(Stream *port) const {
+void tN2kMsg::SendInActisenseFormat(N2kStream *port) const {
   unsigned long _PGN=PGN;
   unsigned long _MsgTime=MsgTime;
-  byte msgIdx=0;
+  uint8_t msgIdx=0;
   int byteSum = 0;
-  byte CheckSum;
+  uint8_t CheckSum;
   unsigned char ActisenseMsgBuf[MaxActisenseMsgBuf];
-  
+
   if (port==0 || !IsValid()) return;
   // Serial.print("freeMemory()="); Serial.println(freeMemory());
-  
+
   ActisenseMsgBuf[msgIdx++]=Escape;
   ActisenseMsgBuf[msgIdx++]=StartOfText;
   AddByteEscapedToBuf(MsgTypeN2k,msgIdx,ActisenseMsgBuf,byteSum);
@@ -619,18 +622,18 @@ void tN2kMsg::SendInActisenseFormat(Stream *port) const {
   AddByteEscapedToBuf(_MsgTime & 0xff,msgIdx,ActisenseMsgBuf,byteSum); _MsgTime>>=8;
   AddByteEscapedToBuf(_MsgTime & 0xff,msgIdx,ActisenseMsgBuf,byteSum);
   AddByteEscapedToBuf(DataLen,msgIdx,ActisenseMsgBuf,byteSum);
-  
+
 
   for (int i = 0; i < DataLen; i++) AddByteEscapedToBuf(Data[i],msgIdx,ActisenseMsgBuf,byteSum);
   byteSum %= 256;
 
-  CheckSum = (byte)((byteSum == 0) ? 0 : (256 - byteSum));
+  CheckSum = (uint8_t)((byteSum == 0) ? 0 : (256 - byteSum));
   ActisenseMsgBuf[msgIdx++]=CheckSum;
   if (CheckSum==Escape) ActisenseMsgBuf[msgIdx++]=CheckSum;
 
   ActisenseMsgBuf[msgIdx++] = Escape;
   ActisenseMsgBuf[msgIdx++] = EndOfText;
-  
+
   port->write(ActisenseMsgBuf,msgIdx);
 //  Serial.print("Actisense data:");
 //  PrintBuf(msgIdx,ActisenseMsgBuf);

From 69053d5f766182b5acb3bb1237c9094ae74e184d Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Fri, 2 Dec 2016 09:50:57 +0100
Subject: [PATCH 05/23] Add missing header for memcpy.

---
 ActisenseReader.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ActisenseReader.cpp b/ActisenseReader.cpp
index ec7a6654..af8e0791 100644
--- a/ActisenseReader.cpp
+++ b/ActisenseReader.cpp
@@ -24,6 +24,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 This is class for reading Actisense format messages from given stream.
 */
 #include "ActisenseReader.h"
+#include <string.h>
 
 //*****************************************************************************
 tActisenseReader::tActisenseReader() {

From 9140aa93144ccec32ce07a1b56aee8db498465f4 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Tue, 6 Dec 2016 07:06:00 +0100
Subject: [PATCH 06/23] Add header for platform abstraction.

N2kDef defines the requirements from the library side. It needs millis() to get the
current uptime, and delay() to be able to delay execution. The header also comes with
a set of macros to be able to store constant data in a more efficient way. Most
platforms do not have a specific way of handling const data, but AVR8 needs explicit
handling to store constant data on flash without copying it to RAM.
---
 N2kDef.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 N2kDef.h

diff --git a/N2kDef.h b/N2kDef.h
new file mode 100644
index 00000000..acc119ac
--- /dev/null
+++ b/N2kDef.h
@@ -0,0 +1,63 @@
+/*
+N2kDef.h
+
+Copyright (c) 2015-2016 Timo Lappalainen, Kave Oy, www.kave.fi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Type definitions and utility macros used in the NMEA2000 libraries.
+
+*/
+
+#ifndef _tN2kDef_H_
+
+#include <stdint.h>
+
+// Application execution delay. Must be implemented by application.
+extern void delay(unsigned long ms);
+
+// Current uptime in milliseconds. Must be implemented by application.
+extern uint32_t millis();
+
+// Macro sets for handling constant data. Some platforms are able to store
+// constant strings and data on flash in order to reduce RAM consumption.
+//
+// - CSTR, A constant string.
+// - CDATA, Constant data.
+// - GET_CINT8, Get a constant 8bit integer.
+// - GET_CINT16, Get a constant 16bit integer.
+// - GET_CINT32, Get a constant 32bit integer.
+
+#ifdef __AVR__
+// AVR8 uses progmem.
+#include <avr/pgmspace.h>
+#define CSTR(str)       str PROGMEM
+#define CDATA(data)     data PROGMEM
+#define GET_CINT8(var)  pgm_read_byte(&var)
+#define GET_CINT16(var) pgm_read_word(&var)
+#define GET_CINT32(var) pgm_read_dword(&var)
+#else
+// No specific const storage support (default).
+#define CSTR(str)       str
+#define CDATA(data)     data
+#define GET_CINT8(var)  var
+#define GET_CINT16(var) var
+#define GET_CINT32(var) var
+#endif
+
+#endif

From 41bc6d740be4eea71942516515869d820ece4ce7 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Tue, 6 Dec 2016 07:08:56 +0100
Subject: [PATCH 07/23] Add N2kStream interface for reading- and writing serial
 data. On Arduino this defaults to Stream.

---
 N2kStream.cpp | 24 ++++++++++++++++++++
 N2kStream.h   | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 N2kStream.cpp
 create mode 100644 N2kStream.h

diff --git a/N2kStream.cpp b/N2kStream.cpp
new file mode 100644
index 00000000..c2da7618
--- /dev/null
+++ b/N2kStream.cpp
@@ -0,0 +1,24 @@
+#include "N2kStream.h"
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef ARDUINO
+// Arduino uses its own implementation.
+#else
+size_t N2kStream::print(const char *str) {
+   if(str == 0)
+      return 0;
+
+   return write(reinterpret_cast<const uint8_t*>(str), strlen(str));
+}
+
+size_t N2kStream::print(int val) {
+   char buf[16];
+   return write(itoa(buf, val, 10), strlen(buf));
+}
+
+size_t N2kStream::println(const char *str) {
+   return print(str) + print("\r\n");
+}
+
+#endif
diff --git a/N2kStream.h b/N2kStream.h
new file mode 100644
index 00000000..122c4620
--- /dev/null
+++ b/N2kStream.h
@@ -0,0 +1,61 @@
+/*
+N2kStream.h
+
+Copyright (c) 2015-2016 Timo Lappalainen, Kave Oy, www.kave.fi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+I/O stream used in the NMEA2000 libraries.
+
+*/
+
+#ifndef _tN2kStream_H_
+#define _tN2kStream_H_
+
+#include <stdint.h>
+#include <stddef.h>
+
+#ifdef ARDUINO
+// Arduino users get away with using the standard Stream class and its
+// subclasses. Forward declare the Stream class here and include Arduino.h in
+// the application.
+#include <Arduino.h>
+typedef Stream N2kStream;
+#else
+// Non Arduino platforms need to implement this themselves if they want to use
+// functions which operate on streams.
+class N2kStream {
+   public:
+   // Returns first byte if incoming data, or -1 on no available data.
+   virtual int read() = 0;
+
+   // Write data to stream.
+   virtual size_t write(const uint8_t* data, size_t size) = 0;
+
+   // Print string to stream.
+   size_t print(const char* str);
+
+   // Print value to stream.
+   size_t print(int val);
+
+   // Print string and newline to stream.
+   size_t println(const char *str);
+};
+#endif
+
+#endif

From 29faf2d14e5786cb4952a8b0a067c81cb45d3bb5 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Thu, 1 Dec 2016 19:22:51 +0100
Subject: [PATCH 08/23] Replace byte with uint8_t.

---
 ActisenseReader.cpp |   2 +-
 N2kMsg.cpp          | 110 ++++++++++++++++++++++----------------------
 2 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/ActisenseReader.cpp b/ActisenseReader.cpp
index 4b3d14bd..ec7a6654 100644
--- a/ActisenseReader.cpp
+++ b/ActisenseReader.cpp
@@ -64,7 +64,7 @@ bool tActisenseReader::CheckMessage(tN2kMsg &N2kMsg) {
      return false; // Length does not match. Add type, length and crc
    }
    
-   byte CheckSum = (byte)((byteSum == 0) ? 0 : (256 - byteSum));
+   uint8_t CheckSum = (uint8_t)((byteSum == 0) ? 0 : (256 - byteSum));
    if ( CheckSum!=MsgBuf[MsgWritePos-1] ) {
      return false; // Checksum does not match
    }
diff --git a/N2kMsg.cpp b/N2kMsg.cpp
index e00509fb..8a9c5cf7 100644
--- a/N2kMsg.cpp
+++ b/N2kMsg.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
 N2kMsg.cpp
 
 Copyright (c) 2015-2016 Timo Lappalainen, Kave Oy, www.kave.fi
@@ -23,6 +23,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "N2kMsg.h"
 #include <math.h>
+#include <stdlib.h>
 //#include <MemoryFree.h>  // For testing used memory
 
 #define Escape 0x10
@@ -173,28 +174,28 @@ unsigned char tN2kMsg::GetByte(int &Index) const {
   if (Index<DataLen) {
     return Data[Index++];
   } else return 0xff;
-}  
-  
+}
+
 //*****************************************************************************
 int16_t tN2kMsg::Get2ByteInt(int &Index, int16_t def) const {
   if (Index+2<=DataLen) {
     return GetBuf2ByteInt(Index,Data);
   } else return def;
-}  
-  
+}
+
 //*****************************************************************************
 uint16_t tN2kMsg::Get2ByteUInt(int &Index, uint16_t def) const {
   if (Index+2<=DataLen) {
     return GetBuf2ByteUInt(Index,Data);
   } else return def;
-}  
-  
+}
+
 //*****************************************************************************
 uint32_t tN2kMsg::Get4ByteUInt(int &Index, uint32_t def) const {
   if (Index+4<=DataLen) {
     return GetBuf4ByteUInt(Index,Data);
   } else return def;
-}  
+}
 
 //*****************************************************************************
 double tN2kMsg::Get1ByteDouble(double precision, int &Index, double def) const {
@@ -298,9 +299,9 @@ void SetBuf8ByteDouble(double v, double precision, int &index, unsigned char *bu
   long long *vll=(long long *)(&buf[index]);
     (*vll)=v*1e6;
     (*vll)*=fpll;
-    
+
     index+=8;
-*/    
+*/
 
     buf[index]=vll&255; index++;
     vll>>=8;
@@ -324,7 +325,7 @@ void SetBuf8ByteDouble(double v, double precision, int &index, unsigned char *bu
 void SetBuf4ByteDouble(double v, double precision, int &index, unsigned char *buf) {
   int32_t *vi=(int32_t *)(&buf[index]);
   index+=4;
-  
+
   (*vi)=(int32_t)round(v/precision);
 }
 
@@ -332,7 +333,7 @@ void SetBuf4ByteDouble(double v, double precision, int &index, unsigned char *bu
 void SetBuf4ByteUDouble(double v, double precision, int &index, unsigned char *buf) {
   uint32_t *vi=(uint32_t *)(&buf[index]);
   index+=4;
-  
+
   (*vi)=(uint32_t)round(v/precision);
 }
 
@@ -347,7 +348,7 @@ void SetBuf3ByteDouble(double v, double precision, int &index, unsigned char *bu
 int16_t GetBuf2ByteInt(int &index, const unsigned char *buf) {
   int16_t *vi=(int16_t *)(&buf[index]);
   index+=2;
-  
+
   return *vi;
 }
 
@@ -355,7 +356,7 @@ int16_t GetBuf2ByteInt(int &index, const unsigned char *buf) {
 uint16_t GetBuf2ByteUInt(int &index, const unsigned char *buf) {
   uint16_t *vi=(uint16_t *)(&buf[index]);
   index+=2;
-  
+
   return *vi;
 }
 
@@ -363,7 +364,7 @@ uint16_t GetBuf2ByteUInt(int &index, const unsigned char *buf) {
 uint32_t GetBuf4ByteUInt(int &index, const unsigned char *buf) {
   uint32_t *vi=(uint32_t *)(&buf[index]);
   index+=4;
-  
+
   return *vi;
 }
 
@@ -371,9 +372,9 @@ uint32_t GetBuf4ByteUInt(int &index, const unsigned char *buf) {
 double GetBuf1ByteDouble(double precision, int &index, const unsigned char *buf, double def) {
   int8_t *vi=(int8_t *)(&buf[index]);
   index+=1;
-  
+
   if (*vi==0x7f) return def;
-  
+
   return ((double)(*vi))*precision;
 }
 
@@ -381,9 +382,9 @@ double GetBuf1ByteDouble(double precision, int &index, const unsigned char *buf,
 double GetBuf1ByteUDouble(double precision, int &index, const unsigned char *buf, double def) {
   uint8_t *vi=(uint8_t *)(&buf[index]);
   index+=1;
-  
+
   if (*vi==0xff) return def;
-  
+
   return ((double)(*vi))*precision;
 }
 
@@ -391,9 +392,9 @@ double GetBuf1ByteUDouble(double precision, int &index, const unsigned char *buf
 double GetBuf2ByteDouble(double precision, int &index, const unsigned char *buf, double def) {
   int16_t *vi=(int16_t *)(&buf[index]);
   index+=2;
-  
+
   if (*vi==0x7fff) return def;
-  
+
   return ((double)(*vi))*precision;
 }
 
@@ -401,9 +402,9 @@ double GetBuf2ByteDouble(double precision, int &index, const unsigned char *buf,
 double GetBuf2ByteUDouble(double precision, int &index, const unsigned char *buf, double def) {
   uint16_t *vi=(uint16_t *)(&buf[index]);
   index+=2;
-  
+
   if (*vi==0xffff) return def;
-  
+
   return ((double)(*vi))*precision;
 }
 
@@ -416,23 +417,23 @@ double GetBuf8ByteDouble(double precision, int &index, const unsigned char *buf,
   index+=4;
   long *vlhi=(long *)(&buf[index]);
   index+=4;
-  
+
   if ( (*vlhi==0x7fff) && (*vllo==0xffff) ) return def;
   double v=*vlhi * 4294967296.0;
-  
+
   if (v>=0) { v += *vllo; } else { v -= *vllo; }
-  
+
   // Below did not work even with Due
   //long long vll=*vlhi;
   //vll<<=32;
   //vll|=*vllo;
- 
-  
-  //Serial.print(*vlhi,HEX); Serial.print(","); Serial.println(*vllo,HEX); 
+
+
+  //Serial.print(*vlhi,HEX); Serial.print(","); Serial.println(*vllo,HEX);
 
 
 //  if (((unsigned long long)(vll))==0xffffffffffffffff) return def;
-  
+
   return v*precision;
 }
 
@@ -445,7 +446,7 @@ double GetBuf3ByteDouble(double precision, int &index, const unsigned char *buf,
   // We use only 3 bytes, so set highest byte to 0
   vll&=0x00ffffff;
   if (vll==0x007fffff) return def;
-  
+
   return ((double)(vll))*precision;
 }
 
@@ -455,7 +456,7 @@ double GetBuf4ByteDouble(double precision, int &index, const unsigned char *buf,
   index+=4;
 
   if (*vl==0x7fffffff) return def;
-  
+
   return ((double)(*vl))*precision;
 }
 
@@ -465,7 +466,7 @@ double GetBuf4ByteUDouble(double precision, int &index, const unsigned char *buf
   index+=4;
 
   if (*vl==0xffffffff) return def;
-  
+
   return ((double)(*vl))*precision;
 }
 
@@ -473,7 +474,7 @@ double GetBuf4ByteUDouble(double precision, int &index, const unsigned char *buf
 void SetBuf2ByteDouble(double v, double precision, int &index, unsigned char *buf) {
   int16_t *vi=(int16_t *)(&buf[index]);
   index+=2;
-  
+
   (*vi)=(int16_t)round(v/precision);
 }
 
@@ -481,7 +482,7 @@ void SetBuf2ByteDouble(double v, double precision, int &index, unsigned char *bu
 void SetBuf2ByteUDouble(double v, double precision, int &index, unsigned char *buf) {
   uint16_t *vi=(uint16_t *)(&buf[index]);
   index+=2;
-  
+
   (*vi)=(uint16_t)round(v/precision);
 }
 
@@ -489,7 +490,7 @@ void SetBuf2ByteUDouble(double v, double precision, int &index, unsigned char *b
 void SetBuf1ByteDouble(double v, double precision, int &index, unsigned char *buf) {
   int8_t *vi=(int8_t *)(&buf[index]);
   index+=1;
-  
+
   (*vi)=(int8_t)round(v/precision);
 }
 
@@ -497,7 +498,7 @@ void SetBuf1ByteDouble(double v, double precision, int &index, unsigned char *bu
 void SetBuf1ByteUDouble(double v, double precision, int &index, unsigned char *buf) {
   uint8_t *vi=(uint8_t *)(&buf[index]);
   index+=1;
-  
+
   (*vi)=(uint8_t)round(v/precision);
 }
 
@@ -524,7 +525,7 @@ void SetBuf3ByteInt(int32_t v, int &index, unsigned char *buf) {
 void SetBuf4ByteUInt(uint32_t v, int &index, unsigned char *buf) {
   uint32_t *vl=(uint32_t *)(&buf[index]);
   index+=4;
-  
+
   (*vl)=v;
 }
 
@@ -557,29 +558,30 @@ void PrintBuf(Stream *port, unsigned char len, const unsigned char *pData, bool
 
     for(int i = 0; i<len; i++) {
       if (i>0) { port->print(","); };
+      // Print bytes as hex.
       port->print(pData[i],HEX);
     }
-    
+
     if (AddLF) port->println("");
 }
 
 //*****************************************************************************
 void tN2kMsg::Print(Stream *port, bool NoData) const {
   if (port==0 || !IsValid()) return;
-  port->print(F("Pri:")); port->print(Priority);
-  port->print(F(" PGN:")); port->print(PGN);
-  port->print(F(" Source:")); port->print(Source);
-  port->print(F(" Dest:")); port->print(Destination);
-  port->print(F(" Len:")); port->print(DataLen);
+  port->print(CSTR("Pri:")); port->print(Priority);
+  port->print(CSTR(" PGN:")); port->print(PGN);
+  port->print(CSTR(" Source:")); port->print(Source);
+  port->print(CSTR(" Dest:")); port->print(Destination);
+  port->print(CSTR(" Len:")); port->print(DataLen);
   if (!NoData) {
-    port->print(F(" Data:"));
+    port->print(CSTR(" Data:"));
     PrintBuf(port,DataLen,Data);
   }
-  port->print(F("\r\n"));
+  port->println("");
 }
 
 //*****************************************************************************
-void AddByteEscapedToBuf(unsigned char byteToAdd, byte &idx, unsigned char *buf, int &byteSum)
+void AddByteEscapedToBuf(unsigned char byteToAdd, uint8_t &idx, unsigned char *buf, int &byteSum)
 {
   buf[idx++]=byteToAdd;
   byteSum+=byteToAdd;
@@ -595,14 +597,14 @@ void AddByteEscapedToBuf(unsigned char byteToAdd, byte &idx, unsigned char *buf,
 void tN2kMsg::SendInActisenseFormat(Stream *port) const {
   unsigned long _PGN=PGN;
   unsigned long _MsgTime=MsgTime;
-  byte msgIdx=0;
+  uint8_t msgIdx=0;
   int byteSum = 0;
-  byte CheckSum;
+  uint8_t CheckSum;
   unsigned char ActisenseMsgBuf[MaxActisenseMsgBuf];
-  
+
   if (port==0 || !IsValid()) return;
   // Serial.print("freeMemory()="); Serial.println(freeMemory());
-  
+
   ActisenseMsgBuf[msgIdx++]=Escape;
   ActisenseMsgBuf[msgIdx++]=StartOfText;
   AddByteEscapedToBuf(MsgTypeN2k,msgIdx,ActisenseMsgBuf,byteSum);
@@ -619,18 +621,18 @@ void tN2kMsg::SendInActisenseFormat(Stream *port) const {
   AddByteEscapedToBuf(_MsgTime & 0xff,msgIdx,ActisenseMsgBuf,byteSum); _MsgTime>>=8;
   AddByteEscapedToBuf(_MsgTime & 0xff,msgIdx,ActisenseMsgBuf,byteSum);
   AddByteEscapedToBuf(DataLen,msgIdx,ActisenseMsgBuf,byteSum);
-  
+
 
   for (int i = 0; i < DataLen; i++) AddByteEscapedToBuf(Data[i],msgIdx,ActisenseMsgBuf,byteSum);
   byteSum %= 256;
 
-  CheckSum = (byte)((byteSum == 0) ? 0 : (256 - byteSum));
+  CheckSum = (uint8_t)((byteSum == 0) ? 0 : (256 - byteSum));
   ActisenseMsgBuf[msgIdx++]=CheckSum;
   if (CheckSum==Escape) ActisenseMsgBuf[msgIdx++]=CheckSum;
 
   ActisenseMsgBuf[msgIdx++] = Escape;
   ActisenseMsgBuf[msgIdx++] = EndOfText;
-  
+
   port->write(ActisenseMsgBuf,msgIdx);
 //  Serial.print("Actisense data:");
 //  PrintBuf(msgIdx,ActisenseMsgBuf);

From 4f91fbfd35fdb56b3f9e6b5c547fb89c0cd8a567 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Fri, 2 Dec 2016 09:50:57 +0100
Subject: [PATCH 09/23] Add missing header for memcpy.

---
 ActisenseReader.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ActisenseReader.cpp b/ActisenseReader.cpp
index ec7a6654..af8e0791 100644
--- a/ActisenseReader.cpp
+++ b/ActisenseReader.cpp
@@ -24,6 +24,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 This is class for reading Actisense format messages from given stream.
 */
 #include "ActisenseReader.h"
+#include <string.h>
 
 //*****************************************************************************
 tActisenseReader::tActisenseReader() {

From c667544fc7b12d2fa05f682231346ba6bdff7f30 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Tue, 6 Dec 2016 07:06:00 +0100
Subject: [PATCH 10/23] Add header for platform abstraction.

N2kDef defines the requirements from the library side. It needs millis() to get the
current uptime, and delay() to be able to delay execution. The header also comes with
a set of macros to be able to store constant data in a more efficient way. Most
platforms do not have a specific way of handling const data, but AVR8 needs explicit
handling to store constant data on flash without copying it to RAM.
---
 N2kDef.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 N2kDef.h

diff --git a/N2kDef.h b/N2kDef.h
new file mode 100644
index 00000000..acc119ac
--- /dev/null
+++ b/N2kDef.h
@@ -0,0 +1,63 @@
+/*
+N2kDef.h
+
+Copyright (c) 2015-2016 Timo Lappalainen, Kave Oy, www.kave.fi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Type definitions and utility macros used in the NMEA2000 libraries.
+
+*/
+
+#ifndef _tN2kDef_H_
+
+#include <stdint.h>
+
+// Application execution delay. Must be implemented by application.
+extern void delay(unsigned long ms);
+
+// Current uptime in milliseconds. Must be implemented by application.
+extern uint32_t millis();
+
+// Macro sets for handling constant data. Some platforms are able to store
+// constant strings and data on flash in order to reduce RAM consumption.
+//
+// - CSTR, A constant string.
+// - CDATA, Constant data.
+// - GET_CINT8, Get a constant 8bit integer.
+// - GET_CINT16, Get a constant 16bit integer.
+// - GET_CINT32, Get a constant 32bit integer.
+
+#ifdef __AVR__
+// AVR8 uses progmem.
+#include <avr/pgmspace.h>
+#define CSTR(str)       str PROGMEM
+#define CDATA(data)     data PROGMEM
+#define GET_CINT8(var)  pgm_read_byte(&var)
+#define GET_CINT16(var) pgm_read_word(&var)
+#define GET_CINT32(var) pgm_read_dword(&var)
+#else
+// No specific const storage support (default).
+#define CSTR(str)       str
+#define CDATA(data)     data
+#define GET_CINT8(var)  var
+#define GET_CINT16(var) var
+#define GET_CINT32(var) var
+#endif
+
+#endif

From 4963adfaea15b754a70934913779d80e7b70a656 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Tue, 6 Dec 2016 07:08:56 +0100
Subject: [PATCH 11/23] Add N2kStream interface for reading- and writing serial
 data. On Arduino this defaults to Stream.

---
 N2kStream.cpp | 24 ++++++++++++++++++++
 N2kStream.h   | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 N2kStream.cpp
 create mode 100644 N2kStream.h

diff --git a/N2kStream.cpp b/N2kStream.cpp
new file mode 100644
index 00000000..c2da7618
--- /dev/null
+++ b/N2kStream.cpp
@@ -0,0 +1,24 @@
+#include "N2kStream.h"
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef ARDUINO
+// Arduino uses its own implementation.
+#else
+size_t N2kStream::print(const char *str) {
+   if(str == 0)
+      return 0;
+
+   return write(reinterpret_cast<const uint8_t*>(str), strlen(str));
+}
+
+size_t N2kStream::print(int val) {
+   char buf[16];
+   return write(itoa(buf, val, 10), strlen(buf));
+}
+
+size_t N2kStream::println(const char *str) {
+   return print(str) + print("\r\n");
+}
+
+#endif
diff --git a/N2kStream.h b/N2kStream.h
new file mode 100644
index 00000000..122c4620
--- /dev/null
+++ b/N2kStream.h
@@ -0,0 +1,61 @@
+/*
+N2kStream.h
+
+Copyright (c) 2015-2016 Timo Lappalainen, Kave Oy, www.kave.fi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+I/O stream used in the NMEA2000 libraries.
+
+*/
+
+#ifndef _tN2kStream_H_
+#define _tN2kStream_H_
+
+#include <stdint.h>
+#include <stddef.h>
+
+#ifdef ARDUINO
+// Arduino users get away with using the standard Stream class and its
+// subclasses. Forward declare the Stream class here and include Arduino.h in
+// the application.
+#include <Arduino.h>
+typedef Stream N2kStream;
+#else
+// Non Arduino platforms need to implement this themselves if they want to use
+// functions which operate on streams.
+class N2kStream {
+   public:
+   // Returns first byte if incoming data, or -1 on no available data.
+   virtual int read() = 0;
+
+   // Write data to stream.
+   virtual size_t write(const uint8_t* data, size_t size) = 0;
+
+   // Print string to stream.
+   size_t print(const char* str);
+
+   // Print value to stream.
+   size_t print(int val);
+
+   // Print string and newline to stream.
+   size_t println(const char *str);
+};
+#endif
+
+#endif

From 75a441e60aed2e8a559963faa61f115c1cd22afa Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Tue, 6 Dec 2016 07:59:38 +0100
Subject: [PATCH 12/23] Switch to using N2kStream and the constant data macros.

---
 ActisenseReader.cpp |  35 ++++++-------
 ActisenseReader.h   |  20 ++++----
 N2kMsg.cpp          |   9 ++--
 N2kMsg.h            |   9 ++--
 NMEA2000.cpp        |  66 +++++++++++++------------
 NMEA2000.h          | 116 ++++++++++++++++++++++----------------------
 6 files changed, 134 insertions(+), 121 deletions(-)

diff --git a/ActisenseReader.cpp b/ActisenseReader.cpp
index af8e0791..b3f9aa3a 100644
--- a/ActisenseReader.cpp
+++ b/ActisenseReader.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
 ActisenseReader.cpp
 
 Copyright (c) 2015-2016 Timo Lappalainen, Kave Oy, www.kave.fi
@@ -20,7 +20,7 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTIO
 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
 OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-  
+
 This is class for reading Actisense format messages from given stream.
 */
 #include "ActisenseReader.h"
@@ -44,10 +44,10 @@ void tActisenseReader::ClearBuffer() {
 //*****************************************************************************
 bool tActisenseReader::AddByteToBuffer(char NewByte) {
   if (MsgWritePos>=MAX_STREAM_MSG_BUF_LEN) return false;
-  
+
   MsgBuf[MsgWritePos]=NewByte;
   MsgWritePos++;
-  if ( MsgBuf[1]+3!=MsgWritePos ) byteSum+=NewByte; // !Do not add CRC to byteSum 
+  if ( MsgBuf[1]+3!=MsgWritePos ) byteSum+=NewByte; // !Do not add CRC to byteSum
   return true;
 }
 
@@ -58,13 +58,13 @@ bool tActisenseReader::AddByteToBuffer(char NewByte) {
 
 //*****************************************************************************
 bool tActisenseReader::CheckMessage(tN2kMsg &N2kMsg) {
- 
+
    N2kMsg.Clear();
-   
+
    if (MsgWritePos!=MsgBuf[1]+3) {
      return false; // Length does not match. Add type, length and crc
    }
-   
+
    uint8_t CheckSum = (uint8_t)((byteSum == 0) ? 0 : (256 - byteSum));
    if ( CheckSum!=MsgBuf[MsgWritePos-1] ) {
      return false; // Checksum does not match
@@ -81,24 +81,25 @@ bool tActisenseReader::CheckMessage(tN2kMsg &N2kMsg) {
    memcpy(&(N2kMsg.MsgTime), &(MsgBuf[8]), 4);
    N2kMsg.DataLen=MsgBuf[12];
    for (int i=13, j=0; i<MsgWritePos-1; i++, j++) N2kMsg.Data[j]=MsgBuf[i];
-   
+
    return true;
 }
 
 //*****************************************************************************
-// Read Actisense formatted NMEA2000 message from stream 
+// Read Actisense formatted NMEA2000 message from stream
 // Actisense Format:
 // <10><02><93><length (1)><priority (1)><PGN (3)><destination (1)><source (1)><time (4)><len (1)><data (len)><CRC (1)><10><03>
 bool tActisenseReader::GetMessageFromStream(tN2kMsg &N2kMsg) {
   bool result=false;
 
-  if (ReadStream==0) return false;
-  
-  while (ReadStream->available() > 0 && !result) {
-    int NewByte=ReadStream->read();
+  if (ReadStream==0)
+    return false;
+
+  int NewByte;
+  while ((NewByte = ReadStream->read()) != -1 && !result) {
 //        Serial.println((char)NewByte,HEX);
       if (MsgIsComing) {
-        if (EscapeReceived) {  
+        if (EscapeReceived) {
           switch (NewByte) {
             case Escape: // Escaped Escape
               EscapeReceived=false;
@@ -121,7 +122,7 @@ bool tActisenseReader::GetMessageFromStream(tN2kMsg &N2kMsg) {
             default: // Error
               ClearBuffer();
           }
-        } else { 
+        } else {
           if (NewByte==Escape) {
             EscapeReceived=true;
           } else {
@@ -147,14 +148,14 @@ bool tActisenseReader::GetMessageFromStream(tN2kMsg &N2kMsg) {
         EscapeReceived=(NewByte==Escape);
       }
   }
-  
+
   return result;
 }
 
 //*****************************************************************************
 void tActisenseReader::ParseMessages() {
   tN2kMsg N2kMsg;
-  
+
     while (GetMessageFromStream(N2kMsg)) {
       if (MsgHandler!=0) MsgHandler(N2kMsg);
     }
diff --git a/ActisenseReader.h b/ActisenseReader.h
index cccf635c..aec2d60a 100644
--- a/ActisenseReader.h
+++ b/ActisenseReader.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ActisenseReader.h
 
 Copyright (c) 2015-2016 Timo Lappalainen, Kave Oy, www.kave.fi
@@ -20,7 +20,7 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTIO
 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
 OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-  
+
 This is class for reading Actisense format messages from given stream.
 
 There is unresolved problem to use programming port with reading data.
@@ -29,7 +29,9 @@ USB port there is no problem.
 */
 #ifndef _ACTISENSE_READER_H_
 #define _ACTISENSE_READER_H_
+
 #include "N2kMsg.h"
+#include "N2kStream.h"
 
 class tActisenseReader
 {
@@ -42,26 +44,26 @@ class tActisenseReader
     // Buffer for incoming messages from stream
     unsigned char MsgBuf[MAX_STREAM_MSG_BUF_LEN];
     int MsgWritePos;
-  
+
 protected:
-    Stream* ReadStream;
+    N2kStream* ReadStream;
     // Handler callback
     void (*MsgHandler)(const tN2kMsg &N2kMsg);
-  
+
 protected:
     bool AddByteToBuffer(char NewByte);
     void ClearBuffer();
     bool CheckMessage(tN2kMsg &N2kMsg);
-    
+
 public:
     tActisenseReader();
     // Set stream, which would be used for reading messages. You have to
     // open stream first, so e.g. for SerialUSB call begin first.
-    void SetReadStream(Stream* _stream) { ReadStream=_stream; }
-    
+    void SetReadStream(N2kStream* _stream) { ReadStream=_stream; }
+
     // You can either call this or ParseMessages periodically.
     bool GetMessageFromStream(tN2kMsg &N2kMsg);
-    
+
     // Set message handler with SetMsgHandler and then call this periodically or use GetMessageFromStream
     void ParseMessages();
     // Set message handler to be used in ParseMessages, when message has been received.
diff --git a/N2kMsg.cpp b/N2kMsg.cpp
index 8a9c5cf7..7f095364 100644
--- a/N2kMsg.cpp
+++ b/N2kMsg.cpp
@@ -553,20 +553,21 @@ void SetBufStr(const char *str, int len, int &index, unsigned char *buf) {
 }
 
 //*****************************************************************************
-void PrintBuf(Stream *port, unsigned char len, const unsigned char *pData, bool AddLF) {
+void PrintBuf(N2kStream *port, unsigned char len, const unsigned char *pData, bool AddLF) {
     if (port==0) return;
 
+    char hex[3];
     for(int i = 0; i<len; i++) {
       if (i>0) { port->print(","); };
       // Print bytes as hex.
-      port->print(pData[i],HEX);
+      port->print(itoa(pData[i], hex, 16));
     }
 
     if (AddLF) port->println("");
 }
 
 //*****************************************************************************
-void tN2kMsg::Print(Stream *port, bool NoData) const {
+void tN2kMsg::Print(N2kStream *port, bool NoData) const {
   if (port==0 || !IsValid()) return;
   port->print(CSTR("Pri:")); port->print(Priority);
   port->print(CSTR(" PGN:")); port->print(PGN);
@@ -594,7 +595,7 @@ void AddByteEscapedToBuf(unsigned char byteToAdd, uint8_t &idx, unsigned char *b
 //*****************************************************************************
 // Actisense Format:
 // <10><02><93><length (1)><priority (1)><PGN (3)><destination (1)><source (1)><time (4)><len (1)><data (len)><CRC (1)><10><03>
-void tN2kMsg::SendInActisenseFormat(Stream *port) const {
+void tN2kMsg::SendInActisenseFormat(N2kStream *port) const {
   unsigned long _PGN=PGN;
   unsigned long _MsgTime=MsgTime;
   uint8_t msgIdx=0;
diff --git a/N2kMsg.h b/N2kMsg.h
index 210c8c21..1b11e918 100644
--- a/N2kMsg.h
+++ b/N2kMsg.h
@@ -27,7 +27,8 @@ Definition for NMEA2000 message class used in my NMEA2000 libraries.
 #ifndef _tN2kMsg_H_
 #define _tN2kMsg_H_
 
-#include <Arduino.h>
+#include "N2kStream.h"
+#include "N2kDef.h"
 #include <stdint.h>
 
 const double   N2kDoubleNA=-1e9;
@@ -127,10 +128,10 @@ class tN2kMsg
 
   bool Set2ByteUInt(uint16_t v, int &Index);
 
-  void Print(Stream *port, bool NoData=false) const;
-  void SendInActisenseFormat(Stream *port) const;
+  void Print(N2kStream *port, bool NoData=false) const;
+  void SendInActisenseFormat(N2kStream *port) const;
 };
 
-void PrintBuf(Stream *port, unsigned char len, const unsigned char *pData, bool AddLF=false);
+void PrintBuf(N2kStream *port, unsigned char len, const unsigned char *pData, bool AddLF=false);
 
 #endif
diff --git a/NMEA2000.cpp b/NMEA2000.cpp
index 0300c62a..f1b8ef06 100644
--- a/NMEA2000.cpp
+++ b/NMEA2000.cpp
@@ -22,6 +22,9 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "NMEA2000.h"
+#include "N2kDef.h"
+#include <string.h>
+#include <stdlib.h>
 
 #define N2kAddressClaimTimeout 250
 
@@ -29,12 +32,14 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // lenght >=90
 #define Max_conf_info_field_len 80
 
-
-const unsigned long SingleFrameSystemMessages[] PROGMEM={59392L /*ISO Acknowledgement*/, 59904L /*ISO Request*/, 60928L /*ISO Address Claim*/,
+CDATA(const unsigned long SingleFrameSystemMessages[]) = {
+                                       59392L /*ISO Acknowledgement*/,
+                                       59904L /*ISO Request*/, 60928L /*ISO Address Claim*/,
                                        0};
-const unsigned long FastPacketSystemMessages[] PROGMEM={126208L,
+CDATA(const unsigned long FastPacketSystemMessages[]) = {
+                                       126208L,
                                        0};
-const unsigned long DefSingleFrameMessages[] PROGMEM={
+CDATA(const unsigned long DefSingleFrameMessages[]) = {
                                        126992L, // System date/time
                                        127245L, // Rudder
                                        127250L, // Vessel Heading
@@ -56,7 +61,7 @@ const unsigned long DefSingleFrameMessages[] PROGMEM={
                                        130312L, // Temperature
                                        130316L, // Temperature extended range
                                        0};
-const unsigned long DefFastPacketMessages[] PROGMEM={
+CDATA(const unsigned long DefFastPacketMessages[]) = {
                                       126996L, /* Product information */
                                       126998L, /* Configuration information */
                                       127489L, /* Engine parameters dynamic */
@@ -73,7 +78,7 @@ const unsigned long DefFastPacketMessages[] PROGMEM={
                                       130074L, // Waypoint list
                                       0};
 
-const tProductInformation DefProductInformation PROGMEM={
+CDATA(const tProductInformation DefProductInformation) = {
                                        1300,               // N2kVersion
                                        666,                // ProductCode
                                        "Arduino N2k->PC",  //N2kModelID
@@ -84,7 +89,7 @@ const tProductInformation DefProductInformation PROGMEM={
                                        1 // LoadEquivalency
                                       };
 
-const tNMEA2000::tProgmemConfigurationInformation DefConfigurationInformation PROGMEM={
+CDATA(const tNMEA2000::tProgmemConfigurationInformation DefConfigurationInformation) = {
                                        "NMEA2000 library, https://github.com/ttlappalainen/NMEA2000", // Manufacturer information
                                        "", // Installation description1
                                        "" // Installation description2
@@ -113,8 +118,7 @@ void ClearSetCharBuf(const char *str, int MaxLen, char *buf) {
 }
 
  //*****************************************************************************
-tNMEA2000::tNMEA2000() 
-  : ForwardStream(0) {
+tNMEA2000::tNMEA2000() {
 
   SingleFrameMessages[0]=DefSingleFrameMessages;
   FastPacketMessages[0]=DefFastPacketMessages;
@@ -128,7 +132,8 @@ tNMEA2000::tNMEA2000()
 
   MsgHandler=0;
   ISORqstHandler=0;
-  
+
+  ForwardStream=&Serial;
   DeviceInformation[0].N2kSource=0;
   DeviceReady=false;
   AddressClaimStarted=0;
@@ -486,11 +491,12 @@ bool tNMEA2000::CheckKnownMessage(unsigned long PGN, bool &SystemMessage, bool &
 
     // First check system messages
     SystemMessage=true;
-    for (i=0; pgm_read_dword(&SingleFrameSystemMessages[i])!=PGN && pgm_read_dword(&SingleFrameSystemMessages[i])!=0; i++);
-    if (pgm_read_dword(&SingleFrameSystemMessages[i])==PGN) return true;
 
-    for (i=0; pgm_read_dword(&FastPacketSystemMessages[i])!=PGN && pgm_read_dword(&FastPacketSystemMessages[i])!=0; i++);
-    if (pgm_read_dword(&FastPacketSystemMessages[i])==PGN) {
+    for (i=0; GET_CINT32(SingleFrameSystemMessages[i])!=PGN && GET_CINT32(SingleFrameSystemMessages[i])!=0; i++);
+    if (GET_CINT32(SingleFrameSystemMessages[i])==PGN) return true;
+
+    for (i=0; GET_CINT32(FastPacketSystemMessages[i])!=PGN && GET_CINT32(FastPacketSystemMessages[i])!=0; i++);
+    if (GET_CINT32(FastPacketSystemMessages[i])==PGN) {
       FastPacket=true;
       return true;
     }
@@ -499,13 +505,13 @@ bool tNMEA2000::CheckKnownMessage(unsigned long PGN, bool &SystemMessage, bool &
     SystemMessage=false;
     for (unsigned char igroup=0; (igroup<N2kMessageGroups); igroup++)  {
       if (SingleFrameMessages[igroup]!=0) {
-        for (i=0; pgm_read_dword(&SingleFrameMessages[igroup][i])!=PGN && pgm_read_dword(&SingleFrameMessages[igroup][i])!=0; i++);
-        if (pgm_read_dword(&SingleFrameMessages[igroup][i])==PGN) return true;
+        for (i=0; GET_CINT32(SingleFrameMessages[igroup][i])!=PGN && GET_CINT32(SingleFrameMessages[igroup][i])!=0; i++);
+        if (GET_CINT32(SingleFrameMessages[igroup][i])==PGN) return true;
       }
 
       if (FastPacketMessages[igroup]!=0) {
-        for (i=0; pgm_read_dword(&FastPacketMessages[igroup][i])!=PGN && pgm_read_dword(&FastPacketMessages[igroup][i])!=0; i++);
-        if (pgm_read_dword(&FastPacketMessages[igroup][i])==PGN) {
+        for (i=0; GET_CINT32(FastPacketMessages[igroup][i])!=PGN && GET_CINT32(FastPacketMessages[igroup][i])!=0; i++);
+        if (GET_CINT32(FastPacketMessages[igroup][i])==PGN) {
          FastPacket=true;
          return true;
         }
@@ -646,18 +652,18 @@ void SetN2kPGN126996Progmem(tN2kMsg &N2kMsg, const tProductInformation *ProductI
 
     N2kMsg.SetPGN(126996L);
     N2kMsg.Priority=6;
-    N2kMsg.Add2ByteInt(pgm_read_word(&(ProductInformation->N2kVersion)));
-    N2kMsg.Add2ByteInt(pgm_read_word(&(ProductInformation->ProductCode)));
-    for (i=0; i<Max_N2kModelID_len && pgm_read_byte(&(ProductInformation->N2kModelID[i])); i++ ) { N2kMsg.AddByte(pgm_read_byte(&(ProductInformation->N2kModelID[i]))); }
+    N2kMsg.Add2ByteInt(GET_CINT16(ProductInformation->N2kVersion));
+    N2kMsg.Add2ByteInt(GET_CINT16(ProductInformation->ProductCode));
+    for (i=0; i<Max_N2kModelID_len && GET_CINT8(ProductInformation->N2kModelID[i]); i++ ) { N2kMsg.AddByte(GET_CINT8(ProductInformation->N2kModelID[i])); }
     for (; i<Max_N2kModelID_len; i++ ) { N2kMsg.AddByte(0); }
-    for (i=0; i<Max_N2kSwCode_len && pgm_read_byte(&(ProductInformation->N2kSwCode[i])); i++ ) { N2kMsg.AddByte(pgm_read_byte(&(ProductInformation->N2kSwCode[i]))); }
+    for (i=0; i<Max_N2kSwCode_len && GET_CINT8(ProductInformation->N2kSwCode[i]); i++ ) { N2kMsg.AddByte(GET_CINT8(ProductInformation->N2kSwCode[i])); }
     for (; i<Max_N2kSwCode_len; i++ ) { N2kMsg.AddByte(0); }
-    for (i=0; i<Max_N2kModelVersion_len && pgm_read_byte(&(ProductInformation->N2kModelVersion[i])); i++ ) { N2kMsg.AddByte(pgm_read_byte(&(ProductInformation->N2kModelVersion[i]))); }
+    for (i=0; i<Max_N2kModelVersion_len && GET_CINT8(ProductInformation->N2kModelVersion[i]); i++ ) { N2kMsg.AddByte(GET_CINT8(ProductInformation->N2kModelVersion[i])); }
     for (; i<Max_N2kModelVersion_len; i++ ) { N2kMsg.AddByte(0); }
-    for (i=0; i<Max_N2kModelSerialCode_len && pgm_read_byte(&(ProductInformation->N2kModelSerialCode[i])); i++ ) { N2kMsg.AddByte(pgm_read_byte(&(ProductInformation->N2kModelSerialCode[i]))); }
+    for (i=0; i<Max_N2kModelSerialCode_len && GET_CINT8(ProductInformation->N2kModelSerialCode[i]); i++ ) { N2kMsg.AddByte(GET_CINT8(ProductInformation->N2kModelSerialCode[i])); }
     for (; i<Max_N2kModelSerialCode_len; i++ ) { N2kMsg.AddByte(0); }
-    N2kMsg.AddByte(pgm_read_byte(&(ProductInformation->SertificationLevel)));
-    N2kMsg.AddByte(pgm_read_byte(&(ProductInformation->LoadEquivalency)));
+    N2kMsg.AddByte(GET_CINT8(ProductInformation->SertificationLevel));
+    N2kMsg.AddByte(GET_CINT8(ProductInformation->LoadEquivalency));
 }
 
 //*****************************************************************************
@@ -683,7 +689,7 @@ bool tNMEA2000::SendProductInformation(int DeviceIndex) {
 int ProgmemStrLen(const char *str) {
   int len;
     if (str==0) return 0;
-    for (len=0; pgm_read_byte(&(str[len]))!=0; len++ );
+    for (len=0; GET_CINT8((str[len]))!=0; len++ );
     return len;
 }
 
@@ -709,15 +715,15 @@ void SetN2kPGN126998Progmem(tN2kMsg &N2kMsg, const tNMEA2000::tProgmemConfigurat
     // InstallationDescription1
     N2kMsg.AddByte(InstDesc1Len+2);
     N2kMsg.AddByte(0x01);
-    for (i=0; i<InstDesc1Len; i++) N2kMsg.AddByte(pgm_read_byte(&(ConfigurationInformation->InstallationDescription1[i])));
+    for (i=0; i<InstDesc1Len; i++) N2kMsg.AddByte(GET_CINT8((ConfigurationInformation->InstallationDescription1[i])));
     // InstallationDescription2
     N2kMsg.AddByte(InstDesc2Len+2);
     N2kMsg.AddByte(0x01);
-    for (i=0; i<InstDesc2Len; i++) N2kMsg.AddByte(pgm_read_byte(&(ConfigurationInformation->InstallationDescription2[i])));
+    for (i=0; i<InstDesc2Len; i++) N2kMsg.AddByte(GET_CINT8((ConfigurationInformation->InstallationDescription2[i])));
     // ManufacturerInformation
     N2kMsg.AddByte(ManInfoLen+2);
     N2kMsg.AddByte(0x01);
-    for (i=0; i<ManInfoLen; i++) N2kMsg.AddByte(pgm_read_byte(&(ConfigurationInformation->ManufacturerInformation[i])));
+    for (i=0; i<ManInfoLen; i++) N2kMsg.AddByte(GET_CINT8((ConfigurationInformation->ManufacturerInformation[i])));
 }
 
 //*****************************************************************************
diff --git a/NMEA2000.h b/NMEA2000.h
index 1445b9bf..13af97c5 100644
--- a/NMEA2000.h
+++ b/NMEA2000.h
@@ -1,4 +1,4 @@
-/* 
+/*
 NMEA2000.h
 
 Copyright (c) 2015-2016 Timo Lappalainen, Kave Oy, www.kave.fi
@@ -43,6 +43,8 @@ address anymore. See also method ReadResetAddressChanged().
 
 #ifndef _NMEA2000_H_
 #define _NMEA2000_H_
+
+#include "N2kStream.h"
 #include "N2kMsg.h"
 #include "N2kCANMsg.h"
 
@@ -76,14 +78,14 @@ class tDeviceInformation {
       unsigned char IndustryGroupAndSystemInstance; // 4 bits each
     };
   } tUnionDeviceInformation;
-  
+
   tUnionDeviceInformation DeviceInformation;
-  
+
 public:
   uint8_t N2kSource;
   unsigned long PendingProductInformation;
   unsigned long PendingConfigurationInformation;
-  
+
 public:
   tDeviceInformation() { DeviceInformation.Name=0; N2kSource=0; PendingProductInformation=0; PendingConfigurationInformation=0; }
   void SetUniqueNumber(unsigned long _UniqueNumber) { DeviceInformation.UnicNumberAndManCode=(DeviceInformation.UnicNumberAndManCode&0xffe00000) | (_UniqueNumber&0x1fffff); }
@@ -100,12 +102,12 @@ class tDeviceInformation {
   unsigned char GetIndustryGroup() { return DeviceInformation.IndustryGroupAndSystemInstance>>4; }
   void SetSystemInstance(unsigned char _SystemInstance) { DeviceInformation.IndustryGroupAndSystemInstance=(DeviceInformation.IndustryGroupAndSystemInstance&0xf0) | (_SystemInstance&0x0f); }
   unsigned char GetSystemInstance() { return DeviceInformation.IndustryGroupAndSystemInstance&0x0f; }
-  
+
   uint64_t GetName()  { return DeviceInformation.Name; }
   void SetPendingProductInformation() { PendingProductInformation=millis()+N2kSource*8; }
   void ClearPendingProductInformation() { PendingProductInformation=0; }
   bool QueryPendingProductInformation() { return (PendingProductInformation?PendingProductInformation<millis():false); }
-  
+
   void SetPendingPendingConfigurationInformation() { PendingConfigurationInformation=millis()+N2kSource*10; }
   void ClearPendingConfigurationInformation() { PendingConfigurationInformation=0; }
   bool QueryPendingConfigurationInformation() { return (PendingConfigurationInformation?PendingConfigurationInformation<millis():false); }
@@ -129,9 +131,9 @@ class tNMEA2000
   // Type how to forward messages in listen mode
   typedef enum { fwdt_Actisense, // Forwards messages to output port in Actisense format. Note that some Navigation sw uses this.
                  fwdt_Text // Forwards messages to output port in clear text. This is e.g. for debuging.
-                } tForwardType; 
-    
-  // System mode. Meaning how it acts in NMEA2000 bus.    
+                } tForwardType;
+
+  // System mode. Meaning how it acts in NMEA2000 bus.
   typedef enum { N2km_ListenOnly, // Default mode. Listen bus and forwards messages to default port in Actisense format. You can not send any data to the bus.
                  N2km_NodeOnly, // This is for devices, which only sends data to the bus e.g. RPM or temperature monitor. Remember to set right device information first.
                  N2km_ListenAndNode, // In this mode, device can be e.g. temperature monitor and as N2km_ListenOnly.
@@ -166,23 +168,23 @@ class tNMEA2000
   static const int FwdModeBit_OnlyKnownMessages    = BIT(2); // Only known messages will be forwarded. System messages will be forwarded according its own bit.
   static const int FwdModeBit_OwnMessages          = BIT(3); // Forward also all messages, what this device will send
   static const int HandleModeBit_OnlyKnownMessages = BIT(4); // Only known messages will be handled.
-               
+
 protected:
     tDebugMode dbMode; // Default dm_None
     tN2kMode N2kMode; // Default N2km_ListenOnly.
     tForwardType ForwardType; // Default fwdt_Actisense.
     unsigned int ForwardMode; // Default all messages - also system and own.
-    Stream *ForwardStream; // Default Serial.
-    
+    N2kStream *ForwardStream;
+
     bool DeviceReady;
     unsigned long AddressClaimStarted;
     bool AddressChanged;
-    
+
     // Device information
     tDeviceInformation DeviceInformation[Max_N2kDevices];
     int DeviceCount;
 //    unsigned long N2kSource[Max_N2kDevices];
-    
+
     // Product information
     const tProductInformation *ProductInformation;
     tProductInformation *LocalProductInformation;
@@ -190,23 +192,23 @@ class tNMEA2000
     // Configuration information
     const tProgmemConfigurationInformation *ConfigurationInformation;
     tConfigurationInformation *LocalConfigurationInformation;
-    
+
     const unsigned long *SingleFrameMessages[N2kMessageGroups];
     const unsigned long *FastPacketMessages[N2kMessageGroups];
-    
-    
+
+
     class tCANSendFrame
     {
     public:
-      unsigned long id; 
+      unsigned long id;
       unsigned char len;
       unsigned char buf[8];
       bool wait_sent;
-      
+
     public:
-      void Clear() {id=0; len=0; for (int i=0; i<8; i++) { buf[i]=0; } }  
+      void Clear() {id=0; len=0; for (int i=0; i<8; i++) { buf[i]=0; } }
     };
-    
+
 protected:
     // Buffer for received messages.
     tN2kCANMsg *N2kCANMsgBuf;
@@ -216,12 +218,12 @@ class tNMEA2000
     uint8_t MaxCANSendFrames;
     uint8_t CANSendFrameBufferWrite;
     uint8_t CANSendFrameBufferRead;
-    
+
     // Handler callbacks
     void (*MsgHandler)(const tN2kMsg &N2kMsg);                  // Normal messages
     bool (*ISORqstHandler)(unsigned long RequestedPGN, unsigned char Requester, int DeviceIndex);                 // 'ISORequest' messages
-    
-    
+
+
 protected:
     // Virtual functions for different interfaces. Currently there are own classes
     // for Arduino due internal CAN (NMEA2000_due) and external MCP2515 SPI CAN bus controller (NMEA2000_mcp)
@@ -237,7 +239,7 @@ class tNMEA2000
     // This is because specially for broadcasted response it may take a while, when higher priority
     // devices sends their response.
     void SendPendingInformation();
-    
+
 protected:
     int SetN2kCANBufMsg(unsigned long canId, unsigned char len, unsigned char *buf);
     bool CheckKnownMessage(unsigned long PGN, bool &SystemMessage, bool &FastPacket);
@@ -250,7 +252,7 @@ class tNMEA2000
     void GetNextAddress(int DeviceIndex);
     bool IsMySource(unsigned char Source);
     int FindSourceDeviceIndex(unsigned char Source);
-    
+
     bool ForwardEnabled() const { return ((ForwardMode&FwdModeBit_EnableForward)>0 && (N2kMode!=N2km_SendOnly)); }
     bool ForwardSystemMessages() const { return ((ForwardMode&FwdModeBit_SystemMessages)>0); }
     bool ForwardOnlyKnownMessages() const { return ((ForwardMode&FwdModeBit_OnlyKnownMessages)>0); }
@@ -258,17 +260,17 @@ class tNMEA2000
     bool HandleOnlyKnownMessages() const { return ((ForwardMode&HandleModeBit_OnlyKnownMessages)>0); }
 public:
     tNMEA2000();
-    
+
     // As default there are reservation for 5 messages. If it is not critical to handle all fast packet messages like with N2km_NodeOnly
-    // you can set buffer size smaller like 3 or 2 by calling this before open.    
+    // you can set buffer size smaller like 3 or 2 by calling this before open.
     void SetN2kCANMsgBufSize(const unsigned char _MaxN2kCANMsgs) { if (N2kCANMsgBuf==0) { MaxN2kCANMsgs=_MaxN2kCANMsgs; }; }
     // When sending long messages like ProductInformation or GNSS data, there may not be enough buffers for successfully send data
     // This depends of your hw and device source. Device source has effect due to priority of getting sending slot. If your data is
-    // critical, use buffer size, which is large enough (default 40 frames). 
+    // critical, use buffer size, which is large enough (default 40 frames).
     // So e.g. Product information takes totally 134 bytes. This needs 20 frames. If you also send GNSS 47 bytes=7 frames.
     // If you want to be sure that both will be sent on any situation, you need at least 27 frame buffer size.
     void SetN2kCANSendFrameBufSize(const unsigned char _MaxCANSendFrames) { if (CANSendFrameBuf==0) { MaxCANSendFrames=_MaxCANSendFrames; }; }
-    
+
     // Define your product information. Defaults will be set on initialization.
     // For keeping defaults use 0xffff/0xff for int/char values and nul ptr for pointers.
     // LoadEquivalency is multiplication of 50 mA, what your device will take power from
@@ -288,7 +290,7 @@ class tNMEA2000
     // Note that I have not yet found a way to test is pointer in PROGMEM or not, so this does not work, if you define
     // tProductInformation to RAM.
     void SetProductInformation(const tProductInformation *_ProductInformation);
-    
+
     // Configuration information is just some extra information about device and manufacturer. Some
     // MFD shows it, some does not. NMEA Reader can show configuration information.
     // You can disable configuration information by calling SetProgmemConfigurationInformation(0);
@@ -308,7 +310,7 @@ class tNMEA2000
     // Note that currently subsequent calls will override previously set list.
     void ExtendSingleFrameMessages(const unsigned long *_SingleFrameMessages);
     void ExtendFastPacketMessages (const unsigned long *_FastPacketMessages);
- 
+
     // Set default device information.
     // For keeping defaults use 0xffff/0xff for int/char values and nul ptr for pointers.
     // Note that ManufacturerCode and UniqueNumber should give unic result on any network.
@@ -319,37 +321,37 @@ class tNMEA2000
                               uint16_t _ManufacturerCode=0xffff,  // Default=2046. Maximum 2046. See the list of codes on http://www.nmea.org/Assets/20140409%20nmea%202000%20registration%20list.pdf
                               unsigned char _IndustryGroup=4  // Default=4, Marine.
                               );
-     
-    // ToDo:     
+
+    // ToDo:
     // If your device has several functions, it should have own bus address for each.
     // Note that there is also in class 25 function code 132, which e.g. Alba Combi uses and it sends several different
-    // type of data. So I am not sure yet how important it is to use own addresses.    
+    // type of data. So I am not sure yet how important it is to use own addresses.
     // Returns Device index to be used on SendMsg. -1, if no more devices can be allocated.
     //int AddDeviceFunction(unsigned char _DeviceFunction,
     //                       unsigned char _DeviceClass,
     //                       unsigned long _N2kSource=0xff
     //                       );
-      
+
     // Class handles automatically address claiming and tell to the bus about itself.
     void SendIsoAddressClaim(unsigned char Destination=0xff, int DeviceIndex=0);
     bool SendProductInformation(int DeviceIndex=0);
     bool SendConfigurationInformation(int DeviceIndex=0);
-    
+
     // Set this before open. You can not change mode after Open().
-    // Note that other than N2km_ListenOnly modes will automatically start initialization and address claim procedure. 
+    // Note that other than N2km_ListenOnly modes will automatically start initialization and address claim procedure.
     // You have to call ParseMessages() periodically to handle these procedures.
     // If you know your system, define source something other address you allready have on your bus.
-    void SetMode(tN2kMode _N2kMode, unsigned long _N2kSource=15); 
-    
+    void SetMode(tN2kMode _N2kMode, unsigned long _N2kSource=15);
+
     // Set type how messages will be forwarded in listen mode. Defult is fwdt_Actisense
     void SetForwardType(tForwardType fwdType) { ForwardType=fwdType; }
 
-    // Set the stream, where messages will be forwarded in listen mode. Default is &Serial.
-    void SetForwardStream(Stream* _stream) { ForwardStream=_stream; }
-    
-    // You can call this. It will be called anyway automatically by ParseMessages(); 
+    // Set the stream, where messages will be forwarded in listen mode.
+    void SetForwardStream(N2kStream* _stream) { ForwardStream=_stream; }
+
+    // You can call this. It will be called anyway automatically by ParseMessages();
     bool Open();
-    
+
     // Generate N2k message e.g. by using N2kMessages.h and simply send it to the bus.
     bool SendMsg(const tN2kMsg &N2kMsg, int DeviceIndex=0);
 
@@ -362,7 +364,7 @@ class tNMEA2000
     void SetMsgHandler(void (*_MsgHandler)(const tN2kMsg &N2kMsg));             // Normal messages
     void SetISORqstHandler(bool(*ISORequestHandler)(unsigned long RequestedPGN, unsigned char Requester, int DeviceIndex));           // ISORequest messages
 
-    
+
     // Read address for current device.
     // Multidevice support is under construction.
     unsigned char GetN2kSource(int DeviceIndex=0) const { if (DeviceIndex>=0 && DeviceIndex<DeviceCount) return DeviceInformation[DeviceIndex].N2kSource; return DeviceInformation[DeviceCount-1].N2kSource; }
@@ -373,21 +375,21 @@ class tNMEA2000
     // some reason needs to change its address again, AddressChanged will be set.
     // So you can e.g. in every 10 min check has address changed and if it has, save it.
     bool ReadResetAddressChanged();
-    
+
     // Control how messages will be forwarded to stream in listen mode
     void EnableForward(bool v=true) {
         if (v) { ForwardMode |= FwdModeBit_EnableForward;  } else { ForwardMode &= ~FwdModeBit_EnableForward; }
     }
-    void SetForwardSystemMessages(bool v=true) { 
+    void SetForwardSystemMessages(bool v=true) {
         if (v) { ForwardMode |= FwdModeBit_SystemMessages;  } else { ForwardMode &= ~FwdModeBit_SystemMessages; }
       }
-    void SetForwardOnlyKnownMessages(bool v=true) {  
+    void SetForwardOnlyKnownMessages(bool v=true) {
         if (v) { ForwardMode |= FwdModeBit_OnlyKnownMessages;  } else { ForwardMode &= ~FwdModeBit_OnlyKnownMessages; }
       }
-    void SetForwardOwnMessages(bool v=true) {  
+    void SetForwardOwnMessages(bool v=true) {
         if (v) { ForwardMode |= FwdModeBit_OwnMessages;  } else { ForwardMode &= ~FwdModeBit_OwnMessages; }
       }
-    void SetHandleOnlyKnownMessages(bool v=true) {  
+    void SetHandleOnlyKnownMessages(bool v=true) {
         if (v) { ForwardMode |= HandleModeBit_OnlyKnownMessages;  } else { ForwardMode &= ~HandleModeBit_OnlyKnownMessages; }
       }
 
@@ -402,7 +404,7 @@ inline void SetN2kPGNISOAcknowledgement(tN2kMsg &N2kMsg, unsigned char Control,
 }
 
 //*****************************************************************************
-// ISO Address Claim                   
+// ISO Address Claim
 void SetN2kPGN60928(tN2kMsg &N2kMsg, unsigned long UniqueNumber, int ManufacturerCode,
                    unsigned char DeviceFunction, unsigned char DeviceClass,
                    unsigned char DeviceInstance=0, unsigned char SystemInstance=0, unsigned char IndustryGroup=4
@@ -414,7 +416,7 @@ inline void SetN2kISOAddressClaim(tN2kMsg &N2kMsg, unsigned long UniqueNumber, i
                    unsigned char DeviceFunction, unsigned char DeviceClass,
                    unsigned char DeviceInstance=0, unsigned char SystemInstance=0, unsigned char IndustryGroup=4
                    ) {
-  SetN2kPGN60928(N2kMsg, UniqueNumber, ManufacturerCode, DeviceFunction, DeviceClass, 
+  SetN2kPGN60928(N2kMsg, UniqueNumber, ManufacturerCode, DeviceFunction, DeviceClass,
                  DeviceInstance, SystemInstance, IndustryGroup);
 }
 
@@ -425,12 +427,12 @@ inline void SetN2kISOAddressClaim(tN2kMsg &N2kMsg, uint64_t Name) {
 //*****************************************************************************
 // Product information
 void SetN2kPGN126996(tN2kMsg &N2kMsg, unsigned int N2kVersion, unsigned int ProductCode,
-                     const char *ModelID, const char *SwCode, 
+                     const char *ModelID, const char *SwCode,
                      const char *ModelVersion, const char *ModelSerialCode,
                      unsigned char SertificationLevel=1, unsigned char LoadEquivalency=1);
-                     
+
 inline void SetN2kProductInformation(tN2kMsg &N2kMsg, unsigned int N2kVersion, unsigned int ProductCode,
-                     const char *ModelID, const char *SwCode, 
+                     const char *ModelID, const char *SwCode,
                      const char *ModelVersion, const char *ModelSerialCode,
                      unsigned char SertificationLevel=1, unsigned char LoadEquivalency=1) {
   SetN2kPGN126996(N2kMsg,N2kVersion,ProductCode,
@@ -444,7 +446,7 @@ void SetN2kPGN126998(tN2kMsg &N2kMsg,
                      const char *ManufacturerInformation,
                      const char *InstallationDescription1=0,
                      const char *InstallationDescription2=0);
-                     
+
 inline void SetN2kConfigurationInformation(tN2kMsg &N2kMsg,
                      const char *ManufacturerInformation,
                      const char *InstallationDescription1=0,

From 6cf0e290d47f84c28eafa88e9c4f79eb0b2ab43e Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Tue, 6 Dec 2016 16:58:41 +0100
Subject: [PATCH 13/23] Fix for constant string storage on Arduinos.

For Arduinos we can use the F(..) macro which casts the string to a streamable helper class.
---
 N2kDef.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/N2kDef.h b/N2kDef.h
index acc119ac..592851c5 100644
--- a/N2kDef.h
+++ b/N2kDef.h
@@ -46,7 +46,14 @@ extern uint32_t millis();
 #ifdef __AVR__
 // AVR8 uses progmem.
 #include <avr/pgmspace.h>
-#define CSTR(str)       str PROGMEM
+
+// Utilize the string helper on Arduino platforms.
+#ifdef ARDUINO
+#include <Arduino.h>
+#define CSTR(str)       F(str)
+#else
+#define CSTR(str)       PSTR(str)
+#endif
 #define CDATA(data)     data PROGMEM
 #define GET_CINT8(var)  pgm_read_byte(&var)
 #define GET_CINT16(var) pgm_read_word(&var)

From c5f148a562ae6f4a693ab96568db55aaf16e1027 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Wed, 7 Dec 2016 12:15:51 +0100
Subject: [PATCH 14/23] Fix N2kStream for AVR targets that aren't Arduinos.

Also fix incorrect itoa usage.
---
 N2kDef.h      | 22 +++++++++-------------
 N2kStream.cpp | 14 +++++++++++++-
 N2kStream.h   |  6 ++++++
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/N2kDef.h b/N2kDef.h
index 592851c5..da1552e9 100644
--- a/N2kDef.h
+++ b/N2kDef.h
@@ -28,11 +28,13 @@ Type definitions and utility macros used in the NMEA2000 libraries.
 
 #include <stdint.h>
 
+extern "C" {
 // Application execution delay. Must be implemented by application.
 extern void delay(unsigned long ms);
 
 // Current uptime in milliseconds. Must be implemented by application.
 extern uint32_t millis();
+}
 
 // Macro sets for handling constant data. Some platforms are able to store
 // constant strings and data on flash in order to reduce RAM consumption.
@@ -42,23 +44,17 @@ extern uint32_t millis();
 // - GET_CINT8, Get a constant 8bit integer.
 // - GET_CINT16, Get a constant 16bit integer.
 // - GET_CINT32, Get a constant 32bit integer.
-
 #ifdef __AVR__
 // AVR8 uses progmem.
 #include <avr/pgmspace.h>
-
-// Utilize the string helper on Arduino platforms.
-#ifdef ARDUINO
-#include <Arduino.h>
-#define CSTR(str)       F(str)
-#else
-#define CSTR(str)       PSTR(str)
-#endif
-#define CDATA(data)     data PROGMEM
-#define GET_CINT8(var)  pgm_read_byte(&var)
-#define GET_CINT16(var) pgm_read_word(&var)
-#define GET_CINT32(var) pgm_read_dword(&var)
+class __FlashStringHelper;
+#define CSTR(str)           (reinterpret_cast<const __FlashStringHelper*>(PSTR(str)))
+#define CDATA(data)         data PROGMEM
+#define GET_CINT8(var)      pgm_read_byte(&var)
+#define GET_CINT16(var)     pgm_read_word(&var)
+#define GET_CINT32(var)     pgm_read_dword(&var)
 #else
+#error
 // No specific const storage support (default).
 #define CSTR(str)       str
 #define CDATA(data)     data
diff --git a/N2kStream.cpp b/N2kStream.cpp
index c2da7618..8164a2ce 100644
--- a/N2kStream.cpp
+++ b/N2kStream.cpp
@@ -12,9 +12,21 @@ size_t N2kStream::print(const char *str) {
    return write(reinterpret_cast<const uint8_t*>(str), strlen(str));
 }
 
+#if defined(__AVR__)
+size_t N2kStream::print(const __FlashStringHelper* str) {
+   size_t bytes_written = 0;
+   PGM_P src = (PGM_P) str;
+   for(uint8_t c = pgm_read_byte(src); c != 0; ++src, ++bytes_written)
+      write(&c, 1);
+
+   return bytes_written;
+}
+#endif
+
+
 size_t N2kStream::print(int val) {
    char buf[16];
-   return write(itoa(buf, val, 10), strlen(buf));
+   return write((const uint8_t*) itoa(val, buf, 10), strlen(buf));
 }
 
 size_t N2kStream::println(const char *str) {
diff --git a/N2kStream.h b/N2kStream.h
index 122c4620..a59555a4 100644
--- a/N2kStream.h
+++ b/N2kStream.h
@@ -27,6 +27,7 @@ I/O stream used in the NMEA2000 libraries.
 #ifndef _tN2kStream_H_
 #define _tN2kStream_H_
 
+#include "N2kDef.h"
 #include <stdint.h>
 #include <stddef.h>
 
@@ -50,6 +51,11 @@ class N2kStream {
    // Print string to stream.
    size_t print(const char* str);
 
+#if defined(__AVR__)
+   // Flash stored string stream for AVR platforms.
+   size_t print(const __FlashStringHelper* str);
+#endif
+
    // Print value to stream.
    size_t print(int val);
 

From bd6b521bda6b1766c174dc818311d730c52dacd6 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Wed, 7 Dec 2016 12:15:51 +0100
Subject: [PATCH 15/23] Fix N2kStream for AVR targets that aren't Arduinos.

Also fix incorrect itoa usage.
---
 N2kDef.h      | 21 ++++++++-------------
 N2kStream.cpp | 14 +++++++++++++-
 N2kStream.h   |  6 ++++++
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/N2kDef.h b/N2kDef.h
index 592851c5..b4174521 100644
--- a/N2kDef.h
+++ b/N2kDef.h
@@ -28,11 +28,13 @@ Type definitions and utility macros used in the NMEA2000 libraries.
 
 #include <stdint.h>
 
+extern "C" {
 // Application execution delay. Must be implemented by application.
 extern void delay(unsigned long ms);
 
 // Current uptime in milliseconds. Must be implemented by application.
 extern uint32_t millis();
+}
 
 // Macro sets for handling constant data. Some platforms are able to store
 // constant strings and data on flash in order to reduce RAM consumption.
@@ -42,22 +44,15 @@ extern uint32_t millis();
 // - GET_CINT8, Get a constant 8bit integer.
 // - GET_CINT16, Get a constant 16bit integer.
 // - GET_CINT32, Get a constant 32bit integer.
-
 #ifdef __AVR__
 // AVR8 uses progmem.
 #include <avr/pgmspace.h>
-
-// Utilize the string helper on Arduino platforms.
-#ifdef ARDUINO
-#include <Arduino.h>
-#define CSTR(str)       F(str)
-#else
-#define CSTR(str)       PSTR(str)
-#endif
-#define CDATA(data)     data PROGMEM
-#define GET_CINT8(var)  pgm_read_byte(&var)
-#define GET_CINT16(var) pgm_read_word(&var)
-#define GET_CINT32(var) pgm_read_dword(&var)
+class __FlashStringHelper;
+#define CSTR(str)           (reinterpret_cast<const __FlashStringHelper*>(PSTR(str)))
+#define CDATA(data)         data PROGMEM
+#define GET_CINT8(var)      pgm_read_byte(&var)
+#define GET_CINT16(var)     pgm_read_word(&var)
+#define GET_CINT32(var)     pgm_read_dword(&var)
 #else
 // No specific const storage support (default).
 #define CSTR(str)       str
diff --git a/N2kStream.cpp b/N2kStream.cpp
index c2da7618..8164a2ce 100644
--- a/N2kStream.cpp
+++ b/N2kStream.cpp
@@ -12,9 +12,21 @@ size_t N2kStream::print(const char *str) {
    return write(reinterpret_cast<const uint8_t*>(str), strlen(str));
 }
 
+#if defined(__AVR__)
+size_t N2kStream::print(const __FlashStringHelper* str) {
+   size_t bytes_written = 0;
+   PGM_P src = (PGM_P) str;
+   for(uint8_t c = pgm_read_byte(src); c != 0; ++src, ++bytes_written)
+      write(&c, 1);
+
+   return bytes_written;
+}
+#endif
+
+
 size_t N2kStream::print(int val) {
    char buf[16];
-   return write(itoa(buf, val, 10), strlen(buf));
+   return write((const uint8_t*) itoa(val, buf, 10), strlen(buf));
 }
 
 size_t N2kStream::println(const char *str) {
diff --git a/N2kStream.h b/N2kStream.h
index 122c4620..a59555a4 100644
--- a/N2kStream.h
+++ b/N2kStream.h
@@ -27,6 +27,7 @@ I/O stream used in the NMEA2000 libraries.
 #ifndef _tN2kStream_H_
 #define _tN2kStream_H_
 
+#include "N2kDef.h"
 #include <stdint.h>
 #include <stddef.h>
 
@@ -50,6 +51,11 @@ class N2kStream {
    // Print string to stream.
    size_t print(const char* str);
 
+#if defined(__AVR__)
+   // Flash stored string stream for AVR platforms.
+   size_t print(const __FlashStringHelper* str);
+#endif
+
    // Print value to stream.
    size_t print(int val);
 

From 97a80e8950e5ca73b406b9681446c4148b15e9cf Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Wed, 7 Dec 2016 12:20:35 +0100
Subject: [PATCH 16/23] Remove stray error.

---
 N2kDef.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/N2kDef.h b/N2kDef.h
index da1552e9..b4174521 100644
--- a/N2kDef.h
+++ b/N2kDef.h
@@ -54,7 +54,6 @@ class __FlashStringHelper;
 #define GET_CINT16(var)     pgm_read_word(&var)
 #define GET_CINT32(var)     pgm_read_dword(&var)
 #else
-#error
 // No specific const storage support (default).
 #define CSTR(str)       str
 #define CDATA(data)     data

From 17c5966badb83b7137a001bb19c923abdaaa79a4 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Wed, 7 Dec 2016 13:14:20 +0100
Subject: [PATCH 17/23] Stray away from itoa as it's not available on all
 compilers.

---
 N2kMsg.cpp    |  3 +--
 N2kStream.cpp | 22 ++++++++++++++++++----
 N2kStream.h   |  2 +-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/N2kMsg.cpp b/N2kMsg.cpp
index 7f095364..8f3833b1 100644
--- a/N2kMsg.cpp
+++ b/N2kMsg.cpp
@@ -556,11 +556,10 @@ void SetBufStr(const char *str, int len, int &index, unsigned char *buf) {
 void PrintBuf(N2kStream *port, unsigned char len, const unsigned char *pData, bool AddLF) {
     if (port==0) return;
 
-    char hex[3];
     for(int i = 0; i<len; i++) {
       if (i>0) { port->print(","); };
       // Print bytes as hex.
-      port->print(itoa(pData[i], hex, 16));
+      port->print(pData[i], 16);
     }
 
     if (AddLF) port->println("");
diff --git a/N2kStream.cpp b/N2kStream.cpp
index 8164a2ce..ad022ea6 100644
--- a/N2kStream.cpp
+++ b/N2kStream.cpp
@@ -1,6 +1,5 @@
 #include "N2kStream.h"
 #include <string.h>
-#include <stdlib.h>
 
 #ifdef ARDUINO
 // Arduino uses its own implementation.
@@ -24,9 +23,24 @@ size_t N2kStream::print(const __FlashStringHelper* str) {
 #endif
 
 
-size_t N2kStream::print(int val) {
-   char buf[16];
-   return write((const uint8_t*) itoa(val, buf, 10), strlen(buf));
+size_t N2kStream::print(int val, uint8_t radix) {
+
+   if(val == 0) {
+      // 0 is always 0 regardless of radix.
+      return write(reinterpret_cast<const uint8_t*>("0"), 1);
+   }
+
+   // Enough for binary representation.
+   char buf[8 * sizeof(val) + 1];
+   char *ptr = &buf[sizeof(buf) - 1];
+   *ptr = '\0';
+
+   do {
+      *--ptr="0123456789abcdef"[val % radix];
+      val /= radix;
+   } while(val != 0);
+
+   return print(ptr);
 }
 
 size_t N2kStream::println(const char *str) {
diff --git a/N2kStream.h b/N2kStream.h
index a59555a4..d656865f 100644
--- a/N2kStream.h
+++ b/N2kStream.h
@@ -57,7 +57,7 @@ class N2kStream {
 #endif
 
    // Print value to stream.
-   size_t print(int val);
+   size_t print(int val, uint8_t radix = 10);
 
    // Print string and newline to stream.
    size_t println(const char *str);

From 7c754d69d2e0f26b8f5d40d7162e18f04daa66fb Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Wed, 7 Dec 2016 13:16:39 +0100
Subject: [PATCH 18/23] Remove Serial object as it should be set by the
 application.

---
 NMEA2000.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NMEA2000.cpp b/NMEA2000.cpp
index f1b8ef06..edda0b3f 100644
--- a/NMEA2000.cpp
+++ b/NMEA2000.cpp
@@ -133,7 +133,6 @@ tNMEA2000::tNMEA2000() {
   MsgHandler=0;
   ISORqstHandler=0;
 
-  ForwardStream=&Serial;
   DeviceInformation[0].N2kSource=0;
   DeviceReady=false;
   AddressClaimStarted=0;

From 7cb08f0470393f2120a03a0664196bd89d2023b8 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Wed, 7 Dec 2016 13:22:02 +0100
Subject: [PATCH 19/23] Add println for flash stored strings and convert F()
 calls to CSTR().

---
 N2kStream.cpp |  4 ++++
 N2kStream.h   |  1 +
 NMEA2000.cpp  | 10 +++++-----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/N2kStream.cpp b/N2kStream.cpp
index ad022ea6..d52d7985 100644
--- a/N2kStream.cpp
+++ b/N2kStream.cpp
@@ -20,6 +20,10 @@ size_t N2kStream::print(const __FlashStringHelper* str) {
 
    return bytes_written;
 }
+
+size_t N2kStream::print(const __FlashStringHelper* str) {
+   return print(str) + print("\r\n");
+}
 #endif
 
 
diff --git a/N2kStream.h b/N2kStream.h
index d656865f..d3974be5 100644
--- a/N2kStream.h
+++ b/N2kStream.h
@@ -54,6 +54,7 @@ class N2kStream {
 #if defined(__AVR__)
    // Flash stored string stream for AVR platforms.
    size_t print(const __FlashStringHelper* str);
+   size_t println(const __FlashStringHelper* str);
 #endif
 
    // Print value to stream.
diff --git a/NMEA2000.cpp b/NMEA2000.cpp
index edda0b3f..02297b43 100644
--- a/NMEA2000.cpp
+++ b/NMEA2000.cpp
@@ -295,13 +295,13 @@ bool tNMEA2000::Open() {
 
     DeviceReady=CANOpen();
     if ( (ForwardStream!=0) && (ForwardType==tNMEA2000::fwdt_Text) ) {
-      if ( DeviceReady ) { ForwardStream->println(F("CAN device ready")); } else { ForwardStream->println(F("CAN device failed to open")); }
+      if ( DeviceReady ) { ForwardStream->println(CSTR("CAN device ready")); } else { ForwardStream->println(CSTR("CAN device failed to open")); }
     }
 
     delay(200);
     if ((DeviceReady || dbMode!=dm_None) && (N2kMode!=N2km_ListenOnly) && (N2kMode!=N2km_SendOnly) && (N2kMode!=N2km_ListenAndSend) ) { // Start address claim automatically
       AddressClaimStarted=0;
-      if ( (ForwardStream!=0) && ( ForwardType==tNMEA2000::fwdt_Text) ) ForwardStream->println(F("Start address claim"));
+      if ( (ForwardStream!=0) && ( ForwardType==tNMEA2000::fwdt_Text) ) ForwardStream->println(CSTR("Start address claim"));
       SendIsoAddressClaim(0xff,0);
       AddressClaimStarted=millis();
     }
@@ -423,7 +423,7 @@ bool tNMEA2000::SendMsg(const tN2kMsg &N2kMsg, int DeviceIndex) {
       if (N2kMsg.DataLen<=8) { // We can send single frame
 //          PrintBuf(ForwardStream,N2kMsg.DataLen, N2kMsg.Data,true);
           result=SendFrame(canId, N2kMsg.DataLen, N2kMsg.Data,false);
-          if (!result && ForwardStream!=0 && ForwardType==tNMEA2000::fwdt_Text) { ForwardStream->print(F("PGN ")); ForwardStream->print(N2kMsg.PGN); ForwardStream->println(F(" send failed")); }
+          if (!result && ForwardStream!=0 && ForwardType==tNMEA2000::fwdt_Text) { ForwardStream->print(CSTR("PGN ")); ForwardStream->print(N2kMsg.PGN); ForwardStream->println(CSTR(" send failed")); }
       } else { // Send it as fast packet in multiple frames
         unsigned char temp[8]; // {0,0,0,0,0,0,0,0};
         int cur=0;
@@ -454,9 +454,9 @@ bool tNMEA2000::SendMsg(const tN2kMsg &N2kMsg, int DeviceIndex) {
 //            PrintBuf(ForwardStream,8,temp,true);
             result=SendFrame(canId, 8, temp, true);
             if (!result && ForwardStream!=0 && ForwardType==tNMEA2000::fwdt_Text) {
-              ForwardStream->print(F("PGN ")); ForwardStream->print(N2kMsg.PGN);
+              ForwardStream->print(CSTR("PGN ")); ForwardStream->print(N2kMsg.PGN);
               ForwardStream->print(", frame:"); ForwardStream->print(i); ForwardStream->print("/"); ForwardStream->print(frames);
-              ForwardStream->println(F(" send failed"));
+              ForwardStream->println(CSTR(" send failed"));
             }
         }
         SendOrder++; if (SendOrder>7) SendOrder=0;

From 272897232a0ffc26ca9febdfbaddd1e26dffd285 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Wed, 7 Dec 2016 14:16:45 +0100
Subject: [PATCH 20/23] Fix incorrect delay signature.

---
 N2kDef.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/N2kDef.h b/N2kDef.h
index b4174521..81b8e1d1 100644
--- a/N2kDef.h
+++ b/N2kDef.h
@@ -30,7 +30,7 @@ Type definitions and utility macros used in the NMEA2000 libraries.
 
 extern "C" {
 // Application execution delay. Must be implemented by application.
-extern void delay(unsigned long ms);
+extern void delay(uint32_t ms);
 
 // Current uptime in milliseconds. Must be implemented by application.
 extern uint32_t millis();

From f2ff8eef024641be7ff712616df9eba5ee5cc259 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Wed, 7 Dec 2016 19:42:44 +0100
Subject: [PATCH 21/23] Switch the way constant strings are handled.

Instead of inventing our own macros, use the AVR macros and functions in code and define them to nothing on non-AVR targets.
---
 N2kDef.h     | 38 ++++++++++++++------------------
 N2kMsg.cpp   | 12 +++++-----
 NMEA2000.cpp | 62 ++++++++++++++++++++++++++--------------------------
 3 files changed, 54 insertions(+), 58 deletions(-)

diff --git a/N2kDef.h b/N2kDef.h
index 81b8e1d1..f4a64f6c 100644
--- a/N2kDef.h
+++ b/N2kDef.h
@@ -36,30 +36,26 @@ extern void delay(uint32_t ms);
 extern uint32_t millis();
 }
 
-// Macro sets for handling constant data. Some platforms are able to store
-// constant strings and data on flash in order to reduce RAM consumption.
-//
-// - CSTR, A constant string.
-// - CDATA, Constant data.
-// - GET_CINT8, Get a constant 8bit integer.
-// - GET_CINT16, Get a constant 16bit integer.
-// - GET_CINT32, Get a constant 32bit integer.
-#ifdef __AVR__
-// AVR8 uses progmem.
+// Declare PROGMEM macros to nothing on non-AVR targets.
+#if !defined(__AVR__)
+#define PROGMEM
+#define pgm_read_byte(var)  *var
+#define pgm_read_word(var)  *var
+#define pgm_read_dword(var) *var
+#endif
+
+// Definition for the F(str) macro. On Arduinos use what the framework
+// provides to utilize the Stream class. On standard AVR8 we declare
+// our own helper class which is handled by the N2kStream. On anything
+// else we resort to char strings.
+#if defined(ARDUINO)
+#include <WString.h>
+#elif defined(__AVR__)
 #include <avr/pgmspace.h>
 class __FlashStringHelper;
-#define CSTR(str)           (reinterpret_cast<const __FlashStringHelper*>(PSTR(str)))
-#define CDATA(data)         data PROGMEM
-#define GET_CINT8(var)      pgm_read_byte(&var)
-#define GET_CINT16(var)     pgm_read_word(&var)
-#define GET_CINT32(var)     pgm_read_dword(&var)
+#define F(str) (reinterpret_cast<const __FlashStringHelper*>(PSTR(str)))
 #else
-// No specific const storage support (default).
-#define CSTR(str)       str
-#define CDATA(data)     data
-#define GET_CINT8(var)  var
-#define GET_CINT16(var) var
-#define GET_CINT32(var) var
+#define F(str) str
 #endif
 
 #endif
diff --git a/N2kMsg.cpp b/N2kMsg.cpp
index 8f3833b1..ca54e86c 100644
--- a/N2kMsg.cpp
+++ b/N2kMsg.cpp
@@ -568,13 +568,13 @@ void PrintBuf(N2kStream *port, unsigned char len, const unsigned char *pData, bo
 //*****************************************************************************
 void tN2kMsg::Print(N2kStream *port, bool NoData) const {
   if (port==0 || !IsValid()) return;
-  port->print(CSTR("Pri:")); port->print(Priority);
-  port->print(CSTR(" PGN:")); port->print(PGN);
-  port->print(CSTR(" Source:")); port->print(Source);
-  port->print(CSTR(" Dest:")); port->print(Destination);
-  port->print(CSTR(" Len:")); port->print(DataLen);
+  port->print(F("Pri:")); port->print(Priority);
+  port->print(F(" PGN:")); port->print(PGN);
+  port->print(F(" Source:")); port->print(Source);
+  port->print(F(" Dest:")); port->print(Destination);
+  port->print(F(" Len:")); port->print(DataLen);
   if (!NoData) {
-    port->print(CSTR(" Data:"));
+    port->print(F(" Data:"));
     PrintBuf(port,DataLen,Data);
   }
   port->println("");
diff --git a/NMEA2000.cpp b/NMEA2000.cpp
index 02297b43..9afb6cc4 100644
--- a/NMEA2000.cpp
+++ b/NMEA2000.cpp
@@ -32,14 +32,14 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // lenght >=90
 #define Max_conf_info_field_len 80
 
-CDATA(const unsigned long SingleFrameSystemMessages[]) = {
+const unsigned long SingleFrameSystemMessages[] PROGMEM = {
                                        59392L /*ISO Acknowledgement*/,
                                        59904L /*ISO Request*/, 60928L /*ISO Address Claim*/,
                                        0};
-CDATA(const unsigned long FastPacketSystemMessages[]) = {
+const unsigned long FastPacketSystemMessages[] PROGMEM = {
                                        126208L,
                                        0};
-CDATA(const unsigned long DefSingleFrameMessages[]) = {
+const unsigned long DefSingleFrameMessages[] PROGMEM = {
                                        126992L, // System date/time
                                        127245L, // Rudder
                                        127250L, // Vessel Heading
@@ -61,7 +61,7 @@ CDATA(const unsigned long DefSingleFrameMessages[]) = {
                                        130312L, // Temperature
                                        130316L, // Temperature extended range
                                        0};
-CDATA(const unsigned long DefFastPacketMessages[]) = {
+const unsigned long DefFastPacketMessages[] PROGMEM = {
                                       126996L, /* Product information */
                                       126998L, /* Configuration information */
                                       127489L, /* Engine parameters dynamic */
@@ -78,7 +78,7 @@ CDATA(const unsigned long DefFastPacketMessages[]) = {
                                       130074L, // Waypoint list
                                       0};
 
-CDATA(const tProductInformation DefProductInformation) = {
+const tProductInformation DefProductInformation PROGMEM = {
                                        1300,               // N2kVersion
                                        666,                // ProductCode
                                        "Arduino N2k->PC",  //N2kModelID
@@ -89,7 +89,7 @@ CDATA(const tProductInformation DefProductInformation) = {
                                        1 // LoadEquivalency
                                       };
 
-CDATA(const tNMEA2000::tProgmemConfigurationInformation DefConfigurationInformation) = {
+const tNMEA2000::tProgmemConfigurationInformation DefConfigurationInformation PROGMEM = {
                                        "NMEA2000 library, https://github.com/ttlappalainen/NMEA2000", // Manufacturer information
                                        "", // Installation description1
                                        "" // Installation description2
@@ -295,13 +295,13 @@ bool tNMEA2000::Open() {
 
     DeviceReady=CANOpen();
     if ( (ForwardStream!=0) && (ForwardType==tNMEA2000::fwdt_Text) ) {
-      if ( DeviceReady ) { ForwardStream->println(CSTR("CAN device ready")); } else { ForwardStream->println(CSTR("CAN device failed to open")); }
+      if ( DeviceReady ) { ForwardStream->println(F("CAN device ready")); } else { ForwardStream->println(F("CAN device failed to open")); }
     }
 
     delay(200);
     if ((DeviceReady || dbMode!=dm_None) && (N2kMode!=N2km_ListenOnly) && (N2kMode!=N2km_SendOnly) && (N2kMode!=N2km_ListenAndSend) ) { // Start address claim automatically
       AddressClaimStarted=0;
-      if ( (ForwardStream!=0) && ( ForwardType==tNMEA2000::fwdt_Text) ) ForwardStream->println(CSTR("Start address claim"));
+      if ( (ForwardStream!=0) && ( ForwardType==tNMEA2000::fwdt_Text) ) ForwardStream->println(F("Start address claim"));
       SendIsoAddressClaim(0xff,0);
       AddressClaimStarted=millis();
     }
@@ -423,7 +423,7 @@ bool tNMEA2000::SendMsg(const tN2kMsg &N2kMsg, int DeviceIndex) {
       if (N2kMsg.DataLen<=8) { // We can send single frame
 //          PrintBuf(ForwardStream,N2kMsg.DataLen, N2kMsg.Data,true);
           result=SendFrame(canId, N2kMsg.DataLen, N2kMsg.Data,false);
-          if (!result && ForwardStream!=0 && ForwardType==tNMEA2000::fwdt_Text) { ForwardStream->print(CSTR("PGN ")); ForwardStream->print(N2kMsg.PGN); ForwardStream->println(CSTR(" send failed")); }
+          if (!result && ForwardStream!=0 && ForwardType==tNMEA2000::fwdt_Text) { ForwardStream->print(F("PGN ")); ForwardStream->print(N2kMsg.PGN); ForwardStream->println(F(" send failed")); }
       } else { // Send it as fast packet in multiple frames
         unsigned char temp[8]; // {0,0,0,0,0,0,0,0};
         int cur=0;
@@ -454,9 +454,9 @@ bool tNMEA2000::SendMsg(const tN2kMsg &N2kMsg, int DeviceIndex) {
 //            PrintBuf(ForwardStream,8,temp,true);
             result=SendFrame(canId, 8, temp, true);
             if (!result && ForwardStream!=0 && ForwardType==tNMEA2000::fwdt_Text) {
-              ForwardStream->print(CSTR("PGN ")); ForwardStream->print(N2kMsg.PGN);
+              ForwardStream->print(F("PGN ")); ForwardStream->print(N2kMsg.PGN);
               ForwardStream->print(", frame:"); ForwardStream->print(i); ForwardStream->print("/"); ForwardStream->print(frames);
-              ForwardStream->println(CSTR(" send failed"));
+              ForwardStream->println(F(" send failed"));
             }
         }
         SendOrder++; if (SendOrder>7) SendOrder=0;
@@ -491,11 +491,11 @@ bool tNMEA2000::CheckKnownMessage(unsigned long PGN, bool &SystemMessage, bool &
     // First check system messages
     SystemMessage=true;
 
-    for (i=0; GET_CINT32(SingleFrameSystemMessages[i])!=PGN && GET_CINT32(SingleFrameSystemMessages[i])!=0; i++);
-    if (GET_CINT32(SingleFrameSystemMessages[i])==PGN) return true;
+    for (i=0; pgm_read_dword(&SingleFrameSystemMessages[i])!=PGN && pgm_read_dword(&SingleFrameSystemMessages[i])!=0; i++);
+    if (pgm_read_dword(&SingleFrameSystemMessages[i])==PGN) return true;
 
-    for (i=0; GET_CINT32(FastPacketSystemMessages[i])!=PGN && GET_CINT32(FastPacketSystemMessages[i])!=0; i++);
-    if (GET_CINT32(FastPacketSystemMessages[i])==PGN) {
+    for (i=0; pgm_read_dword(&FastPacketSystemMessages[i])!=PGN && pgm_read_dword(&FastPacketSystemMessages[i])!=0; i++);
+    if (pgm_read_dword(&FastPacketSystemMessages[i])==PGN) {
       FastPacket=true;
       return true;
     }
@@ -504,13 +504,13 @@ bool tNMEA2000::CheckKnownMessage(unsigned long PGN, bool &SystemMessage, bool &
     SystemMessage=false;
     for (unsigned char igroup=0; (igroup<N2kMessageGroups); igroup++)  {
       if (SingleFrameMessages[igroup]!=0) {
-        for (i=0; GET_CINT32(SingleFrameMessages[igroup][i])!=PGN && GET_CINT32(SingleFrameMessages[igroup][i])!=0; i++);
-        if (GET_CINT32(SingleFrameMessages[igroup][i])==PGN) return true;
+        for (i=0; pgm_read_dword(&SingleFrameMessages[igroup][i])!=PGN && pgm_read_dword(&SingleFrameMessages[igroup][i])!=0; i++);
+        if (pgm_read_dword(&SingleFrameMessages[igroup][i])==PGN) return true;
       }
 
       if (FastPacketMessages[igroup]!=0) {
-        for (i=0; GET_CINT32(FastPacketMessages[igroup][i])!=PGN && GET_CINT32(FastPacketMessages[igroup][i])!=0; i++);
-        if (GET_CINT32(FastPacketMessages[igroup][i])==PGN) {
+        for (i=0; pgm_read_dword(&FastPacketMessages[igroup][i])!=PGN && pgm_read_dword(&FastPacketMessages[igroup][i])!=0; i++);
+        if (pgm_read_dword(&FastPacketMessages[igroup][i])==PGN) {
          FastPacket=true;
          return true;
         }
@@ -651,18 +651,18 @@ void SetN2kPGN126996Progmem(tN2kMsg &N2kMsg, const tProductInformation *ProductI
 
     N2kMsg.SetPGN(126996L);
     N2kMsg.Priority=6;
-    N2kMsg.Add2ByteInt(GET_CINT16(ProductInformation->N2kVersion));
-    N2kMsg.Add2ByteInt(GET_CINT16(ProductInformation->ProductCode));
-    for (i=0; i<Max_N2kModelID_len && GET_CINT8(ProductInformation->N2kModelID[i]); i++ ) { N2kMsg.AddByte(GET_CINT8(ProductInformation->N2kModelID[i])); }
+    N2kMsg.Add2ByteInt(pgm_read_word(&ProductInformation->N2kVersion));
+    N2kMsg.Add2ByteInt(pgm_read_word(&ProductInformation->ProductCode));
+    for (i=0; i<Max_N2kModelID_len && pgm_read_byte(&ProductInformation->N2kModelID[i]); i++ ) { N2kMsg.AddByte(pgm_read_byte(&ProductInformation->N2kModelID[i])); }
     for (; i<Max_N2kModelID_len; i++ ) { N2kMsg.AddByte(0); }
-    for (i=0; i<Max_N2kSwCode_len && GET_CINT8(ProductInformation->N2kSwCode[i]); i++ ) { N2kMsg.AddByte(GET_CINT8(ProductInformation->N2kSwCode[i])); }
+    for (i=0; i<Max_N2kSwCode_len && pgm_read_byte(&ProductInformation->N2kSwCode[i]); i++ ) { N2kMsg.AddByte(pgm_read_byte(&ProductInformation->N2kSwCode[i])); }
     for (; i<Max_N2kSwCode_len; i++ ) { N2kMsg.AddByte(0); }
-    for (i=0; i<Max_N2kModelVersion_len && GET_CINT8(ProductInformation->N2kModelVersion[i]); i++ ) { N2kMsg.AddByte(GET_CINT8(ProductInformation->N2kModelVersion[i])); }
+    for (i=0; i<Max_N2kModelVersion_len && pgm_read_byte(&ProductInformation->N2kModelVersion[i]); i++ ) { N2kMsg.AddByte(pgm_read_byte(&ProductInformation->N2kModelVersion[i])); }
     for (; i<Max_N2kModelVersion_len; i++ ) { N2kMsg.AddByte(0); }
-    for (i=0; i<Max_N2kModelSerialCode_len && GET_CINT8(ProductInformation->N2kModelSerialCode[i]); i++ ) { N2kMsg.AddByte(GET_CINT8(ProductInformation->N2kModelSerialCode[i])); }
+    for (i=0; i<Max_N2kModelSerialCode_len && pgm_read_byte(&ProductInformation->N2kModelSerialCode[i]); i++ ) { N2kMsg.AddByte(pgm_read_byte(&ProductInformation->N2kModelSerialCode[i])); }
     for (; i<Max_N2kModelSerialCode_len; i++ ) { N2kMsg.AddByte(0); }
-    N2kMsg.AddByte(GET_CINT8(ProductInformation->SertificationLevel));
-    N2kMsg.AddByte(GET_CINT8(ProductInformation->LoadEquivalency));
+    N2kMsg.AddByte(pgm_read_byte(&ProductInformation->SertificationLevel));
+    N2kMsg.AddByte(pgm_read_byte(&ProductInformation->LoadEquivalency));
 }
 
 //*****************************************************************************
@@ -688,7 +688,7 @@ bool tNMEA2000::SendProductInformation(int DeviceIndex) {
 int ProgmemStrLen(const char *str) {
   int len;
     if (str==0) return 0;
-    for (len=0; GET_CINT8((str[len]))!=0; len++ );
+    for (len=0; pgm_read_byte(&(str[len]))!=0; len++ );
     return len;
 }
 
@@ -714,15 +714,15 @@ void SetN2kPGN126998Progmem(tN2kMsg &N2kMsg, const tNMEA2000::tProgmemConfigurat
     // InstallationDescription1
     N2kMsg.AddByte(InstDesc1Len+2);
     N2kMsg.AddByte(0x01);
-    for (i=0; i<InstDesc1Len; i++) N2kMsg.AddByte(GET_CINT8((ConfigurationInformation->InstallationDescription1[i])));
+    for (i=0; i<InstDesc1Len; i++) N2kMsg.AddByte(pgm_read_byte(&(ConfigurationInformation->InstallationDescription1[i])));
     // InstallationDescription2
     N2kMsg.AddByte(InstDesc2Len+2);
     N2kMsg.AddByte(0x01);
-    for (i=0; i<InstDesc2Len; i++) N2kMsg.AddByte(GET_CINT8((ConfigurationInformation->InstallationDescription2[i])));
+    for (i=0; i<InstDesc2Len; i++) N2kMsg.AddByte(pgm_read_byte(&(ConfigurationInformation->InstallationDescription2[i])));
     // ManufacturerInformation
     N2kMsg.AddByte(ManInfoLen+2);
     N2kMsg.AddByte(0x01);
-    for (i=0; i<ManInfoLen; i++) N2kMsg.AddByte(GET_CINT8((ConfigurationInformation->ManufacturerInformation[i])));
+    for (i=0; i<ManInfoLen; i++) N2kMsg.AddByte(pgm_read_byte(&(ConfigurationInformation->ManufacturerInformation[i])));
 }
 
 //*****************************************************************************

From 1e5621648919053541ec7e07f0c17a0dce5fb675 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Thu, 8 Dec 2016 10:56:12 +0100
Subject: [PATCH 22/23] Add round() implementation for non-Arduino targets.

---
 N2kMsg.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/N2kMsg.cpp b/N2kMsg.cpp
index ca54e86c..d9984bab 100644
--- a/N2kMsg.cpp
+++ b/N2kMsg.cpp
@@ -33,6 +33,17 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define MaxActisenseMsgBuf 400
 
+//*****************************************************************************
+// On Arduino round() is a macro, hence the definition check. On other systems
+// it is a function that may or may not be implemented so we do it ourselves.
+#if !defined(round)
+double round(double val) {
+   return val >= 0
+         ? floor(val + 0.5)
+         : ceil(val - 0.5);
+}
+#endif
+
 //*****************************************************************************
 tN2kMsg::tN2kMsg(unsigned char _Source) {
   Init(6,0,_Source,255);

From e6509bb5652ac4a8f6710fb877c1ffe31b974571 Mon Sep 17 00:00:00 2001
From: Marco Nilsson <marco@ormgas.com>
Date: Thu, 8 Dec 2016 11:01:45 +0100
Subject: [PATCH 23/23] Move additional strings to flash.

---
 N2kMessagesEnumToStr.h | 10 +++++-----
 N2kMsg.cpp             |  6 +++---
 NMEA2000.cpp           |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/N2kMessagesEnumToStr.h b/N2kMessagesEnumToStr.h
index e2a08ce3..6ea069c5 100644
--- a/N2kMessagesEnumToStr.h
+++ b/N2kMessagesEnumToStr.h
@@ -1,4 +1,4 @@
-/* 
+/*
 N2kMessagesEnumToStr.h
 
 Copyright (c) 2015-2016 Timo Lappalainen, Kave Oy, www.kave.fi
@@ -19,12 +19,12 @@ PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIG
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
 OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-This is collection of functions for handling NMEA2000 bus messages. 
+
+This is collection of functions for handling NMEA2000 bus messages.
 Library contains functions to convert enums in N2kMessages.h to
 const char *
 
-If you do not need enums in clear text, you do not need this library. 
+If you do not need enums in clear text, you do not need this library.
 */
 
 #ifndef _N2kMessagesEnumToStr_H_
@@ -39,7 +39,7 @@ template<typename T> void PrintN2kEnumType(T a, Stream *OutputStream, bool addLF
   if (str[0] != '\0') {
     if (addLF) { OutputStream->println(str); } else { OutputStream->print(str); }
   } else {
-    OutputStream->print("unknown ("); OutputStream->print(a); OutputStream->println(")");
+    OutputStream->print(F("unknown (")); OutputStream->print(a); OutputStream->println(F(")"));
   }
 }
 
diff --git a/N2kMsg.cpp b/N2kMsg.cpp
index d9984bab..f2699894 100644
--- a/N2kMsg.cpp
+++ b/N2kMsg.cpp
@@ -568,12 +568,12 @@ void PrintBuf(N2kStream *port, unsigned char len, const unsigned char *pData, bo
     if (port==0) return;
 
     for(int i = 0; i<len; i++) {
-      if (i>0) { port->print(","); };
+      if (i>0) { port->print(F(",")); };
       // Print bytes as hex.
       port->print(pData[i], 16);
     }
 
-    if (AddLF) port->println("");
+    if (AddLF) port->println(F(""));
 }
 
 //*****************************************************************************
@@ -588,7 +588,7 @@ void tN2kMsg::Print(N2kStream *port, bool NoData) const {
     port->print(F(" Data:"));
     PrintBuf(port,DataLen,Data);
   }
-  port->println("");
+  port->println(F(""));
 }
 
 //*****************************************************************************
diff --git a/NMEA2000.cpp b/NMEA2000.cpp
index 9afb6cc4..36e96fd8 100644
--- a/NMEA2000.cpp
+++ b/NMEA2000.cpp
@@ -455,7 +455,7 @@ bool tNMEA2000::SendMsg(const tN2kMsg &N2kMsg, int DeviceIndex) {
             result=SendFrame(canId, 8, temp, true);
             if (!result && ForwardStream!=0 && ForwardType==tNMEA2000::fwdt_Text) {
               ForwardStream->print(F("PGN ")); ForwardStream->print(N2kMsg.PGN);
-              ForwardStream->print(", frame:"); ForwardStream->print(i); ForwardStream->print("/"); ForwardStream->print(frames);
+              ForwardStream->print(F(", frame:")); ForwardStream->print(i); ForwardStream->print(F("/")); ForwardStream->print(frames);
               ForwardStream->println(F(" send failed"));
             }
         }