From 63e0b530546a914b27bc3a8453fb1a094a5f9a33 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Sat, 27 Feb 2021 09:17:58 +0800 Subject: [PATCH] 1 index channel index --- docs/software/TODO.md | 2 +- proto | 2 +- src/mesh/SinglePortPlugin.h | 1 - src/plugins/AdminPlugin.cpp | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/software/TODO.md b/docs/software/TODO.md index 2320eaafb..481799cc1 100644 --- a/docs/software/TODO.md +++ b/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) diff --git a/proto b/proto index fa40a9389..83e00e564 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit fa40a9389bc910b6291fabe148260070e393600f +Subproject commit 83e00e564d3973b594a46e786b62eed2823e02ed diff --git a/src/mesh/SinglePortPlugin.h b/src/mesh/SinglePortPlugin.h index 20836246d..305532dc5 100644 --- a/src/mesh/SinglePortPlugin.h +++ b/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; } diff --git a/src/plugins/AdminPlugin.cpp b/src/plugins/AdminPlugin.cpp index 63f7a41da..bba1b39a9 100644 --- a/src/plugins/AdminPlugin.cpp +++ b/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: