Added support for building for non-AVR boards. Building was tested for Arduino Due, Arduino Zero and ESP8266 boards.

Author: ewasscher

src/dsmr/crc16.h

@@ -0,0 +1,71 @@
+/*
+ * This file was taken from Paul Stoffregen's Teensy 3 core at:
+ *
+ * https://github.com/PaulStoffregen/cores/tree/master/teensy3
+ */
+
+#ifndef _UTIL_CRC16_H_
+#define _UTIL_CRC16_H_
+
+#include <stdint.h>
+
+static inline uint16_t _crc16_update(uint16_t crc, uint8_t data) __attribute__((always_inline, unused));
+static inline uint16_t _crc16_update(uint16_t crc, uint8_t data)
+{
+	unsigned int i;
+
+	crc ^= data;
+	for (i = 0; i < 8; ++i) {
+		if (crc & 1) {
+			crc = (crc >> 1) ^ 0xA001;
+		} else {
+			crc = (crc >> 1);
+		}
+	}
+	return crc;
+}
+
+static inline uint16_t _crc_xmodem_update(uint16_t crc, uint8_t data) __attribute__((always_inline, unused));
+static inline uint16_t _crc_xmodem_update(uint16_t crc, uint8_t data)
+{
+	unsigned int i;
+
+	crc = crc ^ ((uint16_t)data << 8);
+	for (i=0; i<8; i++) {
+		if (crc & 0x8000) {
+			crc = (crc << 1) ^ 0x1021;
+		} else {
+			crc <<= 1;
+		}
+	}
+	return crc;
+}
+
+static inline uint16_t _crc_ccitt_update (uint16_t crc, uint8_t data) __attribute__((always_inline, unused));
+static inline uint16_t _crc_ccitt_update (uint16_t crc, uint8_t data)
+{
+	data ^= (crc & 255);
+	data ^= data << 4;
+
+	return ((((uint16_t)data << 8) | (crc >> 8)) ^ (uint8_t)(data >> 4) 
+		^ ((uint16_t)data << 3));
+}
+
+static inline uint8_t _crc_ibutton_update(uint8_t crc, uint8_t data) __attribute__((always_inline, unused));
+static inline uint8_t _crc_ibutton_update(uint8_t crc, uint8_t data)
+{
+	unsigned int i;
+
+	crc = crc ^ data;
+	for (i = 0; i < 8; i++) {
+		if (crc & 0x01) {
+			crc = (crc >> 1) ^ 0x8C;
+		} else {
+			crc >>= 1;
+		}
+	}
+	return crc;
+}
+
+#endif
+

src/dsmr/parser.h

@@ -31,7 +31,11 @@
 #ifndef DSMR_INCLUDE_PARSER_H
 #define DSMR_INCLUDE_PARSER_H
 
+#ifdef ARDUINO_ARCH_AVR
 #include <util/crc16.h>
+#else
+#include "crc16.h"
+#endif
 #include "util.h"
 
 namespace dsmr {
@@ -83,7 +87,11 @@ struct ParsedData<> {
 // Do not use F() for multiply-used strings (including strings used from
 // multiple template instantiations), that would result in multiple
 // instances of the string in the binary
+#ifndef ARDUINO_ARCH_ESP8266
 static constexpr char DUPLICATE_FIELD[] PROGMEM = "Duplicate field";
+#else
+static constexpr char DUPLICATE_FIELD[] = "Duplicate field";
+#endif
 
 /**
  * General case: At least one typename is passed.
@@ -156,8 +164,13 @@ struct StringParser {
 // Do not use F() for multiply-used strings (including strings used from
 // multiple template instantiations), that would result in multiple
 // instances of the string in the binary
+#ifndef ARDUINO_ARCH_ESP8266
 static constexpr char INVALID_NUMBER[] PROGMEM = "Invalid number";
 static constexpr char INVALID_UNIT[] PROGMEM = "Invalid unit";
+#else
+static constexpr char INVALID_NUMBER[] = "Invalid number";
+static constexpr char INVALID_UNIT[] = "Invalid unit";
+#endif
 
 struct NumParser {
   static ParseResult<uint32_t> parse(size_t max_decimals, const char* unit, const char *str, const char *end) {

src/dsmr/reader.h

@@ -33,8 +33,11 @@
 #define DSMR_INCLUDE_READER_H
 
 #include <Arduino.h>
+#ifdef ARDUINO_ARCH_AVR
 #include <util/crc16.h>
-
+#else
+#include "crc16.h"
+#endif
 #include "parser.h"
 
 namespace dsmr {
@@ -70,7 +73,7 @@ class P1Reader {
      * rate configured).
      */
     P1Reader(Stream *stream, uint8_t req_pin)
-      : stream(stream), req_pin(req_pin), once(false), state(State::DISABLED) {
+      : stream(stream), req_pin(req_pin), once(false), state(State::DISABLED_STATE) {
       pinMode(req_pin, OUTPUT);
       digitalWrite(req_pin, LOW);
     }
@@ -85,7 +88,7 @@ class P1Reader {
      */
     void enable(bool once) {
       digitalWrite(this->req_pin, HIGH);
-      this->state = State::WAITING;
+      this->state = State::WAITING_STATE;
       this->once = once;
     }
 
@@ -96,7 +99,7 @@ class P1Reader {
      */
     void disable() {
       digitalWrite(this->req_pin, LOW);
-      this->state = State::DISABLED;
+      this->state = State::DISABLED_STATE;
       if (!this->_available)
         this->buffer = "";
       // Clear any pending bytes
@@ -118,7 +121,7 @@ class P1Reader {
      */
     bool loop() {
       while(true) {
-        if (state == State::CHECKSUM) {
+        if (state == State::CHECKSUM_STATE) {
           // Let the Stream buffer the CRC bytes
           if (this->stream->available() < CrcParser::CRC_LEN)
             return false;
@@ -130,7 +133,7 @@ class P1Reader {
           ParseResult<uint16_t> crc = CrcParser::parse(buf, buf + lengthof(buf));
 
           // Prepare for next message
-          state = State::WAITING;
+          state = State::WAITING_STATE;
 
           if (!crc.err && crc.result == this->crc) {
             // Message complete, checksum correct
@@ -148,22 +151,22 @@ class P1Reader {
             return false;
 
           switch (this->state) {
-            case State::DISABLED:
+            case State::DISABLED_STATE:
               // Where did this byte come from? Just toss it
               break;
-            case State::WAITING:
+            case State::WAITING_STATE:
               if (c == '/') {
-                this->state = State::READING;
+                this->state = State::READING_STATE;
                 // Include the / in the CRC
                 this->crc = _crc16_update(0, c);
                 this->clear();
               }
               break;
-            case State::READING:
+            case State::READING_STATE:
               // Include the ! in the CRC
               this->crc = _crc16_update(this->crc, c);
               if (c == '!')
-                this->state = State::CHECKSUM;
+                this->state = State::CHECKSUM_STATE;
               else
                 buffer.concat((char)c);
 
@@ -218,10 +221,10 @@ class P1Reader {
     Stream *stream;
     uint8_t req_pin;
     enum class State : uint8_t {
-      DISABLED,
-      WAITING,
-      READING,
-      CHECKSUM,
+      DISABLED_STATE,
+      WAITING_STATE,
+      READING_STATE,
+      CHECKSUM_STATE,
     };
     bool _available;
     bool once;