From 79df4b88ed68875cd58ef4e1ec5ea22f9ab9d55e Mon Sep 17 00:00:00 2001 From: David Crocker Date: Sun, 26 Jan 2020 20:56:03 +0000 Subject: Refactored MAC address code M540 on Duet WiFi now returns correct MAC address MAC address added to object model WiFi firmware version now returned correctly in object model --- src/ObjectModel/ObjectModel.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/ObjectModel/ObjectModel.h') diff --git a/src/ObjectModel/ObjectModel.h b/src/ObjectModel/ObjectModel.h index 9a18ffe6..54d007b6 100644 --- a/src/ObjectModel/ObjectModel.h +++ b/src/ObjectModel/ObjectModel.h @@ -16,6 +16,7 @@ #include #include #include +#include typedef uint8_t TypeCode; constexpr TypeCode NoType = 0; // code for an invalid or unknown type @@ -54,6 +55,7 @@ template<> constexpr TypeCode TypeOf () noexcept { return 12; } template<> constexpr TypeCode TypeOf () noexcept { return 13; } template<> constexpr TypeCode TypeOf () noexcept { return 14; } template<> constexpr TypeCode TypeOf () noexcept { return 15; } +template<> constexpr TypeCode TypeOf () noexcept { return 16; } #define TYPE_OF(_t) (TypeOf<_t>()) @@ -97,6 +99,7 @@ struct ExpressionValue explicit ExpressionValue(Bitmap bm) noexcept : type(TYPE_OF(Bitmap)), param(0), uVal(bm.GetRaw()) { } explicit ExpressionValue(Bitmap bm) noexcept : type(TYPE_OF(Bitmap)), param(0), uVal(bm.GetRaw()) { } explicit ExpressionValue(Bitmap bm) noexcept : type(TYPE_OF(Bitmap)), param(bm.GetRaw() >> 32), uVal((uint32_t)bm.GetRaw()) { } + explicit ExpressionValue(const MacAddress& mac) noexcept; void Set(bool b) noexcept { type = TYPE_OF(bool); bVal = b; } void Set(char c) noexcept { type = TYPE_OF(char); cVal = c; } -- cgit v1.2.3