1 index channel index

docs/software/TODO.md

@@ -21,7 +21,7 @@ You probably don't care about this section - skip to the next one.
 * implement 'get channels' Admin plugin operation
 * use get-channels from python
 * use set-channel from python
-* combine acks and responses in a single message if possible
+* combine acks and responses in a single message if possible (do routing plugin LAST and drop ACK if someone else has already replied)
 * use portuino TCP connection to debug with python API
 * make python tests more exhaustive
 * document the relationship between want_response (indicating remote node received it) and want_ack (indicating that this message should be sent reliably - and also get acks from the first rx node and naks if it is never delivered)

src/mesh/SinglePortPlugin.h

@@ -33,7 +33,6 @@ class SinglePortPlugin : public MeshPlugin
         // Update our local node info with our position (even if we don't decide to update anyone else)
         MeshPacket *p = router->allocForSending();
         p->decoded.portnum = ourPortNum;
-        p->which_payloadVariant = MeshPacket_decoded_tag;
 
         return p;
     }

src/plugins/AdminPlugin.cpp

@@ -49,8 +49,8 @@ bool AdminPlugin::handleReceivedProtobuf(const MeshPacket &mp, const AdminMessag
         break;
 
     case AdminMessage_get_channel_request_tag:
-        DEBUG_MSG("Client is getting channel %d\n", r->get_channel_request);
-        handleGetChannel(mp, r->get_channel_request);
+        DEBUG_MSG("Client is getting channel %d\n", r->get_channel_request - 1);
+        handleGetChannel(mp, r->get_channel_request - 1);
         break;
 
     case AdminMessage_get_radio_request_tag: