Maxim Integrated / MaximInterface

Device interface library for multiple platforms including Mbed.

Dependents:   DeepCover Embedded Security in IoT MaximInterface MAXREFDES155#

Maxim Interface is a library framework focused on providing flexible and expressive hardware interfaces. Both communication interfaces such as I2C and 1-Wire and device interfaces such as DS18B20 are supported. Modern C++ concepts are used extensively while keeping compatibility with C++98/C++03 and requiring no external dependencies. The embedded-friendly design does not depend on exceptions or RTTI.

The full version of the project is hosted on GitLab: https://gitlab.com/iabenz/MaximInterface

Diff: MaximInterfaceCore/SelectRom.hpp

Revision:
8:5ea891c7d1a1
Parent:
7:9cd16581b578
diff -r 9cd16581b578 -r 5ea891c7d1a1 MaximInterfaceCore/SelectRom.hpp
--- a/MaximInterfaceCore/SelectRom.hpp	Mon Jul 22 11:44:07 2019 -0500
+++ b/MaximInterfaceCore/SelectRom.hpp	Mon Sep 16 11:13:37 2019 -0500
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (C) 2017 Maxim Integrated Products, Inc., All Rights Reserved.
+* Copyright (C) Maxim Integrated Products, Inc., All Rights Reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -30,21 +30,20 @@
 * ownership rights.
 *******************************************************************************/
 
-#ifndef MaximInterfaceCore_SelectRom
-#define MaximInterfaceCore_SelectRom
+#ifndef MaximInterfaceCore_SelectRom_hpp
+#define MaximInterfaceCore_SelectRom_hpp
 
 #include "Config.hpp"
 #include "Function.hpp"
 #include "RomCommands.hpp"
 #include "RomId.hpp"
-#include "system_error.hpp"
 
 namespace MaximInterfaceCore {
 
 class OneWireMaster;
 
 /// Selects a 1-Wire device on the bus for communication.
-typedef Function<error_code(OneWireMaster &)> SelectRom;
+typedef Function<Result<void>(OneWireMaster &)> SelectRom;
 
 /// Selector for a multidrop 1-Wire bus.
 class SelectMatchRom {
@@ -52,49 +51,15 @@
   typedef SelectRom::argument_type argument_type;
   typedef SelectRom::result_type result_type;
 
-  explicit SelectMatchRom(RomId::const_span romId) { setRomId(romId); }
-
-  RomId::const_span romId() const { return romId_; }
+  explicit SelectMatchRom(RomId::const_span romId);
 
-  void setRomId(RomId::const_span romId) { copy(romId, make_span(romId_)); }
-
-  MaximInterfaceCore_EXPORT error_code operator()(OneWireMaster & master) const;
+  MaximInterfaceCore_EXPORT Result<void>
+  operator()(OneWireMaster & master) const;
 
 private:
   RomId::array romId_;
 };
 
-/// @brief
-/// Selector for a multidrop 1-Wire bus where slaves support the Resume ROM
-/// command.
-class SelectMatchRomWithResume {
-public:
-  typedef SelectRom::argument_type argument_type;
-  typedef SelectRom::result_type result_type;
-
-  struct SharedData {
-    SharedData() : lastRomId() {}
-    RomId::array lastRomId;
-  };
-
-  SelectMatchRomWithResume(SharedData & data, RomId::const_span romId)
-      : data(&data) {
-    setRomId(romId);
-  }
-
-  void setSharedData(SharedData & data) { this->data = &data; }
-
-  RomId::const_span romId() const { return romId_; }
-
-  void setRomId(RomId::const_span romId) { copy(romId, make_span(romId_)); }
-
-  MaximInterfaceCore_EXPORT error_code operator()(OneWireMaster & master) const;
-
-private:
-  SharedData * data;
-  RomId::array romId_;
-};
-
 } // namespace MaximInterfaceCore
 
 #endif