WIP on GPIO example

src/plugins/NodeInfoPlugin.cpp

@@ -28,22 +28,17 @@ bool NodeInfoPlugin::handleReceivedProtobuf(const MeshPacket &mp, const User &p)
 
 void NodeInfoPlugin::sendOurNodeInfo(NodeNum dest, bool wantReplies)
 {
-    User &u = owner;
-
-    DEBUG_MSG("sending owner %s/%s/%s\n", u.id, u.long_name, u.short_name);
-    MeshPacket *p = allocForSending(u);
+    MeshPacket *p = allocReply();
     p->to = dest;
     p->decoded.want_response = wantReplies;
 
     service.sendToMesh(p);
 }
 
+MeshPacket *NodeInfoPlugin::allocReply()
+{
+    User &u = owner;
 
-/** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
- * so that subclasses can (optionally) send a response back to the original sender.  Implementing this method
- * is optional
- */
-void NodeInfoPlugin::sendResponse(NodeNum to) {
-    DEBUG_MSG("Sending user reply\n");
-    sendOurNodeInfo(to, false);
-}
+    DEBUG_MSG("sending owner %s/%s/%s\n", u.id, u.long_name, u.short_name);
+    return allocDataProtobuf(u);
+}

src/plugins/NodeInfoPlugin.h

@@ -25,10 +25,8 @@ class NodeInfoPlugin : public ProtobufPlugin<User>
     virtual bool handleReceivedProtobuf(const MeshPacket &mp, const User &p);
 
     /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
-     * so that subclasses can (optionally) send a response back to the original sender.  Implementing this method
-     * is optional
-     */
-    virtual void sendResponse(NodeNum to);
+     * so that subclasses can (optionally) send a response back to the original sender.  */
+    virtual MeshPacket *allocReply();
 };
 
 extern NodeInfoPlugin nodeInfoPlugin;

src/plugins/PositionPlugin.cpp

@@ -28,7 +28,7 @@ bool PositionPlugin::handleReceivedProtobuf(const MeshPacket &mp, const Position
     return false; // Let others look at this message also if they want
 }
 
-void PositionPlugin::sendOurPosition(NodeNum dest, bool wantReplies)
+MeshPacket *PositionPlugin::allocReply()
 {
     NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
     assert(node);
@@ -38,18 +38,15 @@ void PositionPlugin::sendOurPosition(NodeNum dest, bool wantReplies)
     auto position = node->position;
     position.time = getValidTime(RTCQualityGPS); // This nodedb timestamp might be stale, so update it if our clock is valid.
 
-    MeshPacket *p = allocForSending(position);
+    return allocDataProtobuf(position);
+}
+
+void PositionPlugin::sendOurPosition(NodeNum dest, bool wantReplies)
+{
+    MeshPacket *p = allocReply();
     p->to = dest;
     p->decoded.want_response = wantReplies;
 
     service.sendToMesh(p);
 }
 
-/** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
- * so that subclasses can (optionally) send a response back to the original sender.  Implementing this method
- * is optional
- */
-void PositionPlugin::sendResponse(NodeNum to) {
-    DEBUG_MSG("Sending posistion reply\n");
-    sendOurPosition(to, false);
-}

src/plugins/PositionPlugin.h

@@ -26,10 +26,8 @@ class PositionPlugin : public ProtobufPlugin<Position>
     virtual bool handleReceivedProtobuf(const MeshPacket &mp, const Position &p);
 
     /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
-     * so that subclasses can (optionally) send a response back to the original sender.  Implementing this method
-     * is optional
-     */
-    virtual void sendResponse(NodeNum to);
+     * so that subclasses can (optionally) send a response back to the original sender.  */
+    virtual MeshPacket *allocReply();
 };
 
 extern PositionPlugin positionPlugin;

src/plugins/RemoteHardwarePlugin.cpp

@@ -8,10 +8,53 @@
 
 RemoteHardwarePlugin remoteHardwarePlugin;
 
-bool RemoteHardwarePlugin::handleReceivedProtobuf(const MeshPacket &mp, const HardwareMessage &p)
+#define NUM_GPIOS 64
+
+// A macro for clearing a struct, FIXME, move elsewhere
+#define CLEAR_STRUCT(r) memset(&r, 0, sizeof(r))
+
+bool RemoteHardwarePlugin::handleReceivedProtobuf(const MeshPacket &req, const HardwareMessage &p)
 {
+    switch (p.typ) {
+    case HardwareMessage_Type_WRITE_GPIOS:
+        // Print notification to LCD screen
+        screen->print("Write GPIOs");
 
-    return false; // Let others look at this message also if they want
+        for (uint8_t i = 0; i < NUM_GPIOS; i++) {
+            uint64_t mask = 1 << i;
+            if (p.gpio_mask & mask) {
+                digitalWrite(i, (p.gpio_value & mask) ? 1 : 0);
+                pinMode(i, OUTPUT);
+            }
+        }
+        break;
+    case HardwareMessage_Type_READ_GPIOS: {
+        // Print notification to LCD screen
+        screen->print("Read GPIOs");
+
+        uint64_t res = 0;
+        for (uint8_t i = 0; i < NUM_GPIOS; i++) {
+            uint64_t mask = 1 << i;
+            if (p.gpio_mask & mask) {
+                pinMode(i, INPUT_PULLUP);
+                if (digitalRead(i))
+                    res |= (1 << i);
+            }
+        }
+
+        // Send the reply
+        HardwareMessage reply;
+        CLEAR_STRUCT(reply);
+        reply.typ = HardwareMessage_Type_READ_GPIOS_REPLY;
+        reply.gpio_value = res;
+        MeshPacket *p = allocDataProtobuf(reply);
+        setReplyTo(p, req);
+        service.sendToMesh(p);
+        break;
+    }
+    default:
+        DEBUG_MSG("Hardware operation %d not yet implemented! FIXME\n", p.typ);
+        break;
+    }
+    return true; // handled
 }
-
-